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&m=147907369921343&w=2 Index: Makefile =================================================================== RCS file: /cvs/ports/devel/doxygen/Makefile,v retrieving revision 1.38 diff -u -p -u -p -r1.38 Makefile --- Makefile 13 Nov 2016 23:34:17 -0000 1.38 +++ Makefile 10 Dec 2016 07:45:57 -0000 @@ -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 <bsd.port.arch.mk> -.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_txt 1 Mar 2016 20:36:40 -0000 1.1 +++ patches/patch-doc_CMakeLists_txt 10 Dec 2016 07:45:57 -0000 @@ -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.orig Tue 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.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 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 -0000 +++ pkg/DESCR 10 Dec 2016 07:45:57 -0000 @@ -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. There is also support for generating output in RTF +(MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man +pages. The documentation is extracted directly from the sources, which +makes it much easier to keep the documentation consistent with the +source code. + +You can configure doxygen to extract the code structure from +undocumented source files. This is very useful to quickly find your way +in large source distributions. You can also visualize the relations +between the various elements by means of include dependency graphs, +inheritance diagrams, and collaboration diagrams, which are all +generated automatically. + +To take full advantage of doxygen's features the following additional +ports should be installed: + + - print/texlive for generating LaTeX, Postscript, and PDF output. + - math/graphviz for the include dependency graphs, the graphical + inheritance graphs, and the collaboration graphs. + - print/ghostscript + +Note: + +When generating certain filenames (for example directory listing with +the html backend), doxygen uses an md5 sum of the source path. This +is a problem for the ports framework, as the sources location can vary +(/usr/obj/ports/..., usr/ports/.../w-..., /usr/ports/mystuff/.../w-...). + +This port has been modified so that when running doxygen, the +DOXYGEN_ENCODE_PATH_STRIP environment variable can be set to a prefix +to be stripped from a path before its md5 sum is calculated. Ports +using doxygen should use "DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}". Index: pkg/DESCR-gui =================================================================== RCS file: pkg/DESCR-gui diff -N pkg/DESCR-gui --- pkg/DESCR-gui 17 Jul 2005 08:30:06 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -This package contains a GUI front-end for configuring and running -doxygen. Index: pkg/DESCR-main =================================================================== RCS file: pkg/DESCR-main diff -N pkg/DESCR-main --- pkg/DESCR-main 3 Apr 2012 23:15:23 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -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. There is also support for generating output in RTF -(MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man -pages. The documentation is extracted directly from the sources, which -makes it much easier to keep the documentation consistent with the -source code. - -You can configure doxygen to extract the code structure from -undocumented source files. This is very useful to quickly find your way -in large source distributions. You can also visualize the relations -between the various elements by means of include dependency graphs, -inheritance diagrams, and collaboration diagrams, which are all -generated automatically. - -To take full advantage of doxygen's features the following additional -ports should be installed: - - - print/texlive for generating LaTeX, Postscript, and PDF output. - - math/graphviz for the include dependency graphs, the graphical - inheritance graphs, and the collaboration graphs. - - print/ghostscript - -Flavors: - * gui -- build Qt frontend - -Note: - -When generating certain filenames (for example directory listing with -the html backend), doxygen uses an md5 sum of the source path. This -is a problem for the ports framework, as the sources location can vary -(/usr/obj/ports/..., usr/ports/.../w-..., /usr/ports/mystuff/.../w-...). - -This port has been modified so that when running doxygen, the -DOXYGEN_ENCODE_PATH_STRIP environment variable can be set to a prefix -to be stripped from a path before its md5 sum is calculated. Ports -using doxygen should use "DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}". Index: pkg/PLIST =================================================================== RCS file: pkg/PLIST diff -N pkg/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PLIST 10 Dec 2016 07:45:57 -0000 @@ -0,0 +1,6 @@ +@comment $OpenBSD$ +@bin bin/doxyapp +@bin bin/doxygen +@bin bin/doxyindexer +@bin bin/doxysearch.cgi +@man man/man1/doxygen.1 Index: pkg/PLIST-gui =================================================================== RCS file: pkg/PLIST-gui diff -N pkg/PLIST-gui --- pkg/PLIST-gui 4 Nov 2010 20:13:10 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PLIST-gui,v 1.2 2010/11/04 20:13:10 sthen Exp $ -@bin bin/doxywizard -@man man/man1/doxywizard.1 Index: pkg/PLIST-main =================================================================== RCS file: pkg/PLIST-main diff -N pkg/PLIST-main --- pkg/PLIST-main 12 Nov 2016 20:50:41 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2016/11/12 20:50:41 jca Exp $ -@pkgpath devel/doxygen,gui -@pkgpath devel/doxygen -@bin bin/doxyapp -@bin bin/doxygen -@bin bin/doxyindexer -@bin bin/doxysearch.cgi -@man man/man1/doxygen.1
doxygen-gui.tar.gz
Description: application/tar-gz
