Support staging.

25 files changed, 71 insertions, 100 deletions

diff --git a/sysutils/areca-cli/Makefile b/sysutils/areca-cli/Makefile
index 5d2de92d5725..1d8f9d5e6adc 100644
--- a/sysutils/areca-cli/Makefile
+++ b/sysutils/areca-cli/Makefile
@@ -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>
diff --git a/sysutils/cdircmp/Makefile b/sysutils/cdircmp/Makefile
index ea374ccfbc82..8ad64b99a611 100644
--- a/sysutils/cdircmp/Makefile
+++ b/sysutils/cdircmp/Makefile
@@ -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>
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index 338d35a1cac3..138fa7b99396 100644
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -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>
diff --git a/sysutils/disktype/Makefile b/sysutils/disktype/Makefile
index bcd4659f18aa..1c9a7a804966 100644
--- a/sysutils/disktype/Makefile
+++ b/sysutils/disktype/Makefile
@@ -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>
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index 9eb729a5845d..f78be1c95831 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -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}
diff --git a/sysutils/dvdbackup/pkg-plist b/sysutils/dvdbackup/pkg-plist
index 1ef64ae03fc3..dfb159ce2475 100644
--- a/sysutils/dvdbackup/pkg-plist
+++ b/sysutils/dvdbackup/pkg-plist
@@ -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
diff --git a/sysutils/edid-decode/Makefile b/sysutils/edid-decode/Makefile
index a26457e4c471..5b9f274a7a7f 100644
--- a/sysutils/edid-decode/Makefile
+++ b/sysutils/edid-decode/Makefile
@@ -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>
diff --git a/sysutils/fatback/Makefile b/sysutils/fatback/Makefile
index 28ae665d08f7..bec73a8f41b9 100644
--- a/sysutils/fatback/Makefile
+++ b/sysutils/fatback/Makefile
@@ -12,28 +12,26 @@ COMMENT=	Recover deleted files from FAT filesystems
 
 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
 
diff --git a/sysutils/fatback/pkg-plist b/sysutils/fatback/pkg-plist
index e38cc82937e9..eef59a6fc385 100644
--- a/sysutils/fatback/pkg-plist
+++ b/sysutils/fatback/pkg-plist
@@ -1,4 +1,5 @@
 bin/fatback
+man/man1/fatback.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/fatback-manual.texi
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
index e1cf74742311..7efe217e8368 100644
--- a/sysutils/fdupes/Makefile
+++ b/sysutils/fdupes/Makefile
@@ -11,19 +11,16 @@ COMMENT=	Fdupes is a program for identifying or deleting duplicate files
 
 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>
diff --git a/sysutils/fusefs-ext4fuse/Makefile b/sysutils/fusefs-ext4fuse/Makefile
index 0e881e10f64f..be54a318904c 100644
--- a/sysutils/fusefs-ext4fuse/Makefile
+++ b/sysutils/fusefs-ext4fuse/Makefile
@@ -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>
diff --git a/sysutils/highlnk/Makefile b/sysutils/highlnk/Makefile
index ac005463e721..a9556d2a2ca4 100644
--- a/sysutils/highlnk/Makefile
+++ b/sysutils/highlnk/Makefile
@@ -12,13 +12,11 @@ COMMENT=	Tool to save disk space on hard disks by using hardlinks
 
 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>
diff --git a/sysutils/hilite/Makefile b/sysutils/hilite/Makefile
index 7d3f0fd27287..5b7d25c693ad 100644
--- a/sysutils/hilite/Makefile
+++ b/sysutils/hilite/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Command-line utility to highlight anything printed to stderr
 
 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}
diff --git a/sysutils/hploscripts/Makefile b/sysutils/hploscripts/Makefile
index 67cf907304b1..3f32f055795e 100644
--- a/sysutils/hploscripts/Makefile
+++ b/sysutils/hploscripts/Makefile
@@ -21,19 +21,18 @@ PORTDOCS=	iLO_perl_xml.pdf linux-LOsamplescripts.txt
 
 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
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index cd7985885c2a..fdbff6807958 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -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>
diff --git a/sysutils/logstalgia/pkg-plist b/sysutils/logstalgia/pkg-plist
index a1137b71b329..9b3ec777b6a6 100644
--- a/sysutils/logstalgia/pkg-plist
+++ b/sysutils/logstalgia/pkg-plist
@@ -1,4 +1,5 @@
 bin/logstalgia
+man/man1/logstalgia.1.gz
 %%DATADIR%%/fonts/README
 %%DATADIR%%/fonts/FreeMonoBold.ttf
 %%DATADIR%%/fonts/FreeSerif.ttf
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index 9168cf5eb9f6..11e4634057bc 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -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
diff --git a/sysutils/rej/Makefile b/sysutils/rej/Makefile
index bf300e644c30..bb9e9e1e7a5c 100644
--- a/sysutils/rej/Makefile
+++ b/sysutils/rej/Makefile
@@ -19,7 +19,6 @@ PLIST_FILES=	bin/rej bin/rej-qp bin/rej-mp
 
 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
 
diff --git a/sysutils/screenie/Makefile b/sysutils/screenie/Makefile
index bedb5ee36291..7dd23ce160f3 100644
--- a/sysutils/screenie/Makefile
+++ b/sysutils/screenie/Makefile
@@ -16,12 +16,10 @@ RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen
 
 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>
diff --git a/sysutils/tmpreaper/Makefile b/sysutils/tmpreaper/Makefile
index 0d5b1aafd3e8..651665100ee7 100644
--- a/sysutils/tmpreaper/Makefile
+++ b/sysutils/tmpreaper/Makefile
@@ -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>
diff --git a/sysutils/vii/Makefile b/sysutils/vii/Makefile
index f37854cb9e58..6debe9394ca5 100644
--- a/sysutils/vii/Makefile
+++ b/sysutils/vii/Makefile
@@ -17,15 +17,14 @@ LIB_DEPENDS=	explain:${PORTSDIR}/devel/libexplain
 
 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>
diff --git a/sysutils/watchfolder/Makefile b/sysutils/watchfolder/Makefile
index f2a816a26f0f..3ac6bb9a008d 100644
--- a/sysutils/watchfolder/Makefile
+++ b/sysutils/watchfolder/Makefile
@@ -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>
diff --git a/sysutils/weedit/Makefile b/sysutils/weedit/Makefile
index 307d84e595e3..5e33bbfb1d1f 100644
--- a/sysutils/weedit/Makefile
+++ b/sysutils/weedit/Makefile
@@ -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>
diff --git a/sysutils/wuzzah/Makefile b/sysutils/wuzzah/Makefile
index 1d917118422e..63ce9742009b 100644
--- a/sysutils/wuzzah/Makefile
+++ b/sysutils/wuzzah/Makefile
@@ -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>
diff --git a/sysutils/zeroer/Makefile b/sysutils/zeroer/Makefile
index 51fe87a0b9ec..4484a4ca15cd 100644
--- a/sysutils/zeroer/Makefile
+++ b/sysutils/zeroer/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Command-line utility for wiping unallocated space on a filesystem
 
 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>