From owner-svn-ports-head@FreeBSD.ORG Tue Jul 29 00:43:42 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85E5F9CF; Tue, 29 Jul 2014 00:43:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 731E62A9B; Tue, 29 Jul 2014 00:43:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T0hgDx016770; Tue, 29 Jul 2014 00:43:42 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T0hgNe016768; Tue, 29 Jul 2014 00:43:42 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407290043.s6T0hgNe016768@svn.freebsd.org> From: John Marino Date: Tue, 29 Jul 2014 00:43:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363281 - head/net-mgmt/routers2-extras X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 00:43:42 -0000 Author: marino Date: Tue Jul 29 00:43:41 2014 New Revision: 363281 URL: http://svnweb.freebsd.org/changeset/ports/363281 QAT: https://qat.redports.org/buildarchive/r363281/ Log: Stage net-mgmt/routers2-extras and cleanup * stage support * use PORTDOCS (remove from pkg-plist) * use DOCS instead of NOPORTDOCS * get rid of 5 unnecessary for loops PR: 191709 Submitted by: Dan Lukes Modified++: marino Modified: head/net-mgmt/routers2-extras/Makefile head/net-mgmt/routers2-extras/pkg-plist Modified: head/net-mgmt/routers2-extras/Makefile ============================================================================== --- head/net-mgmt/routers2-extras/Makefile Tue Jul 29 00:39:33 2014 (r363280) +++ head/net-mgmt/routers2-extras/Makefile Tue Jul 29 00:43:41 2014 (r363281) @@ -18,39 +18,37 @@ RUN_DEPENDS= ${LOCALBASE}/www/routers2/r WRKSRC= ${WRKDIR}/routers2-v${PORTVERSION}/extras USES= perl5 - NO_BUILD= YES +PORTDOCS= README *.txt + +OPTIONS_DEFINE= DOCS + +.include -NO_STAGE= yes post-patch: - for file in buildwan.pl cfgmaker_host.pl 95.pl ; do \ - ${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|' ${WRKSRC}/$$file; \ - done - for file in cfgmaker_host.pl ; do \ - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/$$file; \ - done + ${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/buildwan.pl \ + ${WRKSRC}/cfgmaker_host.pl \ + ${WRKSRC}/95.pl do-install: - ${MKDIR} -m 755 ${PREFIX}/www/routers2/extras -.if !defined(NOPORTDOCS) - ${MKDIR} -m 755 ${DOCSDIR} - for file in README *.txt; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \ - done + ${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2/extras/templates + cd ${WRKSRC}; ${INSTALL_SCRIPT} buildwan.pl cfgmaker_host.pl \ + check_vmware.pl check_foundry checkagent gather.pl \ + getstats.sh graphprune.pl mrtg-apache mrtg-nrpe.pl \ + mrtg-nrpe.sh mrtg-pnsclient.pl mrtg-portsinuse.pl \ + rrd-archive-clean.pl rrd-archive.pl rrdextend.pl \ + winalert.pl targetnames/targetnames.pl \ + ${STAGEDIR}${PREFIX}/www/routers2/extras + cd ${WRKSRC}; ${INSTALL_DATA} mrtg-nrpe.cfg mrtg-pnsclient.cfg \ + rrd-archive.conf winalert.conf \ + ${STAGEDIR}${PREFIX}/www/routers2/extras + cd ${WRKSRC}; ${INSTALL_DATA} mrtg-templates/* \ + ${STAGEDIR}${PREFIX}/www/routers2/extras/templates +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}; ${INSTALL_DATA} README *.txt ${STAGEDIR}${DOCSDIR} .endif - for file in buildwan.pl cfgmaker_host.pl check_vmware.pl check_foundry checkagent \ - gather.pl getstats.sh graphprune.pl mrtg-apache mrtg-nrpe.pl mrtg-nrpe.sh \ - mrtg-pnsclient.pl mrtg-portsinuse.pl rrd-archive-clean.pl \ - rrd-archive.pl rrdextend.pl \ - winalert.pl targetnames/targetnames.pl; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/www/routers2/extras; \ - done - for file in mrtg-nrpe.cfg mrtg-pnsclient.cfg rrd-archive.conf winalert.conf ; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/www/routers2/extras; \ - done - ${MKDIR} -m 755 ${PREFIX}/www/routers2/extras/templates - for file in mrtg-templates/* ; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/www/routers2/extras/templates; \ - done .include Modified: head/net-mgmt/routers2-extras/pkg-plist ============================================================================== --- head/net-mgmt/routers2-extras/pkg-plist Tue Jul 29 00:39:33 2014 (r363280) +++ head/net-mgmt/routers2-extras/pkg-plist Tue Jul 29 00:43:41 2014 (r363281) @@ -25,13 +25,5 @@ www/routers2/extras/templates/template-m www/routers2/extras/templates/template-mrtg-pnsclient www/routers2/extras/winalert.conf www/routers2/extras/winalert.pl -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/buildwan.txt -%%PORTDOCS%%%%DOCSDIR%%/graphprune.txt -%%PORTDOCS%%%%DOCSDIR%%/mrtg-nrpe.txt -%%PORTDOCS%%%%DOCSDIR%%/mrtg-pnsclient.txt -%%PORTDOCS%%%%DOCSDIR%%/rrd-archive.txt -%%PORTDOCS%%%%DOCSDIR%%/winalert.txt @dirrm www/routers2/extras/templates @dirrm www/routers2/extras -%%PORTDOCS%%@dirrm %%DOCSDIR%%