Date: Mon, 10 Sep 2018 13:16:17 +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: r479408 - in head: cad/calculix-ccx devel/critcl devel/libiqxmlrpc dns/bind9-devel dns/bind912 dns/bind913 editors/the games/connectfive japanese/lookup math/nfft math/reduce math/reduc... Message-ID: <201809101316.w8ADGHpo073226@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Sep 10 13:16:16 2018 New Revision: 479408 URL: https://svnweb.freebsd.org/changeset/ports/479408 Log: Various cleanup & fixes post-DOCS/EXAMPLES cleanup. PR: 230864 Submitted by: mat exp-runs by: antoine Modified: head/cad/calculix-ccx/Makefile (contents, props changed) head/devel/critcl/Makefile (contents, props changed) head/devel/libiqxmlrpc/Makefile (contents, props changed) head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind912/Makefile (contents, props changed) head/dns/bind913/Makefile (contents, props changed) head/editors/the/pkg-plist (contents, props changed) head/games/connectfive/Makefile (contents, props changed) head/japanese/lookup/Makefile (contents, props changed) head/math/nfft/Makefile (contents, props changed) head/math/reduce-psl/Makefile (contents, props changed) head/math/reduce/Makefile (contents, props changed) head/net/sflowtool/Makefile (contents, props changed) head/net/tcludp/Makefile (contents, props changed) head/sysutils/tkdvd/Makefile (contents, props changed) head/textproc/libxml++26-reference/pkg-plist (contents, props changed) head/www/mod_auth_cas/Makefile (contents, props changed) head/www/mod_rpaf2/Makefile (contents, props changed) head/www/varnish6/Makefile (contents, props changed) Modified: head/cad/calculix-ccx/Makefile ============================================================================== --- head/cad/calculix-ccx/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/cad/calculix-ccx/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -34,6 +34,7 @@ ALL_TARGET= #Empty CCX_VER= ccx_${PORTVERSION} WRKSRC= ${WRKDIR}/CalculiX/${CCX_VER}/src +DOCSDIR= ${PREFIX}/share/doc/CalculiX OPTIONS_DEFINE= DOCS EXAMPLES @@ -42,7 +43,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${DIST_HTM} ${DIST_PS} EXTRACT_ONLY+= ${DIST_HTM} ${DIST_PS} -DOCSDIR= ${PREFIX}/share/doc/CalculiX .endif .if $(PORT_OPTIONS:MEXAMPLES) @@ -68,18 +68,18 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${CCX_VER} \ ${STAGEDIR}${PREFIX}/bin/ccx -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR}/ccx) ${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \ ${STAGEDIR}${DOCSDIR} @${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKDIR}/CalculiX/${CCX_VER}/test && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) -.endif .include <bsd.port.mk> Modified: head/devel/critcl/Makefile ============================================================================== --- head/devel/critcl/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/devel/critcl/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -31,8 +31,6 @@ NO_BUILD= yes OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e 's|dtplite|${LOCALBASE}/bin/dtplite|g' ${WRKSRC}/build.tcl ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/lib/critcl/Config Modified: head/devel/libiqxmlrpc/Makefile ============================================================================== --- head/devel/libiqxmlrpc/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/devel/libiqxmlrpc/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -15,7 +15,6 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libboost_thread.so:devel/boost-libs OPTIONS_DEFINE= DOXYGEN DOCS -OPTIONS_DEFAULT= DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/dns/bind9-devel/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -75,11 +75,11 @@ CONFLICTS+= bind9-devel USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools + +PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes - -PORTDOCS= * OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ Modified: head/dns/bind912/Makefile ============================================================================== --- head/dns/bind912/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/dns/bind912/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -62,11 +62,11 @@ CONFLICTS+= bind912 USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools + +PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes - -PORTDOCS= * OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ Modified: head/dns/bind913/Makefile ============================================================================== --- head/dns/bind913/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/dns/bind913/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -61,11 +61,11 @@ CONFLICTS+= bind913 USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools + +PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes - -PORTDOCS= * OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ Modified: head/editors/the/pkg-plist ============================================================================== --- head/editors/the/pkg-plist Mon Sep 10 13:15:47 2018 (r479407) +++ head/editors/the/pkg-plist Mon Sep 10 13:16:16 2018 (r479408) @@ -2,7 +2,6 @@ bin/the %%XCURSES%%bin/xthe man/man1/the.1.gz -@dir %%DATADIR%% %%DATADIR%%/THE_Help.txt %%DATADIR%%/abf.tld %%DATADIR%%/append.the @@ -48,7 +47,6 @@ man/man1/the.1.gz %%DATADIR%%/udiff.tld %%DATADIR%%/uncomm.the %%DATADIR%%/words.the -@dir %%PORTDOCS%%%%DOCSDIR%% %%PORTDOCS%%%%DOCSDIR%%/app1.html %%PORTDOCS%%%%DOCSDIR%%/app2.html %%PORTDOCS%%%%DOCSDIR%%/app3.html Modified: head/games/connectfive/Makefile ============================================================================== --- head/games/connectfive/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/games/connectfive/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -30,8 +30,6 @@ PORTDATA= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.linux @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/connect.cpp Modified: head/japanese/lookup/Makefile ============================================================================== --- head/japanese/lookup/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/japanese/lookup/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= AUTHORS ChangeLog NEWS README.md - post-install: +post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/math/nfft/Makefile ============================================================================== --- head/math/nfft/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/math/nfft/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -22,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= NFFT OPTIONS_DEFINE= DOCS DOXYGEN -OPTIONS_SUB= DOXYGEN +OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_ALL_TARGET= all doc Modified: head/math/reduce-psl/Makefile ============================================================================== --- head/math/reduce-psl/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/math/reduce-psl/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -37,8 +37,6 @@ REDUCE_BINS= ${WRKSRC}/pslbuild/${TARGET_SDIR} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${FILESDIR}/runpsl.sh ${STAGEDIR}${PREFIX}/bin/redpsl Modified: head/math/reduce/Makefile ============================================================================== --- head/math/reduce/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/math/reduce/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -46,8 +46,6 @@ REDUCE_BINS= ${WRKSRC}/cslbuild/${TARGET_SDIR} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${REDUCE_BINS}/csl/reduce.img ${STAGEDIR}${DATADIR} Modified: head/net/sflowtool/Makefile ============================================================================== --- head/net/sflowtool/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/net/sflowtool/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -23,8 +23,6 @@ PORTEXAMPLES= README ipTopTalkers ipTrafficMatrix sflo OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/net/tcludp/Makefile ============================================================================== --- head/net/tcludp/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/net/tcludp/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -22,6 +22,6 @@ TEST_TARGET= test PLIST_FILES= lib/${TCL_PKG}/lib${TCL_PKG}.so \ lib/${TCL_PKG}/pkgIndex.tcl \ - %%PORTDOCS%%man/mann/udp.n.gz + man/mann/udp.n.gz .include <bsd.port.mk> Modified: head/sysutils/tkdvd/Makefile ============================================================================== --- head/sysutils/tkdvd/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/sysutils/tkdvd/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -30,8 +30,6 @@ DESKTOP_ENTRIES="TkDVD" \ OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/install.tcl \ ${WRKSRC}/configure Modified: head/textproc/libxml++26-reference/pkg-plist ============================================================================== --- head/textproc/libxml++26-reference/pkg-plist Mon Sep 10 13:15:47 2018 (r479407) +++ head/textproc/libxml++26-reference/pkg-plist Mon Sep 10 13:16:16 2018 (r479408) @@ -1 +1 @@ -%%PORTDOCS%%share/devhelp/books/libxml++-%%API_VERSION%%/libxml++-%%API_VERSION%%.devhelp2 +share/devhelp/books/libxml++-%%API_VERSION%%/libxml++-%%API_VERSION%%.devhelp2 Modified: head/www/mod_auth_cas/Makefile ============================================================================== --- head/www/mod_auth_cas/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/www/mod_auth_cas/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -37,8 +37,6 @@ PLIST_SUB+= APMOD_FILE=${APMOD_FILE} OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${STAGEDIR}${DOCSDIR} ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ @@ -48,4 +46,4 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/mod_rpaf2/Makefile ============================================================================== --- head/www/mod_rpaf2/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/www/mod_rpaf2/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -33,11 +33,9 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/varnish6/Makefile ============================================================================== --- head/www/varnish6/Makefile Mon Sep 10 13:15:47 2018 (r479407) +++ head/www/varnish6/Makefile Mon Sep 10 13:16:16 2018 (r479408) @@ -45,8 +45,8 @@ EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch OPTIONS_DEFINE= DOCS -post-patch: .if defined(BAD_TESTS) +post-patch: ${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809101316.w8ADGHpo073226>