Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Jul 2014 00:16:33 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363279 - head/net-mgmt/routers2-extensions
Message-ID:  <201407290016.s6T0GXxk003661@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue Jul 29 00:16:32 2014
New Revision: 363279
URL: http://svnweb.freebsd.org/changeset/ports/363279
QAT: https://qat.redports.org/buildarchive/r363279/

Log:
  Stage net-mgmt/routers2-extensions and cleanup
  
   * stage support
   * use PORTDOCS (remove from pkg-plist)
   * use DOCS instead of NOPORTDOCS
   * get rid of 3 unnecessary for loops
  
  PR:		191708
  Submitted by:	Dan Lukes
  Modified++:	marino

Modified:
  head/net-mgmt/routers2-extensions/Makefile
  head/net-mgmt/routers2-extensions/pkg-plist

Modified: head/net-mgmt/routers2-extensions/Makefile
==============================================================================
--- head/net-mgmt/routers2-extensions/Makefile	Tue Jul 29 00:07:32 2014	(r363278)
+++ head/net-mgmt/routers2-extensions/Makefile	Tue Jul 29 00:16:32 2014	(r363279)
@@ -21,24 +21,23 @@ WRKSRC=		${WRKDIR}/routers2-v${PORTVERSI
 USES=		perl5
 
 NO_BUILD=	YES
+PORTDOCS=	README *.txt extension.cgi.pl
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
-	for file in *.cgi ; do \
-		${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/$$file; \
-	done
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/*.cgi
 
 do-install:
-		${MKDIR} -m 755 ${PREFIX}/www/routers2/extensions
-
-.if !defined(NOPORTDOCS)
-		${MKDIR} -m 755 ${DOCSDIR}
-		for file in README *.txt extension.cgi.pl; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
-		done
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2/extensions
+	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi \
+		${STAGEDIR}${PREFIX}/www/routers2/extensions
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} README *.txt extension.cgi.pl \
+		${STAGEDIR}${DOCSDIR}
 .endif
-		for file in *.cgi; do \
-			${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/www/routers2/extensions; \
-		done
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/routers2-extensions/pkg-plist
==============================================================================
--- head/net-mgmt/routers2-extensions/pkg-plist	Tue Jul 29 00:07:32 2014	(r363278)
+++ head/net-mgmt/routers2-extensions/pkg-plist	Tue Jul 29 00:16:32 2014	(r363279)
@@ -6,16 +6,4 @@ www/routers2/extensions/routingtable.cgi
 www/routers2/extensions/showcfg.cgi
 www/routers2/extensions/tonagios.cgi
 www/routers2/extensions/trend.cgi
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/extension.cgi.pl
-%%PORTDOCS%%%%DOCSDIR%%/extension.txt
-%%PORTDOCS%%%%DOCSDIR%%/ifrouter.txt
-%%PORTDOCS%%%%DOCSDIR%%/ifstatus.txt
-%%PORTDOCS%%%%DOCSDIR%%/ifswitch.txt
-%%PORTDOCS%%%%DOCSDIR%%/pdfreport.txt
-%%PORTDOCS%%%%DOCSDIR%%/routingtable.txt
-%%PORTDOCS%%%%DOCSDIR%%/showcfg.txt
-%%PORTDOCS%%%%DOCSDIR%%/tonagios.txt
-%%PORTDOCS%%%%DOCSDIR%%/trend.txt
 @dirrm www/routers2/extensions
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407290016.s6T0GXxk003661>