Date: Wed, 23 Oct 2013 07:14:05 +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: r331353 - in head/sysutils: areca-cli cdircmp cmospwd disktype dvdbackup edid-decode fatback fdupes fusefs-ext4fuse highlnk hilite hploscripts logstalgia most rej screenie tmpreaper vii... Message-ID: <201310230714.r9N7E59D058665@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Wed Oct 23 07:14:05 2013 New Revision: 331353 URL: http://svnweb.freebsd.org/changeset/ports/331353 Log: Support staging. Modified: head/sysutils/areca-cli/Makefile head/sysutils/cdircmp/Makefile head/sysutils/cmospwd/Makefile head/sysutils/disktype/Makefile head/sysutils/dvdbackup/Makefile head/sysutils/dvdbackup/pkg-plist head/sysutils/edid-decode/Makefile head/sysutils/fatback/Makefile head/sysutils/fatback/pkg-plist head/sysutils/fdupes/Makefile head/sysutils/fusefs-ext4fuse/Makefile head/sysutils/highlnk/Makefile head/sysutils/hilite/Makefile head/sysutils/hploscripts/Makefile head/sysutils/logstalgia/Makefile head/sysutils/logstalgia/pkg-plist head/sysutils/most/Makefile head/sysutils/rej/Makefile head/sysutils/screenie/Makefile head/sysutils/tmpreaper/Makefile head/sysutils/vii/Makefile head/sysutils/watchfolder/Makefile head/sysutils/weedit/Makefile head/sysutils/wuzzah/Makefile head/sysutils/zeroer/Makefile Modified: head/sysutils/areca-cli/Makefile ============================================================================== --- head/sysutils/areca-cli/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/areca-cli/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -27,16 +27,15 @@ SUB_FILES+= ${PERIODICSCRIPT} WRKSRC= ${WRKDIR}/V${CLI_VER}_${CLI_REV} -NO_STAGE= yes .include <bsd.port.pre.mk> do-install: .if ${ARCH} == "i386" - ${INSTALL_PROGRAM} ${WRKSRC}/${ARCH}/cli32 ${PREFIX}/sbin/areca-cli + ${INSTALL_PROGRAM} ${WRKSRC}/${ARCH}/cli32 ${STAGEDIR}${PREFIX}/sbin/areca-cli .elif ${ARCH} == "amd64" - ${INSTALL_PROGRAM} ${WRKSRC}/x86_64/cli64 ${PREFIX}/sbin/areca-cli + ${INSTALL_PROGRAM} ${WRKSRC}/x86_64/cli64 ${STAGEDIR}${PREFIX}/sbin/areca-cli .endif - @${MKDIR} ${PREFIX}/etc/periodic/daily - ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODICSCRIPT} ${PREFIX}/etc/periodic/daily + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODICSCRIPT} ${STAGEDIR}${PREFIX}/etc/periodic/daily .include <bsd.port.post.mk> Modified: head/sysutils/cdircmp/Makefile ============================================================================== --- head/sysutils/cdircmp/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/cdircmp/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -15,12 +15,11 @@ LDFLAGS+= -lncurses -lform PLIST_FILES= bin/cdircmp -NO_STAGE= yes do-build: ${CC} ${CFLAGS} -c ${WRKSRC}/main.c -o ${WRKSRC}/main.o ${CC} ${LDFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/main.o do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/cmospwd/Makefile ============================================================================== --- head/sysutils/cmospwd/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/cmospwd/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -21,7 +21,6 @@ ONLY_FOR_ARCHS= i386 amd64 OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -34,11 +33,11 @@ do-build: ${CC} ${CFLAGS} ${WRKSRC}/src/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/sysutils/disktype/Makefile ============================================================================== --- head/sysutils/disktype/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/disktype/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -16,7 +16,6 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -26,10 +25,10 @@ post-patch: .endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${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/sysutils/dvdbackup/Makefile ============================================================================== --- head/sysutils/dvdbackup/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/dvdbackup/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -19,14 +19,12 @@ USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= dvdbackup.1 PORTDOCS= NEWS README DEFAULT_DVD_DEVICE?= /dev/cd0 OPTIONS_DEFINE= DOCS NLS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} Modified: head/sysutils/dvdbackup/pkg-plist ============================================================================== --- head/sysutils/dvdbackup/pkg-plist Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/dvdbackup/pkg-plist Wed Oct 23 07:14:05 2013 (r331353) @@ -1,4 +1,5 @@ bin/dvdbackup +man/man1/dvdbackup.1.gz %%NLS%%share/locale/da/LC_MESSAGES/dvdbackup.mo %%NLS%%share/locale/de/LC_MESSAGES/dvdbackup.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/dvdbackup.mo Modified: head/sysutils/edid-decode/Makefile ============================================================================== --- head/sysutils/edid-decode/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/edid-decode/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -15,11 +15,10 @@ USE_XZ= yes PLIST_FILES= bin/edid-decode -NO_STAGE= yes do-build: ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/fatback/Makefile ============================================================================== --- head/sysutils/fatback/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/fatback/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -12,28 +12,26 @@ COMMENT= Recover deleted files from FAT GNU_CONFIGURE= yes -MAN1= fatback.1 INFO= fatback-manual EXTRACT_AFTER_ARGS= --exclude 'getopt*' \ --exclude 'set[yl].c' OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e "s/-Werror//g" ${WRKSRC}/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/fatback-manual.info ${PREFIX}/${INFO_PATH} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/fatback-manual.info ${STAGEDIR}${PREFIX}/${INFO_PATH} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in fatback-manual.texi texinfo.tex ChangeLog AUTHORS - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/sysutils/fatback/pkg-plist ============================================================================== --- head/sysutils/fatback/pkg-plist Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/fatback/pkg-plist Wed Oct 23 07:14:05 2013 (r331353) @@ -1,4 +1,5 @@ bin/fatback +man/man1/fatback.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/fatback-manual.texi Modified: head/sysutils/fdupes/Makefile ============================================================================== --- head/sysutils/fdupes/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/fdupes/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -11,19 +11,16 @@ COMMENT= Fdupes is a program for identif LICENSE= MIT -MAN1= fdupes.1 -PLIST_FILES= bin/fdupes +PLIST_FILES= bin/fdupes man/man1/fdupes.1.gz CFLAGS+= -DVERSION=\"${PORTVERSION}\" -NO_STAGE= yes - do-build: ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/md5/md5.c \ -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/sysutils/fusefs-ext4fuse/Makefile ============================================================================== --- head/sysutils/fusefs-ext4fuse/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/fusefs-ext4fuse/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -27,8 +27,7 @@ ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/ext4fuse -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/highlnk/Makefile ============================================================================== --- head/sysutils/highlnk/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/highlnk/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -12,13 +12,11 @@ COMMENT= Tool to save disk space on hard LICENSE= GPLv2 -PLIST_FILES= bin/highlnk +PLIST_FILES= bin/highlnk man/man1/highlnk.1.gz PORTDOCS= README -MAN1= highlnk.1 OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -29,12 +27,12 @@ post-patch: ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .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/sysutils/hilite/Makefile ============================================================================== --- head/sysutils/hilite/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/hilite/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -13,7 +13,6 @@ COMMENT= Command-line utility to highlig PLIST_FILES= bin/hilite -NO_STAGE= yes do-extract: @${MKDIR} ${WRKSRC} @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} @@ -22,7 +21,7 @@ do-build: ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin post-install: @${CAT} ${PKGMESSAGE} Modified: head/sysutils/hploscripts/Makefile ============================================================================== --- head/sysutils/hploscripts/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/hploscripts/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -21,19 +21,18 @@ PORTDOCS= iLO_perl_xml.pdf linux-LOsampl OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/*.xml ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/hponcfg_reformat.xsl ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/locfg.pl ${PREFIX}/bin/locfg + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/*.xml ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/hponcfg_reformat.xsl ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/locfg.pl ${STAGEDIR}${PREFIX}/bin/locfg .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/iLO_perl_xml.pdf ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/iLO_perl_xml.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/linux-LOsamplescripts3.00.0-2.txt \ - ${DOCSDIR}/linux-LOsamplescripts.txt + ${STAGEDIR}${DOCSDIR}/linux-LOsamplescripts.txt .endif regression-test: build Modified: head/sysutils/logstalgia/Makefile ============================================================================== --- head/sysutils/logstalgia/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/logstalgia/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -23,9 +23,4 @@ USE_SDL= sdl image CFLAGS+= -L/usr/local/lib -I/usr/local/include -MANCOMPRESSED= yes - -MAN1= logstalgia.1 - -NO_STAGE= yes .include <bsd.port.mk> Modified: head/sysutils/logstalgia/pkg-plist ============================================================================== --- head/sysutils/logstalgia/pkg-plist Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/logstalgia/pkg-plist Wed Oct 23 07:14:05 2013 (r331353) @@ -1,4 +1,5 @@ bin/logstalgia +man/man1/logstalgia.1.gz %%DATADIR%%/fonts/README %%DATADIR%%/fonts/FreeMonoBold.ttf %%DATADIR%%/fonts/FreeSerif.ttf Modified: head/sysutils/most/Makefile ============================================================================== --- head/sysutils/most/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/most/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -20,13 +20,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-mmap MAKE_JOBS_UNSAFE= yes -PLIST_FILES= bin/most +PLIST_FILES= bin/most man/man1/most.1.gz PORTDOCS= README changes.txt lesskeys.rc most-fun.txt most.doc most.rc -MAN1= most.1 PORTSCOUT= skipv:5.0.0a -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \ ${WRKSRC}/src/jdmacros.h Modified: head/sysutils/rej/Makefile ============================================================================== --- head/sysutils/rej/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/rej/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -19,7 +19,6 @@ PLIST_FILES= bin/rej bin/rej-qp bin/rej- OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -27,15 +26,16 @@ post-patch: ${WRKSRC}/runtests.sh do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .for f in qp mp - ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin/${PORTNAME}-${f} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f} .endfor .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/sysutils/screenie/Makefile ============================================================================== --- head/sysutils/screenie/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/screenie/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -16,12 +16,10 @@ RUN_DEPENDS= screen:${PORTSDIR}/sysutils NO_BUILD= yes -MAN1= screenie.1 -PLIST_FILES= sbin/screenie +PLIST_FILES= sbin/screenie man/man1/screenie.1.gz -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/sysutils/tmpreaper/Makefile ============================================================================== --- head/sysutils/tmpreaper/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/tmpreaper/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -14,19 +14,17 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes USES= gmake -PLIST_FILES= sbin/tmpreaper +PLIST_FILES= sbin/tmpreaper man/man8/tmpreaper.8.gz PORTDOCS= README -MAN8= tmpreaper.8 OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/sysutils/vii/Makefile ============================================================================== --- head/sysutils/vii/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/vii/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -17,15 +17,14 @@ LIB_DEPENDS= explain:${PORTSDIR}/devel/l GNU_CONFIGURE= yes -PLIST_FILES= bin/vii -MAN1= vii.1 +PLIST_FILES= bin/vii man/man1/vii.1.gz CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/man1/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/sysutils/watchfolder/Makefile ============================================================================== --- head/sysutils/watchfolder/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/watchfolder/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -17,7 +17,6 @@ USE_RC_SUBR= watchd OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -27,13 +26,15 @@ post-patch: ${WRKSRC}/README ${WRKSRC}/watchd.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/watchd ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/watchd.conf ${PREFIX}/etc/watchd.conf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/watchd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/watchd.conf ${STAGEDIR}${PREFIX}/etc/watchd.conf.sample [ -f ${PREFIX}/etc/watchd.conf ] || \ - ${INSTALL_DATA} ${WRKSRC}/watchd.conf ${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/watchd.conf ${STAGEDIR}${PREFIX}/etc + .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/watchfolder.pdf ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/watchfolder.pdf \ + ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/sysutils/weedit/Makefile ============================================================================== --- head/sysutils/weedit/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/weedit/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -20,7 +20,6 @@ SRCF= crc32 dlink weedit md5 PLIST_FILES= bin/weedit bin/weeditreaddb -NO_STAGE= yes do-build: .for f in ${SRCF} ${CC} ${CFLAGS} -c ${WRKSRC}/${f}.c -o ${WRKSRC}/${f}.o @@ -30,7 +29,7 @@ do-build: ${SRCF:C/(.*)/${WRKSRC}\/\1.o/} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/weeditreaddb ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/weeditreaddb ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/wuzzah/Makefile ============================================================================== --- head/sysutils/wuzzah/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/wuzzah/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -14,10 +14,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes USES= gmake -PLIST_FILES= bin/wuzzah -MAN1= wuzzah.1 +PLIST_FILES= bin/wuzzah man/man1/wuzzah.1.gz -NO_STAGE= yes .include <bsd.port.pre.mk> post-patch: @@ -29,7 +27,8 @@ post-patch: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.post.mk> Modified: head/sysutils/zeroer/Makefile ============================================================================== --- head/sysutils/zeroer/Makefile Wed Oct 23 06:31:21 2013 (r331352) +++ head/sysutils/zeroer/Makefile Wed Oct 23 07:14:05 2013 (r331353) @@ -12,8 +12,7 @@ COMMENT= Command-line utility for wiping LIB_DEPENDS= popt:${PORTSDIR}/devel/popt -MAN1= zeroer.1 -PLIST_FILES= bin/zeroer +PLIST_FILES= bin/zeroer man/man1/zeroer.1.gz PORTDOCS= README CFLAGS+= -I${LOCALBASE}/include @@ -21,7 +20,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -lpopt OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-build: @@ -29,12 +27,12 @@ do-build: -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310230714.r9N7E59D058665>