Re: UPDATE: devel/doxygen, devel/doxygen-gui
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> +MAINTAINER= Rafael Sadowski > > # 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/distinfo1 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_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
UPDATE: devel/doxygen, devel/doxygen-gui
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+MAINTAINER=Rafael Sadowski # 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 Sep 12 07:52:20 2016 -@@ -86,10 +86,16 @@ void DirDef::sort() - - static
Re: UPDATE: devel/doxygen and devel/doxygen-gui
*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
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: UPDATE: devel/doxygen
On 11/13/16 22:54, Jeremie Courreges-Anglas wrote: > Jeremie Courreges-Anglaswrites: > >> Stuart Henderson 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
Jeremie Courreges-Anglaswrites: > Stuart Henderson 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
Stuart Hendersonwrites: > 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
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
On 11/13/16 19:50, Rafael Sadowski wrote: > On Sat Nov 12, 2016 at 11:17:18PM +0100, Jeremie Courreges-Anglas wrote: >> Nigel Taylorwrites: >> >>> 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 library / gcc4, and build with base stdc++ instead. Requires a junk to occur between patching and configure is difficult to reproduce with dpb. The runtime may also fail if something else hasn't installed the library. Then could then cause dpb bulk to fail building the dependent packages as estdc++ is not present. None of this is proved. Have to pkg_delete nearly all the packages to see the problems. $ env FLAVOR="no_gui bootstrap" make show=LIB_DEPENDS $ env FLAVOR=no_gui make show=LIB_DEPENDS $ env FLAVOR= make show=LIB_DEPENDS x11/qt5 STEM->=4.9,<4.10:lang/gcc/4.9,-libs $ env SUBPACKAGE=-main FLAVOR= make show=LIB_DEPENDS x11/qt5
Re: UPDATE: devel/doxygen
Nigel Taylorwrites: > 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
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 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 - >>> @@
Re: UPDATE: devel/doxygen
On 2016/11/10 11:31, Jeremie Courreges-Anglas wrote: > Rafael Sadowskiwrites: > > > 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
Rafael Sadowskiwrites: > 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
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
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/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> > + > > # 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} >
Re: UPDATE: devel/doxygen
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/Makefiledisable-doxygen > devel/kyua-cliwithout-doxygen > devel/kyua-testerswithout-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> + > # 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} ==
UPDATE: devel/doxygen
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+ # 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 === RCS file:
Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10
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/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
Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10
Hi, Stuart Hendersonwrites: > 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
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
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
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
Stuart Hendersonwrites: > 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
Rafael Sadowskiwrites: > 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
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.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 >
Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10
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
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