subject:"doxygen"

Re: Remove doxygen from libgphoto-2.5.31

2024-01-14 Thread Antoine Jacoutot

On Sun, Jan 14, 2024 at 05:04:10PM +0100, Rafael Sadowski wrote:
> On Sun Jan 14, 2024 at 03:44:39PM +0100, Antoine Jacoutot wrote:
> > On Sat, Jan 13, 2024 at 09:22:05PM +0100, Rafael Sadowski wrote:
> > > The upcoming doxygen update 1.10.0 fails to generate docs in libgphoto2.
> > > Doxygen is just pain in libgphoto. The following diff stops using
> > > doxygen in libgphoto2.
> > > 
> > > OK?
> > 
> > Hi.
> > 
> > Using --disable-internal-docs does not work?
> > If it does then please use this with CONFIGURE_ARGS += 
> > --disable-internal-docs
> > with a comment to exlain why.
> 
> With "CONFIGURE_ARGS += --disable-internal-docs" and without DOXYGEN=no
> the configure step prints:
> 
> build doxygen docs:yes
> build API docs with gtk-doc:   no (not requested)
> 
> ..and fails with:
> 
> error: md5 hash does not match for two different runs of 
> /usr/ports/pobj/libgphoto-2.5.31/libgphoto2-2.5.31/doc/doxygen-output/libgphoto2-api.html/dir_237c9d09f3a8ead2cd7ceb22b81cf2ae_dep.dot
>  !
> 
> Anyway what about this?

OK but please explain why we disable doxygen.
I would like to re-enable it in the future.


> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
> diff -u -p -u -p -r1.85 Makefile
> --- Makefile  26 Sep 2023 11:39:07 -  1.85
> +++ Makefile  14 Jan 2024 16:02:44 -
> @@ -3,7 +3,7 @@ COMMENT=  digital camera library
>  VERSION= 2.5.31
>  DISTNAME=libgphoto2-${VERSION}
>  PKGNAME= libgphoto-${VERSION}
> -REVISION=0
> +REVISION=1
>  
>  GPHOTO2_PORT_API=0.12.2
>  SUBST_VARS=  GPHOTO2_PORT_API VERSION
> @@ -27,8 +27,6 @@ WANTLIB += usb usb-1.0 webp xml2 z zstd
>  
>  SITES=   ${SITE_SOURCEFORGE:=gphoto/}
>  
> -BUILD_DEPENDS=   devel/doxygen
> -
>  LIB_DEPENDS= graphics/gd \
>   graphics/libexif \
>   devel/libusb-compat \
> @@ -38,8 +36,13 @@ LIB_DEPENDS=   graphics/gd \
>  
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> - ac_cv_path_DOXYGEN=false
> + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
> +
> +# Force the deactivation of Doxygen.
> +# --disable-internal-docs does not help here
> +CONFIGURE_ENV+=  DOXYGEN=no \
> + ac_cv_path_DOXYGEN=false \
> + ac_cv_path_DOT=false
>  
>  CONFIGURE_ARGS=  --enable-static \
>   --without-hal \
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
> diff -u -p -u -p -r1.35 PLIST
> --- pkg/PLIST 2 Sep 2023 13:31:15 -   1.35
> +++ pkg/PLIST 14 Jan 2024 16:02:44 -
> @@ -63,7 +63,6 @@ share/doc/libgphoto2/AUTHORS
>  share/doc/libgphoto2/COPYING
>  share/doc/libgphoto2/ChangeLog
>  share/doc/libgphoto2/NEWS
> -share/doc/libgphoto2/README.apidocs
>  share/doc/libgphoto2/README.md
>  share/doc/libgphoto2/README.packaging
>  share/doc/libgphoto2/RELEASE-HOWTO.md
> @@ -111,569 +110,6 @@ share/doc/libgphoto2/camlibs/README.st22
>  share/doc/libgphoto2/camlibs/README.st2205-compression
>  share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
>  share/doc/libgphoto2/camlibs/README.tp6801
> -share/doc/libgphoto2/libgphoto2-api.html/
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.html
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.js
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/annotated.html
> -share/doc/libgphoto2/libgphoto2-api.html/annotated_dup.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h_source.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.js
> -share/doc/libgphoto2/libgphoto2-api.html/b

Re: Remove doxygen from libgphoto-2.5.31

2024-01-14 Thread Rafael Sadowski

On Sun Jan 14, 2024 at 03:44:39PM +0100, Antoine Jacoutot wrote:
> On Sat, Jan 13, 2024 at 09:22:05PM +0100, Rafael Sadowski wrote:
> > The upcoming doxygen update 1.10.0 fails to generate docs in libgphoto2.
> > Doxygen is just pain in libgphoto. The following diff stops using
> > doxygen in libgphoto2.
> > 
> > OK?
> 
> Hi.
> 
> Using --disable-internal-docs does not work?
> If it does then please use this with CONFIGURE_ARGS += --disable-internal-docs
> with a comment to exlain why.

With "CONFIGURE_ARGS += --disable-internal-docs" and without DOXYGEN=no
the configure step prints:

build doxygen docs:yes
build API docs with gtk-doc:   no (not requested)

..and fails with:

error: md5 hash does not match for two different runs of 
/usr/ports/pobj/libgphoto-2.5.31/libgphoto2-2.5.31/doc/doxygen-output/libgphoto2-api.html/dir_237c9d09f3a8ead2cd7ceb22b81cf2ae_dep.dot
 !

Anyway what about this?

Index: Makefile
===
RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
diff -u -p -u -p -r1.85 Makefile
--- Makefile26 Sep 2023 11:39:07 -  1.85
+++ Makefile14 Jan 2024 16:02:44 -
@@ -3,7 +3,7 @@ COMMENT=digital camera library
 VERSION=   2.5.31
 DISTNAME=  libgphoto2-${VERSION}
 PKGNAME=   libgphoto-${VERSION}
-REVISION=  0
+REVISION=  1
 
 GPHOTO2_PORT_API=  0.12.2
 SUBST_VARS=GPHOTO2_PORT_API VERSION
@@ -27,8 +27,6 @@ WANTLIB += usb usb-1.0 webp xml2 z zstd
 
 SITES= ${SITE_SOURCEFORGE:=gphoto/}
 
-BUILD_DEPENDS= devel/doxygen
-
 LIB_DEPENDS=   graphics/gd \
graphics/libexif \
devel/libusb-compat \
@@ -38,8 +36,13 @@ LIB_DEPENDS= graphics/gd \
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-   ac_cv_path_DOXYGEN=false
+   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+# Force the deactivation of Doxygen.
+# --disable-internal-docs does not help here
+CONFIGURE_ENV+=DOXYGEN=no \
+   ac_cv_path_DOXYGEN=false \
+   ac_cv_path_DOT=false
 
 CONFIGURE_ARGS=--enable-static \
--without-hal \
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
diff -u -p -u -p -r1.35 PLIST
--- pkg/PLIST   2 Sep 2023 13:31:15 -   1.35
+++ pkg/PLIST   14 Jan 2024 16:02:44 -
@@ -63,7 +63,6 @@ share/doc/libgphoto2/AUTHORS
 share/doc/libgphoto2/COPYING
 share/doc/libgphoto2/ChangeLog
 share/doc/libgphoto2/NEWS
-share/doc/libgphoto2/README.apidocs
 share/doc/libgphoto2/README.md
 share/doc/libgphoto2/README.packaging
 share/doc/libgphoto2/RELEASE-HOWTO.md
@@ -111,569 +110,6 @@ share/doc/libgphoto2/camlibs/README.st22
 share/doc/libgphoto2/camlibs/README.st2205-compression
 share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 share/doc/libgphoto2/camlibs/README.tp6801
-share/doc/libgphoto2/libgphoto2-api.html/
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/annotated.html
-share/doc/libgphoto2/libgphoto2-api.html/annotated_dup.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.png
-share/doc/libgphoto2/libgpho

Re: Remove doxygen from libgphoto-2.5.31

2024-01-14 Thread Antoine Jacoutot

On Sat, Jan 13, 2024 at 09:22:05PM +0100, Rafael Sadowski wrote:
> The upcoming doxygen update 1.10.0 fails to generate docs in libgphoto2.
> Doxygen is just pain in libgphoto. The following diff stops using
> doxygen in libgphoto2.
> 
> OK?

Hi.

Using --disable-internal-docs does not work?
If it does then please use this with CONFIGURE_ARGS += --disable-internal-docs
with a comment to exlain why.

Thanks.



> 
> Cheers Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
> diff -u -p -u -p -r1.85 Makefile
> --- Makefile  26 Sep 2023 11:39:07 -  1.85
> +++ Makefile  13 Jan 2024 20:18:33 -
> @@ -3,7 +3,7 @@ COMMENT=  digital camera library
>  VERSION= 2.5.31
>  DISTNAME=libgphoto2-${VERSION}
>  PKGNAME= libgphoto-${VERSION}
> -REVISION=0
> +REVISION=1
>  
>  GPHOTO2_PORT_API=0.12.2
>  SUBST_VARS=  GPHOTO2_PORT_API VERSION
> @@ -27,8 +27,6 @@ WANTLIB += usb usb-1.0 webp xml2 z zstd
>  
>  SITES=   ${SITE_SOURCEFORGE:=gphoto/}
>  
> -BUILD_DEPENDS=   devel/doxygen
> -
>  LIB_DEPENDS= graphics/gd \
>   graphics/libexif \
>   devel/libusb-compat \
> @@ -39,7 +37,9 @@ LIB_DEPENDS=graphics/gd \
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> - ac_cv_path_DOXYGEN=false
> + DOXYGEN=no \
> + ac_cv_path_DOXYGEN=false \
> + ac_cv_path_DOT=false
>  
>  CONFIGURE_ARGS=  --enable-static \
>   --without-hal \
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
> diff -u -p -u -p -r1.35 PLIST
> --- pkg/PLIST 2 Sep 2023 13:31:15 -   1.35
> +++ pkg/PLIST 13 Jan 2024 20:18:33 -
> @@ -63,7 +63,6 @@ share/doc/libgphoto2/AUTHORS
>  share/doc/libgphoto2/COPYING
>  share/doc/libgphoto2/ChangeLog
>  share/doc/libgphoto2/NEWS
> -share/doc/libgphoto2/README.apidocs
>  share/doc/libgphoto2/README.md
>  share/doc/libgphoto2/README.packaging
>  share/doc/libgphoto2/RELEASE-HOWTO.md
> @@ -111,569 +110,6 @@ share/doc/libgphoto2/camlibs/README.st22
>  share/doc/libgphoto2/camlibs/README.st2205-compression
>  share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
>  share/doc/libgphoto2/camlibs/README.tp6801
> -share/doc/libgphoto2/libgphoto2-api.html/
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.html
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.js
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/annotated.html
> -share/doc/libgphoto2/libgphoto2-api.html/annotated_dup.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h_source.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.html
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.js
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.map
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.md5
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.png
> -share/doc/libgphoto2/libgphoto2-api.html/bayer_8h_source.html
> -share/doc/libgphoto2/libgphoto2-api.html/bc_s.png
> -share/doc/libgphoto2/libgphoto2-api.html/bc_sd.png
> -share/doc/libgphoto2/libgphoto2-api.html/classes.html
> -share/doc/libgphoto2/libgphoto2-api.html/closed.png
> -share/doc/libgphoto2/libgphoto2-api.html/compile

UPDATE: doxygen to 1.10.0

2024-01-13 Thread Rafael Sadowski

Update diff doxygen and doxygen-gui to 1.10.0. I tested alle consumers
and the diff includes those that needs a bump.

This diff does not include the libgphoto2 changes but it re-adds a
lost[1] patch (patches/patch-src_dirdef_cpp) which I deleted a long time
ago with an update. I don't think it will do any good in the ports tree
but never mind.

Objections? Ok?

Rafael

1: 
https://cvsweb.openbsd.org/ports/devel/doxygen/patches/Attic/patch-src_dirdef_cpp

Index: devel/doxygen/Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
diff -u -p -r1.66 Makefile
--- devel/doxygen/Makefile  21 Sep 2023 09:49:52 -  1.66
+++ devel/doxygen/Makefile  13 Jan 2024 20:42:48 -
@@ -5,7 +5,7 @@ BROKEN-alpha=   .got subsegment exceeds 64
 
 COMMENT=   source code documentation generator tool
 
-VERSION=   1.9.8
+VERSION=   1.10.0
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME=   doxygen-${VERSION}
 
@@ -23,31 +23,31 @@ WANTLIB += ${COMPILER_LIBCXX} c iconv m 
 COMPILER = base-clang ports-gcc base-gcc
 
 SITES= https://doxygen.nl/files/
-TAR =  ${LOCALBASE}/bin/gtar
-
-BUILD_DEPENDS = archivers/gtar
-
-LIB_DEPENDS=   converters/libiconv \
-   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
 
 MODPY_RUNDEP=  No
 
-.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
-CXXFLAGS+= -mxgot
-.endif
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
+
 
-BUILD_DEPENDS+=devel/bison \
+BUILD_DEPENDS= devel/bison \
devel/git
 
-RUN_DEPENDS+=  print/ghostscript/gnu \
+RUN_DEPENDS=   print/ghostscript/gnu \
math/graphviz
 
-CONFIGURE_ARGS+=-Dbuild_doc=ON \
-   -Dbuild_app=ON \
-   -Dbuild_search=ON
+CONFIGURE_ARGS=-Dbuild_doc=ON \
+   -Dbuild_app=ON \
+   -Dbuild_search=ON
+
+CONFIGURE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Javacc=ON
+
+.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+CXXFLAGS+= -mxgot
+.endif
 
 WRKDIST=   ${WRKDIR}/doxygen-${VERSION}
 
Index: devel/doxygen/distinfo
=======
RCS file: /cvs/ports/devel/doxygen/distinfo,v
diff -u -p -r1.25 distinfo
--- devel/doxygen/distinfo  30 Aug 2023 13:51:05 -  1.25
+++ devel/doxygen/distinfo  13 Jan 2024 20:42:48 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.9.8.src.tar.gz) = 
BePSKOg4S186+cj9YkbSKASstzGjokzihciYbtfhT2I=
-SIZE (doxygen-1.9.8.src.tar.gz) = 8087770
+SHA256 (doxygen-1.10.0.src.tar.gz) = 
3XxVa02Wyl5oJTS8Hxp4pc+rzgxCWxTBuFSYAmhqREI=
+SIZE (doxygen-1.10.0.src.tar.gz) = 8400410
Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
=======
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
diff -u -p -r1.14 patch-doc_CMakeLists_txt
--- devel/doxygen/patches/patch-doc_CMakeLists_txt  30 Aug 2023 13:51:05 
-  1.14
+++ devel/doxygen/patches/patch-doc_CMakeLists_txt  13 Jan 2024 20:42:48 
-
@@ -14,25 +14,26 @@ Index: doc/CMakeLists.txt
  include(GNUInstallDirs)
  
  if (doxygen_BINARY_DIR)
-@@ -160,9 +157,6 @@ endforeach()
+@@ -157,9 +154,6 @@ endforeach()
  configure_file(${PROJECT_SOURCE_DIR}/doc/manual.sty 
${PROJECT_BINARY_DIR}/doc/manual.sty COPYONLY)
  configure_file(${PROJECT_SOURCE_DIR}/doc/doxygen_manual.tex 
${PROJECT_BINARY_DIR}/doc/doxygen_manual.tex COPYONLY)
  configure_file(${PROJECT_SOURCE_DIR}/doc/doxygen.1  
${PROJECT_BINARY_DIR}/man/doxygen.1)
 -configure_file(${PROJECT_SOURCE_DIR}/doc/doxywizard.1   
${PROJECT_BINARY_DIR}/man/doxywizard.1)
 -configure_file(${PROJECT_SOURCE_DIR}/doc/doxysearch.1   
${PROJECT_BINARY_DIR}/man/doxysearch.1)
 -configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1  
${PROJECT_BINARY_DIR}/man/doxyindexer.1)
+ configure_file(${PROJECT_SOURCE_DIR}/templates/icon/doxygen.ico 
${PROJECT_BINARY_DIR}/doc/doxygen.ico COPYONLY)
  
  # Call the main page "Introduction" in LaTeX, which is more appropriate for 
that format.
- set(MAINPAGE_TITLE Doxygen)
-@@ -188,42 +182,7 @@ add_custom_command(
+@@ -185,43 +179,7 @@ add_custom_command(
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
  )
- set_source_files_properties(config.doc PROPERTIES GENERATED 1)
- 

+ set_source_files_properties(config.dox PROPERTIES GENERATED 1)
+-
 -add_custom_target(run_doxygen
 -COMMENT "Generating Latex and HTML documentation."
--COMMAND ${CMAKE_COMMAND} -E env VERSION=${VERSION} 
INDEX_DOC=index_html.doc GENERATE_HTML=YES GENERATE_LATEX=NO 
${DOXYGEN_EXECUTABLE}
--C

Remove doxygen from libgphoto-2.5.31

2024-01-13 Thread Rafael Sadowski

The upcoming doxygen update 1.10.0 fails to generate docs in libgphoto2.
Doxygen is just pain in libgphoto. The following diff stops using
doxygen in libgphoto2.

OK?

Cheers Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
diff -u -p -u -p -r1.85 Makefile
--- Makefile26 Sep 2023 11:39:07 -  1.85
+++ Makefile13 Jan 2024 20:18:33 -
@@ -3,7 +3,7 @@ COMMENT=digital camera library
 VERSION=   2.5.31
 DISTNAME=  libgphoto2-${VERSION}
 PKGNAME=   libgphoto-${VERSION}
-REVISION=  0
+REVISION=  1
 
 GPHOTO2_PORT_API=  0.12.2
 SUBST_VARS=GPHOTO2_PORT_API VERSION
@@ -27,8 +27,6 @@ WANTLIB += usb usb-1.0 webp xml2 z zstd
 
 SITES= ${SITE_SOURCEFORGE:=gphoto/}
 
-BUILD_DEPENDS= devel/doxygen
-
 LIB_DEPENDS=   graphics/gd \
graphics/libexif \
devel/libusb-compat \
@@ -39,7 +37,9 @@ LIB_DEPENDS=  graphics/gd \
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-   ac_cv_path_DOXYGEN=false
+       DOXYGEN=no \
+   ac_cv_path_DOXYGEN=false \
+   ac_cv_path_DOT=false
 
 CONFIGURE_ARGS=--enable-static \
--without-hal \
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
diff -u -p -u -p -r1.35 PLIST
--- pkg/PLIST   2 Sep 2023 13:31:15 -   1.35
+++ pkg/PLIST   13 Jan 2024 20:18:33 -
@@ -63,7 +63,6 @@ share/doc/libgphoto2/AUTHORS
 share/doc/libgphoto2/COPYING
 share/doc/libgphoto2/ChangeLog
 share/doc/libgphoto2/NEWS
-share/doc/libgphoto2/README.apidocs
 share/doc/libgphoto2/README.md
 share/doc/libgphoto2/README.packaging
 share/doc/libgphoto2/RELEASE-HOWTO.md
@@ -111,569 +110,6 @@ share/doc/libgphoto2/camlibs/README.st22
 share/doc/libgphoto2/camlibs/README.st2205-compression
 share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 share/doc/libgphoto2/camlibs/README.tp6801
-share/doc/libgphoto2/libgphoto2-api.html/
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/annotated.html
-share/doc/libgphoto2/libgphoto2-api.html/annotated_dup.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/bc_s.png
-share/doc/libgphoto2/libgphoto2-api.html/bc_sd.png
-share/doc/libgphoto2/libgphoto2-api.html/classes.html
-share/doc/libgphoto2/libgphoto2-api.html/closed.png
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/deprecated.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_01_04.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_03_01.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_03_04.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_05_02.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_06_01.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_06_03.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_0fd050eb813c55dff11104457b8b

Re: Unbreak doxygen in astro/stellarium

2021-01-28 Thread Antoine Jacoutot

Sure ok. Thanks   

—
Antoine

> On 28 Jan 2021, at 21:59, Rafael Sadowski  wrote:
> 
> The second CONFIGURE_ARGS overwrites the first. Issue spotted by tb,
> full report here:
> 
> http://build-failures.rhaalovely.net/aarch64/2021-01-24/astro/stellarium.log
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/astro/stellarium/Makefile,v
> retrieving revision 1.69
> diff -u -p -u -p -r1.69 Makefile
> --- Makefile29 Dec 2020 12:09:35 -1.69
> +++ Makefile28 Jan 2021 20:55:04 -
> @@ -5,6 +5,7 @@ COMMENT=free open source planetarium
> GH_TAGNAME=v0.20.4
> GH_ACCOUNT=Stellarium
> GH_PROJECT=stellarium
> +REVISION=0
> 
> CATEGORIES=astro x11
> 
> @@ -36,10 +37,10 @@ CONFIGURE_ENV=HOME=${WRKDIR}
> CONFIGURE_ARGS=-Wno-dev \
>-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
>-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
> --DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
> +-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
> 
> # XXX needs FindQt5Positioning.cmake
> -CONFIGURE_ARGS=-DENABLE_GPS=0 -DENABLE_LIBGPS=0
> +CONFIGURE_ARGS+=-DENABLE_GPS=0 -DENABLE_LIBGPS=0
> 
> PORTHOME=${WRKDIR}
> 
>

Unbreak doxygen in astro/stellarium

2021-01-28 Thread Rafael Sadowski

The second CONFIGURE_ARGS overwrites the first. Issue spotted by tb,
full report here:

http://build-failures.rhaalovely.net/aarch64/2021-01-24/astro/stellarium.log

Index: Makefile
===
RCS file: /cvs/ports/astro/stellarium/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- Makefile29 Dec 2020 12:09:35 -  1.69
+++ Makefile28 Jan 2021 20:55:04 -
@@ -5,6 +5,7 @@ COMMENT=free open source planetarium
 GH_TAGNAME=v0.20.4
 GH_ACCOUNT=Stellarium
 GH_PROJECT=stellarium
+REVISION=  0
 
 CATEGORIES=astro x11
 
@@ -36,10 +37,10 @@ CONFIGURE_ENV=  HOME=${WRKDIR}
 CONFIGURE_ARGS=-Wno-dev \
-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
-   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
+   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 
 # XXX needs FindQt5Positioning.cmake
-CONFIGURE_ARGS=-DENABLE_GPS=0 -DENABLE_LIBGPS=0
+CONFIGURE_ARGS+=   -DENABLE_GPS=0 -DENABLE_LIBGPS=0
 
 PORTHOME=  ${WRKDIR}

Re: doxygen update breaks graphics/orthanc/server

2020-08-30 Thread Stuart Henderson

On 2020/08/30 22:10, Rafael Sadowski wrote:
> On Sat Aug 29, 2020 at 12:19:13PM +0100, Stuart Henderson wrote:
> > On 2020/08/24 00:15, Rafael Sadowski wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   rsadow...@cvs.openbsd.org   2020/08/24 00:15:04
> > > 
> > > Modified files:
> > >   devel/doxygen  : Makefile distinfo 
> > >   devel/doxygen/patches: patch-doc_CMakeLists_txt 
> > > 
> > > Log message:
> > > Update doxygen to 1.8.19
> > > 
> > 
> > Breaks graphics/orthanc/server packaging:
> > 
> > Error: 
> > /pobj/orthanc-1.3.0/fake-i386/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png
> >  does not exist
> > 
> 
> Already spotted by naddy@.

Generally problems resulting in build failures will be hit by people
running bulk builds on 2-4 arches, usually everyone hitting the problem
will need to look at logs to identify the cause of the problem, see if
it's arch-dependent, etc.

> On Tue Aug 25, 2020 at 04:25:19PM +0200, Christian Weisgerber wrote:
> > This showed up during my Mesa 20.1.6 test build, but a closer look
> > shows that the failure is unrelated and likely caused by the doxygen
> > 1.8.19 update instead.

This is very common for doxygen updates. Please test "make package"
for consumers when updating doxygen.

> Let's disable doxygen like we do in all other ports:

If the docs aren't really useful then sure. But if they are useful
then it's better to update the plist instead.

Re: doxygen update breaks graphics/orthanc/server

2020-08-30 Thread Rafael Sadowski

On Sat Aug 29, 2020 at 12:19:13PM +0100, Stuart Henderson wrote:
> On 2020/08/24 00:15, Rafael Sadowski wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: rsadow...@cvs.openbsd.org   2020/08/24 00:15:04
> > 
> > Modified files:
> > devel/doxygen  : Makefile distinfo 
> > devel/doxygen/patches: patch-doc_CMakeLists_txt 
> > 
> > Log message:
> > Update doxygen to 1.8.19
> > 
> 
> Breaks graphics/orthanc/server packaging:
> 
> Error: 
> /pobj/orthanc-1.3.0/fake-i386/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png
>  does not exist
> 

Already spotted by naddy@.

On Tue Aug 25, 2020 at 04:25:19PM +0200, Christian Weisgerber wrote:
> This showed up during my Mesa 20.1.6 test build, but a closer look
> shows that the failure is unrelated and likely caused by the doxygen
> 1.8.19 update instead.
> 
> Full log attached, but diffing against the one from an old build shows
> this difference...
> 
> --- Installing: 
> /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orth
> anc/OrthancPlugin/doxygen.png
> +-- Installing: 
> /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orth
> anc/OrthancPlugin/doxygen.svg
> 
> ... resulting in a packaging error:
> 
> Error: 
> /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png
>  does not exist
> 
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de


Let's disable doxygen like we do in all other ports:


Index: Makefile
===
RCS file: /cvs/ports/graphics/orthanc/server/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile2 Oct 2019 18:29:33 -   1.10
+++ Makefile25 Aug 2020 16:29:59 -
@@ -4,7 +4,7 @@ COMMENT =   RESTful DICOM server for heal
 
 DISTNAME = Orthanc-1.3.0
 PKGNAME =  ${DISTNAME:L}
-REVISION = 5
+REVISION = 6
 
 HOMEPAGE =     https://www.orthanc-server.com/
 
@@ -32,8 +32,6 @@ MODULES = devel/cmake \
 
 MODPY_RUNDEP = No
 
-BUILD_DEPENDS =devel/doxygen
-
 LIB_DEPENDS =  databases/sqlite3 \
devel/boost \
devel/gtest \
@@ -54,6 +52,8 @@ CONFIGURE_ARGS += -DCMAKE_C_FLAGS="-I${L
 # CMAKE_COMPILER_IS_GNUCXX isn't set for clang as we invoke the compiler
 # as 'c++' and not 'clang++' (ref: CMakeDetermineCXXCompiler.cmake)
 CONFIGURE_ARGS +=  -DCMAKE_COMPILER_IS_GNUCXX=Yes
+
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 
 SUBST_VARS +=  VARBASE
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/orthanc/server/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   11 Nov 2018 18:49:21 -  1.3
+++ pkg/PLIST   25 Aug 2020 16:29:59 -
@@ -9,78 +9,9 @@ include/orthanc/OrthancCPlugin.h
 include/orthanc/OrthancCppDatabasePlugin.h
 libexec/orthanc/
 libexec/orthanc/plugins/
-libexec/orthanc/plugins/libModalityWorklists.so
-libexec/orthanc/plugins/libServeFolders.so
+@so libexec/orthanc/plugins/libModalityWorklists.so
+@so libexec/orthanc/plugins/libServeFolders.so
 @bin sbin/Orthanc
-share/doc/orthanc/
-share/doc/orthanc/OrthancPlugin/
-share/doc/orthanc/OrthancPlugin/OrthancCDatabasePlugin_8h_source.html
-share/doc/orthanc/OrthancPlugin/OrthancCPlugin_8h_source.html
-share/doc/orthanc/OrthancPlugin/OrthancCppDatabasePlugin_8h_source.html
-share/doc/orthanc/OrthancPlugin/OrthancLogoDocumentation.png
-share/doc/orthanc/OrthancPlugin/annotated.html
-share/doc/orthanc/OrthancPlugin/bc_s.png
-share/doc/orthanc/OrthancPlugin/bdwn.png
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendAdapter-members.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendAdapter.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput-members.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput.png
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseException-members.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseException.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend-members.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend.html
-share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend.png
-share/doc/orthanc/OrthancPlugin/classes.html
-share/doc/orthanc/OrthancPlugin/closed.png
-share/doc/orthanc/OrthancPlugin/deprecated.html
-share/doc/orthanc/OrthancPlugin/dir_027bf64fe5984d5a409df67e6d81a46a.html
-share/doc/

doxygen update breaks graphics/orthanc/server

2020-08-29 Thread Stuart Henderson

On 2020/08/24 00:15, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2020/08/24 00:15:04
> 
> Modified files:
>   devel/doxygen  : Makefile distinfo 
>   devel/doxygen/patches: patch-doc_CMakeLists_txt 
> 
> Log message:
> Update doxygen to 1.8.19
> 

Breaks graphics/orthanc/server packaging:

Error: 
/pobj/orthanc-1.3.0/fake-i386/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png
 does not exist

Re: UPDATE: devel/doxygen, devel/doxygen-gui

2018-01-14 Thread Rafael Sadowski

Any objections?

On Mon Jan 01, 2018 at 03:21:37PM +0100, Rafael Sadowski wrote:
> Hi All,
> 
> please find below a simple diff to update doxygen. There are a three
> notables changes:
> 
> - Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
> - Change MAINTAINER email address
> - CONFIGURE_ARGS and BUILD_DEPENDS tweaks
> 
> The only one consumer opencv builds fine and generate no PLIST changes.
> 
> Ok? Comments?
> 
> Rafael
> 
> 
> Index: devel/doxygen/Makefile
> =======
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 Makefile
> --- devel/doxygen/Makefile17 Aug 2017 14:31:37 -  1.44
> +++ devel/doxygen/Makefile1 Jan 2018 14:12:43 -
> @@ -7,16 +7,15 @@ BROKEN-alpha=   .got subsegment exceeds 64
>  
>  COMMENT= source code documentation generator tool
>  
> -VERSION= 1.8.13
> +VERSION= 1.8.14
>  DISTNAME=doxygen-${VERSION}.src
>  PKGNAME= doxygen-${VERSION}
> -REVISION=0
>  
>  CATEGORIES=  devel textproc
>  
>  HOMEPAGE=http://www.doxygen.org/
>  
> -MAINTAINER=  Rafael Sadowski <raf...@sizeofvoid.org>
> +MAINTAINER=  Rafael Sadowski <rsadow...@openbsd.org>
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -43,9 +42,9 @@ BUILD_DEPENDS+= devel/bison
>  RUN_DEPENDS+=print/ghostscript/gnu \
>   math/graphviz
>  
> -CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
> +CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON \
> + -Dbuild_app:Bool=ON \
> + -Dbuild_search:Bool=ON
>  
>  WRKDIST=     ${WRKDIR}/doxygen-${VERSION}
>  
> Index: devel/doxygen/distinfo
> =======
> RCS file: /cvs/ports/devel/doxygen/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- devel/doxygen/distinfo21 Apr 2017 19:43:38 -  1.11
> +++ devel/doxygen/distinfo    1 Jan 2018 14:12:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (doxygen-1.8.13.src.tar.gz) = 
> r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
> -SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
> +SHA256 (doxygen-1.8.14.src.tar.gz) = 
> 0XV+AnVe9vVv1F8fQ5hZi5IDgZSNb8+lj1ymqlb1nU0=
> +SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
> Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
> =======
> RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-doc_CMakeLists_txt
> --- devel/doxygen/patches/patch-doc_CMakeLists_txt23 Dec 2016 15:23:11 
> -  1.2
> +++ devel/doxygen/patches/patch-doc_CMakeLists_txt1 Jan 2018 14:12:43 
> -
> @@ -4,29 +4,30 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
>  - remove doxywizard.1, see devel/doxygen-gui
>  
>  
>  doc/CMakeLists.txt.orig  Sun Sep  4 19:06:42 2016
> -+++ doc/CMakeLists.txt   Fri Dec  9 22:52:29 2016
> -@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
> +Index: doc/CMakeLists.txt
> +--- doc/CMakeLists.txt.orig
>  doc/CMakeLists.txt
> +@@ -152,12 +152,7 @@ add_custom_target(doxygen_pdf
>   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
>   )
>   add_custom_target(docs
>  -    COMMAND ${CMAKE_COMMAND} -E copy 
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo.gif  ${PROJECT_BINARY_DIR}/html/
>  -COMMAND ${CMAKE_COMMAND} -E copy 
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo_low.gif  ${PROJECT_BINARY_DIR}/html/
>   DEPENDS ${PROJECT_BINARY_DIR}/man/doxygen.1
> - ${PROJECT_BINARY_DIR}/man/doxywizard.1
> +-${PROJECT_BINARY_DIR}/man/doxywizard.1
>  -${PROJECT_BINARY_DIR}/man/doxysearch.1
>  -${PROJECT_BINARY_DIR}/man/doxyindexer.1
> --doxygen_pdf
> + doxygen_pdf
>   VERBATIM
>   )
> - 
> +@@ -165,18 +160,5 @@ add_custom_target(docs
>   
> 
>   install(FILES
>   "${PROJECT_BINARY_DIR}/man/doxygen.1"
>  -"${PROJECT_BINARY_DIR}/man/doxywizard.1"
>  -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
>  -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
> --DESTINATION share/man/man1
> + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
>  -)
>  -
>  -install(FILES
> @@ -37,7 +38,4 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
>  -install(DIRECTORY
>  -    "${PROJECT_BINARY_

UPDATE: devel/doxygen, devel/doxygen-gui

2018-01-01 Thread Rafael Sadowski

Hi All,

please find below a simple diff to update doxygen. There are a three
notables changes:

- Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
- Change MAINTAINER email address
- CONFIGURE_ARGS and BUILD_DEPENDS tweaks

The only one consumer opencv builds fine and generate no PLIST changes.

Ok? Comments?

Rafael


Index: devel/doxygen/Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- devel/doxygen/Makefile  17 Aug 2017 14:31:37 -  1.44
+++ devel/doxygen/Makefile  1 Jan 2018 14:12:43 -
@@ -7,16 +7,15 @@ BROKEN-alpha= .got subsegment exceeds 64
 
 COMMENT=   source code documentation generator tool
 
-VERSION=   1.8.13
+VERSION=   1.8.14
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME=   doxygen-${VERSION}
-REVISION=  0
 
 CATEGORIES=devel textproc
 
 HOMEPAGE=  http://www.doxygen.org/
 
-MAINTAINER=Rafael Sadowski <raf...@sizeofvoid.org>
+MAINTAINER=Rafael Sadowski <rsadow...@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -43,9 +42,9 @@ BUILD_DEPENDS+=   devel/bison
 RUN_DEPENDS+=  print/ghostscript/gnu \
math/graphviz
 
-CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
-CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
-CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
+CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON \
+   -Dbuild_app:Bool=ON \
+   -Dbuild_search:Bool=ON
 
 WRKDIST=   ${WRKDIR}/doxygen-${VERSION}
 
Index: devel/doxygen/distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- devel/doxygen/distinfo  21 Apr 2017 19:43:38 -  1.11
+++ devel/doxygen/distinfo  1 Jan 2018 14:12:43 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.8.13.src.tar.gz) = 
r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
-SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
+SHA256 (doxygen-1.8.14.src.tar.gz) = 
0XV+AnVe9vVv1F8fQ5hZi5IDgZSNb8+lj1ymqlb1nU0=
+SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_CMakeLists_txt
--- devel/doxygen/patches/patch-doc_CMakeLists_txt  23 Dec 2016 15:23:11 
-  1.2
+++ devel/doxygen/patches/patch-doc_CMakeLists_txt  1 Jan 2018 14:12:43 
-
@@ -4,29 +4,30 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
 - remove doxywizard.1, see devel/doxygen-gui
 
 
 doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
-+++ doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
-@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
 doc/CMakeLists.txt
+@@ -152,12 +152,7 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
 -COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_SOURCE_DIR}/doc/doxygen_logo.gif  ${PROJECT_BINARY_DIR}/html/
 -COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_SOURCE_DIR}/doc/doxygen_logo_low.gif  ${PROJECT_BINARY_DIR}/html/
  DEPENDS ${PROJECT_BINARY_DIR}/man/doxygen.1
- ${PROJECT_BINARY_DIR}/man/doxywizard.1
+-${PROJECT_BINARY_DIR}/man/doxywizard.1
 -${PROJECT_BINARY_DIR}/man/doxysearch.1
 -${PROJECT_BINARY_DIR}/man/doxyindexer.1
--doxygen_pdf
+ doxygen_pdf
  VERBATIM
  )
- 
+@@ -165,18 +160,5 @@ add_custom_target(docs
  

  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
 -"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
--DESTINATION share/man/man1
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 -)
 -
 -install(FILES
@@ -37,7 +38,4 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
 -install(DIRECTORY
 -"${PROJECT_BINARY_DIR}/html"
 -DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+    DESTINATION man/man1
  )
- 
- endif(build_doc)
Index: devel/doxygen/patches/patch-src_dirdef_cpp
===
RCS file: devel/doxygen/patches/patch-src_dirdef_cpp
diff -N devel/doxygen/patches/patch-src_dirdef_cpp
--- devel/doxygen/patches/patch-src_dirdef_cpp  12 Nov 2016 20:50:41 -  
1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_dirdef_cpp,v 1.5 2016/11/12 20:50:41 jca Exp $
 src/dirdef.cpp.origSun Sep  4 19:06:42 2016
-+++ src/dirdef.cpp Mon S

Re: disable doxygen in devel/tclap

2017-05-04 Thread Rafael Sadowski

On Sat Apr 29, 2017 at 09:37:26PM +0200, Rafael Sadowski wrote:
> Hi All,
> 
> simple patch to disable doxygen as BUILD_DEPENDS. No plist changes
> detected.
> 
> Comments? Ok?
> 
> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/tclap/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile  22 May 2015 11:31:14 -  1.3
> +++ Makefile  29 Apr 2017 19:35:18 -
> @@ -17,10 +17,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>  # tclap is implemented using only header files
>  PKG_ARCH=*
>  
> -BUILD_DEPENDS=   devel/doxygen \
> - math/graphviz
> +BUILD_DEPENDS=   math/graphviz
>  
>  SEPARATE_BUILD=  Yes
>  CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS +=--disable-doxygen
>  
>  .include 


Please find below an updated diff. Tested with clang and gcc on amd64.
All tests are green.

Comments? Ok?

Best regards,

Rafael


Index: Makefile
===
RCS file: /cvs/ports/devel/tclap/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile22 May 2015 11:31:14 -  1.3
+++ Makefile4 May 2017 17:02:55 -
@@ -17,10 +17,8 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
 # tclap is implemented using only header files
 PKG_ARCH=  *
 
-BUILD_DEPENDS= devel/doxygen \
-   math/graphviz
-
 SEPARATE_BUILD=Yes
 CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS +=  --disable-doxygen
 
 .include

okular failed to package (doxygen related?)

2017-05-04 Thread Antoine Jacoutot

Log attached.

-- 
Antoine


okular-4.14.3p3.log.gz
Description: application/gunzip

Re: disable doxygen in devel/tclap

2017-05-01 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi All,
>
> simple patch to disable doxygen as BUILD_DEPENDS. No plist changes
> detected.
>
> Comments? Ok?

ok jca@

You can also remove math/graphviz from BUILD_DEPENDS, looks like dot is
used for doxygen only.

> Rafael Sadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/tclap/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile  22 May 2015 11:31:14 -  1.3
> +++ Makefile  29 Apr 2017 19:35:18 -
> @@ -17,10 +17,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>  # tclap is implemented using only header files
>  PKG_ARCH=*
>  
> -BUILD_DEPENDS=   devel/doxygen \
> - math/graphviz
> +BUILD_DEPENDS=   math/graphviz
>  
>  SEPARATE_BUILD=  Yes
>  CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS +=--disable-doxygen
>  
>  .include 
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

disable doxygen in devel/tclap

2017-04-29 Thread Rafael Sadowski

Hi All,

simple patch to disable doxygen as BUILD_DEPENDS. No plist changes
detected.

Comments? Ok?

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/tclap/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile22 May 2015 11:31:14 -  1.3
+++ Makefile29 Apr 2017 19:35:18 -
@@ -17,10 +17,10 @@ MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:
 # tclap is implemented using only header files
 PKG_ARCH=  *
 
-BUILD_DEPENDS= devel/doxygen \
-   math/graphviz
+BUILD_DEPENDS= math/graphviz
 
 SEPARATE_BUILD=Yes
 CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS +=  --disable-doxygen
 
 .include

Re: disable doxygen in kmymoney/libalkimia

2017-04-29 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi ports@,
>
> simple diff to disbale doxygen in kmymoney and libalkimia. No changes in
> plist.

ok

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

disable doxygen in kmymoney/libalkimia

2017-04-29 Thread Rafael Sadowski

Hi ports@,

simple diff to disbale doxygen in kmymoney and libalkimia. No changes in
plist.

kmymoney:
 
Index: Makefile
===
RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile20 Jan 2017 09:14:12 -  1.10
+++ Makefile29 Apr 2017 14:53:23 -
@@ -41,7 +41,6 @@ MODULES = x11/kde4 devel/gettext lang/p
 MODKDE4_USE =  pim
 
 BUILD_DEPENDS =devel/boost \
-   devel/doxygen \
misc/shared-mime-info
 
 RUN_DEPENDS =  devel/desktop-file-utils \
@@ -61,7 +60,8 @@ LIB_DEPENDS = devel/gwenhywfar>=4.13.1p3
 CONFIGURE_ARGS =   -DENABLE_KBANKING:Bool=Yes \
-DUSE_HTML_HANDBOOK:Bool=Yes \
-DUSE_DEVELOPER_DOC:Bool=Yes \
-   -DUSE_QT_DESIGNER:Bool=No
+   -DUSE_QT_DESIGNER:Bool=No \
+   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
 
 TEST_IS_INTERACTIVE =  X11


libalkimia:

Index: Makefile
===
RCS file: /cvs/ports/productivity/libalkimia/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile12 Jan 2017 16:18:55 -  1.4
+++ Makefile29 Apr 2017 14:11:04 -
@@ -19,9 +19,10 @@ MODULES =x11/kde4
 MODKDE4_USE =
 KDE4_ONLY =Yes
 
-BUILD_DEPENDS =devel/doxygen \
-   ${MODKDE4_DEP_DIR}/libs
+BUILD_DEPENDS =${MODKDE4_DEP_DIR}/libs
 LIB_DEPENDS =  devel/gmp
+
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
 
 do-test:
cd ${WRKBUILD} && ./libalkimia/alkcompanytest

Re: graphics/digikam-kde4: remove doxygen as BUILD_DEPENDS

2017-04-28 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi ports@,
>
> please find below a simple diff to remove doxygen as BUILD_DEPENDS. No
> changes in plist because digikam only creates a CMake target which is
> never called.
>
> Comments? Ok?

If it builds, ship it. :)

> Best regards,
>
> Rafael Sadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- Makefile  2 Feb 2017 12:57:28 -   1.23
> +++ Makefile  28 Apr 2017 05:46:34 -
> @@ -94,7 +94,6 @@ WANTLIB-mediawiki += ${KDE4LIB}/kio
>  
>  BUILD_DEPENDS =  devel/bison \
>   devel/boost \
> - devel/doxygen \
>   math/eigen3 \
>   misc/shared-desktop-ontologies
>  
> @@ -166,6 +165,7 @@ CONFIGURE_ARGS =  -DCMAKE_DISABLE_FIND_PA
>   -DCMAKE_DISABLE_FIND_PACKAGE_QtSoap:Bool=Yes \
>   -DENABLE_INTERNALMYSQL:Bool=No \
>   -DENABLE_KDEPIMLIBSSUPPORT:Bool=Yes \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \
>   -DENABLE_LCMS2:Bool=Yes
>  
>  # no official release yet
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

graphics/digikam-kde4: remove doxygen as BUILD_DEPENDS

2017-04-28 Thread Rafael Sadowski

Hi ports@,

please find below a simple diff to remove doxygen as BUILD_DEPENDS. No
changes in plist because digikam only creates a CMake target which is
never called.

Comments? Ok?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile2 Feb 2017 12:57:28 -   1.23
+++ Makefile28 Apr 2017 05:46:34 -
@@ -94,7 +94,6 @@ WANTLIB-mediawiki += ${KDE4LIB}/kio
 
 BUILD_DEPENDS =devel/bison \
devel/boost \
-   devel/doxygen \
math/eigen3 \
misc/shared-desktop-ontologies
 
@@ -166,6 +165,7 @@ CONFIGURE_ARGS =-DCMAKE_DISABLE_FIND_PA
-DCMAKE_DISABLE_FIND_PACKAGE_QtSoap:Bool=Yes \
-DENABLE_INTERNALMYSQL:Bool=No \
-DENABLE_KDEPIMLIBSSUPPORT:Bool=Yes \
+   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \
-DENABLE_LCMS2:Bool=Yes
 
 # no official release yet

Re: astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Antoine Jacoutot

On Wed, Apr 26, 2017 at 05:10:36PM +0200, Rafael Sadowski wrote:
> On Wed Apr 26, 2017 at 09:27:03AM +0200, Antoine Jacoutot wrote:
> > On Wed, Apr 26, 2017 at 09:14:37AM +0200, Rafael Sadowski wrote:
> > > On Wed Apr 26, 2017 at 08:54:01AM +0200, Antoine Jacoutot wrote:
> > > > On Wed, Apr 26, 2017 at 08:35:02AM +0200, Rafael Sadowski wrote:
> > > > > Hi All,
> > > > > 
> > > > > stellarium without Doxygen. OK? Comments?
> > > > 
> > > > I'm fine with it.
> > > > While we're at it, what's the rational behind these recent Doxygen 
> > > > changes? Is
> > > > it to remove it from ports or ?
> > > 
> > > https://marc.info/?l=openbsd-ports=147433167219051=2
> > > 
> > > Long story short: Last doxygen updates made many plist changes.
> > 
> > I don't see any mention of stellarium in there.
> >
> 
> From this point of view, I agree but you fetch doxygen as build
> dependency only to create a "apidoc" cmake target which is never used.
> In my opinion, is better to disable all these doxygen cases and save one
> build dependency.

Sure sure, I am not saying I don't agree with it. I was just trying to 
understand
the rational :-)
Thanks.

-- 
Antoine

Re: astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Rafael Sadowski

On Wed Apr 26, 2017 at 09:27:03AM +0200, Antoine Jacoutot wrote:
> On Wed, Apr 26, 2017 at 09:14:37AM +0200, Rafael Sadowski wrote:
> > On Wed Apr 26, 2017 at 08:54:01AM +0200, Antoine Jacoutot wrote:
> > > On Wed, Apr 26, 2017 at 08:35:02AM +0200, Rafael Sadowski wrote:
> > > > Hi All,
> > > > 
> > > > stellarium without Doxygen. OK? Comments?
> > > 
> > > I'm fine with it.
> > > While we're at it, what's the rational behind these recent Doxygen 
> > > changes? Is
> > > it to remove it from ports or ?
> > 
> > https://marc.info/?l=openbsd-ports=147433167219051=2
> > 
> > Long story short: Last doxygen updates made many plist changes.
> 
> I don't see any mention of stellarium in there.
>

>From this point of view, I agree but you fetch doxygen as build
dependency only to create a "apidoc" cmake target which is never used.
In my opinion, is better to disable all these doxygen cases and save one
build dependency.

Rafael

Re: math/ginac without Doxygen docs

2017-04-26 Thread Paul Irofti

> I wanted to use the full line length, anyway new patch below with
> input from you and sthen@.

OK

> 
> Thanks and regards,
> 
> Rafael
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/ginac/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- Makefile  10 Apr 2017 11:46:22 -  1.23
> +++ Makefile  25 Apr 2017 19:41:25 -
> @@ -2,29 +2,34 @@
>  
>  COMMENT= GiNaC is Not a Computer Algebra System (CAS)
>  
> -DISTNAME=ginac-1.6.4
> -SHARED_LIBS +=   ginac   5.0 # 0.5
> +DISTNAME=ginac-1.7.2
> +SHARED_LIBS +=   ginac   6.0 # 0.5
>  CATEGORIES=  math
>  
> -HOMEPAGE=http://www.ginac.de/
> +HOMEPAGE=https://www.ginac.de/
>  
>  MAINTAINER=  Paul Irofti <piro...@openbsd.org>
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES= ${HOMEPAGE} \
> -  ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/
> +MASTER_SITES=${HOMEPAGE}
>  EXTRACT_SUFX=.tar.bz2
>  
>  WANTLIB= c m ncurses readline ${LIBCXX} gmp cln
>  
> -MODULES =   lang/python
> -BUILD_DEPENDS =  devel/doxygen
> +MODULES =lang/python \
> + gcc4
> +
> +MODGCC4_LANGS =  c++
> +MODGCC4_ARCHS =  *
> +
>  LIB_DEPENDS= devel/cln
>  
>  USE_GMAKE=   Yes
>  CONFIGURE_STYLE=gnu
> +
> +CONFIGURE_ENV=   ac_cv_path_DOXYGEN=""
>  
>  TEST_TARGET= check
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/ginac/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo  27 Jun 2015 10:26:38 -  1.9
> +++ distinfo  25 Apr 2017 19:41:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
> -SIZE (ginac-1.6.4.tar.bz2) = 1028044
> +SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
> +SIZE (ginac-1.7.2.tar.bz2) = 1056339
> Index: patches/patch-check_check_matrices_cpp
> ===
> RCS file: /cvs/ports/math/ginac/patches/patch-check_check_matrices_cpp,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-check_check_matrices_cpp
> --- patches/patch-check_check_matrices_cpp17 Mar 2009 11:53:01 -  
> 1.2
> +++ patches/patch-check_check_matrices_cpp25 Apr 2017 19:41:25 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti 
> Exp $
>  check/check_matrices.cpp.origTue Feb 17 14:39:22 2009
> -+++ check/check_matrices.cpp Tue Mar 10 16:12:26 2009
> -@@ -217,7 +217,7 @@ unsigned check_matrices()
> - result += rational_matrix_determinants();  cout << '.' << flush;
> - result += funny_matrix_determinants();  cout << '.' << flush;
> - result += compare_matrix_determinants();  cout << '.' << flush;
> --result += symbolic_matrix_inverse();  cout << '.' << flush;
> -+//result += symbolic_matrix_inverse();  cout << '.' << flush;
> - 
> - return result;
> - }
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/ginac/patches/patch-configure,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 patch-configure
> --- patches/patch-configure   18 Aug 2011 15:19:54 -  1.5
> +++ patches/patch-configure   25 Apr 2017 19:41:25 -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-configure,v 1.5 2011/08/18 15:19:54 pirofti Exp $
>  configure.orig   Mon Jul 18 22:09:56 2011
> -+++ configureThu Aug 18 02:17:28 2011
> -@@ -11473,7 +11473,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
> +--- configure.orig   Sun Apr 23 20:10:28 2017
>  configureSun Apr 23 20:12:42 2017
> +@@ -12145,7 +12145,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
> $as_echo_n "(cached) " >&6
>   else
> ac_check_lib_save_LIBS=$LIBS
> @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
>   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>   /* end confdefs.h.  */
>   
> -@@ -11526,7 +11526,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
> +@@ -12206,7 +12206,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
> $as_echo_n "(cached) " >&6
>   else
> ac_check_lib_save_LIBS=$LIBS
> @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
>   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>   /* end confdefs.h.  */
>   
> -@@ -11569,7 +11569,7 @@ if ${ac_cv_lib_dl

Re: astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Antoine Jacoutot

On Wed, Apr 26, 2017 at 09:14:37AM +0200, Rafael Sadowski wrote:
> On Wed Apr 26, 2017 at 08:54:01AM +0200, Antoine Jacoutot wrote:
> > On Wed, Apr 26, 2017 at 08:35:02AM +0200, Rafael Sadowski wrote:
> > > Hi All,
> > > 
> > > stellarium without Doxygen. OK? Comments?
> > 
> > I'm fine with it.
> > While we're at it, what's the rational behind these recent Doxygen changes? 
> > Is
> > it to remove it from ports or ?
> 
> https://marc.info/?l=openbsd-ports=147433167219051=2
> 
> Long story short: Last doxygen updates made many plist changes.

I don't see any mention of stellarium in there.

-- 
Antoine

Re: astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Rafael Sadowski

On Wed Apr 26, 2017 at 08:54:01AM +0200, Antoine Jacoutot wrote:
> On Wed, Apr 26, 2017 at 08:35:02AM +0200, Rafael Sadowski wrote:
> > Hi All,
> > 
> > stellarium without Doxygen. OK? Comments?
> 
> I'm fine with it.
> While we're at it, what's the rational behind these recent Doxygen changes? Is
> it to remove it from ports or ?

https://marc.info/?l=openbsd-ports=147433167219051=2

Long story short: Last doxygen updates made many plist changes.

Re: astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Antoine Jacoutot

On Wed, Apr 26, 2017 at 08:35:02AM +0200, Rafael Sadowski wrote:
> Hi All,
> 
> stellarium without Doxygen. OK? Comments?

I'm fine with it.
While we're at it, what's the rational behind these recent Doxygen changes? Is
it to remove it from ports or ?


> 
> Best regards,
> 
> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/astro/stellarium/Makefile,v
> retrieving revision 1.48
> diff -u -p -u -p -r1.48 Makefile
> --- Makefile  25 Mar 2017 17:33:02 -  1.48
> +++ Makefile  26 Apr 2017 06:32:56 -
> @@ -22,8 +22,6 @@ MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:
>  MODULES= devel/cmake \
>       x11/qt5
>  
> -BUILD_DEPENDS=   devel/doxygen
> -
>  LIB_DEPENDS= x11/qt5/qtmultimedia \
>   x11/qt5/qtscript \
>   x11/qt5/qtserialport
> @@ -36,7 +34,8 @@ RUN_DEPENDS=net/curl \
>  CONFIGURE_ENV=   HOME=${WRKDIR}
>  CONFIGURE_ARGS=  -Wno-dev \
>   -DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
> - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include"
> + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
>  
>  PORTHOME=${WRKDIR}
>  
> 

-- 
Antoine

astro/stellarium: remove doxygen as BUILD_DEPENDS

2017-04-26 Thread Rafael Sadowski

Hi All,

stellarium without Doxygen. OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/astro/stellarium/Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 Makefile
--- Makefile25 Mar 2017 17:33:02 -  1.48
+++ Makefile26 Apr 2017 06:32:56 -
@@ -22,8 +22,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
 MODULES=   devel/cmake \
x11/qt5
 
-BUILD_DEPENDS= devel/doxygen
-
 LIB_DEPENDS=   x11/qt5/qtmultimedia \
x11/qt5/qtscript \
x11/qt5/qtserialport
@@ -36,7 +34,8 @@ RUN_DEPENDS=  net/curl \
 CONFIGURE_ENV= HOME=${WRKDIR}
 CONFIGURE_ARGS=-Wno-dev \
-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
-   -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include"
+   -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
+   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
 
 PORTHOME=  ${WRKDIR}

Re: math/ginac without Doxygen docs

2017-04-25 Thread Rafael Sadowski

On Tue Apr 25, 2017 at 02:42:53PM +0300, Paul Irofti wrote:
> A few comments below.
> 
> > Index: Makefile
> > ===
> [...]
> > -MODULES =   lang/python
> > -BUILD_DEPENDS =devel/doxygen
> > +MODULES =  lang/python \
> > +   gcc4
> > +
> > +MODGCC4_LANGS =c++
> > +MODGCC4_ARCHS =${GCC3_ARCHS} ${GCC4_ARCHS}
> 
> Is this a new idiom? gcc3 archs under gcc4 archs?
> 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/math/ginac/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 distinfo
> > --- distinfo27 Jun 2015 10:26:38 -  1.9
> > +++ distinfo23 Apr 2017 18:34:30 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
> > -SIZE (ginac-1.6.4.tar.bz2) = 1028044
> > +SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
> > +SIZE (ginac-1.7.2.tar.bz2) = 1056339
> > Index: patches/patch-check_check_matrices_cpp
> > ===
> > RCS file: patches/patch-check_check_matrices_cpp
> > diff -N patches/patch-check_check_matrices_cpp
> > --- patches/patch-check_check_matrices_cpp  17 Mar 2009 11:53:01 -  
> > 1.2
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,12 +0,0 @@
> > -$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti 
> > Exp $
> >  check/check_matrices.cpp.orig  Tue Feb 17 14:39:22 2009
> > -+++ check/check_matrices.cpp   Tue Mar 10 16:12:26 2009
> > -@@ -217,7 +217,7 @@ unsigned check_matrices()
> > -   result += rational_matrix_determinants();  cout << '.' << flush;
> > -   result += funny_matrix_determinants();  cout << '.' << flush;
> > -   result += compare_matrix_determinants();  cout << '.' << flush;
> > --  result += symbolic_MATrix_inverse();  cout << '.' << flush;
> > -+  //result += symbolic_matrix_inverse();  cout << '.' << flush;
> > -   
> > -   return result;
> > - }
> 
> 
> This patch is broken, see the MAT capitalization. Does this regress test
> pass now w/o disabling the inverse test?

Testsuite looks good without this patch one amd64:


Testsuite summary for GiNaC 1.7.2

# TOTAL: 61
# # PASS:  61
# # SKIP:  0
# # XFAIL: 0
# # FAIL:  0
# # XPASS: 0
# # ERROR: 0
# 

> 
> > Index: pkg/DESCR
> > ===
> > RCS file: /cvs/ports/math/ginac/pkg/DESCR,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 DESCR
> > --- pkg/DESCR   1 Dec 2007 13:38:38 -   1.1.1.1
> > +++ pkg/DESCR   23 Apr 2017 18:34:30 -
> > @@ -1,8 +1,7 @@
> > -The name GiNaC is an iterated and recursive abbreviation for GiNaC is
> > -Not a CAS, where CAS stands for Computer Algebra System. It has been
> > -developed to become a replacement engine for xloops which in the past
> > -was powered by the Maple CAS. Its design is revolutionary in a sense
> > -that contrary to other CAS it does not try to provide extensive
> > -algebraic capabilities and a simple programming language but instead
> > -accepts a given language (C++) and extends it by a set of algebraic
> > -capabilities.
> > +The name GiNaC is an iterated and recursive abbreviation for GiNaC is Not a
> > +CAS, where CAS stands for Computer Algebra System. It has been developed to
> > +become a replacement engine for xloops which in the past was powered by the
> > +Maple CAS. Its design is revolutionary in a sense that contrary to other 
> > CAS it
> > +does not try to provide extensive algebraic capabilities and a simple
> > +programming language but instead accepts a given language (C++) and 
> > extends it
> > +by a set of algebraic capabilities.
> 
> Did you wrap the text here? Why do you need this?

I wanted to use the full line length, anyway new patch below with
input from you and sthen@.

Thanks and regards,

Rafael


Index: Makefile
===
RCS file: /cvs/ports/math/ginac/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile10 Apr 2017 11:46:22 -  1.23
+++ Makefile25 Apr 2017 19:41:25 -0

Re: math/ginac without Doxygen docs

2017-04-25 Thread Stuart Henderson

On 2017/04/25 14:42, Paul Irofti wrote:
> A few comments below.
> 
> > Index: Makefile
> > ===
> [...]
> > -MODULES =   lang/python
> > -BUILD_DEPENDS =devel/doxygen
> > +MODULES =  lang/python \
> > +   gcc4
> > +
> > +MODGCC4_LANGS =c++
> > +MODGCC4_ARCHS =${GCC3_ARCHS} ${GCC4_ARCHS}
> 
> Is this a new idiom? gcc3 archs under gcc4 archs?

MODGCC4_ARCHS : tells ports infra to use ports GCC for the following arches

GCC3_ARCHS : contains a list of arches where the base compiler is gcc3
GCC4_ARCHS : contains a list of arches where the base compiler is gcc4.2.1

This is meant to be a more targeted alternative to "MODGCC4_ARCHS = *"
which avoids using ports gcc on arches that use clang as the base compiler.
However it's incomplete because the gcc4 module also adds to WANTLIB.

At this point I think I'd prefer to just use * until we've worked
through the details with the new USE_CXX bits and how to handle WANTLIB.

> > +++ pkg/DESCR   23 Apr 2017 18:34:30 -
> > @@ -1,8 +1,7 @@
> > -The name GiNaC is an iterated and recursive abbreviation for GiNaC is
> > -Not a CAS, where CAS stands for Computer Algebra System. It has been
> > -developed to become a replacement engine for xloops which in the past
> > -was powered by the Maple CAS. Its design is revolutionary in a sense
> > -that contrary to other CAS it does not try to provide extensive
> > -algebraic capabilities and a simple programming language but instead
> > -accepts a given language (C++) and extends it by a set of algebraic
> > -capabilities.
> > +The name GiNaC is an iterated and recursive abbreviation for GiNaC is Not a
> > +CAS, where CAS stands for Computer Algebra System. It has been developed to
> > +become a replacement engine for xloops which in the past was powered by the
> > +Maple CAS. Its design is revolutionary in a sense that contrary to other 
> > CAS it
> > +does not try to provide extensive algebraic capabilities and a simple
> > +programming language but instead accepts a given language (C++) and 
> > extends it
> > +by a set of algebraic capabilities.
> 
> Did you wrap the text here? Why do you need this?

I don't like that change, the text flows more smoothly in the original..

Re: math/ginac without Doxygen docs

2017-04-25 Thread Paul Irofti

A few comments below.

> Index: Makefile
> ===
[...]
> -MODULES =   lang/python
> -BUILD_DEPENDS =  devel/doxygen
> +MODULES =lang/python \
> + gcc4
> +
> +MODGCC4_LANGS =  c++
> +MODGCC4_ARCHS =  ${GCC3_ARCHS} ${GCC4_ARCHS}

Is this a new idiom? gcc3 archs under gcc4 archs?

> Index: distinfo
> ===
> RCS file: /cvs/ports/math/ginac/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo  27 Jun 2015 10:26:38 -  1.9
> +++ distinfo  23 Apr 2017 18:34:30 -
> @@ -1,2 +1,2 @@
> -SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
> -SIZE (ginac-1.6.4.tar.bz2) = 1028044
> +SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
> +SIZE (ginac-1.7.2.tar.bz2) = 1056339
> Index: patches/patch-check_check_matrices_cpp
> ===
> RCS file: patches/patch-check_check_matrices_cpp
> diff -N patches/patch-check_check_matrices_cpp
> --- patches/patch-check_check_matrices_cpp17 Mar 2009 11:53:01 -  
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti 
> Exp $
>  check/check_matrices.cpp.origTue Feb 17 14:39:22 2009
> -+++ check/check_matrices.cpp Tue Mar 10 16:12:26 2009
> -@@ -217,7 +217,7 @@ unsigned check_matrices()
> - result += rational_matrix_determinants();  cout << '.' << flush;
> - result += funny_matrix_determinants();  cout << '.' << flush;
> - result += compare_matrix_determinants();  cout << '.' << flush;
> --result += symbolic_MATrix_inverse();  cout << '.' << flush;
> -+//result += symbolic_matrix_inverse();  cout << '.' << flush;
> - 
> - return result;
> - }


This patch is broken, see the MAT capitalization. Does this regress test
pass now w/o disabling the inverse test?

> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/math/ginac/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 1 Dec 2007 13:38:38 -   1.1.1.1
> +++ pkg/DESCR 23 Apr 2017 18:34:30 -
> @@ -1,8 +1,7 @@
> -The name GiNaC is an iterated and recursive abbreviation for GiNaC is
> -Not a CAS, where CAS stands for Computer Algebra System. It has been
> -developed to become a replacement engine for xloops which in the past
> -was powered by the Maple CAS. Its design is revolutionary in a sense
> -that contrary to other CAS it does not try to provide extensive
> -algebraic capabilities and a simple programming language but instead
> -accepts a given language (C++) and extends it by a set of algebraic
> -capabilities.
> +The name GiNaC is an iterated and recursive abbreviation for GiNaC is Not a
> +CAS, where CAS stands for Computer Algebra System. It has been developed to
> +become a replacement engine for xloops which in the past was powered by the
> +Maple CAS. Its design is revolutionary in a sense that contrary to other CAS 
> it
> +does not try to provide extensive algebraic capabilities and a simple
> +programming language but instead accepts a given language (C++) and extends 
> it
> +by a set of algebraic capabilities.

Did you wrap the text here? Why do you need this?

Re: net/libktorrent: remove doxygen as BUILD_DEPENDS

2017-04-25 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> On Mon Apr 24, 2017 at 08:43:38PM +0200, Rafael Sadowski wrote:
>> Hi ports@,
>> 
>> libktorrent without Doxygen and dditional CMake policies.
>> 
>> OK? Comments?
>> 
>> Best regards,
>> 
>> Rafael Sadowski
>> 
>
> New diff below with -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen from jca@.

ok for the doxygen removal part.

Discovering cmake policies here.  Is this change only about shutting up
warnings, or is there also a change in the behavior of the cmake code?
If we're only hiding problems that wait to appear in upcoming cmake
releases, then maybe it's not a good move.

It *seems* that those warnings come from Automoc4Config.cmake or
KDE4Macros.cmake.  Can/should those files be modified, instead of
consumer ports like libktorrent?

[...]

> +# XXX Silently ignore non-existent dependencies
> +CONFIGURE_ARGS +=-DCMAKE_POLICY_DEFAULT_CMP0053=OLD
> +CONFIGURE_ARGS +=-DCMAKE_POLICY_DEFAULT_CMP0054=OLD
> +CONFIGURE_ARGS +=-DCMAKE_POLICY_DEFAULT_CMP0064=OLD
> +# XXX Don't treat ``DEFINITIONS`` as a built-in directory property
> +CONFIGURE_ARGS +=-DCMAKE_POLICY_DEFAULT_CMP0059=OLD
>  
>  .include 
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: net/libktorrent: remove doxygen as BUILD_DEPENDS

2017-04-25 Thread Rafael Sadowski

On Mon Apr 24, 2017 at 08:43:38PM +0200, Rafael Sadowski wrote:
> Hi ports@,
> 
> libktorrent without Doxygen and dditional CMake policies.
> 
> OK? Comments?
> 
> Best regards,
> 
> Rafael Sadowski
> 

New diff below with -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen from jca@.

Thanks, Rafael


Index: Makefile
===
RCS file: /cvs/ports/net/libktorrent/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Aug 2015 12:33:02 -  1.11
+++ Makefile25 Apr 2017 06:15:31 -
@@ -27,11 +27,19 @@ MODKDE4_USE =   libs
 MODKDE4_LIB_LINKS =Yes
 
 BUILD_DEPENDS =devel/boost \
-   devel/doxygen \
devel/gettext-tools
 
 LIB_DEPENDS =  devel/gmp \
security/libgcrypt \
security/qca2
+
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
+
+# XXX Silently ignore non-existent dependencies
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0053=OLD
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0054=OLD
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0064=OLD
+# XXX Don't treat ``DEFINITIONS`` as a built-in directory property
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0059=OLD
 
 .include

Re: databases/soprano: remove doxygen as BUILD_DEPENDS

2017-04-24 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi ports@,
>
> soprano without Doxygen. OK? Comments?

Maybe we can do without a patch, using

CONFIGURE_ARGS +=   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes

I guess the REVISION bump is here because this changes the content of
the package?  If it doesn't, you could omit the bump.

ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

net/libktorrent: remove doxygen as BUILD_DEPENDS

2017-04-24 Thread Rafael Sadowski

Hi ports@,

libktorrent without Doxygen and dditional CMake policies.

OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/net/libktorrent/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Aug 2015 12:33:02 -  1.11
+++ Makefile24 Apr 2017 16:40:09 -
@@ -5,7 +5,7 @@ COMMENT =   KTorrent engine
 V =1.3.1
 DISTNAME = libktorrent-$V
 HOMEPAGE = http://ktorrent.pwsp.net/
-REVISION = 8
+REVISION = 9
 
 EXTRACT_SUFX = .tar.bz2
 
@@ -27,11 +27,17 @@ MODKDE4_USE =   libs
 MODKDE4_LIB_LINKS =Yes
 
 BUILD_DEPENDS =devel/boost \
-   devel/doxygen \
devel/gettext-tools
 
 LIB_DEPENDS =  devel/gmp \
security/libgcrypt \
security/qca2
+
+# XXX Silently ignore non-existent dependencies
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0053=OLD
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0054=OLD
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0064=OLD
+# XXX Don't treat ``DEFINITIONS`` as a built-in directory property
+CONFIGURE_ARGS +=  -DCMAKE_POLICY_DEFAULT_CMP0059=OLD
 
 .include 
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt24 Apr 2017 16:40:09 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+disable doxygen
+--- doc/CMakeLists.txt.origMon Apr 24 18:34:09 2017
 doc/CMakeLists.txt Mon Apr 24 18:34:14 2017
+@@ -1,4 +1,4 @@
+-find_package(Doxygen)
++#find_package(Doxygen)
+ if (DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND)
+   message (STATUS "Doxygen and dot found. make docs target is available")
+   # Add support for a docs target
+@@ -24,4 +24,4 @@ if (DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND)
+   endif()
+   
+   add_custom_target(docs ${DOCS_ARGS} )
+-endif()
+\ No newline at end of file
++endif()

databases/soprano: remove doxygen as BUILD_DEPENDS

2017-04-24 Thread Rafael Sadowski

Hi ports@,

soprano without Doxygen. OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/databases/soprano/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile10 Apr 2017 11:45:25 -  1.17
+++ Makefile24 Apr 2017 06:17:39 -
@@ -4,7 +4,7 @@ COMMENT =   RDF framework
 CATEGORIES =   databases devel textproc sysutils
 HOMEPAGE = http://soprano.sourceforge.net/
 DISTNAME = soprano-2.9.4
-REVISION = 2
+REVISION = 3
 
 SHARED_LIBS =  soprano   2.1
 SHARED_LIBS += sopranoclient 2.1
@@ -23,8 +23,6 @@ WANTLIB += raptor2 rdf ${LIBCXX}
 
 MODULES =  x11/kde4
 MODKDE4_USE =
-
-BUILD_DEPENDS =devel/doxygen
 
 LIB_DEPENDS =  textproc/clucene \
databases/iodbc \
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt24 Apr 2017 06:17:39 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+disable doxygen
+--- CMakeLists.txt.origMon Apr 24 00:11:13 2017
 CMakeLists.txt Mon Apr 24 00:11:21 2017
+@@ -237,7 +237,7 @@ endif(NOT WIN32)
+ 
+ 
+ ##  apidox 
+-find_package(Doxygen)
++#find_package(Doxygen)
+ 
+ if(DOXYGEN_EXECUTABLE)
+   set(QTDOCS_ONLINE "http://qt-project.org/doc/qt-4.8/;)

Re: audio/libnjb without Doxygen docs

2017-04-23 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi ports@,
>
> libnjb without Doxygen. OK? Comments?

ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: audio/liblo: remove doxygen as BUILD_DEPENDS

2017-04-23 Thread Stuart Henderson

On 2017/04/23 21:35, Jeremie Courreges-Anglas wrote:
> >> 
> >> Try this:
> >> 
> >> pkg_add doxygen
> >> make configure
> >> pkg_delete doxygen
> >> make
> >> 
> >> Either you must supply the BUILD_DEPENDS, or disable/neuter the autoconf 
> >> test.
> >
> > Makes sense, new diff below.
> 
> ok jca@

+1

Re: audio/liblo: remove doxygen as BUILD_DEPENDS

2017-04-23 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> On Sat Apr 22, 2017 at 08:28:08PM +0100, Stuart Henderson wrote:
>> On 2017/04/21 23:38, Rafael Sadowski wrote:
>> > Hi ports@,
>> > 
>> > audio/liblo does not use doxygen to generate documents and there are no
>> > docs in the current plist.
>> > 
>> > OK? Comments?
>> > 
>> > Best regards,
>> > 
>> > Rafael
>> > 
>> > Index: Makefile
>> > ===
>> > RCS file: /cvs/ports/audio/liblo/Makefile,v
>> > retrieving revision 1.8
>> > diff -u -p -u -p -r1.8 Makefile
>> > --- Makefile   9 Jun 2015 11:55:24 -   1.8
>> > +++ Makefile   21 Apr 2017 21:34:41 -
>> > @@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM =   Yes
>> >  
>> >  WANTLIB = c m pthread
>> >  MASTER_SITES =    ${MASTER_SITE_SOURCEFORGE:=liblo/}
>> > -BUILD_DEPENDS =   devel/doxygen
>> >  CONFIGURE_STYLE = gnu
>> >  
>> >  .include 
>> > 
>> 
>> Try this:
>> 
>> pkg_add doxygen
>> make configure
>> pkg_delete doxygen
>> make
>> 
>> Either you must supply the BUILD_DEPENDS, or disable/neuter the autoconf 
>> test.
>
> Makes sense, new diff below.

ok jca@

> Best regards,
>
> Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/liblo/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- Makefile  9 Jun 2015 11:55:24 -   1.8
> +++ Makefile  23 Apr 2017 18:42:37 -
> @@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM =  Yes
>  
>  WANTLIB =c m pthread
>  MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=liblo/}
> -BUILD_DEPENDS =  devel/doxygen
>  CONFIGURE_STYLE =gnu
> +CONFIGURE_ENV=   ac_cv_prog_DOXYGEN=""
>  
>  .include 
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: audio/liblo: remove doxygen as BUILD_DEPENDS

2017-04-23 Thread Rafael Sadowski

On Sat Apr 22, 2017 at 08:28:08PM +0100, Stuart Henderson wrote:
> On 2017/04/21 23:38, Rafael Sadowski wrote:
> > Hi ports@,
> > 
> > audio/liblo does not use doxygen to generate documents and there are no
> > docs in the current plist.
> > 
> > OK? Comments?
> > 
> > Best regards,
> > 
> > Rafael
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/liblo/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -u -p -r1.8 Makefile
> > --- Makefile9 Jun 2015 11:55:24 -   1.8
> > +++ Makefile21 Apr 2017 21:34:41 -
> > @@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM =Yes
> >  
> >  WANTLIB =  c m pthread
> >  MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=liblo/}
> > -BUILD_DEPENDS =    devel/doxygen
> >  CONFIGURE_STYLE =  gnu
> >  
> >  .include 
> > 
> 
> Try this:
> 
> pkg_add doxygen
> make configure
> pkg_delete doxygen
> make
> 
> Either you must supply the BUILD_DEPENDS, or disable/neuter the autoconf test.

Makes sense, new diff below.

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/audio/liblo/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile9 Jun 2015 11:55:24 -   1.8
+++ Makefile23 Apr 2017 18:42:37 -
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c m pthread
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=liblo/}
-BUILD_DEPENDS =devel/doxygen
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ENV= ac_cv_prog_DOXYGEN=""
 
 .include

Re: math/ginac without Doxygen docs

2017-04-23 Thread Rafael Sadowski

On Sat Apr 22, 2017 at 07:58:18PM +0200, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski <raf...@sizeofvoid.org> writes:
> 
> > Hi ports@, Hi pirofti@,
> >
> > remove doxygen as BUILD_DEPENDS and disable doxygen via CONFIGURE_ENV.
> > No docs in plist and no chnages after update-list.
> >
> > OK? Comments?
> 
> ok jca@
> 
> btw, looks like MASTER_SITES should be fixed.
> 
> ===>  Cleaning for ginac-1.6.4
> ===>  Checking files for ginac-1.6.4
> >> Fetch http://www.ginac.de/ginac-1.6.4.tar.bz2
> ftp: Error retrieving file: 404 Not Found
> >> Fetch ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-1.6.4.tar.bz2
> ftp: ftpthep.physik.uni-mainz.de: no address associated with name
> ftp: Can't connect or login to host `ftpthep.physik.uni-mainz.de'
> >> Fetch https://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//ginac-1.6.4.tar.bz2
> ginac-1.6.4.tar.bz2 100% 
> |*|
>   1003 KB00:01
> 
> 

1.6.4 is too old and tarball is no longer provided. Please find below an
update to 1.7.2. All tests passed on amd64. New round for okay's please.

Best regards,

Rafael Sadowski


Index: Makefile
===
RCS file: /cvs/ports/math/ginac/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile10 Apr 2017 11:46:22 -  1.23
+++ Makefile23 Apr 2017 18:34:30 -
@@ -2,29 +2,34 @@
 
 COMMENT=   GiNaC is Not a Computer Algebra System (CAS)
 
-DISTNAME=  ginac-1.6.4
-SHARED_LIBS += ginac   5.0 # 0.5
+DISTNAME=  ginac-1.7.2
+SHARED_LIBS += ginac   6.0 # 0.5
 CATEGORIES=math
 
-HOMEPAGE=  http://www.ginac.de/
+HOMEPAGE=  https://www.ginac.de/
 
 MAINTAINER=Paul Irofti <piro...@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=   ${HOMEPAGE} \
-ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/
+MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.bz2
 
 WANTLIB=   c m ncurses readline ${LIBCXX} gmp cln
 
-MODULES =   lang/python
-BUILD_DEPENDS =devel/doxygen
+MODULES =  lang/python \
+   gcc4
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =${GCC3_ARCHS} ${GCC4_ARCHS}
+
 LIB_DEPENDS=   devel/cln
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
 
 TEST_TARGET=   check
 
Index: distinfo
===
RCS file: /cvs/ports/math/ginac/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo27 Jun 2015 10:26:38 -  1.9
+++ distinfo23 Apr 2017 18:34:30 -
@@ -1,2 +1,2 @@
-SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
-SIZE (ginac-1.6.4.tar.bz2) = 1028044
+SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
+SIZE (ginac-1.7.2.tar.bz2) = 1056339
Index: patches/patch-check_check_matrices_cpp
===
RCS file: patches/patch-check_check_matrices_cpp
diff -N patches/patch-check_check_matrices_cpp
--- patches/patch-check_check_matrices_cpp  17 Mar 2009 11:53:01 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti Exp 
$
 check/check_matrices.cpp.orig  Tue Feb 17 14:39:22 2009
-+++ check/check_matrices.cpp   Tue Mar 10 16:12:26 2009
-@@ -217,7 +217,7 @@ unsigned check_matrices()
-   result += rational_matrix_determinants();  cout << '.' << flush;
-   result += funny_matrix_determinants();  cout << '.' << flush;
-   result += compare_matrix_determinants();  cout << '.' << flush;
--  result += symbolic_MATrix_inverse();  cout << '.' << flush;
-+  //result += symbolic_matrix_inverse();  cout << '.' << flush;
-   
-   return result;
- }
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/ginac/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-configure
--- patches/patch-configure 18 Aug 2011 15:19:54 -  1.5
+++ patches/patch-configure 23 Apr 2017 18:34:30 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.5 2011/08/18 15:19:54 pirofti Exp $
 configure.orig Mon Jul 18 22:09:56 2011
-+++ configure  Thu Aug 18 02:17:28 2011
-@@ -11473,7 +11473,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
+--- configure.orig Sun Apr 23 20:10:28 2017
 configure  Sun Apr 23 20:12:42 2017
+@@ -12145,7 +12145,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(c

Re: audio/liblo: remove doxygen as BUILD_DEPENDS

2017-04-22 Thread Stuart Henderson

On 2017/04/21 23:38, Rafael Sadowski wrote:
> Hi ports@,
> 
> audio/liblo does not use doxygen to generate documents and there are no
> docs in the current plist.
> 
> OK? Comments?
> 
> Best regards,
> 
> Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/liblo/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- Makefile  9 Jun 2015 11:55:24 -   1.8
> +++ Makefile  21 Apr 2017 21:34:41 -
> @@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM =  Yes
>  
>  WANTLIB =c m pthread
>  MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=liblo/}
> -BUILD_DEPENDS =  devel/doxygen
>  CONFIGURE_STYLE =gnu
>  
>  .include 
> 

Try this:

pkg_add doxygen
make configure
pkg_delete doxygen
make

Either you must supply the BUILD_DEPENDS, or disable/neuter the autoconf test.

Re: math/ginac without Doxygen docs

2017-04-22 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi ports@, Hi pirofti@,
>
> remove doxygen as BUILD_DEPENDS and disable doxygen via CONFIGURE_ENV.
> No docs in plist and no chnages after update-list.
>
> OK? Comments?

ok jca@

btw, looks like MASTER_SITES should be fixed.

===>  Cleaning for ginac-1.6.4
===>  Checking files for ginac-1.6.4
>> Fetch http://www.ginac.de/ginac-1.6.4.tar.bz2
ftp: Error retrieving file: 404 Not Found
>> Fetch ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-1.6.4.tar.bz2
ftp: ftpthep.physik.uni-mainz.de: no address associated with name
ftp: Can't connect or login to host `ftpthep.physik.uni-mainz.de'
>> Fetch https://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//ginac-1.6.4.tar.bz2
ginac-1.6.4.tar.bz2 100% 
|*|
  1003 KB00:01


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: math/ginac without Doxygen docs

2017-04-22 Thread paul

OK

De la: Rafael Sadowski
Trimis: vineri, 21 aprilie 2017 23:58
Către: ports@openbsd.org
Cc: Paul Irofti
Subiect: math/ginac without Doxygen docs

Hi ports@, Hi pirofti@,

remove doxygen as BUILD_DEPENDS and disable doxygen via CONFIGURE_ENV.
No docs in plist and no chnages after update-list.

OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/math/ginac/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile10 Apr 2017 11:46:22 -  1.23
+++ Makefile21 Apr 2017 20:52:18 -
@@ -5,8 +5,9 @@ COMMENT=GiNaC is Not a Computer Algebra
 DISTNAME=  ginac-1.6.4
 SHARED_LIBS += ginac   5.0 # 0.5
 CATEGORIES=math
+REVISION=  0
 
-HOMEPAGE=  http://www.ginac.de/
+HOMEPAGE=  https://www.ginac.de/
 
 MAINTAINER=Paul Irofti <piro...@openbsd.org>
 
@@ -20,11 +21,12 @@ EXTRACT_SUFX=   .tar.bz2
 WANTLIB=   c m ncurses readline ${LIBCXX} gmp cln
 
 MODULES =   lang/python
-BUILD_DEPENDS =devel/doxygen
 LIB_DEPENDS=   devel/cln
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
 
 TEST_TARGET=   check

audio/libnjb without Doxygen docs

2017-04-21 Thread Rafael Sadowski

Hi ports@,

libnjb without Doxygen. OK? Comments?

Best regards,

Rafael Sadowski


Index: Makefile
===
RCS file: /cvs/ports/audio/libnjb/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile12 Nov 2016 20:50:41 -  1.14
+++ Makefile21 Apr 2017 21:47:41 -
@@ -3,7 +3,7 @@
 COMMENT=   communicate with some Creative and Dell audio players
 
 DISTNAME=  libnjb-2.2.7
-REVISION=  1
+REVISION=  2
 CATEGORIES=audio devel
 
 SHARED_LIBS +=  njb  0.0  # 6.1
@@ -17,12 +17,12 @@ WANTLIB += c curses pthread usb usb-1.0 
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libnjb/}
 
-BUILD_DEPENDS= devel/doxygen
 LIB_DEPENDS=   devel/libusb-compat
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
-   CPPFLAGS="-I${LOCALBASE}/include"
+   CPPFLAGS="-I${LOCALBASE}/include" \
+   HAVE_DOXYGEN="no"
 
 FAKE_FLAGS=pkgdocdir=${PREFIX}/share/doc/libnjb
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.5
+++ pkg/PLIST   21 Apr 2017 21:47:41 -
@@ -26,155 +26,3 @@ lib/libnjb.a
 lib/libnjb.la
 @lib lib/libnjb.so.${LIBnjb_VERSION}
 lib/pkgconfig/libnjb.pc
-share/doc/libnjb/
-share/doc/libnjb/html/
-share/doc/libnjb/html/annotated.html
-share/doc/libnjb/html/base_8c.html
-share/doc/libnjb/html/base_8h_source.html
-share/doc/libnjb/html/bc_s.png
-share/doc/libnjb/html/bdwn.png
-share/doc/libnjb/html/byteorder_8c.html
-share/doc/libnjb/html/byteorder_8h_source.html
-share/doc/libnjb/html/classes.html
-share/doc/libnjb/html/closed.png
-share/doc/libnjb/html/cursesplay_8c-example.html
-share/doc/libnjb/html/datafile_8c.html
-share/doc/libnjb/html/datafile_8h_source.html
-share/doc/libnjb/html/defs_8h_source.html
-share/doc/libnjb/html/delfile_8c-example.html
-share/doc/libnjb/html/deltr_8c-example.html
-share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
-share/doc/libnjb/html/doc.png
-share/doc/libnjb/html/doxygen.css
-share/doc/libnjb/html/doxygen.png
-share/doc/libnjb/html/dumpeax_8c-example.html
-share/doc/libnjb/html/dumptime_8c-example.html
-share/doc/libnjb/html/dynsections.js
-share/doc/libnjb/html/eax_8c.html
-share/doc/libnjb/html/eax_8h_source.html
-share/doc/libnjb/html/examples.html
-share/doc/libnjb/html/examples_8h_source.html
-share/doc/libnjb/html/files.html
-share/doc/libnjb/html/files_8c-example.html
-share/doc/libnjb/html/folderclosed.png
-share/doc/libnjb/html/folderopen.png
-share/doc/libnjb/html/functions.html
-share/doc/libnjb/html/functions_vars.html
-share/doc/libnjb/html/fwupgrade_8c-example.html
-share/doc/libnjb/html/getfile_8c-example.html
-share/doc/libnjb/html/getowner_8c-example.html
-share/doc/libnjb/html/gettr_8c-example.html
-share/doc/libnjb/html/getusage_8c-example.html
-share/doc/libnjb/html/globals.html
-share/doc/libnjb/html/globals_d.html
-share/doc/libnjb/html/globals_defs.html
-share/doc/libnjb/html/globals_e.html
-share/doc/libnjb/html/globals_enum.html
-share/doc/libnjb/html/globals_f.html
-share/doc/libnjb/html/globals_func.html
-share/doc/libnjb/html/globals_func_d.html
-share/doc/libnjb/html/globals_func_e.html
-share/doc/libnjb/html/globals_func_f.html
-share/doc/libnjb/html/globals_func_g.html
-share/doc/libnjb/html/globals_func_m.html
-share/doc/libnjb/html/globals_func_n.html
-share/doc/libnjb/html/globals_func_p.html
-share/doc/libnjb/html/globals_func_s.html
-share/doc/libnjb/html/globals_func_t.html
-share/doc/libnjb/html/globals_func_u.html
-share/doc/libnjb/html/globals_g.html
-share/doc/libnjb/html/globals_l.html
-share/doc/libnjb/html/globals_m.html
-share/doc/libnjb/html/globals_n.html
-share/doc/libnjb/html/globals_o.html
-share/doc/libnjb/html/globals_p.html
-share/doc/libnjb/html/globals_s.html
-share/doc/libnjb/html/globals_t.html
-share/doc/libnjb/html/globals_type.html
-share/doc/libnjb/html/globals_u.html
-share/doc/libnjb/html/globals_vars.html
-share/doc/libnjb/html/group__basic.html
-share/doc/libnjb/html/group__codecs.html
-share/doc/libnjb/html/group__datatagapi.html
-share/doc/libnjb/html/group__debugflags.html
-share/doc/libnjb/html/group__eaxapi.html
-share/doc/libnjb/html/group__errors.html
-share/doc/libnjb/html/group__frames.html
-share/doc/libnjb/html/group__frametypes.html
-share/doc/libnjb/html/group__internals.html
-share/doc/libnjb/html/group__njbboxes.html
-share/doc/libnjb/html/group__playapi.html
-share/doc/libnjb/html/group__playlistapi.html
-share/doc/libnjb/html/group__tagapi.html
-share/doc/libnjb/html/group__timeapi.html
-share/doc/libnjb/html/group__turboflags.html
-share/doc/libnjb/html/

audio/liblo: remove doxygen as BUILD_DEPENDS

2017-04-21 Thread Rafael Sadowski

Hi ports@,

audio/liblo does not use doxygen to generate documents and there are no
docs in the current plist.

OK? Comments?

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/audio/liblo/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile9 Jun 2015 11:55:24 -   1.8
+++ Makefile21 Apr 2017 21:34:41 -
@@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c m pthread
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=liblo/}
-BUILD_DEPENDS =devel/doxygen
 CONFIGURE_STYLE =  gnu
 
 .include

math/ginac without Doxygen docs

2017-04-21 Thread Rafael Sadowski

Hi ports@, Hi pirofti@,

remove doxygen as BUILD_DEPENDS and disable doxygen via CONFIGURE_ENV.
No docs in plist and no chnages after update-list.

OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/math/ginac/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile10 Apr 2017 11:46:22 -  1.23
+++ Makefile21 Apr 2017 20:52:18 -
@@ -5,8 +5,9 @@ COMMENT=GiNaC is Not a Computer Algebra
 DISTNAME=  ginac-1.6.4
 SHARED_LIBS += ginac   5.0 # 0.5
 CATEGORIES=math
+REVISION=  0
 
-HOMEPAGE=  http://www.ginac.de/
+HOMEPAGE=  https://www.ginac.de/
 
 MAINTAINER=Paul Irofti <piro...@openbsd.org>
 
@@ -20,11 +21,12 @@ EXTRACT_SUFX=   .tar.bz2
 WANTLIB=   c m ncurses readline ${LIBCXX} gmp cln
 
 MODULES =   lang/python
-BUILD_DEPENDS =devel/doxygen
 LIB_DEPENDS=   devel/cln
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
 
 TEST_TARGET=   check

Re: UPDATE: devel/doxygen and devel/doxygen-gui

2017-04-05 Thread Rafael Sadowski

*ping*

On Sat Mar 25, 2017 at 09:06:35AM +0100, Rafael Sadowski wrote:
> Hi All,
> 
> straightforward update to the last doxygen version. After all
> problematic doxygen ports have been modified, the doxygen update is
> ready. The following ports still use it but there are no PLIST changes:
> 
> astro/stellarium
> audio/liblo
> audio/libnjb
> databases/soprano
> devel/simulavr
> devel/tclap
> graphics/digikam-kde4
> graphics/opencv
> math/ginac
> net/libktorrent
> productivity/kmymoney
> productivity/libalkimia
> x11/kde4/nepomuk-core
> x11/kde4/runtime
> 
> Please find below one diff for doxygen and one for doxygen-gui.
> 
> Best regards,
> 
> Rafael Sadowski
> 
> Index: Makefile
> =======
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.39
> diff -u -p -u -p -r1.39 Makefile
> --- Makefile  23 Dec 2016 15:23:11 -  1.39
> +++ Makefile  25 Mar 2017 08:00:30 -
> @@ -7,10 +7,9 @@ BROKEN-alpha=.got subsegment exceeds 64
>  
>  COMMENT= source code documentation generator tool
>  
> -VERSION= 1.8.12
> +VERSION= 1.8.13
>  DISTNAME=doxygen-${VERSION}.src
>  PKGNAME= doxygen-${VERSION}
> -REVISION=1
>  
>  CATEGORIES=  devel textproc
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/doxygen/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- distinfo  12 Nov 2016 20:50:41 -  1.10
> +++ distinfo  25 Mar 2017 08:00:30 -
> @@ -1,2 +1,2 @@
> -SHA256 (doxygen-1.8.12.src.tar.gz) = 
> eS1AkcvfIoVJ/yAz3XH/fqUCnGtDYxfMXshm5xMC32w=
> -SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
> +SHA256 (doxygen-1.8.13.src.tar.gz) = 
> r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
> +SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/doxygen-gui/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 Makefile
> --- Makefile  23 Dec 2016 15:29:22 -  1.1.1.1
> +++ Makefile  25 Mar 2017 08:00:19 -
> @@ -7,10 +7,9 @@ BROKEN-alpha=.got subsegment exceeds 64
>  
>  COMMENT= GUI front-end for doxygen
>  
> -VERSION= 1.8.12
> +VERSION= 1.8.13
>  DISTNAME=doxygen-${VERSION}.src
>  PKGNAME= doxygen-gui-${VERSION}
> -REVISION=1
>  
>  CATEGORIES=  devel textproc
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/doxygen-gui/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  23 Dec 2016 15:29:22 -  1.1.1.1
> +++ distinfo  25 Mar 2017 08:00:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (doxygen-1.8.12.src.tar.gz) = 
> eS1AkcvfIoVJ/yAz3XH/fqUCnGtDYxfMXshm5xMC32w=
> -SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
> +SHA256 (doxygen-1.8.13.src.tar.gz) = 
> r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
> +SIZE (doxygen-1.8.13.src.tar.gz) = 4893912

UPDATE: devel/doxygen and devel/doxygen-gui

2017-03-25 Thread Rafael Sadowski

Hi All,

straightforward update to the last doxygen version. After all
problematic doxygen ports have been modified, the doxygen update is
ready. The following ports still use it but there are no PLIST changes:

astro/stellarium
audio/liblo
audio/libnjb
databases/soprano
devel/simulavr
devel/tclap
graphics/digikam-kde4
graphics/opencv
math/ginac
net/libktorrent
productivity/kmymoney
productivity/libalkimia
x11/kde4/nepomuk-core
x11/kde4/runtime

Please find below one diff for doxygen and one for doxygen-gui.

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- Makefile23 Dec 2016 15:23:11 -  1.39
+++ Makefile25 Mar 2017 08:00:30 -
@@ -7,10 +7,9 @@ BROKEN-alpha=  .got subsegment exceeds 64
 
 COMMENT=   source code documentation generator tool
 
-VERSION=   1.8.12
+VERSION=   1.8.13
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME=   doxygen-${VERSION}
-REVISION=  1
 
 CATEGORIES=devel textproc
 
Index: distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo12 Nov 2016 20:50:41 -  1.10
+++ distinfo25 Mar 2017 08:00:30 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.8.12.src.tar.gz) = 
eS1AkcvfIoVJ/yAz3XH/fqUCnGtDYxfMXshm5xMC32w=
-SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
+SHA256 (doxygen-1.8.13.src.tar.gz) = 
r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
+SIZE (doxygen-1.8.13.src.tar.gz) = 4893912


Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen-gui/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile23 Dec 2016 15:29:22 -  1.1.1.1
+++ Makefile25 Mar 2017 08:00:19 -
@@ -7,10 +7,9 @@ BROKEN-alpha=  .got subsegment exceeds 64
 
 COMMENT=   GUI front-end for doxygen
 
-VERSION=   1.8.12
+VERSION=   1.8.13
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME=   doxygen-gui-${VERSION}
-REVISION=  1
 
 CATEGORIES=devel textproc
 
Index: distinfo
===
RCS file: /cvs/ports/devel/doxygen-gui/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo23 Dec 2016 15:29:22 -  1.1.1.1
+++ distinfo25 Mar 2017 08:00:19 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.8.12.src.tar.gz) = 
eS1AkcvfIoVJ/yAz3XH/fqUCnGtDYxfMXshm5xMC32w=
-SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
+SHA256 (doxygen-1.8.13.src.tar.gz) = 
r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
+SIZE (doxygen-1.8.13.src.tar.gz) = 4893912

Re: x11/ede/lib without Doxygen docs

2017-02-05 Thread Rafael Sadowski

On Sun Feb 05, 2017 at 12:51:40AM +0100, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski <raf...@sizeofvoid.org> writes:
> 
> > Hi All!
> 
> Hi Rafael,
> 
> > Below you can find a patch to disable Doxygen docs in ede/lib.
> > I modified configure because there is no option to disable doxygen.
> 
> A bit hackish, but I used ac_cv_path_DOXYGEN="" in CONFIGURE_ENV instead
> of the patch.
> 

Hi Jeremie,

a much better approach, new tested diff below.

Thanks,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/ede/lib/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile23 Dec 2016 20:59:58 -  1.11
+++ Makefile5 Feb 2017 14:31:01 -
@@ -3,7 +3,7 @@
 COMMENT =  equinox desktop library
 
 DISTNAME = edelib-${V}
-REVISION = 5
+REVISION = 6
 
 API_VER =  1.0
 .for l in edelib edelib_dbus edelib_gui
@@ -14,8 +14,8 @@ WANTLIB += X11 Xau Xcursor Xdmcp Xext Xf
 WANTLIB += fltk fltk_images fontconfig jpeg m png pthread stdc++ z
 
 MODULES =  lang/python
-BUILD_DEPENDS =devel/jam \
-   devel/doxygen
+BUILD_DEPENDS =devel/jam
+
 LIB_DEPENDS =  x11/fltk \
x11/dbus
 
@@ -23,7 +23,8 @@ MAKE_ENV =EDE_VERSION="${FULL_V}"
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-shared
-CONFIGURE_ENV =API_VER="${API_VER}"
+CONFIGURE_ENV =API_VER="${API_VER}" \
+   ac_cv_path_DOXYGEN=""
 
 NO_TEST =  Yes
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/ede/lib/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.4
+++ pkg/PLIST   5 Feb 2017 14:31:01 -
@@ -97,344 +97,6 @@ share/doc/edelib-${FULL_V}/
 share/doc/edelib-${FULL_V}/COPYING
 share/doc/edelib-${FULL_V}/INSTALL
 share/doc/edelib-${FULL_V}/README
-share/doc/edelib-${FULL_V}/html/
-share/doc/edelib-${FULL_V}/html/AnimateBox_8h_source.html
-share/doc/edelib-${FULL_V}/html/ColorDb_8h_source.html
-share/doc/edelib-${FULL_V}/html/Color_8h_source.html
-share/doc/edelib-${FULL_V}/html/Config_8h_source.html
-share/doc/edelib-${FULL_V}/html/DateTime_8h_source.html
-share/doc/edelib-${FULL_V}/html/Debug_8h_source.html
-share/doc/edelib-${FULL_V}/html/DesktopFile_8h_source.html
-share/doc/edelib-${FULL_V}/html/DirWatch_8h_source.html
-share/doc/edelib-${FULL_V}/html/Directory_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusConnection_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusContainer_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusData_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusDict_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusError_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusList_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusMessage_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusObjectPath_8h_source.html
-share/doc/edelib-${FULL_V}/html/Ede_8h_source.html
-share/doc/edelib-${FULL_V}/html/ExpandableGroup_8h_source.html
-share/doc/edelib-${FULL_V}/html/FileTest_8h_source.html
-share/doc/edelib-${FULL_V}/html/File_8h_source.html
-share/doc/edelib-${FULL_V}/html/FontCache_8h_source.html
-share/doc/edelib-${FULL_V}/html/FontChooser_8h_source.html
-share/doc/edelib-${FULL_V}/html/ForeignCallback_8h_source.html
-share/doc/edelib-${FULL_V}/html/Functional_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconChooser_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconLoader_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconTheme_8h_source.html
-share/doc/edelib-${FULL_V}/html/List_8h_source.html
-share/doc/edelib-${FULL_V}/html/Listener_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuBar_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuBase_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuButton_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuItem_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuTooltip_8h_source.html
-share/doc/edelib-${FULL_V}/html/MessageBox_8h_source.html
-share/doc/edelib-${FULL_V}/html/MimeType_8h_source.html
-share/doc/edelib-${FULL_V}/html/Missing_8h_source.html
-share/doc/edelib-${FULL_V}/html/Namespace_8h_source.html
-share/doc/edelib-${FULL_V}/html/Netwm_8h_source.html
-share/doc/edelib-${FULL_V}/html/Nls_8h_source.html
-share/doc/edelib-${FULL_V}/html/PtyProcess_8h_source.html
-share/doc/edelib-${FULL_V}/html/Pty_8h_source.html
-share/doc/edelib-${FULL_V}/html/Regex_8h_source.html
-share/doc/edelib-${FULL_V}/html/Resource_8h_source.html
-share/doc/edelib-${FULL_V}/html/Run_8h_source.html
-share/doc/edelib-${FULL_V}/html/SchemeEditor_8h_source.html
-share/doc/edelib-${FULL_V}/html/Scheme_8h_source.html
-share/d

Re: x11/ede/lib without Doxygen docs

2017-02-04 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi All!

Hi Rafael,

> Below you can find a patch to disable Doxygen docs in ede/lib.
> I modified configure because there is no option to disable doxygen.

A bit hackish, but I used ac_cv_path_DOXYGEN="" in CONFIGURE_ENV instead
of the patch.

Thanks,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

x11/kde4 without Doxygen docs

2017-02-02 Thread Rafael Sadowski

Hi All,

remove doxygen as BUILD_DEPEND from kde4. Yes there are some doxygen files in
kde4/runtime and kde4/nepomuk-core but no CMake task or similar.

Tested with no PLIST changes (no relevant change).

Kind regards,

Rafael


Index: nepomuk-core/Makefile
===
RCS file: /cvs/ports/x11/kde4/nepomuk-core/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- nepomuk-core/Makefile   28 May 2015 10:17:30 -  1.10
+++ nepomuk-core/Makefile   2 Feb 2017 20:12:39 -
@@ -23,8 +23,7 @@ WANTLIB += sopranoserver tag
 
 MODKDE4_USE =  libs
 
-BUILD_DEPENDS =devel/doxygen \
-   misc/shared-desktop-ontologies>=0.10.51
+BUILD_DEPENDS =misc/shared-desktop-ontologies>=0.10.51
 
 RUN_DEPENDS =  devel/desktop-file-utils \
misc/shared-desktop-ontologies>=0.10.51
Index: runtime/Makefile
===
RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- runtime/Makefile22 Sep 2015 21:48:25 -  1.31
+++ runtime/Makefile2 Feb 2017 20:12:39 -
@@ -48,7 +48,6 @@ MODKDE4_USE = pim libs
 
 BUILD_DEPENDS =archivers/bzip2 \
archivers/xz \
-   devel/doxygen \
${MODKDE4_DEP_DIR}/nepomuk-core>=${MODKDE4_DEP_VERSION}
 
 RUN_DEPENDS-locale =

x11/ede/lib without Doxygen docs

2017-01-31 Thread Rafael Sadowski

Hi All!

Below you can find a patch to disable Doxygen docs in ede/lib.
I modified configure because there is no option to disable doxygen.

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/ede/lib/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile23 Dec 2016 20:59:58 -  1.11
+++ Makefile31 Jan 2017 21:05:27 -
@@ -3,7 +3,7 @@
 COMMENT =  equinox desktop library
 
 DISTNAME = edelib-${V}
-REVISION = 5
+REVISION = 6
 
 API_VER =  1.0
 .for l in edelib edelib_dbus edelib_gui
@@ -14,8 +14,8 @@ WANTLIB += X11 Xau Xcursor Xdmcp Xext Xf
 WANTLIB += fltk fltk_images fontconfig jpeg m png pthread stdc++ z
 
 MODULES =  lang/python
-BUILD_DEPENDS =devel/jam \
-   devel/doxygen
+BUILD_DEPENDS =devel/jam
+
 LIB_DEPENDS =  x11/fltk \
x11/dbus
 
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/ede/lib/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 11 Jul 2014 21:39:04 -  1.2
+++ patches/patch-configure 31 Jan 2017 21:05:27 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.2 2014/07/11 21:39:04 pascal Exp $
 --- configure.orig Sat Jun 21 23:24:17 2014
-+++ configure  Fri Jul 11 18:46:15 2014
 configure  Tue Jan 31 22:01:25 2017
 @@ -2211,7 +2211,7 @@ ac_config_headers="$ac_config_headers config.h:config.
  EDELIB_MAJOR_VERSION=2
  EDELIB_MINOR_VERSION=1
@@ -10,7 +10,17 @@ $OpenBSD: patch-configure,v 1.2 2014/07/
  
  user_cflags="$CFLAGS"
  user_cxxflags="$CXXFLAGS"
-@@ -4311,7 +4311,6 @@ int
+@@ -3423,7 +3423,8 @@ IFS=$as_save_IFS
+   ;;
+ esac
+ fi
+-DOXYGEN=$ac_cv_path_DOXYGEN
++# Disable Doxygen docs
++DOXYGEN=
+ if test -n "$DOXYGEN"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+ $as_echo "$DOXYGEN" >&6; }
+@@ -4311,7 +4312,6 @@ int
  main ()
  {
  
@@ -18,7 +28,7 @@ $OpenBSD: patch-configure,v 1.2 2014/07/
int d = daylight;
  
;
-@@ -5506,12 +5505,7 @@ $as_echo "$DBUS_CFLAGS" >&6; }
+@@ -5506,12 +5506,7 @@ $as_echo "$DBUS_CFLAGS" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
  $as_echo_n "checking DBUS_LIBS... " >&6; }
  ## don't use --libs since that can do evil things like add 
-Wl,--export-dynamic
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/ede/lib/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.4
+++ pkg/PLIST   31 Jan 2017 21:05:27 -
@@ -97,344 +97,6 @@ share/doc/edelib-${FULL_V}/
 share/doc/edelib-${FULL_V}/COPYING
 share/doc/edelib-${FULL_V}/INSTALL
 share/doc/edelib-${FULL_V}/README
-share/doc/edelib-${FULL_V}/html/
-share/doc/edelib-${FULL_V}/html/AnimateBox_8h_source.html
-share/doc/edelib-${FULL_V}/html/ColorDb_8h_source.html
-share/doc/edelib-${FULL_V}/html/Color_8h_source.html
-share/doc/edelib-${FULL_V}/html/Config_8h_source.html
-share/doc/edelib-${FULL_V}/html/DateTime_8h_source.html
-share/doc/edelib-${FULL_V}/html/Debug_8h_source.html
-share/doc/edelib-${FULL_V}/html/DesktopFile_8h_source.html
-share/doc/edelib-${FULL_V}/html/DirWatch_8h_source.html
-share/doc/edelib-${FULL_V}/html/Directory_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusConnection_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusContainer_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusData_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusDict_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusError_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusList_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusMessage_8h_source.html
-share/doc/edelib-${FULL_V}/html/EdbusObjectPath_8h_source.html
-share/doc/edelib-${FULL_V}/html/Ede_8h_source.html
-share/doc/edelib-${FULL_V}/html/ExpandableGroup_8h_source.html
-share/doc/edelib-${FULL_V}/html/FileTest_8h_source.html
-share/doc/edelib-${FULL_V}/html/File_8h_source.html
-share/doc/edelib-${FULL_V}/html/FontCache_8h_source.html
-share/doc/edelib-${FULL_V}/html/FontChooser_8h_source.html
-share/doc/edelib-${FULL_V}/html/ForeignCallback_8h_source.html
-share/doc/edelib-${FULL_V}/html/Functional_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconChooser_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconLoader_8h_source.html
-share/doc/edelib-${FULL_V}/html/IconTheme_8h_source.html
-share/doc/edelib-${FULL_V}/html/List_8h_source.html
-share/doc/edelib-${FULL_V}/html/Listener_8h_source.html
-share/doc/edelib-${FULL_V}/html/MenuBar_8h_source.h

x11/awesome without Doxygen docs

2017-01-31 Thread Rafael Sadowski

Hi All,

till awesome 4.0 ready here is a version whitout Doxygen docs and
with new MASTER_SITES.

Best regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.103
diff -u -p -u -p -r1.103 Makefile
--- Makefile17 Oct 2016 19:33:38 -  1.103
+++ Makefile31 Jan 2017 19:56:21 -
@@ -3,7 +3,7 @@
 COMMENT=   highly configurable framework window manager
 
 DISTNAME=  awesome-3.5.9
-REVISION=  1
+REVISION=  2
 EXTRACT_SUFX=  .tar.xz
 CATEGORIES=x11
 
@@ -22,7 +22,7 @@ WANTLIB=  X11 c cairo dbus-1 execinfo \
xcb-render xcb-shape xcb-util \
xcb-xinerama xcb-xtest xdg-basedir
 
-MASTER_SITES=  ${HOMEPAGE}download/
+MASTER_SITES=  
https://github.com/awesomeWM/awesome-releases/raw/master/
 
 MODULES=   devel/cmake \
devel/gettext \
@@ -43,8 +43,7 @@ MODLUA_BUILD_DEPENDS= devel/lua-lgi
 BUILD_DEPENDS= devel/lualdoc \
textproc/asciidoc>=8.4.5 \
textproc/xmlto \
-   graphics/ImageMagick \
-   devel/doxygen
+   graphics/ImageMagick
 
 MODLUA_RUN_DEPENDS=devel/lua-lgi
 
@@ -53,6 +52,7 @@ RUN_DEPENDS=  devel/pango \
shells/bash
 
 CONFIGURE_ARGS=-DCOMPRESS_MANPAGES=off \
+   -DGENERATE_DOC=off \
-DSYSCONFDIR=${SYSCONFDIR}
 
 SEPARATE_BUILD=No
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST
--- pkg/PLIST   22 May 2013 15:05:50 -  1.14
+++ pkg/PLIST   31 Jan 2017 19:56:21 -
@@ -207,96 +207,6 @@ share/doc/awesome/AUTHORS
 share/doc/awesome/BUGS
 share/doc/awesome/LICENSE
 share/doc/awesome/README
-share/doc/awesome/doc/
-share/doc/awesome/doc/index.html
-share/doc/awesome/doc/ldoc.css
-share/doc/awesome/doc/modules/
-share/doc/awesome/doc/modules/awesome.html
-share/doc/awesome/doc/modules/awful.autofocus.html
-share/doc/awesome/doc/modules/awful.button.html
-share/doc/awesome/doc/modules/awful.client.html
-share/doc/awesome/doc/modules/awful.completion.html
-share/doc/awesome/doc/modules/awful.dbus.html
-share/doc/awesome/doc/modules/awful.ewmh.html
-share/doc/awesome/doc/modules/awful.html
-share/doc/awesome/doc/modules/awful.key.html
-share/doc/awesome/doc/modules/awful.keygrabber.html
-share/doc/awesome/doc/modules/awful.layout.html
-share/doc/awesome/doc/modules/awful.layout.suit.fair.html
-share/doc/awesome/doc/modules/awful.layout.suit.floating.html
-share/doc/awesome/doc/modules/awful.layout.suit.html
-share/doc/awesome/doc/modules/awful.layout.suit.magnifier.html
-share/doc/awesome/doc/modules/awful.layout.suit.max.html
-share/doc/awesome/doc/modules/awful.layout.suit.spiral.html
-share/doc/awesome/doc/modules/awful.layout.suit.tile.html
-share/doc/awesome/doc/modules/awful.menu.html
-share/doc/awesome/doc/modules/awful.mouse.finder.html
-share/doc/awesome/doc/modules/awful.mouse.html
-share/doc/awesome/doc/modules/awful.placement.html
-share/doc/awesome/doc/modules/awful.prompt.html
-share/doc/awesome/doc/modules/awful.remote.html
-share/doc/awesome/doc/modules/awful.rules.html
-share/doc/awesome/doc/modules/awful.screen.html
-share/doc/awesome/doc/modules/awful.startup_notification.html
-share/doc/awesome/doc/modules/awful.tag.html
-share/doc/awesome/doc/modules/awful.titlebar.html
-share/doc/awesome/doc/modules/awful.tooltip.html
-share/doc/awesome/doc/modules/awful.util.html
-share/doc/awesome/doc/modules/awful.wibox.html
-share/doc/awesome/doc/modules/awful.widget.button.html
-share/doc/awesome/doc/modules/awful.widget.common.html
-share/doc/awesome/doc/modules/awful.widget.graph.html
-share/doc/awesome/doc/modules/awful.widget.html
-share/doc/awesome/doc/modules/awful.widget.launcher.html
-share/doc/awesome/doc/modules/awful.widget.layoutbox.html
-share/doc/awesome/doc/modules/awful.widget.progressbar.html
-share/doc/awesome/doc/modules/awful.widget.prompt.html
-share/doc/awesome/doc/modules/awful.widget.taglist.html
-share/doc/awesome/doc/modules/awful.widget.tasklist.html
-share/doc/awesome/doc/modules/awful.widget.textclock.html
-share/doc/awesome/doc/modules/beautiful.html
-share/doc/awesome/doc/modules/button.html
-share/doc/awesome/doc/modules/client.html
-share/doc/awesome/doc/modules/dbus.html
-share/doc/awesome/doc/modules/drawable.html
-share/doc/awesome/doc/modules/drawin.html
-share/doc/awesome/doc/modules/gears.color.html
-share/doc/awesome/doc/modules/gears.debug.html
-share/doc/awesome/doc/modules/gears.html
-share/doc/awesome/doc/modules/gears.object.html
-share/doc/awesome/doc/modules/gears.sort.html
-share/

devel/libmtp without Doxygen docs

2017-01-29 Thread Rafael Sadowski

Hi All,

simple patch to remove doxygen as BUILD_DEPEND.

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/devel/libmtp/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile12 Nov 2016 20:50:41 -  1.33
+++ Makefile29 Jan 2017 11:25:19 -
@@ -4,7 +4,7 @@ COMMENT=Media Transfer Protocol (MTP) 
 
 DISTNAME=  libmtp-1.1.12
 CATEGORIES=devel
-REVISION=  0
+REVISION=  1
 
 SHARED_LIBS +=  mtp  7.0  # 12.0
 
@@ -17,13 +17,11 @@ WANTLIB += c gcrypt gpg-error iconv intl
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libmtp/}
 
-BUILD_DEPENDS= devel/doxygen
-MAKE_ENV+= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
 LIB_DEPENDS=   devel/libusb1 \
security/libgcrypt
 
 CONFIGURE_STYLE=   gnu
-CONFIGURE_ARGS+=   --enable-doxygen
+CONFIGURE_ARGS+=   --enable-doxygen=no
 CONFIGURE_ENV+=LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libmtp/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.16
+++ pkg/PLIST   29 Jan 2017 11:25:19 -
@@ -25,168 +25,3 @@ lib/libmtp.a
 lib/libmtp.la
 @lib lib/libmtp.so.${LIBmtp_VERSION}
 lib/pkgconfig/libmtp.pc
-share/doc/libmtp/
-share/doc/libmtp/html/
-share/doc/libmtp/html/__stdint_8h_source.html
-share/doc/libmtp/html/annotated.html
-share/doc/libmtp/html/bc_s.png
-share/doc/libmtp/html/bdwn.png
-share/doc/libmtp/html/chdk__live__view_8h_source.html
-share/doc/libmtp/html/chdk__ptp_8h_source.html
-share/doc/libmtp/html/classes.html
-share/doc/libmtp/html/closed.png
-share/doc/libmtp/html/delfile_8c-example.html
-share/doc/libmtp/html/detect_8c-example.html
-share/doc/libmtp/html/device-flags_8h.html
-share/doc/libmtp/html/device-flags_8h_source.html
-share/doc/libmtp/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
-share/doc/libmtp/html/doc.png
-share/doc/libmtp/html/doxygen.css
-share/doc/libmtp/html/doxygen.png
-share/doc/libmtp/html/dynsections.js
-share/doc/libmtp/html/examples.html
-share/doc/libmtp/html/examples_8h_source.html
-share/doc/libmtp/html/files.html
-share/doc/libmtp/html/files_8c-example.html
-share/doc/libmtp/html/folderclosed.png
-share/doc/libmtp/html/folderopen.png
-share/doc/libmtp/html/folders_8c-example.html
-share/doc/libmtp/html/functions.html
-share/doc/libmtp/html/functions_vars.html
-share/doc/libmtp/html/getfile_8c-example.html
-share/doc/libmtp/html/getplaylist_8c-example.html
-share/doc/libmtp/html/globals.html
-share/doc/libmtp/html/globals_d.html
-share/doc/libmtp/html/globals_defs.html
-share/doc/libmtp/html/globals_enum.html
-share/doc/libmtp/html/globals_eval.html
-share/doc/libmtp/html/globals_func.html
-share/doc/libmtp/html/globals_func_d.html
-share/doc/libmtp/html/globals_func_g.html
-share/doc/libmtp/html/globals_func_l.html
-share/doc/libmtp/html/globals_func_p.html
-share/doc/libmtp/html/globals_func_s.html
-share/doc/libmtp/html/globals_func_u.html
-share/doc/libmtp/html/globals_g.html
-share/doc/libmtp/html/globals_l.html
-share/doc/libmtp/html/globals_m.html
-share/doc/libmtp/html/globals_p.html
-share/doc/libmtp/html/globals_s.html
-share/doc/libmtp/html/globals_type.html
-share/doc/libmtp/html/globals_u.html
-share/doc/libmtp/html/globals_vars.html
-share/doc/libmtp/html/gphoto2-endian_8h_source.html
-share/doc/libmtp/html/group__albums.html
-share/doc/libmtp/html/group__basic.html
-share/doc/libmtp/html/group__files.html
-share/doc/libmtp/html/group__folders.html
-share/doc/libmtp/html/group__internals.html
-share/doc/libmtp/html/group__objects.html
-share/doc/libmtp/html/group__playlists.html
-share/doc/libmtp/html/group__structar.html
-share/doc/libmtp/html/group__tracks.html
-share/doc/libmtp/html/group__types.html
-share/doc/libmtp/html/hotplug_8c-example.html
-share/doc/libmtp/html/index.html
-share/doc/libmtp/html/jquery.js
-share/doc/libmtp/html/libmtp_8c.html
-share/doc/libmtp/html/libmtp_8h.html
-share/doc/libmtp/html/libmtp_8h_source.html
-share/doc/libmtp/html/libusb-glue_8h.html
-share/doc/libmtp/html/libusb-glue_8h_source.html
-share/doc/libmtp/html/mainpage_8h_source.html
-share/doc/libmtp/html/menu.js
-share/doc/libmtp/html/menudata.js
-share/doc/libmtp/html/modules.html
-share/doc/libmtp/html/mtpz_8c.html
-share/doc/libmtp/html/mtpz_8h.html
-share/doc/libmtp/html/mtpz_8h_source.html
-share/doc/libmtp/html/music-players_8h.html
-share/doc/libmtp/html/music-players_8h_source.html
-share/doc/libmtp/html/nav_f.png
-share/doc/libmtp/html/nav_g.png
-share/doc/libmtp/html/nav_h.png
-share/doc/libmtp/html/newfolder_8c-example.html
-share/doc/libmtp/html/open.png
-share/doc/libmtp/html/playlist-spl_8h_source.html
-s

net/ortp without Doxygen docs

2017-01-29 Thread Rafael Sadowski

Hi All,

simple patch to remove doxygen ad BUILD_DEPEND.

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/net/ortp/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Nov 2016 20:50:41 -  1.11
+++ Makefile29 Jan 2017 10:25:36 -
@@ -2,7 +2,7 @@
 
 COMMENT =  RTP (RFC3550) library
 DISTNAME = ortp-0.24.2
-REVISION = 2
+REVISION = 3
 
 SHARED_LIBS += ortp 2.0  # 9.0
 
@@ -17,18 +17,13 @@ WANTLIB =   crypto m pthread ssl
 
 MASTER_SITES = 
http://download.savannah.nongnu.org/releases/linphone/ortp/sources/
 
-BUILD_DEPENDS =devel/doxygen
-
 SEPARATE_BUILD =   Yes
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS =   --enable-ssl-hmac
+CONFIGURE_ARGS =   --enable-ssl-hmac \
+   --enable-doxygen=no
 
 # OpenBSD does not support AI_V4MAPPED/AI_ALL
 CONFIGURE_ENV =CFLAGS="${CFLAGS} -DAI_V4MAPPED=0 -DAI_ALL"
-
-post-install:
-   rm -Rf ${PREFIX}/share/doc/ortp
-   mv ${PREFIX}/share/doc/${DISTNAME} ${PREFIX}/share/doc/ortp
 
 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/ortp/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.6
+++ pkg/PLIST   29 Jan 2017 10:25:36 -
@@ -18,145 +18,3 @@ lib/libortp.a
 lib/libortp.la
 @lib lib/libortp.so.${LIBortp_VERSION}
 lib/pkgconfig/ortp.pc
-share/doc/ortp/
-share/doc/ortp/AUTHORS
-share/doc/ortp/COPYING
-share/doc/ortp/ChangeLog
-share/doc/ortp/README
-share/doc/ortp/html/
-share/doc/ortp/html/annotated.html
-share/doc/ortp/html/b64_8c.html
-share/doc/ortp/html/b64_8h_source.html
-share/doc/ortp/html/bc_s.png
-share/doc/ortp/html/bdwn.png
-share/doc/ortp/html/classes.html
-share/doc/ortp/html/closed.png
-share/doc/ortp/html/dir_1237c0c4ac8a40c5981d204c92d68506.html
-share/doc/ortp/html/dir_36adbd774c1c6f000b1297d70be35b2a.html
-share/doc/ortp/html/dir_6bf604f68eb5164e4b2a9bb0b07c3bf3.html
-share/doc/ortp/html/dir_82e548d772bf9edbe5ac623da58159b2.html
-share/doc/ortp/html/doc.png
-share/doc/ortp/html/doxygen.css
-share/doc/ortp/html/doxygen.png
-share/doc/ortp/html/dynsections.js
-share/doc/ortp/html/event_8h_source.html
-share/doc/ortp/html/files.html
-share/doc/ortp/html/folderclosed.png
-share/doc/ortp/html/folderopen.png
-share/doc/ortp/html/functions.html
-share/doc/ortp/html/functions_vars.html
-share/doc/ortp/html/globals.html
-share/doc/ortp/html/globals_defs.html
-share/doc/ortp/html/globals_enum.html
-share/doc/ortp/html/globals_eval.html
-share/doc/ortp/html/globals_func.html
-share/doc/ortp/html/globals_type.html
-share/doc/ortp/html/index.html
-share/doc/ortp/html/jitterctl_8h_source.html
-share/doc/ortp/html/jquery.js
-share/doc/ortp/html/logging_8h.html
-share/doc/ortp/html/logging_8h_source.html
-share/doc/ortp/html/menu.js
-share/doc/ortp/html/menudata.js
-share/doc/ortp/html/nav_f.png
-share/doc/ortp/html/nav_g.png
-share/doc/ortp/html/nav_h.png
-share/doc/ortp/html/open.png
-share/doc/ortp/html/ortp_8h.html
-share/doc/ortp/html/ortp_8h_source.html
-share/doc/ortp/html/payloadtype_8h.html
-share/doc/ortp/html/payloadtype_8h_source.html
-share/doc/ortp/html/port_8h_source.html
-share/doc/ortp/html/rtcp_8h_source.html
-share/doc/ortp/html/rtp_8h_source.html
-share/doc/ortp/html/rtpprofile_8h.html
-share/doc/ortp/html/rtpprofile_8h_source.html
-share/doc/ortp/html/rtpsession_8h.html
-share/doc/ortp/html/rtpsession_8h_source.html
-share/doc/ortp/html/rtpsession__priv_8h_source.html
-share/doc/ortp/html/rtpsignaltable_8h_source.html
-share/doc/ortp/html/rtptimer_8h_source.html
-share/doc/ortp/html/scheduler_8h_source.html
-share/doc/ortp/html/sessionset_8h.html
-share/doc/ortp/html/sessionset_8h_source.html
-share/doc/ortp/html/splitbar.png
-share/doc/ortp/html/str__utils_8h_source.html
-share/doc/ortp/html/structOrtpEvQueue.html
-share/doc/ortp/html/structOrtpLossRateEstimator.html
-share/doc/ortp/html/structOrtpRtcpSendAlgorithm.html
-share/doc/ortp/html/structOrtpRtcpTmmbrInfo.html
-share/doc/ortp/html/structOrtpRtcpXrConfiguration.html
-share/doc/ortp/html/structOrtpRtcpXrMediaCallbacks.html
-share/doc/ortp/html/structOrtpRtcpXrStats.html
-share/doc/ortp/html/struct__JBParameters.html
-share/doc/ortp/html/struct__JitterControl.html
-share/doc/ortp/html/struct__MetaRtpTransportImpl.html
-share/doc/ortp/html/struct__OList.html
-share/doc/ortp/html/struct__OrtpAddress.html
-share/doc/ortp/html/struct__OrtpEventData.html
-share/doc/ortp/html/struct__OrtpMemoryFunctions.html
-share/doc/ortp/html/struct__OrtpNetworkSimulatorCtx.html
-share/doc/ortp/html/struct__OrtpNetworkSimulatorParams.html
-share/doc/ortp/html/struct__OrtpStream.html
-share/doc/ortp/html/struct__PayloadType.html
-share/doc/ortp/html/struct__PayloadTypeAvpfParams.html

multimedia/libquicktime without Doxygen docs

2017-01-29 Thread Rafael Sadowski

Hi All.

simple patch to remove doxygen ad BUILD_DEPEND.

Index: Makefile
===
RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- Makefile12 Nov 2016 20:50:41 -  1.51
+++ Makefile29 Jan 2017 09:51:52 -
@@ -3,7 +3,7 @@
 COMMENT=   library for reading and writing QuickTime files
 
 DISTNAME=  libquicktime-1.2.4
-REVISION=  7
+REVISION=  8
 CATEGORIES=multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
@@ -27,7 +27,7 @@ WANTLIB += xcb xcb-dri2 xcb-glx xcb-rend
 WANTLIB += atk-1.0 vorbis
 
 MODULES=   devel/gettext
-BUILD_DEPENDS= devel/doxygen>=1.7.2
+
 LIB_DEPENDS=   audio/faad \
audio/lame \
audio/libvorbis \
@@ -38,22 +38,20 @@ LIB_DEPENDS=audio/faad \
multimedia/x264 \
x11/gtk+2
 
-MAKE_ENV=  DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
-
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=--enable-gpl \
--enable-static \
--with-libdv \
--without-alsa \
--without-faac \
-   --without-schroedinger
+   --without-schroedinger \
+   --without-doxygen
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
ac_cv_lib_ossaudio__oss_ioctl=no \
ac_cv_header_soundcard_h=no
 
 post-install:
-   @rm ${PREFIX}/share/doc/libquicktime/apiref/dir_*.html
@find ${PREFIX}/lib/libquicktime -name '*.a' -print | xargs rm
@find ${PREFIX}/lib -name '*.la' -print | xargs rm
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/libquicktime/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 PLIST
--- pkg/PLIST   12 Nov 2016 20:50:41 -  1.15
+++ pkg/PLIST   29 Jan 2017 09:51:52 -
@@ -35,78 +35,4 @@ lib/libquicktime/lqt_vorbis.so
 lib/libquicktime/lqt_x264.so
 lib/pkgconfig/libquicktime.pc
 @man man/man1/lqtplay.1
-share/doc/libquicktime/
-share/doc/libquicktime/apiref/
-share/doc/libquicktime/apiref/annotated.html
-share/doc/libquicktime/apiref/bc_s.png
-share/doc/libquicktime/apiref/bdwn.png
-share/doc/libquicktime/apiref/classes.html
-share/doc/libquicktime/apiref/closed.png
-share/doc/libquicktime/apiref/colormodels_8h_source.html
-share/doc/libquicktime/apiref/doc.png
-share/doc/libquicktime/apiref/doxygen.css
-share/doc/libquicktime/apiref/doxygen.png
-share/doc/libquicktime/apiref/dynsections.js
-share/doc/libquicktime/apiref/files.html
-share/doc/libquicktime/apiref/folderclosed.png
-share/doc/libquicktime/apiref/folderopen.png
-share/doc/libquicktime/apiref/functions.html
-share/doc/libquicktime/apiref/functions_vars.html
-share/doc/libquicktime/apiref/globals.html
-share/doc/libquicktime/apiref/globals_defs.html
-share/doc/libquicktime/apiref/globals_enum.html
-share/doc/libquicktime/apiref/globals_eval.html
-share/doc/libquicktime/apiref/globals_func.html
-share/doc/libquicktime/apiref/globals_q.html
-share/doc/libquicktime/apiref/globals_type.html
-share/doc/libquicktime/apiref/group__atoms.html
-share/doc/libquicktime/apiref/group__audio.html
-share/doc/libquicktime/apiref/group__audio__codecs.html
-share/doc/libquicktime/apiref/group__audio__decode.html
-share/doc/libquicktime/apiref/group__audio__encode.html
-share/doc/libquicktime/apiref/group__codec__parameters.html
-share/doc/libquicktime/apiref/group__codec__registry.html
-share/doc/libquicktime/apiref/group__color.html
-share/doc/libquicktime/apiref/group__general.html
-share/doc/libquicktime/apiref/group__log.html
-share/doc/libquicktime/apiref/group__metadata.html
-share/doc/libquicktime/apiref/group__multichannel.html
-share/doc/libquicktime/apiref/group__text.html
-share/doc/libquicktime/apiref/group__text__decode.html
-share/doc/libquicktime/apiref/group__text__encode.html
-share/doc/libquicktime/apiref/group__timecodes.html
-share/doc/libquicktime/apiref/group__video.html
-share/doc/libquicktime/apiref/group__video__codecs.html
-share/doc/libquicktime/apiref/group__video__decode.html
-share/doc/libquicktime/apiref/group__video__encode.html
-share/doc/libquicktime/apiref/index.html
-share/doc/libquicktime/apiref/jquery.js
-share/doc/libquicktime/apiref/lqt_8h.html
-share/doc/libquicktime/apiref/lqt_8h_source.html
-share/doc/libquicktime/apiref/lqt__atoms_8h_source.html
-share/doc/libquicktime/apiref/lqt__codecinfo_8h_source.html
-share/doc/libquicktime/apiref/menu.js
-share/doc/libquicktime/apiref/menudata.js
-share/doc/libquicktime/apiref/modules.html
-share/doc/libquicktime/apiref/nav_f.png
-share/doc/libquicktime/apiref/nav_g.png
-share/doc/libquicktime/apiref/nav_h.png
-share/doc/libquicktime/apiref/open.png
-share/doc/libquicktime/apiref/quicktime_8h.html
-share/

Re: devel/doxygen: Split the gui off to a different port

2016-12-19 Thread Rafael Sadowski

On Mon Dec 19, 2016 at 03:34:34PM +0300, Vadim Zhukov wrote:
> 
> We could also stop avoiding devel/doxygen dep in general, right?
> 

Yes, this is on my list after the split.

Rafael

Re: devel/doxygen: Split the gui off to a different port

2016-12-19 Thread Vadim Zhukov

2016-12-19 1:31 GMT+03:00 Jeremie Courreges-Anglas <j...@wxcvbn.org>:
> Rafael Sadowski <raf...@sizeofvoid.org> writes:
>
> [...]
>
>> @@ -47,11 +35,6 @@ MODULES=   devel/cmake \
>>  MODPY_RUNDEP=No
>>
>>  .include 
>
> This line isn't needed any more.  The MACHINE_ARCH variable used in the
> tests below is set by make(1).
>
>> -.if ${BUILD_PACKAGES:M-gui}
>> -CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
>> -CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
>> -MODULES+=x11/qt4
>> -.endif
>>  .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>>  # ld(1) fails
>>  CONFIGURE_ARGS+=-Denglish_only:Bool=ON
>
> devel/doxygen-gui would need this as much as devel/doxygen does.
>
> re doxygen-gui: since we build doxygen and not just doxywizard, libiconv
> is still directly used at build time, so it needs to be in
> BUILD_DEPENDS.  xapian-core is not needed for doxygen-gui.
>
> Updated diff for doxygen below, updated tarball for doxygen-gui
> attached.  It would be nice to move B/L/R deps around to make things
> clearer, but I'd rather not add more churn right now.
>
> Since doxygen-gui is a "new" port I'd need a review/ok from another
> developer.

Ideally, someone who owns alpha, mips64/mips64el, m88k and/or landisk
could verify what package builds where now. Unfortunately, that's not
me, though. :(

We could also stop avoiding devel/doxygen dep in general, right?

In any case, the whole thing looks like okay to me.

--
  WBR,
  Vadim Zhukov

Re: devel/doxygen: Split the gui off to a different port

2016-12-18 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

[...]

> @@ -47,11 +35,6 @@ MODULES=   devel/cmake \
>  MODPY_RUNDEP=No
>  
>  .include 

This line isn't needed any more.  The MACHINE_ARCH variable used in the
tests below is set by make(1).

> -.if ${BUILD_PACKAGES:M-gui}
> -CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
> -CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
> -MODULES+=x11/qt4
> -.endif
>  .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>  # ld(1) fails
>  CONFIGURE_ARGS+=-Denglish_only:Bool=ON

devel/doxygen-gui would need this as much as devel/doxygen does.

re doxygen-gui: since we build doxygen and not just doxywizard, libiconv
is still directly used at build time, so it needs to be in
BUILD_DEPENDS.  xapian-core is not needed for doxygen-gui.

Updated diff for doxygen below, updated tarball for doxygen-gui
attached.  It would be nice to move B/L/R deps around to make things
clearer, but I'd rather not add more churn right now.

Since doxygen-gui is a "new" port I'd need a review/ok from another
developer.



doxygen-gui.tgz
Description: Binary data

Index: Makefile
=======
RCS file: /d/cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile18 Dec 2016 21:23:50 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K
 
-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool
 
 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-${VERSION}
+REVISION=  1
 
 CATEGORIES=devel textproc
 
@@ -25,33 +21,19 @@ MAINTAINER= Rafael Sadowski <rafael@size
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
+WANTLIB += c iconv m pthread stdc++ xapian z
+
 MASTER_SITES=  http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/
 
-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
 
 MODPY_RUNDEP=  No
 
-.include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-doc_CMakeLists_txt
=======
RCS file: /d/cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt18 Dec 2016 20:52:07 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $
 
--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui
 
 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )
  
-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 
########
  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   18 Dec 2016 20:52:07 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
+(Corba and Microsoft flavors) and to some extent PHP, C# and D.
+
+It can generate an on-line

Re: devel/doxygen: Split the gui off to a different port

2016-12-18 Thread Rafael Sadowski

On Sun Dec 18, 2016 at 11:20:48AM +0100, Rafael Sadowski wrote:
> On Mon Dec 12, 2016 at 01:31:55PM +0100, Jeremie Courreges-Anglas wrote:
> > Stuart Henderson <s...@spacehopper.org> writes:
> > 
> > > You need @pkgpath markers so that updates work.
> > 
> > Yup, something like @pkgpath devel/doxygen,-main and @pkgpath
> > devel/doxygen,-gui.  Rafael, would you mind sending the diff that
> > *removes* the gui parts from devel/doxygen? :)
> > 
> > Unless I'm mistaken, doxygen-gui has no use if devel/doxygen itself
> > isn't installed, so the latter should probably be listed in RUN_DEPENDS.
> > No opinion about having a hard dependency on a specific devel/doxygen
> > version.
> > 
> > -- 
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 
> 
> Updated diff and tarball with following changes:
> 
> https://github.com/jasperla/openbsd-wip/commit/a9c04d432b4557546df7fda9aad2e11f87951287
> https://github.com/jasperla/openbsd-wip/commit/6cf5e7b1c80eeb081bc1f3f0f9f68d080d7f6ad8

Wrong diff spotted by jca@, hope this one is better:

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile18 Dec 2016 19:58:11 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K
 
-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool
 
 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-${VERSION}
+REVISION=  1
 
 CATEGORIES=devel textproc
 
@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski <rafael@size
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
+WANTLIB += c iconv m pthread stdc++ xapian z
+
 MASTER_SITES=  http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/
 
-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No
 
 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt18 Dec 2016 19:58:11 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $
 
--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui
 
 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )
  
-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 

  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   18 Dec 2016 19:58:11 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
+(Corba and Microsoft fla

Re: devel/doxygen: Split the gui off to a different port

2016-12-18 Thread Rafael Sadowski

On Mon Dec 12, 2016 at 01:31:55PM +0100, Jeremie Courreges-Anglas wrote:
> Stuart Henderson <s...@spacehopper.org> writes:
> 
> > You need @pkgpath markers so that updates work.
> 
> Yup, something like @pkgpath devel/doxygen,-main and @pkgpath
> devel/doxygen,-gui.  Rafael, would you mind sending the diff that
> *removes* the gui parts from devel/doxygen? :)
> 
> Unless I'm mistaken, doxygen-gui has no use if devel/doxygen itself
> isn't installed, so the latter should probably be listed in RUN_DEPENDS.
> No opinion about having a hard dependency on a specific devel/doxygen
> version.
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE


Updated diff and tarball with following changes:

https://github.com/jasperla/openbsd-wip/commit/a9c04d432b4557546df7fda9aad2e11f87951287
https://github.com/jasperla/openbsd-wip/commit/6cf5e7b1c80eeb081bc1f3f0f9f68d080d7f6ad8

Cheers,

Rafael


Index: Makefile
=======
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile18 Dec 2016 10:15:50 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K
 
-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool
 
 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-gui-${VERSION}
+REVISION=  1
 
 CATEGORIES=devel textproc
 
@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski <rafael@size
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
+WANTLIB += c iconv m pthread stdc++ xapian z
+
 MASTER_SITES=  http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/
 
-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No
 
 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-doc_CMakeLists_txt
=======
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt18 Dec 2016 10:15:50 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $
 
--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui
 
 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )
  
-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 
####
  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   18 Dec 2016 10:15:50 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
+(Corba and Microsoft flavors) and to some extent PHP, C# and D.
+
+It can generate an on-line documentation browser (in HTML) and/or an
+off-line reference manual (in $\mbox{\LaTeX}$ ) from a set of documented
+source files. T

Re: devel/doxygen: Split the gui off to a different port

2016-12-12 Thread Jeremie Courreges-Anglas

Stuart Henderson <s...@spacehopper.org> writes:

> You need @pkgpath markers so that updates work.

Yup, something like @pkgpath devel/doxygen,-main and @pkgpath
devel/doxygen,-gui.  Rafael, would you mind sending the diff that
*removes* the gui parts from devel/doxygen? :)

Unless I'm mistaken, doxygen-gui has no use if devel/doxygen itself
isn't installed, so the latter should probably be listed in RUN_DEPENDS.
No opinion about having a hard dependency on a specific devel/doxygen
version.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: devel/doxygen: Split the gui off to a different port

2016-12-10 Thread Stuart Henderson


You need @pkgpath markers so that updates work.

--
 Sent from a phone, apologies for poor formatting.



On 10 December 2016 08:36:45 Rafael Sadowski <raf...@sizeofvoid.org> wrote:


Hi ports@,

based on the discussion [1] I would like to split doxygen in two
separate ports. Below you can see a diff to remove gui from current
port. Please find attached doxygen-gui tarball witch only include
doxywizard and doxywizard.1.

In conflict prevention, doxygen and doxygen-gui still have an REVISION
which was bumped up.

Best regards,

Rafael

[1]: https://marc.info/?l=openbsd-ports=147907369921343=2

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile10 Dec 2016 07:45:57 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K

-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool

 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-gui-${VERSION}
+REVISION=  1

 CATEGORIES=devel textproc

@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski <rafael@size
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes

+WANTLIB += c iconv m pthread stdc++ xapian z
+
 MASTER_SITES=  http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/

-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core

 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No

 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-addon_doxywizard_CMakeLists_txt
===
RCS file: patches/patch-addon_doxywizard_CMakeLists_txt
diff -N patches/patch-addon_doxywizard_CMakeLists_txt
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt10 Dec 2016 07:45:57 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $

--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui

 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )

-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 


  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: patches/patch-libmd5_libmd5_pro_in
===
RCS file: patches/patch-libmd5_libmd5_pro_in
diff -N patches/patch-libmd5_libmd5_pro_in
Index: patches/patch-qtools_qtools_pro_in
===
RCS file: patches/patch-qtools_qtools_pro_in
diff -N patches/patch-qtools_qtools_pro_in
Index: patches/patch-src_CMakeLists_txt
===
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
Index: pkg/DESCR
===

devel/doxygen: Split the gui off to a different port

2016-12-10 Thread Rafael Sadowski

Hi ports@,

based on the discussion [1] I would like to split doxygen in two
separate ports. Below you can see a diff to remove gui from current
port. Please find attached doxygen-gui tarball witch only include
doxywizard and doxywizard.1.

In conflict prevention, doxygen and doxygen-gui still have an REVISION
which was bumped up.

Best regards,

Rafael

[1]: https://marc.info/?l=openbsd-ports=147907369921343=2

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile13 Nov 2016 23:34:17 -  1.38
+++ Makefile10 Dec 2016 07:45:57 -
@@ -5,16 +5,12 @@
 NOT_FOR_ARCHS= m88k sh
 BROKEN-alpha=  .got subsegment exceeds 64K
 
-COMMENT-main=  source code documentation generator tool
-COMMENT-gui=   GUI front-end for doxygen
+COMMENT=   source code documentation generator tool
 
 VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}
-FULLPKGNAME-gui=doxygen-gui-${VERSION}
-
-REVISION-main= 0
-REVISION-gui=  0
+PKGNAME=   doxygen-gui-${VERSION}
+REVISION=  1
 
 CATEGORIES=devel textproc
 
@@ -25,21 +21,13 @@ MAINTAINER= Rafael Sadowski <rafael@size
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
+WANTLIB += c iconv m pthread stdc++ xapian z
+
 MASTER_SITES=  http://ftp.stack.nl/pub/users/dimitri/ \
ftp://ftp.stack.nl/pub/users/dimitri/
 
-MULTI_PACKAGES=-main -gui
-PSEUDO_FLAVORS=no_gui bootstrap
-
-WANTLIB-main +=c iconv m pthread stdc++ xapian z
-WANTLIB-gui += QtCore QtGui QtXml c m stdc++
-
-LIB_DEPENDS-main=  converters/libiconv \
-   databases/xapian-core
-
-LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
+LIB_DEPENDS=   converters/libiconv \
+   databases/xapian-core
 
 MODULES=   devel/cmake \
lang/python
@@ -47,11 +35,6 @@ MODULES= devel/cmake \
 MODPY_RUNDEP=  No
 
 .include 
-.if ${BUILD_PACKAGES:M-gui}
-CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
-MODULES+=  x11/qt4
-.endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
 CONFIGURE_ARGS+=-Denglish_only:Bool=ON
Index: patches/patch-addon_doxywizard_CMakeLists_txt
===
RCS file: patches/patch-addon_doxywizard_CMakeLists_txt
diff -N patches/patch-addon_doxywizard_CMakeLists_txt
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt1 Mar 2016 20:36:40 -   1.1
+++ patches/patch-doc_CMakeLists_txt10 Dec 2016 07:45:57 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2016/03/01 20:36:40 jca Exp $
 
--only manual pages
+- only manual pages
+- remove doxywizard.1, see devel/doxygen-gui
 
 doc/CMakeLists.txt.origTue Sep  1 14:42:06 2015
-+++ doc/CMakeLists.txt Sat Jan 16 22:00:23 2016
-@@ -153,13 +153,8 @@ add_custom_target(doxygen_pdf
+
+--- doc/CMakeLists.txt.origSun Sep  4 19:06:42 2016
 doc/CMakeLists.txt Fri Dec  9 22:52:29 2016
+@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
  )
  add_custom_target(docs
@@ -18,10 +20,10 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.1
  VERBATIM
  )
  
-@@ -167,19 +162,7 @@ add_custom_target(docs
+ 

  install(FILES
  "${PROJECT_BINARY_DIR}/man/doxygen.1"
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
 -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
 -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
 -DESTINATION share/man/man1
Index: patches/patch-libmd5_libmd5_pro_in
===
RCS file: patches/patch-libmd5_libmd5_pro_in
diff -N patches/patch-libmd5_libmd5_pro_in
Index: patches/patch-qtools_qtools_pro_in
===
RCS file: patches/patch-qtools_qtools_pro_in
diff -N patches/patch-qtools_qtools_pro_in
Index: patches/patch-src_CMakeLists_txt
===
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   10 Dec 2016 07:45:57 -
@@ -0,0 +1,37 @@
+Doxygen is a documentation system for C++, C,

Re: UPDATE: devel/doxygen

2016-11-14 Thread Nigel Taylor

On 11/13/16 22:54, Jeremie Courreges-Anglas wrote:
> Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:
> 
>> Stuart Henderson <s...@spacehopper.org> writes:
> 
> [...]
> 
>>> 3. split the gui off to a different port. keep the same pkgname stem,
>>> so it just needs an @pkgpath in PLIST for updates to work.
>>
>> I'd prefer this option.
> 
> In the meantime, let's unbreak the current situation by going back to
> Qt4.  Rafael, does the -Dforce_qt4:Bool=ON part actually works?  I don't
> have Qt5 anymore on this machine...
> 
> ok?
> 
> 
> Index: Makefile
> =======
> RCS file: /d/cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile  12 Nov 2016 20:59:18 -  1.37
> +++ Makefile  13 Nov 2016 22:48:32 -
> @@ -3,8 +3,6 @@
>  # Memory hog, stuck for days on the same file (configoptions.cpp) during 
> build.
>  # XXX check with different optimizer level? see doc/install.doc
>  NOT_FOR_ARCHS=   m88k sh
> -# Qt5 doesn't build yet on powerpc
> -NOT_FOR_ARCHS-gui=   m88k sh powerpc
>  BROKEN-alpha=    .got subsegment exceeds 64K
>  
>  COMMENT-main=source code documentation generator tool
> @@ -15,6 +13,9 @@ DISTNAME=   doxygen-${VERSION}.src
>  PKGNAME-main=doxygen-${VERSION}
>  FULLPKGNAME-gui=doxygen-gui-${VERSION}
>  
> +REVISION-main=   0
> +REVISION-gui=0
> +
>  CATEGORIES=  devel textproc
>  
>  HOMEPAGE=http://www.doxygen.org/
> @@ -30,10 +31,8 @@ MASTER_SITES=  http://ftp.stack.nl/pub/us
>  MULTI_PACKAGES=  -main -gui
>  PSEUDO_FLAVORS=  no_gui bootstrap
>  
> -COMMON_WANTLIB= c m pthread estdc++
> -WANTLIB-main=${COMMON_WANTLIB} iconv z xapian
> -WANTLIB-gui= Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
> - ${COMMON_WANTLIB}
> +WANTLIB-main +=  c iconv m pthread stdc++ xapian z
> +WANTLIB-gui +=   QtCore QtGui QtXml c m stdc++
>  
>  LIB_DEPENDS-main=converters/libiconv \
>   databases/xapian-core
> @@ -50,7 +49,8 @@ MODPY_RUNDEP=   No
>  .include 
>  .if ${BUILD_PACKAGES:M-gui}
>  CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
> -MODULES+=x11/qt5
> +CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
> +MODULES+=x11/qt4
>  .endif
>  .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>  # ld(1) fails
> 
> 
Thanks, I will try out, seen it gone in to CVS.

Re: UPDATE: devel/doxygen

2016-11-13 Thread Jeremie Courreges-Anglas

Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:

> Stuart Henderson <s...@spacehopper.org> writes:

[...]

>> 3. split the gui off to a different port. keep the same pkgname stem,
>> so it just needs an @pkgpath in PLIST for updates to work.
>
> I'd prefer this option.

In the meantime, let's unbreak the current situation by going back to
Qt4.  Rafael, does the -Dforce_qt4:Bool=ON part actually works?  I don't
have Qt5 anymore on this machine...

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile12 Nov 2016 20:59:18 -  1.37
+++ Makefile13 Nov 2016 22:48:32 -
@@ -3,8 +3,6 @@
 # Memory hog, stuck for days on the same file (configoptions.cpp) during build.
 # XXX check with different optimizer level? see doc/install.doc
 NOT_FOR_ARCHS= m88k sh
-# Qt5 doesn't build yet on powerpc
-NOT_FOR_ARCHS-gui= m88k sh powerpc
 BROKEN-alpha=  .got subsegment exceeds 64K
 
 COMMENT-main=  source code documentation generator tool
@@ -15,6 +13,9 @@ DISTNAME= doxygen-${VERSION}.src
 PKGNAME-main=  doxygen-${VERSION}
 FULLPKGNAME-gui=doxygen-gui-${VERSION}
 
+REVISION-main= 0
+REVISION-gui=  0
+
 CATEGORIES=devel textproc
 
 HOMEPAGE=  http://www.doxygen.org/
@@ -30,10 +31,8 @@ MASTER_SITES=http://ftp.stack.nl/pub/us
 MULTI_PACKAGES=-main -gui
 PSEUDO_FLAVORS=no_gui bootstrap
 
-COMMON_WANTLIB= c m pthread estdc++
-WANTLIB-main=  ${COMMON_WANTLIB} iconv z xapian
-WANTLIB-gui=   Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
-   ${COMMON_WANTLIB}
+WANTLIB-main +=c iconv m pthread stdc++ xapian z
+WANTLIB-gui += QtCore QtGui QtXml c m stdc++
 
 LIB_DEPENDS-main=  converters/libiconv \
databases/xapian-core
@@ -50,7 +49,8 @@ MODPY_RUNDEP= No
 .include 
 .if ${BUILD_PACKAGES:M-gui}
 CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-MODULES+=  x11/qt5
+CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
+MODULES+=  x11/qt4
 .endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen

2016-11-13 Thread Jeremie Courreges-Anglas

Stuart Henderson <s...@spacehopper.org> writes:

> On 2016/11/13 21:26, Nigel Taylor wrote:
>> > 
>> I will not be able to test building that for sometime as in middle of
>> dpb run, I would say that it will fail. Not proved, but the estdc++ in
>> the wantlib requires the library to be installed, that requires a
>> dependency set by x11/qt5.port.mk,
>> 
>> MODQT5_USE_GCC4_MODULE ?=   Yes
>> .if ${MODQT5_USE_GCC4_MODULE} == "Yes"
>>   MODULES +=gcc4
>>   MODGCC4_LANGS +=  c++
>>   MODGCC4_ARCHS ?=  *
>> .endif
>> 
>> which means either qt5 and gcc4 plus the library is installed or the
>> library isn't installed then relies on the chance dpb has installed gcc4
>> the library in building something else. Before stdc++ from base was used
>> for earlier version with qt4.
>> 
>> This would require a LDEP change, and possibly a revision bump also, or
>> the inclusion of the gcc4 module and revision bump.
>
> Yep, valid concern.
>
> As well as the ones you've suggested there's another option too.
> Any of these should work:
>
> 1. add the gcc4 module to doxygen so that the no_gui pseudo-flavour is
> also built with ports gcc. simple, but downside: pushes anything using
> doxygen later in dpb.
>
> 2. turn the no_gui pseudo-flavour back into a real flavour with a
> PFRAG for the gui bits. @pkgpath devel/doxygen,-gui would go in the
> pfrag.
>
> 3. split the gui off to a different port. keep the same pkgname stem,
> so it just needs an @pkgpath in PLIST for updates to work.

I'd prefer this option.

> Whichever is chosen, the current situation is wrong because no_gui is
> only a pseudo-flavour so it is only meant to select which subpackages
> are built and not change anything else; however at present it is also
> changing which compiler is used.

Right.  *sigh*

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen

2016-11-13 Thread Stuart Henderson

On 2016/11/13 21:26, Nigel Taylor wrote:
> > 
> I will not be able to test building that for sometime as in middle of
> dpb run, I would say that it will fail. Not proved, but the estdc++ in
> the wantlib requires the library to be installed, that requires a
> dependency set by x11/qt5.port.mk,
> 
> MODQT5_USE_GCC4_MODULE ?=   Yes
> .if ${MODQT5_USE_GCC4_MODULE} == "Yes"
>   MODULES +=gcc4
>   MODGCC4_LANGS +=  c++
>   MODGCC4_ARCHS ?=  *
> .endif
> 
> which means either qt5 and gcc4 plus the library is installed or the
> library isn't installed then relies on the chance dpb has installed gcc4
> the library in building something else. Before stdc++ from base was used
> for earlier version with qt4.
> 
> This would require a LDEP change, and possibly a revision bump also, or
> the inclusion of the gcc4 module and revision bump.

Yep, valid concern.

As well as the ones you've suggested there's another option too.
Any of these should work:

1. add the gcc4 module to doxygen so that the no_gui pseudo-flavour is
also built with ports gcc. simple, but downside: pushes anything using
doxygen later in dpb.

2. turn the no_gui pseudo-flavour back into a real flavour with a
PFRAG for the gui bits. @pkgpath devel/doxygen,-gui would go in the
pfrag.

3. split the gui off to a different port. keep the same pkgname stem,
so it just needs an @pkgpath in PLIST for updates to work.

Whichever is chosen, the current situation is wrong because no_gui is
only a pseudo-flavour so it is only meant to select which subpackages
are built and not change anything else; however at present it is also
changing which compiler is used.

Re: UPDATE: devel/doxygen

2016-11-13 Thread Nigel Taylor

On 11/13/16 19:50, Rafael Sadowski wrote:
> On Sat Nov 12, 2016 at 11:17:18PM +0100, Jeremie Courreges-Anglas wrote:
>> Nigel Taylor <njtaylor0...@btinternet.com> writes:
>>
>>> On 10/22/16 16:42, Rafael Sadowski wrote:
>>>> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>>>>> These plist changes for every update are getting silly, I think I'd
>>>>> rather disable doxygen in those ports..
>>>>>
>>>>
>>>> Other opinions or agreements?
>>>>
>>>
>>> I don't build qt5/kde4/kde5 for amd64.
>>>
>>> From what I see, the -gui and hence inclusion qt5 has no point it
>>> doesn't appear to be used in other ports. If no one actually uses the
>>> -gui spending a lot of time building qt5 / and -gui for nothing.
>>>
>>> Because of the size of qt5 this should be split into two ports, rather
>>> than using the PSEUDO_FLAVOR otherwise all the ports listed will be
>>> waiting on the qt5 build to complete when using dpb.
>>>
>>> qt5 itself needs splitting using the separate source files provided,
>>> rather then the combined file with everything needed or not.
>>>
>>> As is I will be just removing -gui / PSEUDO_FLAVOR from the port for myself.
>>
>> Instead of people having to maintain local patches, wouldn't it be
>> better to remove qt5 from this build path?  That can surely be done
>> without killing the -gui package.
>>
>>> The same way I have removed kde4 from editors/libreoffice, qt, qt4, qt5
>>> from print/poppler.
>>
>>> The PLIST issue is gnerating html documentation with changed scripts,
>>> images, with the same names
>>>
>>>
>>> also as far as I can see there is an option to force the use of Qt4 if
>>> Qt5 is present.
>>>
>>> From doxygen install document it says...
>>>
>>> Qt Software's GUI toolkit
>>> http://qt-project.org/;>Qt
>>> \addindex Qt
>>> version 4.3 or higher (but currently, Qt 5.x is not yet supported).
>>> This is needed to build the GUI front-end doxywizard.
>>>
>>> I searched the changelog not a single mention of a switch to Qt5
>>>
>>> This looks like we are switching to Qt5 because it being built / test on
>>> a machine with Qt5 installed else the switch to Qt5 hasn't been documented.
> 
> No, the worst think about doxygen is the documentation ;). That's sad
> but everting is clear and well readable in the CMake environment. Qt5 is
> default on and Qt4 only available with the option "force_qt4".
> 
>>>
>>> So why is this even using Qt5.
>>
>> Upstream made the choice of introducing Qt5 compatibility in this
>> release, and to use Qt5 by default.  doxywizard runs fine here.
>> To me it looks like a case of slightly outdated information on the
>> website.
>>
>> Note that this diff has been floating on the mailing-list since some
>> time already, you could have voiced objections earlier. ;)
>>
> 
> Diff below based on jca@ idea. "no_gui bootstrap" is set as default.
> 
> Kind regards,
> 
> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -p -r1.37 Makefile
> --- Makefile  12 Nov 2016 20:59:18 -  1.37
> +++ Makefile  13 Nov 2016 19:35:50 -
> @@ -29,6 +29,7 @@ MASTER_SITES=   http://ftp.stack.nl/pub/us
>  
>  MULTI_PACKAGES=  -main -gui
>  PSEUDO_FLAVORS=  no_gui bootstrap
> +FLAVOR?= no_gui bootstrap
>  
>  COMMON_WANTLIB= c m pthread estdc++
>  WANTLIB-main=${COMMON_WANTLIB} iconv z xapian
> 
> 
I will not be able to test building that for sometime as in middle of
dpb run, I would say that it will fail. Not proved, but the estdc++ in
the wantlib requires the library to be installed, that requires a
dependency set by x11/qt5.port.mk,

MODQT5_USE_GCC4_MODULE ?=   Yes
.if ${MODQT5_USE_GCC4_MODULE} == "Yes"
  MODULES +=gcc4
  MODGCC4_LANGS +=  c++
  MODGCC4_ARCHS ?=  *
.endif

which means either qt5 and gcc4 plus the library is installed or the
library isn't installed then relies on the chance dpb has installed gcc4
the library in building something else. Before stdc++ from base was used
for earlier version with qt4.

This would require a LDEP change, and possibly a revision bump also, or
the inclusion of the gcc4 module and revision bump.

It also exposes it to dpb failures that can junk the l

Re: UPDATE: devel/doxygen

2016-11-12 Thread Jeremie Courreges-Anglas

Nigel Taylor <njtaylor0...@btinternet.com> writes:

> On 10/22/16 16:42, Rafael Sadowski wrote:
>> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>>> These plist changes for every update are getting silly, I think I'd
>>> rather disable doxygen in those ports..
>>>
>> 
>> Other opinions or agreements?
>> 
>
> I don't build qt5/kde4/kde5 for amd64.
>
> From what I see, the -gui and hence inclusion qt5 has no point it
> doesn't appear to be used in other ports. If no one actually uses the
> -gui spending a lot of time building qt5 / and -gui for nothing.
>
> Because of the size of qt5 this should be split into two ports, rather
> than using the PSEUDO_FLAVOR otherwise all the ports listed will be
> waiting on the qt5 build to complete when using dpb.
>
> qt5 itself needs splitting using the separate source files provided,
> rather then the combined file with everything needed or not.
>
> As is I will be just removing -gui / PSEUDO_FLAVOR from the port for myself.

Instead of people having to maintain local patches, wouldn't it be
better to remove qt5 from this build path?  That can surely be done
without killing the -gui package.

> The same way I have removed kde4 from editors/libreoffice, qt, qt4, qt5
> from print/poppler.

> The PLIST issue is gnerating html documentation with changed scripts,
> images, with the same names
>
>
> also as far as I can see there is an option to force the use of Qt4 if
> Qt5 is present.
>
> From doxygen install document it says...
>
> Qt Software's GUI toolkit
> http://qt-project.org/;>Qt
> \addindex Qt
> version 4.3 or higher (but currently, Qt 5.x is not yet supported).
> This is needed to build the GUI front-end doxywizard.
>
> I searched the changelog not a single mention of a switch to Qt5
>
> This looks like we are switching to Qt5 because it being built / test on
> a machine with Qt5 installed else the switch to Qt5 hasn't been documented.
>
> So why is this even using Qt5.

Upstream made the choice of introducing Qt5 compatibility in this
release, and to use Qt5 by default.  doxywizard runs fine here.
To me it looks like a case of slightly outdated information on the
website.

Note that this diff has been floating on the mailing-list since some
time already, you could have voiced objections earlier. ;)

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen

2016-11-12 Thread Nigel Taylor

On 10/22/16 16:42, Rafael Sadowski wrote:
> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>> These plist changes for every update are getting silly, I think I'd
>> rather disable doxygen in those ports..
>>
> 
> Other opinions or agreements?
> 

I don't build qt5/kde4/kde5 for amd64.

>From what I see, the -gui and hence inclusion qt5 has no point it
doesn't appear to be used in other ports. If no one actually uses the
-gui spending a lot of time building qt5 / and -gui for nothing.

Because of the size of qt5 this should be split into two ports, rather
than using the PSEUDO_FLAVOR otherwise all the ports listed will be
waiting on the qt5 build to complete when using dpb.

qt5 itself needs splitting using the separate source files provided,
rather then the combined file with everything needed or not.

As is I will be just removing -gui / PSEUDO_FLAVOR from the port for myself.

The same way I have removed kde4 from editors/libreoffice, qt, qt4, qt5
from print/poppler.

The PLIST issue is gnerating html documentation with changed scripts,
images, with the same names


also as far as I can see there is an option to force the use of Qt4 if
Qt5 is present.

>From doxygen install document it says...

Qt Software's GUI toolkit
http://qt-project.org/;>Qt
\addindex Qt
version 4.3 or higher (but currently, Qt 5.x is not yet supported).
This is needed to build the GUI front-end doxywizard.

I searched the changelog not a single mention of a switch to Qt5

This looks like we are switching to Qt5 because it being built / test on
a machine with Qt5 installed else the switch to Qt5 hasn't been documented.

So why is this even using Qt5.


>>
>>
>> On 2016/09/19 21:38, Rafael Sadowski wrote:
>>> Hi ports@
>>>
>>> updated again. Doxygen port changes:
>>>
>>> - Switch to qt5
>>> -- Build doxyapp, doxyindexer applications (Tested @amd64)
>>> - Some patches are no longer needed (committed upstream)
>>> - Take Maintainer
>>>
>>> I checked all ports with doxygen usage:
>>>
>>> devel/libmtpREVISION bump and updated plist
>>> devel/qjson REVISION bump and updated plist
>>> geo/geosREVISION bump and updated plist, switch 
>>> HOMEPAGE to HTTPS
>>> graphics/lensfunREVISION bump and updated plist
>>> multimedia/libquicktime REVISION bump and updated plist
>>> x11/dbusmenu-qt REVISION bump and updated plist
>>> x11/ede/lib REVISION bump and updated plist
>>> net/ortpREVISION bump and updated plist
>>>
>>> databases/soprano   none plist changes
>>> devel/kf5/kapidox   none plist changes
>>> devel/libidnnone plist changes
>>> devel/simulavr  none plist changes
>>> devel/tclap none plist changes
>>> graphics/digikam-kde4   none plist changes
>>> graphics/opencv none plist changes
>>> math/ginac  none plist changes
>>> net/libktorrent none plist changes
>>> net/libmygpo-qt none plist changes
>>> productivity/kmymoney   none plist changes
>>> productivity/libalkimia none plist changes
>>> x11/awesome none plist changes
>>> x11/gtk3mm  none plist changes
>>> x11/kde4/nepomuk-core   none plist changes
>>> x11/kde4/runtimenone plist changes
>>>
>>> devel/cppunit/Makefile  disable-doxygen
>>> devel/kyua-cli  without-doxygen
>>> devel/kyua-testers  without-doxygen
>>> devel/libhidw   without-doxygen
>>> devel/rapidsvn  with-doxygen=no
>>> graphics/geeqie     disable-doxygen-doc
>>> graphics/libpgf     Force disabling documentation 
>>> generation through doxygen
>>> multimedia/libbluraydisable-doxygen-doc
>>> multimedia/libv4l   disable-doxygen-doc
>>> net/avahi   disable-doxygen-doc
>>> net/meanwhile   enable-doxygen=no
>>> net/pidgin  disable-doxygen
>>> productivity/gnucashdisable-doxygen
>>> sysutils/inotify-tools  disable-doxygen
>>> x11/dbusdisable-doxygen-docs
>>> x11/libxdg-basedir  disable-doxygen-doc
>>> x11/xkbcommon

Re: UPDATE: devel/doxygen

2016-11-10 Thread Stuart Henderson

On 2016/11/10 11:31, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski <raf...@sizeofvoid.org> writes:
> 
> > On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
> >> These plist changes for every update are getting silly, I think I'd
> >> rather disable doxygen in those ports..
> >> 
> >
> > Other opinions or agreements?
> 
> I propose that we first see whether this update is good to be committed
> (bulk builds are planned) so that the time you spent tweaking PLISTs
> isn't wasted.  But in the end I agree with Stuart, it would be nice to
> avoid this overhead.
> 
> Stuart, are you fine with this proposal?

Yes, fine with me. Thanks!

Re: UPDATE: devel/doxygen

2016-11-10 Thread Jeremie Courreges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>> These plist changes for every update are getting silly, I think I'd
>> rather disable doxygen in those ports..
>> 
>
> Other opinions or agreements?

I propose that we first see whether this update is good to be committed
(bulk builds are planned) so that the time you spent tweaking PLISTs
isn't wasted.  But in the end I agree with Stuart, it would be nice to
avoid this overhead.

Stuart, are you fine with this proposal?

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen

2016-10-22 Thread Donovan Watteau

Hi,

Rafael Sadowski wrote:
> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>> These plist changes for every update are getting silly, I think I'd
>> rather disable doxygen in those ports..
>>
>
> Other opinions or agreements?

Doxygen breaks very often on mips64, and AFAICT there's a good number
of ports that don't get built there because of that since 5.8.

I think Doxygen is mostly bloat, most people will look for their HTML
documentation online these days anyway,

I don't feel good having a dependency on a port which does this:

NOT_FOR_ARCHS= m88k sh
BROKEN-alpha= .got subsegment exceeds 64K

.if ${MACHINE_ARCH} == "mips64" ...
# ld(1) fails
CONFIGURE_ARGS+=-Denglish_only:Bool=ON
.endif

Re: UPDATE: devel/doxygen

2016-10-22 Thread Rafael Sadowski

On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
> These plist changes for every update are getting silly, I think I'd
> rather disable doxygen in those ports..
> 

Other opinions or agreements?

> 
> 
> On 2016/09/19 21:38, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > updated again. Doxygen port changes:
> > 
> > - Switch to qt5
> > -- Build doxyapp, doxyindexer applications (Tested @amd64)
> > - Some patches are no longer needed (committed upstream)
> > - Take Maintainer
> > 
> > I checked all ports with doxygen usage:
> > 
> > devel/libmtpREVISION bump and updated plist
> > devel/qjson REVISION bump and updated plist
> > geo/geosREVISION bump and updated plist, switch 
> > HOMEPAGE to HTTPS
> > graphics/lensfunREVISION bump and updated plist
> > multimedia/libquicktime REVISION bump and updated plist
> > x11/dbusmenu-qt REVISION bump and updated plist
> > x11/ede/lib REVISION bump and updated plist
> > net/ortpREVISION bump and updated plist
> > 
> > databases/soprano   none plist changes
> > devel/kf5/kapidox   none plist changes
> > devel/libidnnone plist changes
> > devel/simulavr  none plist changes
> > devel/tclap none plist changes
> > graphics/digikam-kde4   none plist changes
> > graphics/opencv none plist changes
> > math/ginac  none plist changes
> > net/libktorrent none plist changes
> > net/libmygpo-qt none plist changes
> > productivity/kmymoney   none plist changes
> > productivity/libalkimia none plist changes
> > x11/awesome none plist changes
> > x11/gtk3mm  none plist changes
> > x11/kde4/nepomuk-core   none plist changes
> > x11/kde4/runtime    none plist changes
> > 
> > devel/cppunit/Makefile  disable-doxygen
> > devel/kyua-cli  without-doxygen
> > devel/kyua-testers  without-doxygen
> > devel/libhidw   without-doxygen
> > devel/rapidsvn  with-doxygen=no
> > graphics/geeqie     disable-doxygen-doc
> > graphics/libpgf     Force disabling documentation 
> > generation through doxygen
> > multimedia/libbluray    disable-doxygen-doc
> > multimedia/libv4l   disable-doxygen-doc
> > net/avahi   disable-doxygen-doc
> > net/meanwhile   enable-doxygen=no
> > net/pidgin  disable-doxygen
> > productivity/gnucashdisable-doxygen
> > sysutils/inotify-tools  disable-doxygen
> > x11/dbus    disable-doxygen-docs
> > x11/libxdg-basedir  disable-doxygen-doc
> > x11/xkbcommon   without-doxygen
> > 
> > Tested only on amd64. I am looking forward about your feedback and I hope we
> > will see 1.8.12 quickly in the tree.
> > 
> > Kind regards,
> > 
> > Rafael Sadowski
> > 
> > 
> > 
> > Index: devel/doxygen/Makefile
> > ===
> > RCS file: /cvs/ports/devel/doxygen/Makefile,v
> > retrieving revision 1.35
> > diff -u -p -u -p -r1.35 Makefile
> > --- devel/doxygen/Makefile  28 Apr 2016 17:55:27 -  1.35
> > +++ devel/doxygen/Makefile  18 Sep 2016 15:13:38 -
> > @@ -8,16 +8,17 @@ BROKEN-alpha= .got subsegment exceeds 64
> >  COMMENT-main=  source code documentation generator tool
> >  COMMENT-gui=   GUI front-end for doxygen
> >  
> > -VERSION=   1.8.11
> > +VERSION=   1.8.12
> >  DISTNAME=  doxygen-${VERSION}.src
> >  PKGNAME-main=  doxygen-${VERSION}
> >  FULLPKGNAME-gui=doxygen-gui-${VERSION}
> > -REVISION=  0
> >  
> >  CATEGORIES=devel textproc
> >  
> >  HOMEPAGE=  http://www.doxygen.org/
> >  
> > +MAINTAINER=Rafael Sadowski <raf...@sizeofvoid.org>
> > +
> >  # GPLv2
> >  PERMIT_PACKAGE_CDROM=  Yes
> >  
> > @@ -27,24 +28,27 @@ MASTER_SITES=   http://ftp.stack.nl/pub/us
> >  MULTI_PACKAGES=-main -gui
> >  PSEUDO_FLAVORS=no_gui bootstrap
> >  
> > -COMMON_WANTLIB=c m stdc++
> > -WANTLIB-main=  ${COMMON_WANTLIB} iconv pthread
> &

Re: UPDATE: devel/doxygen

2016-09-19 Thread Stuart Henderson

These plist changes for every update are getting silly, I think I'd
rather disable doxygen in those ports..



On 2016/09/19 21:38, Rafael Sadowski wrote:
> Hi ports@
> 
> updated again. Doxygen port changes:
> 
> - Switch to qt5
> -- Build doxyapp, doxyindexer applications (Tested @amd64)
> - Some patches are no longer needed (committed upstream)
> - Take Maintainer
> 
> I checked all ports with doxygen usage:
> 
> devel/libmtp  REVISION bump and updated plist
> devel/qjson   REVISION bump and updated plist
> geo/geos  REVISION bump and updated plist, switch 
> HOMEPAGE to HTTPS
> graphics/lensfun  REVISION bump and updated plist
> multimedia/libquicktime   REVISION bump and updated plist
> x11/dbusmenu-qt   REVISION bump and updated plist
> x11/ede/lib   REVISION bump and updated plist
> net/ortp  REVISION bump and updated plist
> 
> databases/soprano none plist changes
> devel/kf5/kapidox none plist changes
> devel/libidn  none plist changes
> devel/simulavrnone plist changes
> devel/tclap   none plist changes
> graphics/digikam-kde4 none plist changes
> graphics/opencv   none plist changes
> math/ginacnone plist changes
> net/libktorrent   none plist changes
> net/libmygpo-qt   none plist changes
> productivity/kmymoney none plist changes
> productivity/libalkimia   none plist changes
> x11/awesome   none plist changes
> x11/gtk3mmnone plist changes
> x11/kde4/nepomuk-core none plist changes
> x11/kde4/runtime  none plist changes
> 
> devel/cppunit/Makefile    disable-doxygen
> devel/kyua-cli    without-doxygen
> devel/kyua-testers    without-doxygen
> devel/libhidw     without-doxygen
> devel/rapidsvnwith-doxygen=no
> graphics/geeqie       disable-doxygen-doc
> graphics/libpgf   Force disabling documentation 
> generation through doxygen
> multimedia/libbluray  disable-doxygen-doc
> multimedia/libv4l disable-doxygen-doc
> net/avahi disable-doxygen-doc
> net/meanwhile enable-doxygen=no
> net/pidgindisable-doxygen
> productivity/gnucash  disable-doxygen
> sysutils/inotify-toolsdisable-doxygen
> x11/dbus  disable-doxygen-docs
> x11/libxdg-basedirdisable-doxygen-doc
> x11/xkbcommon without-doxygen
> 
> Tested only on amd64. I am looking forward about your feedback and I hope we
> will see 1.8.12 quickly in the tree.
> 
> Kind regards,
> 
> Rafael Sadowski
> 
> 
> 
> Index: devel/doxygen/Makefile
> =======
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- devel/doxygen/Makefile28 Apr 2016 17:55:27 -  1.35
> +++ devel/doxygen/Makefile18 Sep 2016 15:13:38 -
> @@ -8,16 +8,17 @@ BROKEN-alpha=   .got subsegment exceeds 64
>  COMMENT-main=source code documentation generator tool
>  COMMENT-gui= GUI front-end for doxygen
>  
> -VERSION= 1.8.11
> +VERSION= 1.8.12
>  DISTNAME=doxygen-${VERSION}.src
>  PKGNAME-main=doxygen-${VERSION}
>  FULLPKGNAME-gui=doxygen-gui-${VERSION}
> -REVISION=0
>  
>  CATEGORIES=  devel textproc
>  
>  HOMEPAGE=http://www.doxygen.org/
>  
> +MAINTAINER=  Rafael Sadowski <raf...@sizeofvoid.org>
> +
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
> @@ -27,24 +28,27 @@ MASTER_SITES= http://ftp.stack.nl/pub/us
>  MULTI_PACKAGES=  -main -gui
>  PSEUDO_FLAVORS=  no_gui bootstrap
>  
> -COMMON_WANTLIB=  c m stdc++
> -WANTLIB-main=${COMMON_WANTLIB} iconv pthread
> -WANTLIB-gui= ${COMMON_WANTLIB} QtCore QtGui QtXml
> -
> -COMMON_LIB_DEPENDS= converters/libiconv
> -LIB_DEPENDS-main= ${COMMON_LIB_DEPENDS}
> -LIB_DEPENDS-gui= ${COMMON_LIB_DEPENDS} ${MODQT_LIB_DEPENDS}
> +COMMON_WANTLIB= c m pthread estdc++
> +WANTLIB-main=${COMMON_WANTLIB} iconv z xapian
> +WANTLIB-gui= Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
> + ${COMMON_WANTLIB}
> +
> +LIB_DEPENDS-main=converters/libiconv \
> + databases/xapian-core
> +
> +LIB_DEPENDS-gui= ${MODQT_LIB_DEPENDS}
> +
>  RUN_DEPENDS-gui= doxy

UPDATE: devel/doxygen

2016-09-19 Thread Rafael Sadowski

Hi ports@

updated again. Doxygen port changes:

- Switch to qt5
-- Build doxyapp, doxyindexer applications (Tested @amd64)
- Some patches are no longer needed (committed upstream)
- Take Maintainer

I checked all ports with doxygen usage:

devel/libmtpREVISION bump and updated plist
devel/qjson REVISION bump and updated plist
geo/geosREVISION bump and updated plist, switch 
HOMEPAGE to HTTPS
graphics/lensfunREVISION bump and updated plist
multimedia/libquicktime REVISION bump and updated plist
x11/dbusmenu-qt REVISION bump and updated plist
x11/ede/lib REVISION bump and updated plist
net/ortpREVISION bump and updated plist

databases/soprano   none plist changes
devel/kf5/kapidox   none plist changes
devel/libidnnone plist changes
devel/simulavr  none plist changes
devel/tclap none plist changes
graphics/digikam-kde4   none plist changes
graphics/opencv none plist changes
math/ginac  none plist changes
net/libktorrent none plist changes
net/libmygpo-qt none plist changes
productivity/kmymoney   none plist changes
productivity/libalkimia none plist changes
x11/awesome none plist changes
x11/gtk3mm  none plist changes
x11/kde4/nepomuk-core   none plist changes
x11/kde4/runtimenone plist changes

devel/cppunit/Makefile  disable-doxygen
devel/kyua-cli  without-doxygen
devel/kyua-testers  without-doxygen
devel/libhidw   without-doxygen
devel/rapidsvn  with-doxygen=no
graphics/geeqie disable-doxygen-doc
graphics/libpgf Force disabling documentation generation 
through doxygen
multimedia/libbluraydisable-doxygen-doc
multimedia/libv4l   disable-doxygen-doc
net/avahi   disable-doxygen-doc
net/meanwhile   enable-doxygen=no
net/pidgin  disable-doxygen
productivity/gnucashdisable-doxygen
sysutils/inotify-tools  disable-doxygen
x11/dbusdisable-doxygen-docs
x11/libxdg-basedir  disable-doxygen-doc
x11/xkbcommon   without-doxygen

Tested only on amd64. I am looking forward about your feedback and I hope we
will see 1.8.12 quickly in the tree.

Kind regards,

Rafael Sadowski



Index: devel/doxygen/Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- devel/doxygen/Makefile  28 Apr 2016 17:55:27 -  1.35
+++ devel/doxygen/Makefile  18 Sep 2016 15:13:38 -
@@ -8,16 +8,17 @@ BROKEN-alpha= .got subsegment exceeds 64
 COMMENT-main=  source code documentation generator tool
 COMMENT-gui=   GUI front-end for doxygen
 
-VERSION=   1.8.11
+VERSION=   1.8.12
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME-main=  doxygen-${VERSION}
 FULLPKGNAME-gui=doxygen-gui-${VERSION}
-REVISION=  0
 
 CATEGORIES=devel textproc
 
 HOMEPAGE=  http://www.doxygen.org/
 
+MAINTAINER=Rafael Sadowski <raf...@sizeofvoid.org>
+
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
@@ -27,24 +28,27 @@ MASTER_SITES=   http://ftp.stack.nl/pub/us
 MULTI_PACKAGES=-main -gui
 PSEUDO_FLAVORS=no_gui bootstrap
 
-COMMON_WANTLIB=c m stdc++
-WANTLIB-main=  ${COMMON_WANTLIB} iconv pthread
-WANTLIB-gui=   ${COMMON_WANTLIB} QtCore QtGui QtXml
-
-COMMON_LIB_DEPENDS= converters/libiconv
-LIB_DEPENDS-main= ${COMMON_LIB_DEPENDS}
-LIB_DEPENDS-gui= ${COMMON_LIB_DEPENDS} ${MODQT_LIB_DEPENDS}
+COMMON_WANTLIB= c m pthread estdc++
+WANTLIB-main=  ${COMMON_WANTLIB} iconv z xapian
+WANTLIB-gui=   Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
+   ${COMMON_WANTLIB}
+
+LIB_DEPENDS-main=  converters/libiconv \
+   databases/xapian-core
+
+LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
+
 RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
 
-MODULES =  devel/cmake \
+MODULES=   devel/cmake \
lang/python
 
-MODPY_RUNDEP = No
+MODPY_RUNDEP=  No
 
 .include 
 .if ${BUILD_PACKAGES:M-gui}
 CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
 .endif
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 # ld(1) fails
@@ -57,6 +61,8 @@ RUN_DEPENDS+= print/ghostscript/gnu \
math/graphviz
 
 CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
+CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
+CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
 
 WRKDIST=   ${WRKDIR}/doxygen-${VERSION}
 
Index: devel/doxygen/distinfo
===

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2016-01-18 Thread Rafael Sadowski

On Thu Dec 10, 2015 at 10:24:35PM +, Stuart Henderson wrote:
> On 2015/12/10 22:39, Rafael Sadowski wrote:
> > On Thu Dec 10, 2015 at 10:01:46AM +, Stuart Henderson wrote:
> > > On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
> > > > >> - Don't use own libmd5 but base md5
> > > > >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> > > > 
> > > > What is the point with those two items?  This adds clutter to this
> > > > update and possible problems for the following ones.
> > > 
> > > These changes are exactly why I, for one, didn't dig into the update yet.
> > 
> > Of course I understand you but I don't like to use doxygen own libmd5.
> > md5(3) is in base and MD5Data is doing the same as MD5Buffer+MD5SigToString.
> > 
> > I've learned[1] to use base and ports libs and not own shipped libs if it
> > is possible.
> > 
> > [1]: https://www.marc.info/?l=openbsd-ports=142177625024026=4
> 
> That's a different situation, in that case they are bundling entire
> libraries which we already have in ports. That's usually bad because
> when some bug is fixed in the library, it doesn't then get fixed in
> the embedded versions of that library.
> 
> > It's okay for me to remove the patches and test agine.
> > 
> > Cheers,
> > 
> > Rafael
> > 

A little bit late but this monster needs time to test.

Changes between the old diff:

- direct update to the last stable version 1.8.11 (not 1.8.10)
- without libmd5 changes

My 1.8.11 ninja patches accepted and committed upstream.

I hope it's okay, now.

Best regards,

Rafael Sadowski


Index: audio/libnjb/Makefile
===
RCS file: /cvs/ports/audio/libnjb/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/libnjb/Makefile   2 May 2015 20:53:18 -   1.12
+++ audio/libnjb/Makefile   18 Jan 2016 19:40:29 -
@@ -3,6 +3,7 @@
 COMMENT=   communicate with some Creative and Dell audio players
 
 DISTNAME=  libnjb-2.2.7
+REVISION=  0
 CATEGORIES=audio devel
 
 SHARED_LIBS +=  njb  0.0  # 6.1
Index: audio/libnjb/pkg/PLIST
===
RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/libnjb/pkg/PLIST  2 May 2015 20:53:18 -   1.3
+++ audio/libnjb/pkg/PLIST  18 Jan 2016 19:40:29 -
@@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
 share/doc/libnjb/
 share/doc/libnjb/html/
 share/doc/libnjb/html/annotated.html
+share/doc/libnjb/html/arrowdown.png
+share/doc/libnjb/html/arrowright.png
 share/doc/libnjb/html/base_8c.html
 share/doc/libnjb/html/base_8h_source.html
 share/doc/libnjb/html/bc_s.png
@@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
 share/doc/libnjb/html/delfile_8c-example.html
 share/doc/libnjb/html/deltr_8c-example.html
 share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/libnjb/html/doc.png
 share/doc/libnjb/html/doxygen.css
 share/doc/libnjb/html/doxygen.png
 share/doc/libnjb/html/dumpeax_8c-example.html
@@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
 share/doc/libnjb/html/examples_8h_source.html
 share/doc/libnjb/html/files.html
 share/doc/libnjb/html/files_8c-example.html
-share/doc/libnjb/html/ftv2blank.png
-share/doc/libnjb/html/ftv2cl.png
-share/doc/libnjb/html/ftv2doc.png
-share/doc/libnjb/html/ftv2folderclosed.png
-share/doc/libnjb/html/ftv2folderopen.png
-share/doc/libnjb/html/ftv2lastnode.png
-share/doc/libnjb/html/ftv2link.png
-share/doc/libnjb/html/ftv2mlastnode.png
-share/doc/libnjb/html/ftv2mnode.png
-share/doc/libnjb/html/ftv2mo.png
-share/doc/libnjb/html/ftv2node.png
-share/doc/libnjb/html/ftv2ns.png
-share/doc/libnjb/html/ftv2plastnode.png
-share/doc/libnjb/html/ftv2pnode.png
-share/doc/libnjb/html/ftv2splitbar.png
-share/doc/libnjb/html/ftv2vertline.png
+share/doc/libnjb/html/folderclosed.png
+share/doc/libnjb/html/folderopen.png
 share/doc/libnjb/html/functions.html
 share/doc/libnjb/html/functions_vars.html
 share/doc/libnjb/html/fwupgrade_8c-example.html
@@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
 share/doc/libnjb/html/gettr_8c-example.html
 share/doc/libnjb/html/getusage_8c-example.html
 share/doc/libnjb/html/globals.html
-share/doc/libnjb/html/globals_0x64.html
-share/doc/libnjb/html/globals_0x65.html
-share/doc/libnjb/html/globals_0x66.html
-share/doc/libnjb/html/globals_0x67.html
-share/doc/libnjb/html/globals_0x6c.html
-share/doc/libnjb/html/globals_0x6d.html
-share/doc/libnjb/html/globals_0x6e.html
-share/doc/libnjb/html/globals_0x6f.html
-share/doc/libnjb/html/globals_0x70.html
-share/doc/libnjb/html/globals_0x73.html
-share/doc/libnjb/html/globals_0x74.html
-share/doc/

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-23 Thread Jérémie Courrèges-Anglas


Hi,

Stuart Henderson <st...@openbsd.org> writes:

> On 2015/12/10 22:39, Rafael Sadowski wrote:
>> On Thu Dec 10, 2015 at 10:01:46AM +, Stuart Henderson wrote:
>> > On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
>> > > >> - Don't use own libmd5 but base md5
>> > > >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
>> > > 
>> > > What is the point with those two items?  This adds clutter to this
>> > > update and possible problems for the following ones.
>> > 
>> > These changes are exactly why I, for one, didn't dig into the update yet.
>> 
>> Of course I understand you but I don't like to use doxygen own libmd5.
>> md5(3) is in base and MD5Data is doing the same as MD5Buffer+MD5SigToString.
>> 
>> I've learned[1] to use base and ports libs and not own shipped libs if it
>> is possible.
>> 
>> [1]: https://www.marc.info/?l=openbsd-ports=142177625024026=4
>
> That's a different situation, in that case they are bundling entire
> libraries which we already have in ports. That's usually bad because
> when some bug is fixed in the library, it doesn't then get fixed in
> the embedded versions of that library.

And it's not like the API used in the port is exactly the same as the
one available in base.

>> It's okay for me to remove the patches and test agine.

Please do.  I don't think another full round of tests is needed.

Cheers,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-10 Thread Stuart Henderson

On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
> >> - Don't use own libmd5 but base md5
> >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> 
> What is the point with those two items?  This adds clutter to this
> update and possible problems for the following ones.

These changes are exactly why I, for one, didn't dig into the update yet.

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-10 Thread Stuart Henderson

On 2015/12/10 22:39, Rafael Sadowski wrote:
> On Thu Dec 10, 2015 at 10:01:46AM +, Stuart Henderson wrote:
> > On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
> > > >> - Don't use own libmd5 but base md5
> > > >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> > > 
> > > What is the point with those two items?  This adds clutter to this
> > > update and possible problems for the following ones.
> > 
> > These changes are exactly why I, for one, didn't dig into the update yet.
> 
> Of course I understand you but I don't like to use doxygen own libmd5.
> md5(3) is in base and MD5Data is doing the same as MD5Buffer+MD5SigToString.
> 
> I've learned[1] to use base and ports libs and not own shipped libs if it
> is possible.
> 
> [1]: https://www.marc.info/?l=openbsd-ports=142177625024026=4

That's a different situation, in that case they are bundling entire
libraries which we already have in ports. That's usually bad because
when some bug is fixed in the library, it doesn't then get fixed in
the embedded versions of that library.

> It's okay for me to remove the patches and test agine.
> 
> Cheers,
> 
> Rafael
>

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-10 Thread Rafael Sadowski

On Thu Dec 10, 2015 at 10:01:46AM +, Stuart Henderson wrote:
> On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
> > >> - Don't use own libmd5 but base md5
> > >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> > 
> > What is the point with those two items?  This adds clutter to this
> > update and possible problems for the following ones.
> 
> These changes are exactly why I, for one, didn't dig into the update yet.

Of course I understand you but I don't like to use doxygen own libmd5.
md5(3) is in base and MD5Data is doing the same as MD5Buffer+MD5SigToString.

I've learned[1] to use base and ports libs and not own shipped libs if it
is possible.

[1]: https://www.marc.info/?l=openbsd-ports=142177625024026=4

It's okay for me to remove the patches and test agine.

Cheers,

Rafael

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-10 Thread Jérémie Courrèges-Anglas

Stuart Henderson  writes:

> On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
>> >> - Don't use own libmd5 but base md5
>> >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
>> 
>> What is the point with those two items?  This adds clutter to this
>> update and possible problems for the following ones.
>
> These changes are exactly why I, for one, didn't dig into the update yet.

The bulk build (thanks ajacoutot@) didn't show any problem.

Rafael, if the MD5 patches are actually not necessary please provide an
updated patch without those changes.

Cheers,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-09 Thread Jérémie Courrèges-Anglas

Rafael Sadowski <raf...@sizeofvoid.org> writes:

> Hi @ports,

Hi Rafael,

> nobody cares *ping* harder ;-)

This is the correct method indeed. :)

> Cheers, Rafael
>
> On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
>> Hi ports@
>> 
>> after my first attempt here is the new diff to update doxygen.

Looks fine, thanks for your work on this.  A bulk build is currently
running with your patch applied, no visible fallout so far.

There's one thing that worries me though.

>> doxygen port highlights:
>> 
>> - switch to CMake


>> - Don't use own libmd5 but base md5
>> - Use MD5Data() instead of MD5Buffer+MD5SigToString

What is the point with those two items?  This adds clutter to this
update and possible problems for the following ones.

>> 
>> I checked all ports with doxygen usage.
>> 
>> - No changes with 1.8.10:
>> 
>> audio/liblo
>> database/soprano
>> devel/simulavr
>> devel/tclap
>> math/ginac
>> graphics/digikam-kde4
>> graphics/opencv
>> net/libktorrent
>> productivit/kmymoney
>> productivit/libalkimia
>> x11/awesome
>> x11/kde4/runtime
>> x11/kde4/nepomuk-core
>> 
>> 
>> - REVISION bump and update plist:
>> 
>> audio/libnjb
>> devel/libmtp
>> devel/qjson
>> geo/geos
>> graphics/lensfun
>> multimedia/libquicktime
>> x11/dbusmenu-qt
>> x11/ede/lib
>> 
>> I am looking forward about your feedback and I hope we will see 1.8.10
>> quickly in the tree.
>> 
>> Best regards, Rafael
>> 

[...]

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-12-07 Thread Rafael Sadowski

Hi @ports,

nobody cares *ping* harder ;-)

Cheers, Rafael

On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> after my first attempt here is the new diff to update doxygen.
> 
> doxygen port highlights:
> 
> - switch to CMake
> - Don't use own libmd5 but base md5
> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> 
> I checked all ports with doxygen usage.
> 
> - No changes with 1.8.10:
> 
> audio/liblo
> database/soprano
> devel/simulavr
> devel/tclap
> math/ginac
> graphics/digikam-kde4
> graphics/opencv
> net/libktorrent
> productivit/kmymoney
> productivit/libalkimia
> x11/awesome
> x11/kde4/runtime
> x11/kde4/nepomuk-core
> 
> 
> - REVISION bump and update plist:
> 
> audio/libnjb
> devel/libmtp
> devel/qjson
> geo/geos
> graphics/lensfun
> multimedia/libquicktime
> x11/dbusmenu-qt
> x11/ede/lib
> 
> I am looking forward about your feedback and I hope we will see 1.8.10
> quickly in the tree.
> 
> Best regards, Rafael
> 
> 
> Index: audio/libnjb/Makefile
> ===
> RCS file: /cvs/ports/audio/libnjb/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- audio/libnjb/Makefile 2 May 2015 20:53:18 -   1.12
> +++ audio/libnjb/Makefile 22 Nov 2015 14:44:29 -
> @@ -4,6 +4,7 @@ COMMENT=  communicate with some Creative
>  
>  DISTNAME=libnjb-2.2.7
>  CATEGORIES=  audio devel
> +REVISION =   0
>  
>  SHARED_LIBS +=  njb  0.0  # 6.1
>  
> Index: audio/libnjb/pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- audio/libnjb/pkg/PLIST2 May 2015 20:53:18 -   1.3
> +++ audio/libnjb/pkg/PLIST22 Nov 2015 14:44:29 -
> @@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
>  share/doc/libnjb/
>  share/doc/libnjb/html/
>  share/doc/libnjb/html/annotated.html
> +share/doc/libnjb/html/arrowdown.png
> +share/doc/libnjb/html/arrowright.png
>  share/doc/libnjb/html/base_8c.html
>  share/doc/libnjb/html/base_8h_source.html
>  share/doc/libnjb/html/bc_s.png
> @@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
>  share/doc/libnjb/html/delfile_8c-example.html
>  share/doc/libnjb/html/deltr_8c-example.html
>  share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
> +share/doc/libnjb/html/doc.png
>  share/doc/libnjb/html/doxygen.css
>  share/doc/libnjb/html/doxygen.png
>  share/doc/libnjb/html/dumpeax_8c-example.html
> @@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
>  share/doc/libnjb/html/examples_8h_source.html
>  share/doc/libnjb/html/files.html
>  share/doc/libnjb/html/files_8c-example.html
> -share/doc/libnjb/html/ftv2blank.png
> -share/doc/libnjb/html/ftv2cl.png
> -share/doc/libnjb/html/ftv2doc.png
> -share/doc/libnjb/html/ftv2folderclosed.png
> -share/doc/libnjb/html/ftv2folderopen.png
> -share/doc/libnjb/html/ftv2lastnode.png
> -share/doc/libnjb/html/ftv2link.png
> -share/doc/libnjb/html/ftv2mlastnode.png
> -share/doc/libnjb/html/ftv2mnode.png
> -share/doc/libnjb/html/ftv2mo.png
> -share/doc/libnjb/html/ftv2node.png
> -share/doc/libnjb/html/ftv2ns.png
> -share/doc/libnjb/html/ftv2plastnode.png
> -share/doc/libnjb/html/ftv2pnode.png
> -share/doc/libnjb/html/ftv2splitbar.png
> -share/doc/libnjb/html/ftv2vertline.png
> +share/doc/libnjb/html/folderclosed.png
> +share/doc/libnjb/html/folderopen.png
>  share/doc/libnjb/html/functions.html
>  share/doc/libnjb/html/functions_vars.html
>  share/doc/libnjb/html/fwupgrade_8c-example.html
> @@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
>  share/doc/libnjb/html/gettr_8c-example.html
>  share/doc/libnjb/html/getusage_8c-example.html
>  share/doc/libnjb/html/globals.html
> -share/doc/libnjb/html/globals_0x64.html
> -share/doc/libnjb/html/globals_0x65.html
> -share/doc/libnjb/html/globals_0x66.html
> -share/doc/libnjb/html/globals_0x67.html
> -share/doc/libnjb/html/globals_0x6c.html
> -share/doc/libnjb/html/globals_0x6d.html
> -share/doc/libnjb/html/globals_0x6e.html
> -share/doc/libnjb/html/globals_0x6f.html
> -share/doc/libnjb/html/globals_0x70.html
> -share/doc/libnjb/html/globals_0x73.html
> -share/doc/libnjb/html/globals_0x74.html
> -share/doc/libnjb/html/globals_0x75.html
> +share/doc/libnjb/html/globals_d.html
>  share/doc/libnjb/html/globals_defs.html
> +share/doc/libnjb/html/globals_e.html
>  share/doc/libnjb/html/globals_enum.html
> +share/doc/libnjb/html/globals_f.html
>  share/doc/libnjb/html/globals_func.h

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-11-23 Thread Rafael Sadowski

On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> after my first attempt here is the new diff to update doxygen.
> 
> doxygen port highlights:
> 
> - switch to CMake
> - Don't use own libmd5 but base md5
> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> 
> I checked all ports with doxygen usage.
> 
> - No changes with 1.8.10:
> 
> audio/liblo
> database/soprano
> devel/simulavr
> devel/tclap
> math/ginac
> graphics/digikam-kde4
> graphics/opencv

... still no plist changes in current opencv 2.4.12.3

UPDATE: devel/doxygen 1.8.2 -> 1.8.10

2015-11-22 Thread Rafael Sadowski

Hi ports@

after my first attempt here is the new diff to update doxygen.

doxygen port highlights:

- switch to CMake
- Don't use own libmd5 but base md5
- Use MD5Data() instead of MD5Buffer+MD5SigToString

I checked all ports with doxygen usage.

- No changes with 1.8.10:

audio/liblo
database/soprano
devel/simulavr
devel/tclap
math/ginac
graphics/digikam-kde4
graphics/opencv
net/libktorrent
productivit/kmymoney
productivit/libalkimia
x11/awesome
x11/kde4/runtime
x11/kde4/nepomuk-core


- REVISION bump and update plist:

audio/libnjb
devel/libmtp
devel/qjson
geo/geos
graphics/lensfun
multimedia/libquicktime
x11/dbusmenu-qt
x11/ede/lib

I am looking forward about your feedback and I hope we will see 1.8.10
quickly in the tree.

Best regards, Rafael


Index: audio/libnjb/Makefile
===
RCS file: /cvs/ports/audio/libnjb/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/libnjb/Makefile   2 May 2015 20:53:18 -   1.12
+++ audio/libnjb/Makefile   22 Nov 2015 14:44:29 -
@@ -4,6 +4,7 @@ COMMENT=communicate with some Creative
 
 DISTNAME=  libnjb-2.2.7
 CATEGORIES=audio devel
+REVISION = 0
 
 SHARED_LIBS +=  njb  0.0  # 6.1
 
Index: audio/libnjb/pkg/PLIST
===
RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/libnjb/pkg/PLIST  2 May 2015 20:53:18 -   1.3
+++ audio/libnjb/pkg/PLIST  22 Nov 2015 14:44:29 -
@@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
 share/doc/libnjb/
 share/doc/libnjb/html/
 share/doc/libnjb/html/annotated.html
+share/doc/libnjb/html/arrowdown.png
+share/doc/libnjb/html/arrowright.png
 share/doc/libnjb/html/base_8c.html
 share/doc/libnjb/html/base_8h_source.html
 share/doc/libnjb/html/bc_s.png
@@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
 share/doc/libnjb/html/delfile_8c-example.html
 share/doc/libnjb/html/deltr_8c-example.html
 share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/libnjb/html/doc.png
 share/doc/libnjb/html/doxygen.css
 share/doc/libnjb/html/doxygen.png
 share/doc/libnjb/html/dumpeax_8c-example.html
@@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
 share/doc/libnjb/html/examples_8h_source.html
 share/doc/libnjb/html/files.html
 share/doc/libnjb/html/files_8c-example.html
-share/doc/libnjb/html/ftv2blank.png
-share/doc/libnjb/html/ftv2cl.png
-share/doc/libnjb/html/ftv2doc.png
-share/doc/libnjb/html/ftv2folderclosed.png
-share/doc/libnjb/html/ftv2folderopen.png
-share/doc/libnjb/html/ftv2lastnode.png
-share/doc/libnjb/html/ftv2link.png
-share/doc/libnjb/html/ftv2mlastnode.png
-share/doc/libnjb/html/ftv2mnode.png
-share/doc/libnjb/html/ftv2mo.png
-share/doc/libnjb/html/ftv2node.png
-share/doc/libnjb/html/ftv2ns.png
-share/doc/libnjb/html/ftv2plastnode.png
-share/doc/libnjb/html/ftv2pnode.png
-share/doc/libnjb/html/ftv2splitbar.png
-share/doc/libnjb/html/ftv2vertline.png
+share/doc/libnjb/html/folderclosed.png
+share/doc/libnjb/html/folderopen.png
 share/doc/libnjb/html/functions.html
 share/doc/libnjb/html/functions_vars.html
 share/doc/libnjb/html/fwupgrade_8c-example.html
@@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
 share/doc/libnjb/html/gettr_8c-example.html
 share/doc/libnjb/html/getusage_8c-example.html
 share/doc/libnjb/html/globals.html
-share/doc/libnjb/html/globals_0x64.html
-share/doc/libnjb/html/globals_0x65.html
-share/doc/libnjb/html/globals_0x66.html
-share/doc/libnjb/html/globals_0x67.html
-share/doc/libnjb/html/globals_0x6c.html
-share/doc/libnjb/html/globals_0x6d.html
-share/doc/libnjb/html/globals_0x6e.html
-share/doc/libnjb/html/globals_0x6f.html
-share/doc/libnjb/html/globals_0x70.html
-share/doc/libnjb/html/globals_0x73.html
-share/doc/libnjb/html/globals_0x74.html
-share/doc/libnjb/html/globals_0x75.html
+share/doc/libnjb/html/globals_d.html
 share/doc/libnjb/html/globals_defs.html
+share/doc/libnjb/html/globals_e.html
 share/doc/libnjb/html/globals_enum.html
+share/doc/libnjb/html/globals_f.html
 share/doc/libnjb/html/globals_func.html
-share/doc/libnjb/html/globals_func_0x64.html
-share/doc/libnjb/html/globals_func_0x65.html
-share/doc/libnjb/html/globals_func_0x66.html
-share/doc/libnjb/html/globals_func_0x67.html
-share/doc/libnjb/html/globals_func_0x6d.html
-share/doc/libnjb/html/globals_func_0x6e.html
-share/doc/libnjb/html/globals_func_0x70.html
-share/doc/libnjb/html/globals_func_0x73.html
-share/doc/libnjb/html/globals_func_0x74.html
-share/doc/libnjb/html/globals_func_0x75.html
+share/doc/libnjb/html/globals_func_d.html
+share/doc/libnjb/html/globals_func_e.html
+share/doc/libnjb/html/globals_func_f.html
+share/doc/libnjb/html/globals_func_g.html
+share/doc/libnjb/html/globals_func_m.html
+share/doc/libnjb/html/globals_func_n.html
+share/doc/libnjb/html/globals_func_p.html

Re: Small fix for devel/doxygen

2012-08-25 Thread Brian Callahan


On 8/18/2012 10:59 PM, Brian Callahan wrote:

Hi ports --

A while ago, I reported that devel/doxygen did not build on mips64el
unless --english-only was enabled. Later, it was extended to include
mips64. I've just discovered that the if statement dealing with mips64
and mips64el is somehow wrong, as it doesn't pass --english-only when
building on a mips64el machine. Attached is a patch that fixes this.

Thanks.

~Brian

Bumping this. mips64el won't build without it.

Thanks.

~Brian

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile13 Apr 2012 16:08:20 -  1.24
+++ Makefile19 Aug 2012 02:54:06 -
@@ -44,7 +44,7 @@ CONFIGURE_ENV=QTDIR=${LOCALBASE}

 MODULES+=  x11/qt4
 .endif
-.if ${ARCH:Mmips64} || ${ARCH:Mmips64el}
+.if ${MACHINE_ARCH} == mips64 || ${MACHINE_ARCH} == mips64el
 # ld(1) fails
 CONFIGURE_ARGS+= --english-only
 .endif

Small fix for devel/doxygen

2012-08-18 Thread Brian Callahan


Hi ports --

A while ago, I reported that devel/doxygen did not build on mips64el 
unless --english-only was enabled. Later, it was extended to include 
mips64. I've just discovered that the if statement dealing with mips64 and 
mips64el is somehow wrong, as it doesn't pass --english-only when 
building on a mips64el machine. Attached is a patch that fixes this.


Thanks.

~BrianIndex: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile13 Apr 2012 16:08:20 -  1.24
+++ Makefile19 Aug 2012 02:54:06 -
@@ -44,7 +44,7 @@ CONFIGURE_ENV=QTDIR=${LOCALBASE}
 
 MODULES+=  x11/qt4
 .endif
-.if ${ARCH:Mmips64} || ${ARCH:Mmips64el}
+.if ${MACHINE_ARCH} == mips64 || ${MACHINE_ARCH} == mips64el
 # ld(1) fails
 CONFIGURE_ARGS+= --english-only
 .endif

Re: doxygen module

2012-04-02 Thread Landry Breuil

On Sun, Apr 01, 2012 at 10:46:38PM +0100, Stuart Henderson wrote:
 The doxygen port has a note tucked away at the bottom of a very
 long DESCR telling you to set DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
 to avoid random-looking html filenames (based on md5 of the full
 path including the port's work directory).

I've seen that issue on textproc/ebook-tools on one machine, and it
already has that statement in MAKE_ENV and i've not been able to
reproduce on any other build machine, amd64 or not.

Error:
/usr/obj/ports//ebook-tools-0.2.1/fake-amd64/usr/local/share/doc/ebook-tools/html/dir_1aadfcc6ce99810c4f28b3e40bd89d10.html
does not exist
Error:
/usr/obj/ports//ebook-tools-0.2.1/fake-amd64/usr/local/share/doc/ebook-tools/html/dir_bb3a45700f8b636266dda7e86f379deb.html
does not exist

Landry

doxygen module

2012-04-01 Thread Stuart Henderson

The doxygen port has a note tucked away at the bottom of a very
long DESCR telling you to set DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
to avoid random-looking html filenames (based on md5 of the full
path including the port's work directory).

It only affects ports with the random-looking filenames but
doesn't harm other doxygen users so I think it makes sense to add
a MODULE to set it.

How does this look? Is it sane to use this BUILD_DEPENDS?

Index: devel/doxygen/doxygen.port.mk
===
RCS file: devel/doxygen/doxygen.port.mk
diff -N devel/doxygen/doxygen.port.mk
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/doxygen/doxygen.port.mk   1 Apr 2012 21:34:18 -
@@ -0,0 +1,4 @@
+# $OpenBSD$
+
+BUILD_DEPENDS += devel/doxygen,no_gui,bootstrap=1.7.2
+MAKE_ENV += DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
Index: devel/simulavr/Makefile
===
RCS file: /cvs/ports/devel/simulavr/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/simulavr/Makefile 15 Nov 2011 18:55:30 -  1.5
+++ devel/simulavr/Makefile 1 Apr 2012 21:34:18 -
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=  --enable-curses=yes \
 
 USE_GMAKE= Yes
 
+MODULES=   devel/doxygen
 BUILD_DEPENDS= ${RUN_DEPENDS} \
-   devel/doxygen \
textproc/texi2html \
print/texlive/base
 RUN_DEPENDS=   devel/avr/binutils \
Index: graphics/opencv/Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- graphics/opencv/Makefile5 Dec 2011 09:36:32 -   1.11
+++ graphics/opencv/Makefile1 Apr 2012 21:34:18 -
@@ -75,8 +75,8 @@ USE_LIBTOOL=  Yes
 VMEM_WARNING=  Yes
 
 RUN_DEPENDS-main=  math/py-numpy
-BUILD_DEPENDS= devel/doxygen \
-   math/py-numpy
+MODULES=   devel/doxygen
+BUILD_DEPENDS= math/py-numpy
 
 # ATM opencv requires V4L1 compat, ask them to change it,
 # then see WITH_V4L below.
Index: multimedia/gstreamer-0.10/mm/Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/mm/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- multimedia/gstreamer-0.10/mm/Makefile   20 Feb 2012 07:59:09 -  
1.11
+++ multimedia/gstreamer-0.10/mm/Makefile   1 Apr 2012 21:34:18 -
@@ -21,11 +21,8 @@ WANTLIB += xml2 z
 
 MASTER_SITES = 
${MASTER_SITE_GNOME:=sources/${NAME}/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
 
-MODULES =  devel/gettext
+MODULES =  devel/gettext devel/doxygen
 
-MODPY_RUNDEP = No
-
-BUILD_DEPENDS =devel/doxygen
 LIB_DEPENDS =  devel/glib2mm \
multimedia/gstreamer-0.10/plugins-base,-cdda \
textproc/libxml++
Index: geo/geos/Makefile
===
RCS file: /cvs/ports/geo/geos/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- geo/geos/Makefile   17 Nov 2010 08:05:12 -  1.7
+++ geo/geos/Makefile   1 Apr 2012 21:34:18 -
@@ -21,7 +21,7 @@ MASTER_SITES= http://download.osgeo.org
 EXTRACT_SUFX=  .tar.bz2
 
 WANTLIB=   m stdc++
-BUILD_DEPENDS= devel/doxygen=1.7.2
+MODULES=   devel/doxygen
 
 USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
Index: graphics/lensfun/Makefile
===
RCS file: /cvs/ports/graphics/lensfun/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- graphics/lensfun/Makefile   16 Sep 2011 10:02:37 -  1.7
+++ graphics/lensfun/Makefile   1 Apr 2012 21:34:18 -
@@ -19,10 +19,8 @@ WANTLIB += c glib-2.0 m png stdc++ z
 MASTER_SITES=  ${MASTER_SITE_BERLIOS:=lensfun/}
 EXTRACT_SUFX=  .tar.bz2
 
-MODULES=   lang/python devel/gettext
+MODULES=   lang/python devel/doxygen devel/gettext
 MODPY_RUNDEP=  No
-BUILD_DEPENDS= devel/doxygen=1.7.2
-
 LIB_DEPENDS=   devel/glib2 \
graphics/png
 
Index: x11/awesome/Makefile
===
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- x11/awesome/Makefile18 Feb 2012 11:24:44 -  1.45
+++ x11/awesome/Makefile1 Apr 2012 21:34:18 -
@@ -45,13 +45,13 @@ BUILD_DEPENDS=  devel/gperf \
textproc/asciidoc=8.4.5 \
textproc/xmlto \
graphics/ImageMagick \
-   devel/doxygen
 
 RUN_DEPENDS=   graphics/feh \
misc/rlwrap \
shells/bash
 
 MODULES=   devel/cmake

Re: doxygen fails to compile on lemote yeeloong

2012-01-26 Thread wen heping

2012/1/26 Bryan Irvine sparcta...@gmail.com

 On Tue, Jan 17, 2012 at 7:36 PM, Bryan Irvine sparcta...@gmail.com
 wrote:
  Im trying to compile gpsd and doxygen fails to compile (I think gimp
  needs this one too).

 update.

 I added --english-only to the configure args for doxygen and it
 compiled and installed just fine.  I did attempt to adjust ulimits to


I met this problem too. Thank you.

wen




 insane values first with no change.  Any ideas on a better fix?

 -Bryan

Re: doxygen fails to compile on lemote yeeloong

2012-01-25 Thread Bryan Irvine

On Tue, Jan 17, 2012 at 7:36 PM, Bryan Irvine sparcta...@gmail.com wrote:
 Im trying to compile gpsd and doxygen fails to compile (I think gimp
 needs this one too).

update.

I added --english-only to the configure args for doxygen and it
compiled and installed just fine.  I did attempt to adjust ulimits to
insane values first with no change.  Any ideas on a better fix?

-Bryan

doxygen fails to compile on lemote yeeloong

2012-01-17 Thread Bryan Irvine

Im trying to compile gpsd and doxygen fails to compile (I think gimp
needs this one too).

The lines leading up to the failure are:
../lib/libdoxygen.a(language.o)(.text+0x2c): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_CALL16 qstricmp(char const*, char const*)
../lib/libdoxygen.a(language.o)(.text+0x44): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_CALL16 operator new(unsigned long)
../lib/libdoxygen.a(language.o)(.text+0x50): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_GOT_DISP vtable for TranslatorEnglish
../lib/libdoxygen.a(language.o)(.text+0x5c): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_GOT_DISP theTranslator
../lib/libdoxygen.a(language.o)(.text+0x64): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_GOT_DISP theTranslator
../lib/libdoxygen.a(language.o)(.text+0x98): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_CALL16 QCString::~QCString()
../lib/libdoxygen.a(language.o)(.text+0xcc): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_CALL16 qstricmp(char const*, char const*)
../lib/libdoxygen.a(language.o)(.text+0xe4): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_CALL16 operator new(unsigned long)
../lib/libdoxygen.a(language.o)(.text+0xf0): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_GOT_DISP vtable for TranslatorDutch
../lib/libdoxygen.a(language.o)(.text+0xfc): In function
`setTranslator(char const*)':
: relocation truncated to fit: R_MIPS_GOT_DISP theTranslator
../lib/libdoxygen.a(language.o)(.text+0x10c): In function
`setTranslator(char const*)':
: additional relocation overflows omitted from the output
collect2: ld returned 1 exit status
gmake[2]: *** [../bin/doxygen] Error 1
gmake[2]: Leaving directory
`/home/ports/pobj/doxygen-1.7.2.src/doxygen-1.7.2/src'
gmake[1]: *** [all] Error 2
gmake[1]: Leaving directory
`/home/ports/pobj/doxygen-1.7.2.src/doxygen-1.7.2/src'
gmake: *** [all] Error 2
*** Error code 2

Stop in /home/ports/devel/doxygen (line 2494 of
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /home/ports/devel/doxygen (line 2250 of
/usr/ports/infrastructure/mk/bsd.port.mk).


dmesg:

[ using 463944 bytes of bsd ELF symbol table ]
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California.  All rights reserved.
Copyright (c) 1995-2011 OpenBSD. All rights reserved.  http://www.OpenBSD.org

OpenBSD 5.0 (GENERIC) #26: Wed Aug 17 10:41:08 MDT 2011
dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC
real mem = 1073741824 (1024MB)
avail mem = 1059209216 (1010MB)
mainbus0 at root: Lemote Yeeloong
cpu0 at mainbus0: STC Loongson2F CPU 797 MHz, STC Loongson2F FPU
cpu0: cache L1-I 64KB D 64KB 4 way, L2 512KB 4 way
bonito0 at mainbus0: memory and PCI-X controller, rev 1
pci0 at bonito0 bus 0
rl0 at pci0 dev 7 function 0 Realtek 8139 rev 0x10: irq 5, address
00:23:8b:84:6f:40
rlphy0 at rl0 phy 0: RTL internal PHY
smfb0 at pci0 dev 8 function 0 Silicon Motion LynxEM+ rev 0xb0
wsdisplay0 at smfb0 mux 1: console (std, vt100 emulation)
ohci0 at pci0 dev 9 function 0 NEC USB rev 0x44: irq 7, version 1.0
ehci0 at pci0 dev 9 function 1 NEC USB rev 0x05: irq 7
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 NEC EHCI root hub rev 2.00/1.00 addr 1
glxpcib0 at pci0 dev 14 function 0 AMD CS5536 ISA rev 0x03: rev 3,
32-bit 3579545Hz timer, watchdog, gpio
gpio1 at glxpcib0: 32 pins
pciide0 at pci0 dev 14 function 2 AMD CS5536 IDE rev 0x01: DMA,
channel 0 wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: FUJITSU MHZ2160BH G2
wd0: 16-sector PIO, LBA48, 152627MB, 312581808 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 2
pciide0: channel 1 ignored (disabled)
auglx0 at pci0 dev 14 function 3 AMD CS5536 Audio rev 0x01: isa irq
9, CS5536 AC97
ac97: codec id 0x414c4760 (Avance Logic ALC655 rev 0)
audio0 at auglx0
ohci1 at pci0 dev 14 function 4 AMD CS5536 USB rev 0x02: isa irq 11,
version 1.0, legacy support
ehci1 at pci0 dev 14 function 5 AMD CS5536 USB rev 0x02: isa irq 11
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 AMD EHCI root hub rev 2.00/1.00 addr 1
usb2 at ohci0: USB revision 1.0
uhub2 at usb2 NEC OHCI root hub rev 1.00/1.00 addr 1
isa0 at glxpcib0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
pckbc0: using irq 12 for aux slot
wsmouse0 at pms0 mux 0
mcclock0 at isa0 port 0x70/2: mc146818 or compatible
ykbec0 at isa0 port 0x381/3
usb3 at ohci1: USB revision 1.0
uhub3 at usb3 AMD OHCI root hub rev 1.00/1.00 addr 1
clock0 at mainbus0: ticker on int5 using count register
apm0 at mainbus0
umass0 at uhub1 port 1 configuration 1 interface 0 Generic
USB2.0-CRW

disable doxygen on landisk

2011-11-13 Thread Paul Irofti

Okay?

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile17 Oct 2011 10:24:52 -  1.17
+++ Makefile13 Nov 2011 15:05:10 -
@@ -1,5 +1,6 @@
 # $OpenBSD: Makefile,v 1.17 2011/10/17 10:24:52 espie Exp $
 
+NOT_FOR_ARCHS= sh
 COMMENT-main=  source code documentation generator tool
 COMMENT-gui=   GUI front-end for doxygen

doxygen

2010-09-16 Thread Stuart Henderson

Here's an update to doxygen prompted by seeing some 'unsupported tag'
warnings. I'm not sure if we want this now or not (it will need a bulk 
build if we do, there will definitely be some PLIST fallout) but since
I have the diff I figured I'd send it out and see what anyone thinks...

Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile10 Aug 2009 06:31:07 -  1.11
+++ Makefile16 Sep 2010 16:42:38 -
@@ -3,9 +3,9 @@
 COMMENT-main=  source code documentation generator tool
 COMMENT-gui=   GUI front-end for doxygen
 
-VERSION=   1.5.4
+VERSION=   1.7.1
 DISTNAME=  doxygen-${VERSION}.src
-PKGNAME-main=  doxygen-${VERSION}p0
+PKGNAME-main=  doxygen-${VERSION}
 FULLPKGNAME-gui=doxygen-gui-${VERSION}
 CATEGORIES=devel textproc 
 
@@ -25,10 +25,7 @@ FLAVOR?=
 USE_GMAKE= Yes
 MODULES=   converters/libiconv
 
-LIB_DEPENDS-main=  png.=4::graphics/png \
-   ${LIB_DEPENDS}
-
-WANTLIB=   m c stdc++
+WANTLIB=   c m pthread stdc++
 
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS=--prefix ${WRKINST}${LOCALBASE} \
@@ -40,12 +37,12 @@ MULTI_PACKAGES= -main
 CONFIGURE_ARGS+=--with-doxywizard
 CONFIGURE_ENV= QTDIR=${LOCALBASE}
 
-MODULES+=  x11/qt3
+MODULES+=  x11/qt4
 
 MULTI_PACKAGES+=-gui
 .endif
 
-WANTLIB-gui=   ${WANTLIB} X11 Xext pthread pthread-stubs xcb
+WANTLIB-gui=   ${WANTLIB} QtGui QtXml
 LIB_DEPENDS-gui=${MODQT_LIB_DEPENDS} \
${LIB_DEPENDS}
 RUN_DEPENDS-gui=:doxygen-${VERSION}:${BUILD_PKGPATH}
@@ -54,12 +51,10 @@ WANTLIB-main=   ${WANTLIB} z
 
 MAKE_FLAGS+=   CXX=${CXX} CC=${CC} _CFLAGS=${CXXFLAGS} 
-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
+FAKE_FLAGS+=   DESTDIR=
 WRKDIST=   ${WRKDIR}/doxygen-${VERSION}
 
 NO_REGRESS=Yes
 VMEM_WARNING=  Yes
-
-pre-configure:
-   @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' ${WRKSRC}/configure
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo6 Jan 2008 10:02:59 -   1.6
+++ distinfo16 Sep 2010 16:42:38 -
@@ -1,5 +1,5 @@
-MD5 (doxygen-1.5.4.src.tar.gz) = EP/o1EXcG/fdaSkrJmkG/w==
-RMD160 (doxygen-1.5.4.src.tar.gz) = Jj4ih9pPvpGkKdxT/jVpsVDHb98=
-SHA1 (doxygen-1.5.4.src.tar.gz) = GoFffea0EveFLVfeyetQ98SwMmg=
-SHA256 (doxygen-1.5.4.src.tar.gz) = 
EuaiFmuMeKmR1M7vHdkEIReyS3biDM/f38MLxKfjHfI=
-SIZE (doxygen-1.5.4.src.tar.gz) = 3762535
+MD5 (doxygen-1.7.1.src.tar.gz) = E+duEPtVWBoW7gTeNcJk8A==
+RMD160 (doxygen-1.7.1.src.tar.gz) = gxh3ZQUiWAeK+wlZuAUk9wPCDNc=
+SHA1 (doxygen-1.7.1.src.tar.gz) = /KddcPSO8N7ydv2NtJV3L2xD+GI=
+SHA256 (doxygen-1.7.1.src.tar.gz) = 
S4ZvOxlJcNfgdolEJV2JsKGq578zf1rj5Lg1jaNJ2jE=
+SIZE (doxygen-1.7.1.src.tar.gz) = 4116363
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   6 Jan 2008 10:02:59 -   1.3
+++ patches/patch-Makefile_in   16 Sep 2010 16:42:38 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2008/01/06 10:02:59 eric Exp $
 Makefile.in.orig   Mon Dec 17 20:57:30 2007
-+++ Makefile.inMon Dec 17 20:57:44 2007
-@@ -45,7 +45,7 @@ distclean: clean
-   -rm -f addon/doxywizard/moc/moc_*
-   -rm -f addon/doxywizard/config.cpp
+--- Makefile.in.orig   Thu Aug 20 20:41:13 2009
 Makefile.inThu Sep 16 11:35:26 2010
+@@ -42,7 +42,7 @@ distclean: clean
+   -rm -f VERSION
+   -rm -f packages/rpm/doxygen.spec
  
 -DATE=$(shell date +%B %Y)
 +DATE=`date +%B %Y`
Index: patches/patch-addon_doxywizard_Makefile_in
===
RCS file: patches/patch-addon_doxywizard_Makefile_in
diff -N patches/patch-addon_doxywizard_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-addon_doxywizard_Makefile_in  16 Sep 2010 16:42:38 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- addon/doxywizard/Makefile.in.orig  Sun May 23 15:51:31 2010
 addon/doxywizard/Makefile.in   Thu Sep 16 17:25:07 2010
+@@ -10,7 +10,8 @@
+ # See the GNU General Public License for more details.
+ # 
+ 
+-QMAKE=qmake $(MKSPECS)
++QMAKE=qmake4 $(MKSPECS)
++MAN1DIR=man/man1
+ 
+ all: Makefile.doxywizard  
+   $(MAKE) -f Makefile.doxywizard 
Index: patches/patch-addon_doxywizard_doxywizard_pro_in
===
RCS file: 
/cvs/ports/devel/doxygen/patches/patch-addon_doxywizard_doxywizard_pro_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-addon_doxywizard_doxywizard_pro_in
--- patches/patch-addon_doxywizard_doxywizard_pro_in6 Jan 2008 10:02:59 
-   1.2

Re: UPDATE+FIX: devel/doxygen

2008-01-02 Thread Simon Bertrang

On Tue, Jan 01, 2008 at 03:11:13PM +0100, Eric Faurot wrote:
 Hi and happy new year.
 
 While working on another port, simon and I noticed that the current doxygen
 is broken. Generated HTML filenames for directory listing are constructed by
 md5 summing the original path, but the md5 algorithm used is broken on 64bit
 archs, so the PLIST differed. This is fixed in recent versions. Now another
 problem is that the original path itself (the one where the sources to be
 documented are located) may vary when building a port needing doxygen: one
 could use WRKOBJDIR=/usr/obj/ports, or the port could be built from
 /usr/ports/mystuff. This is very inconvenient for PLISTs.
 
 So, I thought the simplest/nicest way to fix this would be to use an env var
 set to the prefix to strip from the paths used to generate the md5 sum. Ports
 using doxygen would just have something like:
 
 MAKE_ENV=   ENCODE_DIRNAME_PREFIX_STRIP=${WRKSRC}
 
 (the variable name is not too bright maybe)
 

As the chcksums should IMO be built relative to WRKSRC anyway i think
the prefix strip does exactly what it should.

 Diff with update and hack attached. 
 
 Comments?
 

Checked with your gdal port on amd64 - no plist changes anymore.

Ok from my side.

Regards,
Simon

Re: UPDATE+FIX: devel/doxygen

2008-01-02 Thread Landry Breuil

On Wed, Jan 02, 2008 at 09:47:32PM +0100, Simon Bertrang wrote:
 On Tue, Jan 01, 2008 at 03:11:13PM +0100, Eric Faurot wrote:
  Hi and happy new year.
  
  While working on another port, simon and I noticed that the current doxygen
  is broken. Generated HTML filenames for directory listing are constructed by
  md5 summing the original path, but the md5 algorithm used is broken on 64bit
  archs, so the PLIST differed. This is fixed in recent versions. Now another
  problem is that the original path itself (the one where the sources to be
  documented are located) may vary when building a port needing doxygen: one
  could use WRKOBJDIR=/usr/obj/ports, or the port could be built from
  /usr/ports/mystuff. This is very inconvenient for PLISTs.
  
  So, I thought the simplest/nicest way to fix this would be to use an env var
  set to the prefix to strip from the paths used to generate the md5 sum. 
  Ports
  using doxygen would just have something like:
  
  MAKE_ENV=   ENCODE_DIRNAME_PREFIX_STRIP=${WRKSRC}
  
  (the variable name is not too bright maybe)
  
 
 As the chcksums should IMO be built relative to WRKSRC anyway i think
 the prefix strip does exactly what it should.
 
  Diff with update and hack attached. 
  
  Comments?
  
 
 Checked with your gdal port on amd64 - no plist changes anymore.
 
 Ok from my side.

Builds and installs fine. I didn't test ports using it, but on a small app
here @i386 with an old doxyfile, works fine. Diff ok for me too, and hack
seems nice.
Maybe mentionning it in DESCR would be useful for future ports using it
?

Landry

UPDATE+FIX: devel/doxygen

2008-01-01 Thread Eric Faurot

Hi and happy new year.

While working on another port, simon and I noticed that the current doxygen
is broken. Generated HTML filenames for directory listing are constructed by
md5 summing the original path, but the md5 algorithm used is broken on 64bit
archs, so the PLIST differed. This is fixed in recent versions. Now another
problem is that the original path itself (the one where the sources to be
documented are located) may vary when building a port needing doxygen: one
could use WRKOBJDIR=/usr/obj/ports, or the port could be built from
/usr/ports/mystuff. This is very inconvenient for PLISTs.

So, I thought the simplest/nicest way to fix this would be to use an env var
set to the prefix to strip from the paths used to generate the md5 sum. Ports
using doxygen would just have something like:

MAKE_ENV=   ENCODE_DIRNAME_PREFIX_STRIP=${WRKSRC}

(the variable name is not too bright maybe)

Diff with update and hack attached. 

Comments?

Eric.


doxygen.diff
Description: Binary data

UPDATE: doxygen-1.4.5

2005-10-06 Thread Bernd Ahlers

Hi!

Attached is an update to doxygen-1.4.5. It would be cool if some 
doxygen users can test it. Thanks.

Bernd
Index: Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile26 Jul 2005 05:45:08 -  1.2
+++ Makefile5 Oct 2005 12:17:34 -
@@ -3,7 +3,7 @@
 COMMENT=   documentation system for C++/C/Java/Objective-C/IDL and others
 COMMENT-gui=   GUI front-end for doxygen
 
-VERSION=   1.4.4
+VERSION=   1.4.5
 DISTNAME=  doxygen-${VERSION}.src
 PKGNAME=   doxygen-${VERSION}
 FULLPKGNAME-gui=doxygen-gui-${VERSION}
@@ -59,8 +59,5 @@
 
 NO_REGRESS=Yes
 VMEM_WARNING=  Yes
-
-post-extract:
-   ${CHMOD} +x ${WRKSRC}/configure
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo26 Jul 2005 05:45:08 -  1.2
+++ distinfo5 Oct 2005 12:17:34 -
@@ -1,4 +1,4 @@
-MD5 (doxygen-1.4.4.src.tar.gz) = 0e7fdbeafc6264cbde590c363a4debcd
-RMD160 (doxygen-1.4.4.src.tar.gz) = 7999f196b8deb2137e9d411a1c0ea257db32ff3e
-SHA1 (doxygen-1.4.4.src.tar.gz) = 50e04f40b6b69b1897cad789f993a11df0368eb5
-SIZE (doxygen-1.4.4.src.tar.gz) = 2854374
+MD5 (doxygen-1.4.5.src.tar.gz) = 6319afd44c47a4bcf49658c995322f0e
+RMD160 (doxygen-1.4.5.src.tar.gz) = 9fcc6820b2036e54ecee91650f2470d179d86e2e
+SHA1 (doxygen-1.4.5.src.tar.gz) = cbd01c0f1369cdd078c7bee4646559f805bfb237
+SIZE (doxygen-1.4.5.src.tar.gz) = 2884510
Index: patches/patch-examples_Makefile_in
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-examples_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-examples_Makefile_in
--- patches/patch-examples_Makefile_in  17 Jul 2005 08:30:06 -  1.1.1.1
+++ patches/patch-examples_Makefile_in  5 Oct 2005 12:17:34 -
@@ -1,10 +1,11 @@
 $OpenBSD: patch-examples_Makefile_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
 examples/Makefile.in.orig  Thu May  5 00:04:48 2005
-+++ examples/Makefile.in   Thu May  5 00:04:50 2005
-@@ -98,6 +98,4 @@ memgrp/html/index.html: memgrp.cpp memgr
-   $(DOXYGEN)/bin/doxygen memgrp.cfg
+--- examples/Makefile.in.orig  Mon Jul 25 10:28:13 2005
 examples/Makefile.in   Wed Oct  5 14:15:32 2005
+@@ -106,7 +106,5 @@ docstring/html/index.html: docstring.py 
+   $(DOXYGEN)/bin/doxygen docstring.cfg
  
  diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h 
diagrams_e.h diagrams.cfg
 -ifneq ($(HAVE_DOT),)
$(DOXYGEN)/bin/doxygen diagrams.cfg
 -endif
+ 
Index: patches/patch-src_libdoxygen_pro_in
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-src_libdoxygen_pro_in,v
retrieving revision 1.2
diff -u -u -r1.2 patch-src_libdoxygen_pro_in
--- patches/patch-src_libdoxygen_pro_in 26 Jul 2005 05:45:08 -  1.2
+++ patches/patch-src_libdoxygen_pro_in 5 Oct 2005 12:17:34 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_libdoxygen_pro_in,v 1.2 2005/07/26 05:45:08 alek Exp $
 src/libdoxygen.pro.in.orig Sun Jun 12 18:06:58 2005
-+++ src/libdoxygen.pro.in  Mon Jul 25 21:50:53 2005
-@@ -197,8 +197,8 @@ SOURCES  = ce_lex.cpp \
+--- src/libdoxygen.pro.in.orig Mon Aug  8 20:17:10 2005
 src/libdoxygen.pro.in  Wed Oct  5 14:15:32 2005
+@@ -198,8 +198,8 @@ SOURCES  = ce_lex.cpp \
  win32:TMAKE_CXXFLAGS   += -DQT_NODLL 
  win32-msvc:TMAKE_CXXFLAGS  += -Zm200
  win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti

1 2 >

1 - 100 of 102 matches

Mail list logo