Date: Fri, 25 Oct 2013 14:33:17 +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: r331588 - in head/misc: countrycodes ddate gnu-watch shc Message-ID: <201310251433.r9PEXHZs094781@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Fri Oct 25 14:33:17 2013 New Revision: 331588 URL: http://svnweb.freebsd.org/changeset/ports/331588 Log: Support staging. Modified: head/misc/countrycodes/Makefile head/misc/ddate/Makefile head/misc/gnu-watch/Makefile head/misc/shc/Makefile Modified: head/misc/countrycodes/Makefile ============================================================================== --- head/misc/countrycodes/Makefile Fri Oct 25 14:17:10 2013 (r331587) +++ head/misc/countrycodes/Makefile Fri Oct 25 14:33:17 2013 (r331588) @@ -15,21 +15,19 @@ LICENSE= GPLv2 BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${BUILD_WRKSRC} -PLIST_FILES= bin/iso3166 +PLIST_FILES= bin/iso3166 man/man1/iso3166.1.gz PORTDOCS= README -MAN1= iso3166.1 -MAKE_ARGS= prefix="${PREFIX}" CC="${CC}" CCOPTS="${CFLAGS}" WARNINGS="" +MAKE_ARGS= prefix="${STAGEDIR}${PREFIX}" CC="${CC}" CCOPTS="${CFLAGS}" WARNINGS="" OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/misc/ddate/Makefile ============================================================================== --- head/misc/ddate/Makefile Fri Oct 25 14:17:10 2013 (r331587) +++ head/misc/ddate/Makefile Fri Oct 25 14:33:17 2013 (r331588) @@ -14,7 +14,7 @@ COMMENT= Command to print the date in Di LICENSE= GPLv2 -PLIST_FILES= bin/ddate +PLIST_FILES= bin/ddate man/man1/ddate.1.gz GNU_CONFIGURE= yes USE_XZ= yes @@ -28,8 +28,6 @@ CONFIGURE_ARGS= --disable-libuuid --disa --disable-rename --disable-login --disable-sulogin \ --disable-su --disable-schedutils --disable-wall -MAN1= ddate.1 - OPTIONS_DEFINE= USFORMAT PRAISEBOB KILLBOB USFORMAT_DESC= US time format @@ -38,7 +36,6 @@ KILLBOB_DESC= Countdown to X-Day OPTIONS_DEFAULT=KILLBOB -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MUSFORMAT} @@ -58,7 +55,9 @@ do-build: -o ${WRKSRC}/misc-utils/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/misc-utils/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/misc-utils/ddate.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/misc-utils/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/misc-utils/ddate.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/misc/gnu-watch/Makefile ============================================================================== --- head/misc/gnu-watch/Makefile Fri Oct 25 14:17:10 2013 (r331587) +++ head/misc/gnu-watch/Makefile Fri Oct 25 14:33:17 2013 (r331588) @@ -16,16 +16,15 @@ LICENSE= GPLv2 LDFLAGS+= -lncurses -MAN1= gnu-watch.1 -PLIST_FILES= bin/${UNIQUENAME} +PLIST_FILES= bin/${UNIQUENAME} man/man1/gnu-watch.1.gz -NO_STAGE= yes do-build: ${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \ -o ${WRKSRC}/${UNIQUENAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${UNIQUENAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/watch.1 ${MANPREFIX}/man/man1/${UNIQUENAME}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/${UNIQUENAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/watch.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 .include <bsd.port.mk> Modified: head/misc/shc/Makefile ============================================================================== --- head/misc/shc/Makefile Fri Oct 25 14:17:10 2013 (r331587) +++ head/misc/shc/Makefile Fri Oct 25 14:33:17 2013 (r331588) @@ -11,10 +11,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ehaupt@FreeBSD.org COMMENT= Generic script compiler -MAN1= shc.1 -PLIST_FILES= bin/shc +PLIST_FILES= bin/shc man/man1/shc.1.gz -NO_STAGE= yes post-extract: @${RM} ${WRKSRC}/shc @@ -22,7 +20,7 @@ do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/shc ${WRKSRC}/${PORTNAME}-${PORTVERSION}.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/shc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/shc.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/shc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/shc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310251433.r9PEXHZs094781>