Date: Fri, 27 Dec 2013 14:47:58 +0000 (UTC) From: Philippe Audeoud <jadawin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337733 - in head: misc/mirmon misc/yaunc net-mgmt/disco net-mgmt/p5-Net-CIDR net-p2p/rtgui Message-ID: <201312271447.rBRElwBd074974@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jadawin Date: Fri Dec 27 14:47:58 2013 New Revision: 337733 URL: http://svnweb.freebsd.org/changeset/ports/337733 Log: - support STAGE Modified: head/misc/mirmon/Makefile head/misc/yaunc/Makefile (contents, props changed) head/net-mgmt/disco/Makefile (contents, props changed) head/net-mgmt/p5-Net-CIDR/Makefile head/net-mgmt/p5-Net-CIDR/pkg-plist (contents, props changed) head/net-p2p/rtgui/Makefile Modified: head/misc/mirmon/Makefile ============================================================================== --- head/misc/mirmon/Makefile Fri Dec 27 14:23:06 2013 (r337732) +++ head/misc/mirmon/Makefile Fri Dec 27 14:47:58 2013 (r337733) @@ -14,12 +14,11 @@ USES= perl5 USE_PERL5= run SUB_FILES= pkg-message -SUB_LIST= PREFIX=${PREFIX} +SUB_LIST= PREFIX=${STAGEDIR}${PREFIX} PLIST_FILES= bin/mirmon bin/probe MAN1= mirmon.1 -NO_STAGE= yes .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MDOCS} @@ -33,18 +32,17 @@ post-patch: -e "s,/usr/bin/rsync,${LOCALBASE}/bin/rsync," ${WRKSRC}/probe do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/mirmon ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/probe ${PREFIX}/bin - @${MKDIR} ${DATADIR} - ${CP} -R ${WRKSRC}/countries.list ${WRKSRC}/icons ${DATADIR} - @${FIND} ${DATADIR} ! -type d | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${DATADIR} -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} - ${INSTALL_MAN} ${WRKSRC}/mirmon.1 ${MANPREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/mirmon ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/probe ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -R ${WRKSRC}/countries.list ${WRKSRC}/icons ${STAGEDIR}${DATADIR} + @${FIND} ${STAGEDIR}${DATADIR} ! -type d | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${DATADIR} -type d | ${SORT} -r | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .if ! ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${CP} ${WRKSRC}/mirmon.html ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/mirmon.html ${STAGEDIR}${DOCSDIR} .endif post-install: Modified: head/misc/yaunc/Makefile ============================================================================== --- head/misc/yaunc/Makefile Fri Dec 27 14:23:06 2013 (r337732) +++ head/misc/yaunc/Makefile Fri Dec 27 14:47:58 2013 (r337733) @@ -10,22 +10,20 @@ MAINTAINER= jadawin@FreeBSD.org COMMENT= Yet another uptimes.net client ALL_TARGET= bsd -CFLAGS+= -DCONFFILE=\\\"${PREFIX}/etc/yaunc.conf\\\" +CFLAGS+= -DCONFFILE=\\\"${STAGEDIR}${PREFIX}/etc/yaunc.conf\\\" PLIST_FILES= bin/yaunc \ - etc/yaunc.conf.sample + etc/yaunc.conf.sample \ + man/man1/yaunc.1.gz USE_RC_SUBR= yaunc -MAN1= yaunc.1 - -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/yaunc.1 + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${STAGEDIR}${PREFIX}|g" ${WRKSRC}/yaunc.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/yaunc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} -m 600 ${WRKSRC}/yaunc.conf ${PREFIX}/etc/yaunc.conf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/yaunc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} -m 600 ${WRKSRC}/yaunc.conf ${STAGEDIR}${PREFIX}/etc/yaunc.conf.sample .include <bsd.port.mk> Modified: head/net-mgmt/disco/Makefile ============================================================================== --- head/net-mgmt/disco/Makefile Fri Dec 27 14:23:06 2013 (r337732) +++ head/net-mgmt/disco/Makefile Fri Dec 27 14:47:58 2013 (r337733) @@ -16,15 +16,15 @@ CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/${PORTNAME} -PORTDOCS= README PLIST_FILES= bin/disco bin/disco.fp -NO_STAGE= yes +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ! ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-mgmt/p5-Net-CIDR/Makefile ============================================================================== --- head/net-mgmt/p5-Net-CIDR/Makefile Fri Dec 27 14:23:06 2013 (r337732) +++ head/net-mgmt/p5-Net-CIDR/Makefile Fri Dec 27 14:47:58 2013 (r337733) @@ -12,7 +12,4 @@ COMMENT= Perl module to manipulate IPv4/ USES= perl5 USE_PERL5= configure -MAN3= Net::CIDR.3 - -NO_STAGE= yes .include <bsd.port.mk> Modified: head/net-mgmt/p5-Net-CIDR/pkg-plist ============================================================================== --- head/net-mgmt/p5-Net-CIDR/pkg-plist Fri Dec 27 14:23:06 2013 (r337732) +++ head/net-mgmt/p5-Net-CIDR/pkg-plist Fri Dec 27 14:47:58 2013 (r337733) @@ -1,3 +1,4 @@ +%%PERL5_MAN3%%/Net::CIDR.3.gz %%SITE_PERL%%/Net/CIDR.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR Modified: head/net-p2p/rtgui/Makefile ============================================================================== --- head/net-p2p/rtgui/Makefile Fri Dec 27 14:23:06 2013 (r337732) +++ head/net-p2p/rtgui/Makefile Fri Dec 27 14:47:58 2013 (r337733) @@ -17,7 +17,6 @@ OPTIONS_DEFAULTS= APACHE BUILD_DEPENDS+= xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MAPACHE} @@ -37,19 +36,15 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -SUB_LIST= WWWDIR=${WWWDIR} \ - PORTNAME=${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's/import_request_variables("gp","r_")/extract(\$_REQUEST, EXTR_PREFIX_ALL|EXTR_REFS, "r")/' ${WRKSRC}/*.php - @${FIND} ${WRKSRC} -name "*.bak" -delete + @${FIND} ${WRKSRC} -name "*.bak" -delete + @${FIND} ${WRKSRC} -name "*.php~" -delete do-install: - ${MKDIR} ${WWWDIR} - ${RM} ${WRKSRC}/functions.php~ - ${RM} ${WRKSRC}/index.php~ - ${CP} -r ${WRKSRC}/* ${WWWDIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} + ${CP} -r ${WRKSRC}/* ${STAGEDIR}${WWWDIR} post-install: @${CAT} ${PKGMESSAGE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312271447.rBRElwBd074974>