From e638299edcfecb35838ad7fad0b71c4fa5ed7639 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 28 Aug 2015 13:39:56 +0000 Subject: [PATCH] - Switch to options helpers - While here, add some NO_ARCHes and couple missing PORT_OPTIONS=DOCS Approved by: portmgr blanket --- math/asir2000/Makefile | 14 ++++++-------- math/emc2/Makefile | 9 ++++----- math/jts/Makefile | 7 +++---- math/ocaml-zarith/Makefile | 8 ++------ math/octave/Makefile | 10 ++++------ math/py-statsmodels/Makefile | 12 ++++++------ math/qhull/Makefile | 8 ++------ math/qhull5/Makefile | 6 +----- math/why3/Makefile | 6 ++---- misc/clex/Makefile | 6 +----- misc/digitemp/Makefile | 14 ++++++-------- misc/logsurfer/Makefile | 6 +----- misc/lv/Makefile | 9 ++------- misc/magicpoint/Makefile | 6 ++---- misc/rname/Makefile | 6 +----- multimedia/flvstreamer/Makefile | 10 +++------- multimedia/rtmpdump/Makefile | 6 +----- multimedia/umplayer/Makefile | 6 ++---- net-mgmt/arts++/Makefile | 6 ++---- net-mgmt/confregdecode/Makefile | 9 +++------ net-mgmt/nagios-check_email_delivery/Makefile | 9 ++++----- net-mgmt/netustad/Makefile | 6 +----- net-mgmt/percona-monitoring-plugins/Makefile | 16 +++++++--------- net-mgmt/routers2-extensions/Makefile | 7 +++---- net-mgmt/routers2/Makefile | 9 ++++----- net/cf/Makefile | 6 ++---- net/dhcp6/Makefile | 6 ++---- net/dshell/Makefile | 9 ++++----- net/findmtu/Makefile | 6 ++---- net/get_iplayer/Makefile | 7 +++---- net/gnet2/Makefile | 9 ++------- net/googlecl/Makefile | 11 +++++------ net/ipgrab/Makefile | 6 ++---- net/ladvd/Makefile | 6 +----- net/mrouted/Makefile | 6 +----- net/netselect/Makefile | 6 ++---- net/pbnc/Makefile | 7 ++----- net/ptpd2/Makefile | 12 +++++------- net/py-s3cmd/Makefile | 14 +++++++------- net/samplicator/Makefile | 6 ++---- net/skstream/Makefile | 6 +----- net/spoofer/Makefile | 5 +---- net/tcpflow/Makefile | 6 +----- net/tinyldap/Makefile | 6 ++---- net/torsocks/Makefile | 9 ++------- net/uplog/Makefile | 6 +----- net/vinagre/Makefile | 8 ++------ net/wmnetload/Makefile | 6 +----- net/x11vnc/Makefile | 6 +----- 49 files changed, 127 insertions(+), 259 deletions(-) diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile index 10e3c2fa4157..66ca14f7972b 100644 --- a/math/asir2000/Makefile +++ b/math/asir2000/Makefile @@ -42,11 +42,9 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * PORTDATA= * -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif +BROKEN_ia64= does not compile +BROKEN_powerpc= does not compile +BROKEN_sparc64= does not compile post-extract: @( cd ${WRKSRC}; ${TAR} xfz ${DISTDIR}/${GC_SRC} ) @@ -71,9 +69,9 @@ post-install: ${LN} -fs ${PREFIX}/bin/asir ${STAGEDIR}${DATADIR}/ox_launch ${LN} -fs ${DATADIR} ${STAGEDIR}${PREFIX}/lib/asir ${INSTALL_MAN} ${WRKDIR}/asirdoc/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/asirdoc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif -.include +.include diff --git a/math/emc2/Makefile b/math/emc2/Makefile index 06bc6309f691..455c6ad50d90 100644 --- a/math/emc2/Makefile +++ b/math/emc2/Makefile @@ -35,15 +35,14 @@ OPTIONS_DEFINE= DOCS DOCS_DISTFILES= RTemc2_fr.pdf RTemc2_gb.pdf -.include do-install: ${INSTALL_PROGRAM} ${WRKSRC}/emc2 ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/prf_f3d ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${DISTDIR} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${DISTDIR} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + .include diff --git a/math/jts/Makefile b/math/jts/Makefile index d898f4dc0b5a..62d1218a4b8d 100644 --- a/math/jts/Makefile +++ b/math/jts/Makefile @@ -15,6 +15,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \ USES= zip NO_BUILD= yes +NO_ARCH= yes USE_JAVA= yes NO_WRKSUBDIR= yes @@ -23,18 +24,16 @@ JARFILES= JTS_Test acme jts-${VER} OPTIONS_DEFINE= DOCS -.include - do-install: .for jar in ${JARFILES} ${INSTALL_DATA} ${WRKSRC}/lib/${jar}.jar \ ${STAGEDIR}${JAVAJARDIR}/${jar:S|-${VER}||}.jar .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif .if defined(MAINTAINER_MODE) regression-test: install diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile index aa7d75d5ff7f..ae8292f9e347 100644 --- a/math/ocaml-zarith/Makefile +++ b/math/ocaml-zarith/Makefile @@ -32,14 +32,10 @@ DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS -.include +DOCS_ALL_TARGET=doc -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= doc - -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MV} ${WRKSRC}/html ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/math/octave/Makefile b/math/octave/Makefile index 2d6489ea5bf4..550a5ddea3f7 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -70,8 +70,6 @@ ATLAS_USES= blaslapack:atlas INFO= octave liboctave -.include - post-patch: ${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc ${REINPLACE_CMD} 's+lapack lapack_rs6k+${LAPACKLIB:C/-l//}+' ${WRKSRC}/configure @@ -82,14 +80,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/etc/icons/octave.desktop \ ${STAGEDIR}${DESKTOPDIR}/www.octave.org-octave.desktop (cd ${STAGEDIR}${DATADIR} && ln -s ${PORTVERSION}/imagelib .) -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for file in liboctave/liboctave.ps \ +.for file in liboctave/liboctave.ps \ refcard/refcard-a4.ps refcard/refcard-legal.ps \ refcard/refcard-letter.ps interpreter/octave.ps ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR} -. endfor -.endif +.endfor check regression-test: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check) diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile index 9468b181f208..3330bd4e677d 100644 --- a/math/py-statsmodels/Makefile +++ b/math/py-statsmodels/Makefile @@ -32,17 +32,17 @@ GH_TAGNAME= 8e812cd PORTEXAMPLES= * PORTDOCS= README.rst README_l1.txt -.include - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nonparametric/_smoothers_lowess.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nonparametric/linbin.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/tsa/kalmanf/kalman_loglike.so -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/README_l1.txt ${STAGEDIR}${DOCSDIR} -.endif + +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/README_l1.txt ${STAGEDIR}${DOCSDIR} + .include diff --git a/math/qhull/Makefile b/math/qhull/Makefile index d48e8f1f0500..7959da7edb4f 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -18,14 +18,10 @@ CONFLICTS= qhull-1.0* afni-[0-9]* qhull5-* OPTIONS_DEFINE= DOCS +DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt + post-patch: ${REINPLACE_CMD} -e 's#share/man/man#man/man#g' \ ${WRKSRC}/CMakeLists.txt -.include - -.if empty(PORT_OPTIONS:MDOCS) -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt -.endif - .include diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile index 3e47d4588bd5..b22ac1aea83c 100644 --- a/math/qhull5/Makefile +++ b/math/qhull5/Makefile @@ -24,14 +24,10 @@ GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -.include - -pre-configure: -.if empty(PORT_OPTIONS:MDOCS) +pre-configure-DOCS-off: @${REINPLACE_CMD} -e "s|src html eg config|src config|" \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-docDATA install-examplesDATA||" \ ${WRKSRC}/src/Makefile.in -.endif .include diff --git a/math/why3/Makefile b/math/why3/Makefile index 6558b40d2866..49997e350a17 100644 --- a/math/why3/Makefile +++ b/math/why3/Makefile @@ -52,8 +52,6 @@ OPTIONS_DEFINE= DOCS MAKE_JOBS_UNSAFE= yes -.include - post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/src/util/sysutil.ml \ @@ -63,9 +61,9 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/why3* \ ${STAGEDIR}${PREFIX}/lib/why3/plugins/*.cmxs \ ${STAGEDIR}${PREFIX}/lib/why3/why3-cpulimit -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/misc/clex/Makefile b/misc/clex/Makefile index 1cd181d1b34c..ac83169d2872 100644 --- a/misc/clex/Makefile +++ b/misc/clex/Makefile @@ -31,12 +31,8 @@ post-patch: OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/misc/digitemp/Makefile b/misc/digitemp/Makefile index 52f89f3b3928..ad851714da0c 100644 --- a/misc/digitemp/Makefile +++ b/misc/digitemp/Makefile @@ -35,20 +35,18 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/digitemp_DS9097U ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} + ${INSTALL_DATA} ${FILESDIR}/digitemp.conf.sample ${STAGEDIR}${PREFIX}/etc/ + @${ECHO_MSG} "" + @${ECHO_MSG} "Sample config installed at ${PREFIX}/etc/digitemp.conf.sample" + @${ECHO_MSG} "" + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .for dir in perl python/gui python/mysql rrdb @${MKDIR} ${STAGEDIR}${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${STAGEDIR}${DOCSDIR}/${dir} \; .endfor -.endif - ${INSTALL_DATA} ${FILESDIR}/digitemp.conf.sample ${STAGEDIR}${PREFIX}/etc/ - @${ECHO_MSG} "" - @${ECHO_MSG} "Sample config installed at ${PREFIX}/etc/digitemp.conf.sample" - @${ECHO_MSG} "" .include diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile index 7319c58acf94..ae0bad2727cf 100644 --- a/misc/logsurfer/Makefile +++ b/misc/logsurfer/Makefile @@ -21,14 +21,10 @@ USE_RC_SUBR= logsurfer OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/misc/lv/Makefile b/misc/lv/Makefile index 2a808379001a..028774882831 100644 --- a/misc/lv/Makefile +++ b/misc/lv/Makefile @@ -18,15 +18,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/${DISTNAME}; \ - ${INSTALL_DATA} *.html hello.sample* ${STAGEDIR}${DOCSDIR}) -.endif + ${INSTALL_DATA} *.html hello.sample* ${STAGEDIR}${DOCSDIR}) .include diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index da1dbeef4562..e88459a39b39 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -58,8 +58,6 @@ GIF_CONFIGURE_ENABLE= gif GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CPPFLAGS= -I${LOCALBASE}/include -.include - post-patch: ${REINPLACE_CMD} -e 's|-lungif|-lgif|' \ -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ @@ -82,7 +80,8 @@ post-install: ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \ ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && \ ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ @@ -101,6 +100,5 @@ post-install: cd ${WRKSRC}/contrib && \ ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} \ ${STAGEDIR}${DOCSDIR}/scripts/ -.endif .include diff --git a/misc/rname/Makefile b/misc/rname/Makefile index f4214a4c27fa..019da748f395 100644 --- a/misc/rname/Makefile +++ b/misc/rname/Makefile @@ -15,10 +15,6 @@ USES= gmake OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install-doc -.endif +DOCS_INSTALL_TARGET= install install-doc .include diff --git a/multimedia/flvstreamer/Makefile b/multimedia/flvstreamer/Makefile index 32f77736a36b..deef028fee45 100644 --- a/multimedia/flvstreamer/Makefile +++ b/multimedia/flvstreamer/Makefile @@ -17,18 +17,14 @@ MAKE_ARGS= THREADLIB="-lpthread" XCFLAGS="${CFLAGS}" XLDFLAGS="${LDFLAGS}" PLIST_FILES= bin/flvstreamer bin/streams PORTDOCS= ChangeLog ChangeLog.rtmpdump README +OPTIONS_DEFINE= DOCS + do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:S,^bin/,,} \ ${STAGEDIR}${PREFIX}/bin -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} -post-install: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index 1f9752c0b860..e7012460f298 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -22,12 +22,8 @@ PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile index ffc529e860bb..d4b2cad78d6f 100644 --- a/multimedia/umplayer/Makefile +++ b/multimedia/umplayer/Makefile @@ -26,8 +26,6 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \ -e 's|cd src|(&| ; /cd src/s|$$|)|' \ @@ -37,10 +35,10 @@ post-patch: -e 's|/doc/packages|/doc|' \ -e 's|^.*/get_svn_revision.sh$$||' \ ${WRKSRC}/Makefile -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: @${REINPLACE_CMD} -E -e '/(install|tar).*DOC_PATH/d' \ ${WRKSRC}/Makefile -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile index 789cfb8485ad..d2ac6b2664c9 100644 --- a/net-mgmt/arts++/Makefile +++ b/net-mgmt/arts++/Makefile @@ -20,8 +20,6 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's/make_pair/std::make_pair/' \ ${WRKSRC}/classes/include/Ipv4PrefixPatricia.hh.in @@ -34,12 +32,12 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libArts.so -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for f in ChangeLog INSTALL WishList @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor @${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html -.endif .include diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile index 55f9c017f63a..df16a2c22ec2 100644 --- a/net-mgmt/confregdecode/Makefile +++ b/net-mgmt/confregdecode/Makefile @@ -16,22 +16,19 @@ ALL_TARGET= jar MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= confregdecode +NO_ARCH= yes OPTIONS_DEFINE= DOCS -.include - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/confregdecode ${STAGEDIR}${PREFIX}/bin -post-install: -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in README.txt ConfregDecode.html - ${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net-mgmt/nagios-check_email_delivery/Makefile b/net-mgmt/nagios-check_email_delivery/Makefile index 011f302829ce..765d7cdbb8e5 100644 --- a/net-mgmt/nagios-check_email_delivery/Makefile +++ b/net-mgmt/nagios-check_email_delivery/Makefile @@ -29,6 +29,7 @@ SCRIPTS= check_email_delivery check_email_delivery_epn \ SHEBANG_FILES= ${SCRIPTS} USE_PERL5= run NO_BUILD= yes +NO_ARCH= yes DOC_FILES= check_email_delivery.html check_email_delivery.pod \ check_imap_receive.html check_imap_receive.pod \ check_smtp_send.html check_smtp_send.pod \ @@ -39,8 +40,6 @@ PORTSCOUT= ignore:1 OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e \ 's|/usr/local/nagios/libexec|${PREFIX}/libexec/nagios|' \ @@ -51,11 +50,11 @@ do-install: .for file in ${SCRIPTS} ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/libexec/nagios/ .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/docs/${docfile} ${STAGEDIR}${DOCSDIR} .endfor -.endif -.include +.include diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile index 71de0c440e87..3608335e5d51 100644 --- a/net-mgmt/netustad/Makefile +++ b/net-mgmt/netustad/Makefile @@ -24,12 +24,8 @@ SSL_CONFIGURE_WITH= ssl NLS_CONFIGURE_WITH= nls -.include - -.if ! ${PORT_OPTIONS:MDOCS} -post-patch: +post-patch-DOCS-off: ${REINPLACE_CMD} "s/^install-data-am:.*/install-data-am:/" ${WRKSRC}/Makefile.in -.endif post-install: @${MV} ${STAGEDIR}${ETCDIR}/netustad.conf-dist ${STAGEDIR}${ETCDIR}/netustad.conf.sample diff --git a/net-mgmt/percona-monitoring-plugins/Makefile b/net-mgmt/percona-monitoring-plugins/Makefile index 91aa5fcc9998..4c618778ddfa 100644 --- a/net-mgmt/percona-monitoring-plugins/Makefile +++ b/net-mgmt/percona-monitoring-plugins/Makefile @@ -31,22 +31,14 @@ USE_PHP= yes WANT_PHP_CLI= yes NO_BUILD= yes +NO_ARCH= yes PORTDOCS= Changelog CACTIDIR?= share/cacti OPTIONS_DEFINE= DOCS -.include - do-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}/${doc} -.endfor -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/share/cacti/scripts ${MKDIR} ${STAGEDIR}${PREFIX}/share/percona-monitoring-plugins @@ -63,4 +55,10 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cacti/bin/* ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/nagios/bin/* ${STAGEDIR}${PREFIX}/bin +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}/${doc} +.endfor + .include diff --git a/net-mgmt/routers2-extensions/Makefile b/net-mgmt/routers2-extensions/Makefile index 506b92d2ff83..fa12e5070744 100644 --- a/net-mgmt/routers2-extensions/Makefile +++ b/net-mgmt/routers2-extensions/Makefile @@ -21,12 +21,11 @@ WRKSRC= ${WRKDIR}/routers2-v${PORTVERSION}/extensions USES= perl5 NO_BUILD= YES +NO_ARCH= yes PORTDOCS= README *.txt extension.cgi.pl OPTIONS_DEFINE= DOCS -.include - post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/*.cgi @@ -34,10 +33,10 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2/extensions ${INSTALL_SCRIPT} ${WRKSRC}/*.cgi \ ${STAGEDIR}${PREFIX}/www/routers2/extensions -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}; ${INSTALL_DATA} README *.txt extension.cgi.pl \ ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile index 38a4a4740415..18b8d9eadc01 100644 --- a/net-mgmt/routers2/Makefile +++ b/net-mgmt/routers2/Makefile @@ -24,14 +24,13 @@ RUN_DEPENDS= p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \ WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION} USES= perl5 -NO_BUILD= YES +NO_BUILD= yes +NO_ARCH= yes PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PORTDOCS= * OPTIONS_DEFINE= DOCS -.include - post-patch: @${RM} ${WRKSRC}/extras/targetnames/BER.pm \ ${WRKSRC}/extras/targetnames/SNMP_*.pm @@ -49,11 +48,11 @@ do-install: ${STAGEDIR}${PREFIX}/www/routers2/rrdicons ${INSTALL_SCRIPT} ${WRKSRC}/routers2.cgi.pl \ ${STAGEDIR}${PREFIX}/www/routers2/routers2.cgi -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}; \ ${INSTALL_DATA} CHANGES README doc/* ${STAGEDIR}${DOCSDIR} -.endif #post-install: #.if !defined(BATCH) diff --git a/net/cf/Makefile b/net/cf/Makefile index ffa9a6d0f491..0e5034709719 100644 --- a/net/cf/Makefile +++ b/net/cf/Makefile @@ -23,8 +23,6 @@ STRIP= # stripping can break go binaries OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e "s/BUILT_FROM_SOURCE/${PORTVERSION}/g" ${WRKSRC}/cf/app_constants.go @cd ${WRKSRC} ; ${MKDIR} Godeps/_workspace/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ @@ -46,11 +44,11 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/cf \ ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net/dhcp6/Makefile b/net/dhcp6/Makefile index d96073872824..e4aa5ff8e53d 100644 --- a/net/dhcp6/Makefile +++ b/net/dhcp6/Makefile @@ -22,15 +22,13 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -.include - post-install: cd ${WRKSRC} && ${INSTALL_DATA} \ dhcp6c.conf.sample dhcp6s.conf.sample \ ${STAGEDIR}${PREFIX}/etc -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/dshell/Makefile b/net/dshell/Makefile index 7b685c4bed9a..82d51da70e50 100644 --- a/net/dshell/Makefile +++ b/net/dshell/Makefile @@ -21,6 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes USES= python +NO_ARCH= yes GH_ACCOUNT= USArmyResearchLab GH_PROJECT= Dshell @@ -30,8 +31,6 @@ OPTIONS_DEFINE= DOCS MAKE_ENV+= PYTHON_CMD=${PYTHON_CMD} -.include - post-patch: .for f in bin/generate-dshellrc.py doc/generate-doc.sh ${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/${f} @@ -63,11 +62,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/.dshellrc ${STAGEDIR}/${PREFIX}/etc/dshell (cd ${WRKSRC}/lib; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell) (cd ${WRKSRC}/decoders; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell/decoders) -.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR} (cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} "-name *\.html") -.endif - ${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP .include diff --git a/net/findmtu/Makefile b/net/findmtu/Makefile index ab5600da8962..9a7d8541e117 100644 --- a/net/findmtu/Makefile +++ b/net/findmtu/Makefile @@ -13,8 +13,6 @@ OPTIONS_DEFINE= DOCS SUB_FILES= findmtu -.include - post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile.rawsocket @@ -24,10 +22,10 @@ do-configure: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/findmtu ${STAGEDIR}${PREFIX}/bin/findmtu ${INSTALL_PROGRAM} ${WRKSRC}/findmtu ${STAGEDIR}${PREFIX}/bin/findmtu.real -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.freebsd ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/get_iplayer/Makefile b/net/get_iplayer/Makefile index a7398677449c..66c8f053bffc 100644 --- a/net/get_iplayer/Makefile +++ b/net/get_iplayer/Makefile @@ -25,6 +25,7 @@ USE_PERL5= run perl_OLD_CMD= ${SETENV} perl SHEBANG_FILES= ${PORTNAME} ${PORTNAME}.cgi NO_BUILD= yes +NO_ARCH= yes USE_RC_SUBR= ${PORTNAME} @@ -43,8 +44,6 @@ PORTDOCS= CHANGELOG-get_iplayer.cgi.txt CHANGELOG.txt \ OPTIONS_DEFINE= DOCS -.include - post-patch: ${REINPLACE_CMD} -e "s|/usr/bin/get_iplayer|${PREFIX}/bin/${PORTNAME}|" \ ${WRKSRC}/README-get_iplayer.cgi.txt ${WRKSRC}/get_iplayer.cgi @@ -61,9 +60,9 @@ do-install: .for DIR in html plugins (cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${STAGEDIR}${WWWDIR}) .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif .include diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index 4981265b49b8..24e8d2c84472 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -19,13 +19,8 @@ INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --with-html-dir=${DOCSDIR} -.else -CONFIGURE_ARGS+= --without-html-dir -.endif +DOCS_CONFIGURE_ON= --with-html-dir=${DOCSDIR} +DOCS_CONFIGURE_OFF= --without-html-dir post-patch: @${REINPLACE_CMD} -e 's|GNET_INTERFACE_AGE=0|GNET_INTERFACE_AGE=8|g' \ diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile index 34cfdab62c86..eead3fce6243 100644 --- a/net/googlecl/Makefile +++ b/net/googlecl/Makefile @@ -15,19 +15,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata USES= python:2 USE_PYTHON= autoplist distutils +NO_ARCH= yes OPTIONS_DEFINE= DOCS PLIST_FILES= man/man1/google.1.gz PORTDOCS= * -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR} -.endif ${INSTALL_MAN} ${WRKSRC}/man/google.1 ${STAGEDIR}${MANPREFIX}/man/man1 +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR} + .include diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile index 4d214199ffea..3a46120bd0d3 100644 --- a/net/ipgrab/Makefile +++ b/net/ipgrab/Makefile @@ -24,15 +24,13 @@ PORTDOCS= README AUTHORS COPYING ChangeLog DEVELOPER-HOWTO \ OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_MAN} ${WRKSRC}/doc/ipgrab.8 ${STAGEDIR}${MANPREFIX}/man/man8/ ${INSTALL_DATA} ${WRKSRC}/doc/ipgrab.info ${STAGEDIR}${PREFIX}/info/ ${INSTALL_PROGRAM} ${WRKSRC}/src/ipgrab ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif .include diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile index 613c0758f17f..192aad549922 100644 --- a/net/ladvd/Makefile +++ b/net/ladvd/Makefile @@ -32,12 +32,8 @@ PLIST_FILES= man/man8/ladvd.8.gz \ OPTIONS_DEFINE= DOCS -.include - -post-patch: -.if ! ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-off: @@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \ ${WRKSRC}/doc/Makefile.in -.endif .include diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile index 6e862ab92b68..3bff7371c473 100644 --- a/net/mrouted/Makefile +++ b/net/mrouted/Makefile @@ -24,10 +24,6 @@ PLIST_FILES= sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \ man/man8/mtrace.8.gz OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -MAKE_ARGS+= datadir=${DOCSDIR} doc=yes -.endif +DOCS_MAKE_ARGS= datadir=${DOCSDIR} doc=yes .include diff --git a/net/netselect/Makefile b/net/netselect/Makefile index 3813ecd0fed7..b7d4d33297fd 100644 --- a/net/netselect/Makefile +++ b/net/netselect/Makefile @@ -23,13 +23,11 @@ do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c ${REINPLACE_CMD} -E -i "" -e 's|[[:blank:]]+$$||' ${WRKSRC}/README -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/pbnc/Makefile b/net/pbnc/Makefile index 4189b84f9294..b2d811b02188 100644 --- a/net/pbnc/Makefile +++ b/net/pbnc/Makefile @@ -17,13 +17,12 @@ RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask USES= perl5 USE_PERL5= run NO_BUILD= yes +NO_ARCH= yes PLIST_FILES= etc/pbnc.cfg bin/pbnc.pl PORTDOCS= pbnc.readme OPTIONS_DEFINE= DOCS -.include - pre-install: ${REINPLACE_CMD} 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/pbnc.pl @@ -31,10 +30,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pbnc.cfg ${STAGEDIR}${PREFIX}/etc/pbnc.cfg ${INSTALL_SCRIPT} ${WRKSRC}/pbnc.pl ${STAGEDIR}${PREFIX}/bin/pbnc.pl -.if ${PORT_OPTIONS:MDOCS} -post-install: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/ptpd2/Makefile b/net/ptpd2/Makefile index 1289d9513a41..2b800182c836 100644 --- a/net/ptpd2/Makefile +++ b/net/ptpd2/Makefile @@ -24,19 +24,17 @@ PORTDOCS= * USE_RC_SUBR= ptpd2 OPTIONS_DEFINE= DOCS SNMP -OPTIONS_DEFAULT=DOCS SNMP +OPTIONS_DEFAULT=SNMP SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/ptpd-${DISTVERSION}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.endif ${MKDIR} ${STAGEDIR}${ETCDIR} ${CP} ${FILESDIR}/*.sample ${STAGEDIR}${ETCDIR} +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR}/ptpd-${DISTVERSION}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + .include diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 97a5ffdd8589..c3ee88fd80fd 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -12,21 +12,21 @@ COMMENT= Unix-like tools to manipulate stored files from the command line LICENSE= GPLv2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil + USES= python:2 USE_PYTHON= autoplist distutils - -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil +NO_ARCH= yes OPTIONS_DEFINE= DOCS -.include - post-patch: ${REINPLACE_CMD} -e 's,share/man,man,' ${WRKSRC}/setup.py -.if ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-on: ${REINPLACE_CMD} -e 's,doc/packages,doc,' ${WRKSRC}/setup.py -.else + +post-patch-DOCS-off: ${REINPLACE_CMD} -e '/(doc_path+/d' ${WRKSRC}/setup.py -.endif .include diff --git a/net/samplicator/Makefile b/net/samplicator/Makefile index facbba891517..04b5d34d24cf 100644 --- a/net/samplicator/Makefile +++ b/net/samplicator/Makefile @@ -21,13 +21,11 @@ PORTDOCS= NEWS README OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/samplicate ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/skstream/Makefile b/net/skstream/Makefile index 78234384ebaf..6e2ba8f43f3d 100644 --- a/net/skstream/Makefile +++ b/net/skstream/Makefile @@ -16,17 +16,13 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's| install-docdataDATA | |g' ${WRKSRC}/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in README COPYING AUTHORS NEWS README.FreeSockets @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile index 1b018b690e60..6247693fb7b2 100644 --- a/net/spoofer/Makefile +++ b/net/spoofer/Makefile @@ -16,16 +16,13 @@ HAS_CONFIGURE= yes OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile index d2dfddce0d95..5d2c9ec6ea35 100644 --- a/net/tcpflow/Makefile +++ b/net/tcpflow/Makefile @@ -24,12 +24,8 @@ PORTDOCS= AUTHORS ChangeLog NEWS README OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile index 74476e837880..eb19a8f26066 100644 --- a/net/tinyldap/Makefile +++ b/net/tinyldap/Makefile @@ -30,8 +30,6 @@ TINYLDAP_DATA?= ${PREFIX}/tinyldap/data OPTIONS_DEFINE= DOCS -.include - post-patch: ${TOUCH} ${WRKSRC}/alloca.h ${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \ @@ -46,11 +44,11 @@ do-install: .for i in ${SBINFILES} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/ .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile index 0a3e1aedcbb1..c58d3de7205c 100644 --- a/net/torsocks/Makefile +++ b/net/torsocks/Makefile @@ -23,14 +23,9 @@ INSTALL_TARGET= install-strip SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= ChangeLog DEBUG SOCKS5 socks-extensions.txt -.endif + +OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} -e 's,(defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))),defined(__FreeBSD__),' ${WRKSRC}/src/lib/syscall.c diff --git a/net/uplog/Makefile b/net/uplog/Makefile index 26f886ccd477..9324905f161e 100644 --- a/net/uplog/Makefile +++ b/net/uplog/Makefile @@ -18,19 +18,15 @@ PLIST_FILES= bin/uplog OPTIONS_DEFINE= DOCS -.include - post-patch: ${REINPLACE_CMD} -e \ 's|#include ||g' \ ${WRKSRC}/${PORTNAME}.c -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 708b5931c1f4..e1b91d950bbe 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -34,7 +34,7 @@ LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= TELEPATHY RDP +OPTIONS_DEFINE= TELEPATHY RDP DOCS OPTIONS_DEFAULT=TELEPATHY RDP TELEPATHY_DESC= Telepathy integration RDP_DESC= MS Windows remote desktop support @@ -45,14 +45,10 @@ RDP_CONFIGURE_ENABLE= rdp RDP_BUILD_DEPENDS= xfreerdp:${PORTSDIR}/net/freerdp RDP_RUN_DEPENDS= xfreerdp:${PORTSDIR}/net/freerdp -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS COPYING ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile index 78c5d70d86b2..47368ed10626 100644 --- a/net/wmnetload/Makefile +++ b/net/wmnetload/Makefile @@ -20,12 +20,8 @@ GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ -.endif .include diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 668e8c4d0d19..be2af8c9af75 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -33,17 +33,13 @@ NLS_USES= gettext AVAHI_LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_OFF= --without-avahi -.include - post-patch: ${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \ -e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \ -e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif .include