Date: Fri, 4 Jul 2014 21:53:52 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360666 - in head/net-mgmt: check_multi coovachilli ehnt fprobe netleak netspoc netustad nsca nsca27 p5-Nagios-Plugins-Memcached pmacct softflowd whatmask Message-ID: <201407042153.s64Lrqgt002704@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Jul 4 21:53:52 2014 New Revision: 360666 URL: http://svnweb.freebsd.org/changeset/ports/360666 QAT: https://qat.redports.org/buildarchive/r360666/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES. Modified: head/net-mgmt/check_multi/Makefile head/net-mgmt/coovachilli/Makefile head/net-mgmt/ehnt/Makefile head/net-mgmt/fprobe/Makefile head/net-mgmt/netleak/Makefile head/net-mgmt/netspoc/Makefile head/net-mgmt/netustad/Makefile head/net-mgmt/nsca/Makefile head/net-mgmt/nsca27/Makefile head/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile head/net-mgmt/pmacct/Makefile head/net-mgmt/softflowd/Makefile head/net-mgmt/whatmask/Makefile Modified: head/net-mgmt/check_multi/Makefile ============================================================================== --- head/net-mgmt/check_multi/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/check_multi/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -23,12 +23,12 @@ PLUGIN_DIR= libexec/nagios SHEBANG_FILES= check_multi +OPTIONS_DEFINE= EXAMPLES + do-install: -${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} ${INSTALL_SCRIPT} ${WRKSRC}/check_multi ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}/ -.if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${TAR} -C ${WRKSRC}/contrib -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf - -.endif .include <bsd.port.mk> Modified: head/net-mgmt/coovachilli/Makefile ============================================================================== --- head/net-mgmt/coovachilli/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/coovachilli/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -25,13 +25,13 @@ USE_PERL5= build USE_LDCONFIG= yes USE_RC_SUBR= coovachilli +OPTIONS_DEFINE= EXAMPLES + post-install: -.if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_MAN} ${FILESDIR}/main.conf.sample ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_MAN} ${FILESDIR}/pf.conf.sample ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_MAN} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}/${EXAMPLESDIR} -.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/net-mgmt/ehnt/Makefile ============================================================================== --- head/net-mgmt/ehnt/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/ehnt/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -18,6 +18,8 @@ PLIST_DIRS+= share/ehnt PORTDOCS= README STPREFIX= ${STAGEDIR}${PREFIX} +OPTIONS_DEFINE= DOCS + post-extract: ${TOUCH} ${WRKSRC}/asnc.txt @@ -29,9 +31,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/ehntserv.8 ${STPREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/asnc.txt ${STAGEDIR}${DATADIR}/ -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.endif .include <bsd.port.mk> Modified: head/net-mgmt/fprobe/Makefile ============================================================================== --- head/net-mgmt/fprobe/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/fprobe/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -17,15 +17,15 @@ SUB_LIST= NAME=${PORTNAME} PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/fprobe PORTDOCS= ChangeLog README +OPTIONS_DEFINE= DOCS + post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/net-mgmt/netleak/Makefile ============================================================================== --- head/net-mgmt/netleak/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/netleak/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -27,10 +27,10 @@ SHEBANG_FILES= netleak netleakd PORTDOCS= BUGS README TODO +OPTIONS_DEFINE= DOCS + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/net-mgmt/netspoc/Makefile ============================================================================== --- head/net-mgmt/netspoc/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/netspoc/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -19,17 +19,15 @@ USE_PERL5= configure PORTDOCS= * PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EXAMPLES + post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/index.shtml ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/doc - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc) -.endif -.if !defined(NOPORTEXAMPLES) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -.endif + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include <bsd.port.mk> Modified: head/net-mgmt/netustad/Makefile ============================================================================== --- head/net-mgmt/netustad/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/netustad/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -15,25 +15,20 @@ USES= gettext GNU_CONFIGURE= yes SUB_FILES= pkg-message -OPTIONS_DEFINE= SSL NLS +OPTIONS_DEFINE= SSL NLS DOCS OPTIONS_DEFAULT=SSL SSL_DESC= Use netUstad with SSL support LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} -.include <bsd.port.options.mk> +SSL_USE= OPENSSL=yes +SSL_CONFIGURE_WITH= ssl -.if ${PORT_OPTIONS:MSSL} -USE_OPENSSL= yes -.else -CONFIGURE_ARGS+= --without-ssl -.endif +NLS_CONFIGURE_WITH= nls -.if empty(PORT_OPTIONS:MNLS) -CONFIGURE_ARGS+= --without-nls -.endif +.include <bsd.port.options.mk> -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-patch: ${REINPLACE_CMD} "s/^install-data-am:.*/install-data-am:/" ${WRKSRC}/Makefile.in .endif Modified: head/net-mgmt/nsca/Makefile ============================================================================== --- head/net-mgmt/nsca/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/nsca/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -29,6 +29,8 @@ USES= perl5 CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/spool/nagios DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +OPTIONS_DEFINE= DOCS + .if !defined(_BUILDING_NSCA_CLIENT) USE_RC_SUBR= nsca PLIST_SUB+= SERVER="" @@ -61,10 +63,8 @@ do-install: .endif post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/net-mgmt/nsca27/Makefile ============================================================================== --- head/net-mgmt/nsca27/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/nsca27/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -30,6 +30,8 @@ USES= perl5 CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/spool/nagios DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +OPTIONS_DEFINE= DOCS + .if !defined(_BUILDING_NSCA_CLIENT) USE_RC_SUBR= nsca PLIST_SUB+= SERVER="" @@ -62,10 +64,8 @@ do-install: .endif post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile ============================================================================== --- head/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -21,13 +21,13 @@ RUN_DEPENDS+= ${BUILD_DEPENDS} PORTDOCS= Changes README +OPTIONS_DEFINE= DOCS + post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL} ${WRKSRC}/bin/check_memcached ${STAGEDIR}${PREFIX}/libexec/nagios/check_memcached -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif .include <bsd.port.mk> Modified: head/net-mgmt/pmacct/Makefile ============================================================================== --- head/net-mgmt/pmacct/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/pmacct/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -21,7 +21,7 @@ LDFLAGS+= "-L${LOCALBASE}/lib" PORTSCOUT= skipv:0.15.0 OPTIONS_DEFINE= MYSQL PGSQL SQLITE THREADS MMAP LAYER2 IPV6 SHARED DEBUG \ - MONGO GEOIP + MONGO GEOIP DOCS OPTIONS_DEFAULT=MMAP LAYER2 IPV6 SHARED SQLITE_DESC= Enable SQLite support @@ -29,8 +29,6 @@ MMAP_DESC= Enable mmap(2) support LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs SHARED_DESC= Enable shared objects -.include <bsd.port.options.mk> - .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" @@ -113,17 +111,13 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure post-install: -.if !defined(NOPORTEXAMPLES) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} -.endif -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} .for i in ChangeLog FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sql/* ${STAGEDIR}${DATADIR} Modified: head/net-mgmt/softflowd/Makefile ============================================================================== --- head/net-mgmt/softflowd/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/softflowd/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -18,10 +18,10 @@ PLIST_FILES= sbin/softflowd sbin/softflo PORTDOCS= README USE_RC_SUBR= softflowd +OPTIONS_DEFINE= DOCS + post-install: -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/net-mgmt/whatmask/Makefile ============================================================================== --- head/net-mgmt/whatmask/Makefile Fri Jul 4 21:45:20 2014 (r360665) +++ head/net-mgmt/whatmask/Makefile Fri Jul 4 21:53:52 2014 (r360666) @@ -15,10 +15,10 @@ GNU_CONFIGURE= yes DOCS= AUTHORS ChangeLog README -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042153.s64Lrqgt002704>