Date: Thu, 24 Oct 2013 15:11:40 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331494 - in head: devel/cvsspam games/textmaze german/schwobifyer graphics/bmp2html graphics/icat mail/cyrus2courier mail/delatt mail/spfval mail/sylpheed misc/ree misc/shuffle-db net-... Message-ID: <201310241511.r9OFBerm016894@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Thu Oct 24 15:11:40 2013 New Revision: 331494 URL: http://svnweb.freebsd.org/changeset/ports/331494 Log: Support staging. Modified: head/devel/cvsspam/Makefile head/games/textmaze/Makefile head/german/schwobifyer/Makefile head/graphics/bmp2html/Makefile head/graphics/icat/Makefile head/mail/cyrus2courier/Makefile head/mail/delatt/Makefile head/mail/spfval/Makefile head/mail/sylpheed/Makefile head/misc/ree/Makefile head/misc/shuffle-db/Makefile head/net-im/bsflite/Makefile head/net-p2p/createtorrent/Makefile head/www/bannerfilter/Makefile head/www/linklint/Makefile Modified: head/devel/cvsspam/Makefile ============================================================================== --- head/devel/cvsspam/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/devel/cvsspam/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -19,7 +19,6 @@ PORTDOCS= COPYING CREDITS TODO cvsspam-d OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -31,19 +30,22 @@ post-patch: ${WRKSRC}/collect_diffs.rb do-install: - ${MKDIR} ${PREFIX}/libexec/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} .for f in collect_diffs.rb cvsspam.rb record_lastdir.rb - ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} \ + ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} .endfor - ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf ${PREFIX}/etc/cvsspam.conf.default -.if !exists(${PREFIX}/etc/cvsspam.conf) - ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf ${PREFIX}/etc/cvsspam.conf + ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf \ + ${STAGEDIR}${PREFIX}/etc/cvsspam.conf.default +.if !exists(${STAGEDIR}${PREFIX}/etc/cvsspam.conf) + ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf \ + ${STAGEDIR}${PREFIX}/etc/cvsspam.conf .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/games/textmaze/Makefile ============================================================================== --- head/games/textmaze/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/games/textmaze/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -21,8 +21,7 @@ PLIST_FILES= bin/textmaze WRKSRC= ${WRKDIR}/TextMaze -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/german/schwobifyer/Makefile ============================================================================== --- head/german/schwobifyer/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/german/schwobifyer/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -13,8 +13,7 @@ MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/schwobifyer -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/graphics/bmp2html/Makefile ============================================================================== --- head/graphics/bmp2html/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/graphics/bmp2html/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -20,7 +20,6 @@ DEFINES= -D_REENTRANT PLIST_FILES= bin/bmp2html -NO_STAGE= yes post-patch: @${RM} ${WRKSRC}/${PORTNAME} @@ -31,6 +30,6 @@ do-build: -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.o do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/graphics/icat/Makefile ============================================================================== --- head/graphics/icat/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/graphics/icat/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -25,8 +25,7 @@ PLIST_FILES= bin/icat CONFLICTS= sleuthkit-[0-9]* -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/mail/cyrus2courier/Makefile ============================================================================== --- head/mail/cyrus2courier/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/mail/cyrus2courier/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -15,12 +15,11 @@ ALL_TARGET= build PLIST_FILES= bin/cyrus2courier -NO_STAGE= yes post-patch: @${REINPLACE_CMD} '/^CFLAGS*/d; /^LDFLAGS*/d; /^CC*/d' \ ${WRKSRC}/src/Makefile.FreeBSD do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/mail/delatt/Makefile ============================================================================== --- head/mail/delatt/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/mail/delatt/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -21,8 +21,7 @@ NO_BUILD= yes SHEBANG_FILES= delatt PLIST_FILES= bin/delatt -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/mail/spfval/Makefile ============================================================================== --- head/mail/spfval/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/mail/spfval/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -15,8 +15,7 @@ MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/spfval -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/spfval ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/spfval ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/mail/sylpheed/Makefile ============================================================================== --- head/mail/sylpheed/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/mail/sylpheed/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -40,7 +40,6 @@ ONIGURUMA_DESC= Oniguruma support OPTIONS_DEFAULT=SSL GTKSPELL -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSSL} @@ -124,13 +123,13 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog INSTALL README TODO - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${i}.ja ${STAGEDIR}${DOCSDIR} .endfor .endif - @${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/ - @${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + @${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include <bsd.port.mk> Modified: head/misc/ree/Makefile ============================================================================== --- head/misc/ree/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/misc/ree/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -17,7 +17,6 @@ ONLY_FOR_ARCHS= i386 amd64 OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-build: @@ -26,12 +25,13 @@ do-build: .endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/rom-${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/fontdump ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin/rom-${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/fontdump ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/misc/shuffle-db/Makefile ============================================================================== --- head/misc/shuffle-db/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/misc/shuffle-db/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -16,8 +16,7 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/rebuild_db PLIST_FILES= bin/rebuild_db.py -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/rebuild_db.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/rebuild_db.py ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/net-im/bsflite/Makefile ============================================================================== --- head/net-im/bsflite/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/net-im/bsflite/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -15,7 +15,6 @@ PORTDOCS= COPYING ChangeLog README OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -24,14 +23,14 @@ post-patch: ${WRKSRC}/imcomm/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bsflite ${PREFIX}/bin - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/config-example ${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/bsflite ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/config-example ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-p2p/createtorrent/Makefile ============================================================================== --- head/net-p2p/createtorrent/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/net-p2p/createtorrent/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -16,8 +16,7 @@ USE_OPENSSL= yes PLIST_FILES= bin/createtorrent -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/www/bannerfilter/Makefile ============================================================================== --- head/www/bannerfilter/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/www/bannerfilter/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -25,7 +25,6 @@ CONFIG_FILES= bannerfilter.conf banners. SHEBANG_FILES= redirector.pl -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^;\ \(DATA\ =\ \).*|\1${PREFIX}/etc/${PORTNAME}/|' \ @@ -35,18 +34,18 @@ post-patch: ${WRKSRC}/update.sh do-install: - ${MKDIR} ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_SCRIPT} ${WRKSRC}/redirector.pl ${PREFIX}/libexec/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/redirector.pl ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_SCRIPT} ${WRKSRC}/update.sh \ - ${PREFIX}/bin/update-bannerfilter-rules - ${MKDIR} ${PREFIX}/etc/${PORTNAME} + ${STAGEDIR}${PREFIX}/bin/update-bannerfilter-rules + ${MKDIR} ${STAGEDIR}${ETCDIR} .for f in ${CONFIG_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/${PORTNAME}/${f}.default -.if !exists(${PREFIX}/etc/${PORTNAME}/${f}) - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ETCDIR}/${f}.default +.if !exists(${STAGEDIR}${ETCDIR}/${f}) + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ETCDIR} .endif .endfor - ${CP} -R ${WRKSRC}/www ${PREFIX}/${WWW_ROOT}/${PORTNAME} + ${CP} -R ${WRKSRC}/www ${STAGEDIR}${PREFIX}/${WWW_ROOT}/${PORTNAME} post-install: @${ECHO_MSG} "" Modified: head/www/linklint/Makefile ============================================================================== --- head/www/linklint/Makefile Thu Oct 24 15:04:53 2013 (r331493) +++ head/www/linklint/Makefile Thu Oct 24 15:11:40 2013 (r331494) @@ -18,8 +18,8 @@ SHEBANG_FILES= ${DISTNAME} PLIST_FILES= bin/linklint -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310241511.r9OFBerm016894>