Date: Mon, 19 Dec 2016 16:10:12 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428947 - in head: textproc/zorba www/cgicc www/wt Message-ID: <201612191610.uBJGACNw048973@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Dec 19 16:10:12 2016 New Revision: 428947 URL: https://svnweb.freebsd.org/changeset/ports/428947 Log: The DOCS option must not install doxygen. Sponsored by: Absolight Modified: head/textproc/zorba/Makefile (contents, props changed) head/textproc/zorba/pkg-plist (contents, props changed) head/www/cgicc/Makefile (contents, props changed) head/www/wt/Makefile (contents, props changed) Modified: head/textproc/zorba/Makefile ============================================================================== --- head/textproc/zorba/Makefile Mon Dec 19 15:56:24 2016 (r428946) +++ head/textproc/zorba/Makefile Mon Dec 19 16:10:12 2016 (r428947) @@ -3,7 +3,7 @@ PORTNAME= zorba PORTVERSION= 2.7.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= textproc MASTER_SITES= https://launchpadlibrarian.net/119058962/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -22,10 +22,11 @@ RUN_DEPENDS= fop:textproc/fop WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS +OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS DOXYGEN OPTIONS_SUB= yes -DOCS_BUILD_DEPENDS+= doxygen:devel/doxygen +DOXYGEN_BUILD_DEPENDS+= doxygen:devel/doxygen +DOXYGEN_IMPLIES= DOCS PHP_CMAKE_BOOL= WITH_PHP5 PYTHON_CMAKE_BOOL= WITH_PYTHON RUBY_CMAKE_BOOL= WITH_RUBY @@ -101,6 +102,9 @@ post-patch: post-install: ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R} +.if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN} + cd ${STAGEDIR}${DOCSDIR} && rmdir c/html code/html code cxx/html zorba/html +.endif test: build cd ${BUILD_WRKSRC} && ${MAKE} test Modified: head/textproc/zorba/pkg-plist ============================================================================== --- head/textproc/zorba/pkg-plist Mon Dec 19 15:56:24 2016 (r428946) +++ head/textproc/zorba/pkg-plist Mon Dec 19 16:10:12 2016 (r428947) @@ -113,17 +113,17 @@ lib/zorba/core/%%FULLVERSION%%/org/expat %%PORTDOCS%%%%DOCSDIR%%/c/examples/csequences.c %%PORTDOCS%%%%DOCSDIR%%/c/examples/cserialization.c %%PORTDOCS%%%%DOCSDIR%%/c/examples/csimple.c -%%PORTDOCS%%%%DOCSDIR%%/c/html/documentation.png -%%PORTDOCS%%%%DOCSDIR%%/c/html/download.png -%%PORTDOCS%%%%DOCSDIR%%/c/html/modules.png -%%PORTDOCS%%%%DOCSDIR%%/c/html/noisepattern.png -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/terminal.png -%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_r.gif +%%DOXYGEN%%%%DOCSDIR%%/c/html/documentation.png +%%DOXYGEN%%%%DOCSDIR%%/c/html/download.png +%%DOXYGEN%%%%DOCSDIR%%/c/html/modules.png +%%DOXYGEN%%%%DOCSDIR%%/c/html/noisepattern.png +%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_b.gif +%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_l.gif +%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_r.gif +%%DOXYGEN%%%%DOCSDIR%%/c/html/terminal.png +%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_b.gif +%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_l.gif +%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_r.gif %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/Makefile %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/binary.cpp %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/callback.cpp @@ -141,14 +141,14 @@ lib/zorba/core/%%FULLVERSION%%/org/expat %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/serialization.cpp %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/simple.cpp %%PORTDOCS%%%%DOCSDIR%%/cxx/examples/uri_resolvers.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/documentation.png -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/download.png -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/modules.png -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/noisepattern.png -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/terminal.png +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/documentation.png +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/download.png +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/modules.png +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/noisepattern.png +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_b.gif +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_l.gif +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_r.gif +%%DOXYGEN%%%%DOCSDIR%%/cxx/html/terminal.png %%PORTDOCS%%%%DOCSDIR%%/xqdoc/generator/xqdoc-html.xq %%PORTDOCS%%%%DOCSDIR%%/xqdoc/generator/xqdoc-xml.xq %%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/images/External.gif @@ -189,34 +189,34 @@ lib/zorba/core/%%FULLVERSION%%/org/expat %%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.functx.com_index.html %%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions.html %%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions_math.html -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_b.gif -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_r.gif -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/JSONforXQuery.html -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/W3C-WD.css -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/XQueryforJSON.html -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/documentation.png -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/download.png -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/modules.png -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/noisepattern.png -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/scripting_spec.html -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/terminal.png -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/Makefile -%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_b.gif -%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_r.gif -%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_l.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_b.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_r.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_l.gif +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/JSONforXQuery.html +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/W3C-WD.css +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/XQueryforJSON.html +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/documentation.png +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/download.png +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/modules.png +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/noisepattern.png +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_b.gif +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_l.gif +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_r.gif +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/scripting_spec.html +%%DOXYGEN%%%%DOCSDIR%%/zorba/html/terminal.png +%%DOXYGEN%%%%DOCSDIR%%/zorba/xqdoc/Makefile +%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_b.gif +%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_r.gif +%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_l.gif %%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/python_test.py %%RUBY%%share/ruby/zorba_api.so -%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_b.gif -%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_l.gif -%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_r.gif +%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_b.gif +%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_l.gif +%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_r.gif %%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/ruby_test.rb -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_b.gif -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_l.gif -%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_r.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_b.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_l.gif +%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_r.gif %%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index.xq %%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.0.xq %%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.xq Modified: head/www/cgicc/Makefile ============================================================================== --- head/www/cgicc/Makefile Mon Dec 19 15:56:24 2016 (r428946) +++ head/www/cgicc/Makefile Mon Dec 19 16:10:12 2016 (r428947) @@ -3,6 +3,7 @@ PORTNAME= cgicc PORTVERSION= 3.2.16 +PORTREVISION= 1 CATEGORIES= www devel MASTER_SITES= GNU @@ -11,7 +12,7 @@ COMMENT= C++ class library for writing C LICENSE= LGPL3+ -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOXYGEN USES= gmake pathfix libtool GNU_CONFIGURE= yes @@ -24,8 +25,8 @@ CXXFLAGS+= -Wno-unknown-pragmas PORTDOCS= * -DOCS_BUILD_DEPENDS= doxygen:devel/doxygen -DOCS_CONFIGURE_ENV_OFF= ac_cv_prog_DOXYGEN="${ECHO_CMD}" +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_CONFIGURE_ENV_OFF= ac_cv_prog_DOXYGEN="${ECHO_CMD}" post-patch: @${REINPLACE_CMD} -e \ Modified: head/www/wt/Makefile ============================================================================== --- head/www/wt/Makefile Mon Dec 19 15:56:24 2016 (r428946) +++ head/www/wt/Makefile Mon Dec 19 16:10:12 2016 (r428947) @@ -3,7 +3,7 @@ PORTNAME= wt PORTVERSION= 3.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= info@babaei.net @@ -34,7 +34,7 @@ CMAKE_ARGS+= -DCONFIGDIR:STRING=${LOCALB NO_OPTIONS_SORT= yes OPTIONS_DEFINE= \ - DOCS \ + DOXYGEN \ EXAMPLES \ TESTS \ RESOURCES \ @@ -90,8 +90,8 @@ EXAMPLES_IMPLIES= SQLITE3 WTHTTP CMAKE_MODULE_CMAKE_ON= -DINSTALL_FINDWT_CMAKE_FILE:BOOL=ON CMAKE_MODULE_CMAKE_OFF= -DINSTALL_FINDWT_CMAKE_FILE:BOOL=OFF -DOCS_CMAKE_ON= -DBUILD_DOCS:BOOL=ON -DOCS_CMAKE_OFF= -DBUILD_DOCS:BOOL=OFF +DOXYGEN_CMAKE_ON= -DBUILD_DOCS:BOOL=ON +DOXYGEN_CMAKE_OFF= -DBUILD_DOCS:BOOL=OFF FCGI_CMAKE_ON= -DCONNECTOR_FCGI:BOOL=ON FCGI_CMAKE_OFF= -DCONNECTOR_FCGI:BOOL=OFF FIREBIRD_CMAKE_ON= -DENABLE_FIREBIRD:BOOL=ON @@ -127,7 +127,7 @@ WTHTTP_CMAKE_OFF= -DCONNECTOR_HTTP:BOOL= .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= asciidoc:textproc/asciidoc \ doxygen:devel/doxygen .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612191610.uBJGACNw048973>