Date: Tue, 1 Sep 2015 16:20:48 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395777 - in head: databases/apq devel/cmunge devel/cvsd devel/dcmtk devel/dmalloc devel/edb devel/erlang-exmpp devel/etcd devel/etcdctl devel/flatzebra devel/fujaba devel/gnome-js-comm... Message-ID: <201509011620.t81GKmI2082397@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 1 16:20:47 2015 New Revision: 395777 URL: https://svnweb.freebsd.org/changeset/ports/395777 Log: - Switch to options helpers - While here, add some NO_ARCHes Approved by: portmgr blanket Modified: head/databases/apq/Makefile head/devel/cmunge/Makefile head/devel/cvsd/Makefile head/devel/dcmtk/Makefile head/devel/dmalloc/Makefile head/devel/edb/Makefile head/devel/erlang-exmpp/Makefile head/devel/etcd/Makefile head/devel/etcdctl/Makefile head/devel/flatzebra/Makefile head/devel/fujaba/Makefile head/devel/gnome-js-common/Makefile head/devel/go-bindata/Makefile head/devel/google-sparsehash/Makefile head/devel/hadoop/Makefile head/devel/kBuild/Makefile head/devel/libatomic_ops/Makefile head/devel/libbobcat/Makefile head/devel/libreadline-java/Makefile head/devel/nasm/Makefile head/devel/ocaml-ulex/Makefile head/devel/omake/Makefile head/devel/p5-Parse-RecDescent/Makefile head/devel/pcsc-lite/Makefile head/devel/perlconsole/Makefile head/devel/py-durus/Makefile head/devel/py-dynrules/Makefile head/devel/py-icalendar/Makefile head/devel/py-jsmin/Makefile head/devel/py-sdl2/Makefile head/devel/py-watchdog/Makefile head/devel/pyst/Makefile head/devel/quilt/Makefile head/devel/seed/Makefile head/devel/tcltls/Makefile head/devel/tkcon/Makefile head/devel/xmltooling/Makefile head/devel/zookeeper/Makefile head/net-p2p/ctorrent/Makefile head/net-p2p/qbittorrent/Makefile head/net-p2p/twister/Makefile head/news/golded+/Makefile head/palm/pilrc/Makefile head/ports-mgmt/pkg_jail/Makefile head/print/flpsed/Makefile head/textproc/adabrowse/Makefile head/textproc/agrep/Makefile Modified: head/databases/apq/Makefile ============================================================================== --- head/databases/apq/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/databases/apq/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -28,7 +28,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ OPTIONS_DEFINE= DOCS .include "${.CURDIR}/Makefile.version" -.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e '/for Object_Dir/d' ${WRKSRC}/gnat/apq.gpr.in @@ -48,9 +47,9 @@ do-install: ${STAGEDIR}${PREFIX}/lib/apq/static ${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq.gpr \ ${STAGEDIR}${PREFIX}/lib/gnat -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HISTORY \ ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/devel/cmunge/Makefile ============================================================================== --- head/devel/cmunge/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/cmunge/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -20,8 +20,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e \ 's|/vcpc_users/jhm/bin/cmunger|${PREFIX}|; \ @@ -31,9 +29,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ctran ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/proc-incl ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/cmunge ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/devel/cvsd/Makefile ============================================================================== --- head/devel/cvsd/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/cvsd/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -41,9 +41,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${STAGEDIR}${PREFIX}/etc/cvsd/cvsd.conf.sample ${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.post.mk> Modified: head/devel/dcmtk/Makefile ============================================================================== --- head/devel/dcmtk/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/dcmtk/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -31,18 +31,14 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" -CFLAGS+= -fPIC -.endif +CFLAGS_amd64= -fPIC post-patch: ${FIND} ${WRKSRC} -name "*.h.orig" -delete -.if !${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: ${FIND} ${WRKSRC} -name CMakeLists.txt | ${XARGS} \ ${REINPLACE_CMD} -e '/INSTALL_DOCDIR/d' -.endif post-install: ${INSTALL_DATA} ${WRKSRC}/doxygen/manpages/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1/ @@ -51,4 +47,4 @@ post-install: @${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/dmalloc/Makefile ============================================================================== --- head/devel/dmalloc/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/dmalloc/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -25,11 +25,7 @@ INSTALL_TARGET= install OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET+=installdocs -.endif +DOCS_INSTALL_TARGET= installdocs post-install: ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc Modified: head/devel/edb/Makefile ============================================================================== --- head/devel/edb/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/edb/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -28,16 +28,14 @@ STRIP_FILES= bin/${PORTNAME} libexec/${P OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-install: -.if ${PORT_OPTIONS:MDOCS} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif ${INSTALL_DATA} ${WRKSRC}/edb.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/src/images/edb48-logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/edb.png ${INSTALL_MAN} ${WRKSRC}/edb.1 ${STAGEDIR}${MANPREFIX}/man/man1/edb.1 (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} +post-install-DOCS-on: + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + .include <bsd.port.mk> Modified: head/devel/erlang-exmpp/Makefile ============================================================================== --- head/devel/erlang-exmpp/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/erlang-exmpp/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -37,13 +37,7 @@ USES= autoreconf cpe libtool pkgconfig CPE_VENDOR= process-one USE_OPENSSL= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --enable-documentation -.else -CONFIGURE_ARGS+= --disable-documentation -.endif +DOCS_CONFIGURE_ENABLE= documentation MAKE_JOBS_UNSAFE= yes Modified: head/devel/etcd/Makefile ============================================================================== --- head/devel/etcd/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/etcd/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -24,8 +24,6 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS DOCS_DESC= Install etcd README file -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version @${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version @@ -34,11 +32,11 @@ do-build: cd ${WRKSRC}; ${SH} build do-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif ${INSTALL_PROGRAM} ${WRKSRC}/bin/bench ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/bin/etcd ${STAGEDIR}${PREFIX}/bin/ +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> Modified: head/devel/etcdctl/Makefile ============================================================================== --- head/devel/etcdctl/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/etcdctl/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -23,8 +23,6 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS DOCS_DESC= Install etcdctl README file -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version @${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version @@ -33,10 +31,10 @@ do-build: (cd ${WRKSRC}; ${SH} build) do-install: -.if ${PORT_OPTIONS:MDOCS} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/devel/flatzebra/Makefile ============================================================================== --- head/devel/flatzebra/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/flatzebra/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -23,11 +23,7 @@ PORTDOCS= AUTHORS COPYING INSTALL NEWS R OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-patch: -.if empty(PORT_OPTIONS:MDOCS) +post-patch-DOCS-off: @${REINPLACE_CMD} 's|^install-data-am: .*|install-data-am: install-pkgconfigDATA|' ${WRKSRC}/Makefile.in -.endif .include <bsd.port.mk> Modified: head/devel/fujaba/Makefile ============================================================================== --- head/devel/fujaba/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/fujaba/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -15,6 +15,7 @@ USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes +NO_ARCH= yes WRKSRC= ${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION} DATADIRS= DTDs Templates libs plugins stylesheets @@ -29,18 +30,16 @@ SUB_LIST= LOCALBASE="${LOCALBASE}" DATAD OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/bin ${INSTALL_SCRIPT} ${WRKDIR}/fujaba.sh ${STAGEDIR}${DATADIR}/bin ${LN} -s ${DATADIR}/bin/fujaba.sh ${STAGEDIR}${PREFIX}/bin/fujaba (cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATADIRS}" ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${STAGEDIR}${DATADIR}) + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.if ${PORT_OPTIONS:MDOCS} ${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc -.endif .include <bsd.port.mk> Modified: head/devel/gnome-js-common/Makefile ============================================================================== --- head/devel/gnome-js-common/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/gnome-js-common/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -15,21 +15,21 @@ COMMENT= GNOME JavaScript common modules GNU_CONFIGURE= yes USE_GNOME= intltool USES= pathfix pkgconfig gettext gmake tar:bzip2 +NO_ARCH= yes PORTDOCS= AUTHORS COPYING INSTALL NEWS README ChangeLog OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ ${WRKSRC}/configure -.if ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \ ${WRKSRC}/Makefile.in -.else + +post-patch-DOCS-off: @${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in -.endif .include <bsd.port.mk> Modified: head/devel/go-bindata/Makefile ============================================================================== --- head/devel/go-bindata/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/go-bindata/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -21,8 +21,6 @@ STRIP= # stripping can break go binarie OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ ${MV} CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \ @@ -38,11 +36,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: .for x in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \ + ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \ ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/devel/google-sparsehash/Makefile ============================================================================== --- head/devel/google-sparsehash/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/google-sparsehash/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -18,21 +18,20 @@ USES= compiler:c++11-lang OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e \ 's|^pkgconfigdir = .*|pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in -.if ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-on: ${REINPLACE_CMD} -e \ 's|^docdir = .*|docdir = ${DOCSDIR}|' \ ${WRKSRC}/Makefile.in -.else + +post-patch-DOCS-off: ${REINPLACE_CMD} -e \ '/install-data-am/ s|install-dist_docDATA||' \ ${WRKSRC}/Makefile.in -.endif regression-test: check Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/hadoop/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -128,16 +128,16 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} + ${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR} + ${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR} .for f in ${DOC} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif - ${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR} - ${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR} - ${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR} .include <bsd.port.mk> Modified: head/devel/kBuild/Makefile ============================================================================== --- head/devel/kBuild/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/kBuild/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -45,9 +45,10 @@ ENV= .SHELL: path="/bin/sh" unsetenv=true .endif -OPTIONS_DEFINE= DOCS +BROKEN_ia64= does not compile on ia64 +BROKEN_powerpc= does not compile on powerpc -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure @@ -68,17 +69,11 @@ do-install: .endfor ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" -BROKEN= Does not compile on ia64 or powerpc -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/libatomic_ops/Makefile ============================================================================== --- head/devel/libatomic_ops/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/libatomic_ops/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -19,20 +19,19 @@ USES= libtool pathfix OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: # Inhibit installation of extra copy of GPL @${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \ ${WRKSRC}/Makefile.in -.if ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-on: # Fix documentation installation directory @${REINPLACE_CMD} -e 's,pkgdata,pkgdoc,g ; s,(datadir.*,(docdir),' \ ${WRKSRC}/doc/Makefile.in -.else + +post-patch-DOCS-off: # If documentation is not wanted, just disable it instead of fixing @${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \ ${WRKSRC}/doc/Makefile.in -.endif .include <bsd.port.mk> Modified: head/devel/libbobcat/Makefile ============================================================================== --- head/devel/libbobcat/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/libbobcat/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -41,8 +41,6 @@ SHEBANG_FILES= build \ OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \ s|"/share/doc/libbobcat3"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \ @@ -60,10 +58,10 @@ post-patch: s|-lX11|-lX11 -L${LOCALBASE}/lib| ; \ s|-lmilter|-lmilter -lpthread|' \ ${WRKSRC}/icmake/special -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCs-off: @${REINPLACE_CMD} -e 's|#define DOCOTHER||' \ ${WRKSRC}/INSTALL.im -.endif do-build: @cd ${WRKSRC} && ./build libraries all strip && ./build man Modified: head/devel/libreadline-java/Makefile ============================================================================== --- head/devel/libreadline-java/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/libreadline-java/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -29,20 +29,18 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${STAGEDIR}${JAVAJARDIR} ${INSTALL_LIB} ${WRKSRC}/libJavaReadline.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libJavaEditline.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libJavaGetline.so ${STAGEDIR}${PREFIX}/lib -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.1st ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/jython.sh ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${STAGEDIR}${DOCSDIR} -.endif .if !defined(BATCH) test: Modified: head/devel/nasm/Makefile ============================================================================== --- head/devel/nasm/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/nasm/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -28,13 +28,9 @@ RDOFF_INSTALL_TARGET= install_rdf DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX} PORTDOCS= * -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKSRC}/doc/nasmdoc.txt ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/devel/ocaml-ulex/Makefile ============================================================================== --- head/devel/ocaml-ulex/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/ocaml-ulex/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -26,14 +26,10 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> +DOCS_ALL_TARGET= doc -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= doc - -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.css ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/devel/omake/Makefile ============================================================================== --- head/devel/omake/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/omake/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -19,14 +19,12 @@ MAKE_JOBS_UNSAFE= yes INFO= omake-doc +BROKEN_powerpc= does not build on powerpc + OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${ARCH} == "powerpc" -BROKEN= Does not build on powerpc -.endif - post-patch: # # Dirty hack for PREFIX safety @@ -62,9 +60,9 @@ post-install: ${STAGEDIR}${PREFIX}/${INFO_PATH}) @(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info-* \ ${STAGEDIR}${PREFIX}/${INFO_PATH}) -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.post.mk> Modified: head/devel/p5-Parse-RecDescent/Makefile ============================================================================== --- head/devel/p5-Parse-RecDescent/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/p5-Parse-RecDescent/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -21,13 +21,10 @@ OPTIONS_DEFINE= DOCS USES= perl5 USE_PERL5= configure +NO_ARCH= yes -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/tutorial ${INSTALL_DATA} ${WRKSRC}/tutorial/* ${STAGEDIR}${DOCSDIR}/tutorial -.endif .include <bsd.port.mk> Modified: head/devel/pcsc-lite/Makefile ============================================================================== --- head/devel/pcsc-lite/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/pcsc-lite/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -43,9 +43,9 @@ post-patch: s,libusb_strerror(ret),ret," ${WRKSRC}/configure \ ${WRKSRC}/src/hotplug_libusb.c ${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/src/spy/Makefile.in -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: ${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in -.endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/devel/perlconsole/Makefile ============================================================================== --- head/devel/perlconsole/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/perlconsole/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -19,6 +19,7 @@ RUN_DEPENDS= p5-ReadLine-Gnu>=0:${PORTSD USES= perl5 shebangfix USE_PERL5= configure SHEBANG_FILES= perlconsole +NO_ARCH= yes PORTDOCS= README \ AUTHORS \ @@ -32,15 +33,7 @@ PLIST_FILES= bin/perlconsole \ OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in README AUTHORS CHANGES - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.endif ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/ ${CP} -R ${WRKSRC}/lib/PerlConsole/ \ ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/ @@ -48,4 +41,10 @@ do-install: ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole.pm ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in README AUTHORS CHANGES + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} +.endfor + .include <bsd.port.mk> Modified: head/devel/py-durus/Makefile ============================================================================== --- head/devel/py-durus/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-durus/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -16,18 +16,14 @@ COMMENT= Persistent object storage syste LICENSE= MIT USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @ ${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ACKS.txt CHANGES.txt INSTALL.txt LICENSE.txt README.txt doc/FAQ.txt @ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/devel/py-dynrules/Makefile ============================================================================== --- head/devel/py-dynrules/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-dynrules/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -14,16 +14,13 @@ LICENSE= ZLIB USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html @${TAR} -C ${WRKSRC}/doc/html -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR}/html -xf - -.endif .include <bsd.port.mk> Modified: head/devel/py-icalendar/Makefile ============================================================================== --- head/devel/py-icalendar/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-icalendar/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -17,18 +17,15 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}date USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}/ -.endif .include <bsd.port.mk> Modified: head/devel/py-jsmin/Makefile ============================================================================== --- head/devel/py-jsmin/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-jsmin/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -14,19 +14,16 @@ LICENSE= MIT USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= PKG-INFO OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif regression-test: @(cd ${WRKSRC}/${PORTNAME} && ${PYTHON_CMD} test.py) Modified: head/devel/py-sdl2/Makefile ============================================================================== --- head/devel/py-sdl2/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-sdl2/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -16,16 +16,13 @@ LICENSE= ZLIB USES= python USE_SDL= sdl2 gfx2 image2 ttf2 mixer2 USE_PYTHON= autoplist distutils +NO_ARCH= yes OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html @${TAR} -C ${WRKSRC}/doc/html -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR}/html -xf - -.endif .include <bsd.port.mk> Modified: head/devel/py-watchdog/Makefile ============================================================================== --- head/devel/py-watchdog/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/py-watchdog/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -29,17 +29,14 @@ PORTDOCS= * USE_GITHUB= yes USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes -.include <bsd.port.options.mk> +post-build-DOCS-on: + (cd ${WRKSRC}/docs ; ${MAKE_CMD} html) -.if ${PORT_OPTIONS:MDOCS} -post-build: - (cd ${WRKSRC}/docs ; ${MAKE} html) - -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs/build/html ; \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo") -.endif .include <bsd.port.mk> Modified: head/devel/pyst/Makefile ============================================================================== --- head/devel/pyst/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/pyst/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -14,19 +14,16 @@ LICENSE_COMB= dual USES= python:2 USE_PYTHON= distutils +NO_ARCH= yes PORTDOCS= README README.html ChangeLog OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/devel/quilt/Makefile ============================================================================== --- head/devel/quilt/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/quilt/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -22,6 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ formail:${PORTSDIR}/mail/procmail USES= desthack gmake perl5 +NO_ARCH= yes OPTIONS_DEFINE= RPMBUILD DOCS NLS OPTIONS_SUB= yes @@ -41,6 +42,8 @@ RPMBUILD_CONFIGURE_OFF= --without-rpmbui NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls +DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-Makefile.in + .include <bsd.port.options.mk> .if !exists(${LOCALBASE}/sbin/sendmail) @@ -49,10 +52,6 @@ PLIST_SUB+= SENDMAIL="" PLIST_SUB+= SENDMAIL="@comment " .endif -.if ! ${PORT_OPTIONS:MDOCS} -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Makefile.in -.endif - post-extract: @${REINPLACE_CMD} -e 's|$$(docdir)/$$(PACKAGE)-$$(VERSION)|$$(docdir)/$$(PACKAGE)|g' \ ${WRKSRC}/Makefile.in Modified: head/devel/seed/Makefile ============================================================================== --- head/devel/seed/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/seed/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -31,18 +31,16 @@ CONFIGURE_ARGS+=--enable-gtk-doc=no --wi DATADIR= share/seed-gtk3 INSTALL_TARGET= install-strip -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/libseed/Makefile.in @${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: @${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \ ${WRKSRC}/Makefile.in -.endif pre-build: cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \ Modified: head/devel/tcltls/Makefile ============================================================================== --- head/devel/tcltls/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/tcltls/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -32,8 +32,6 @@ PLIST_FILES= include/tls.h \ lib/${TCLPKG}/tls.tcl PORTDOCS= * -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e \ 's,package require tls.*,load ${WRKSRC}/libtls.so.1;\ @@ -42,11 +40,9 @@ post-patch: # The tests in ciphers.test are meaningless so far: ${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR} -.endif xregression-test test check: build cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY="${WRKSRC}" \ Modified: head/devel/tkcon/Makefile ============================================================================== --- head/devel/tkcon/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/tkcon/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -12,23 +12,22 @@ COMMENT= Tk console for Tcl OPTIONS_DEFINE= DOCS NO_BUILD= yes +NO_ARCH= yes USES+= tk PORTDOCS= * PLIST_FILES= bin/${PORTNAME} -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e \ 's|%%DOCSDIR%%|${DOCSDIR}|g; s|%%WISH%%|${WISH}|g' ${WRKSRC}/${PORTNAME}.tcl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/README.${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/devel/xmltooling/Makefile ============================================================================== --- head/devel/xmltooling/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/xmltooling/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -26,13 +26,11 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \ ${WRKSRC}/doc/Makefile.in -.if empty(PORT_OPTIONS:MDOCS) + +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in -.endif .include <bsd.port.mk> Modified: head/devel/zookeeper/Makefile ============================================================================== --- head/devel/zookeeper/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/devel/zookeeper/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -25,6 +25,7 @@ JAVA_RUN= yes USE_RC_SUBR= zookeeper NO_BUILD= yes +NO_ARCH= yes SCRIPTS= zkCleanup.sh \ zkCli.sh \ @@ -59,17 +60,15 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/${PORTNAME} ${LN} -s ${PREFIX}/${PORTNAME}/bin/zkCli.sh ${STAGEDIR}${PREFIX}/bin/zkCli.sh -.include <bsd.port.options.mk> - post-install: @${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} @${MKDIR} ${STAGEDIR}${ZOOKEEPER_RUNDIR} -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/translations ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/scripts ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/css -.endif .include <bsd.port.mk> Modified: head/net-p2p/ctorrent/Makefile ============================================================================== --- head/net-p2p/ctorrent/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/net-p2p/ctorrent/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -18,14 +18,10 @@ PORTDOCS= README-DNH.TXT UserGuide OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include <bsd.port.mk> Modified: head/net-p2p/qbittorrent/Makefile ============================================================================== --- head/net-p2p/qbittorrent/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/net-p2p/qbittorrent/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -58,11 +58,6 @@ CONFIGURE_ARGS+= --disable-gui .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif - .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no" @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \ @@ -74,4 +69,8 @@ post-install: .endif @${RM} -rf ${STAGEDIR}${PREFIX}/share/man +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> Modified: head/net-p2p/twister/Makefile ============================================================================== --- head/net-p2p/twister/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/net-p2p/twister/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -59,9 +59,9 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/twisterd ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/news/golded+/Makefile ============================================================================== --- head/news/golded+/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/news/golded+/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -24,13 +24,8 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -SUB_LIST= NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}" -.else -SUB_LIST= NOTEWORK="" -.endif +DOCS_SUB_LIST= NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}" +DOCS_SUB_LIST_OFF= NOTEWORK="" post-patch: @${SED}\ @@ -52,6 +47,8 @@ do-install: ${FIND} ${WRKSRC}/cfgs/$i -maxdepth 1 -type f |\ ${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${STAGEDIR}${EXAMPLESDIR}/$i .endfor + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${STAGEDIR}${DOCSDIR} Modified: head/palm/pilrc/Makefile ============================================================================== --- head/palm/pilrc/Makefile Tue Sep 1 16:16:35 2015 (r395776) +++ head/palm/pilrc/Makefile Tue Sep 1 16:20:47 2015 (r395777) @@ -12,20 +12,18 @@ COMMENT= Resource compiler for Pilot app LICENSE= GPLv2 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509011620.t81GKmI2082397>