4 files changed, 16 insertions, 22 deletions

diff --git a/misc/countrycodes/Makefile b/misc/countrycodes/Makefile
index 9f07cf3c38e7..8fc28ee14493 100644
--- a/misc/countrycodes/Makefile
+++ b/misc/countrycodes/Makefile
@@ -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>
diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile
index ad8655962ab0..c437a24724fb 100644
--- a/misc/ddate/Makefile
+++ b/misc/ddate/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Command to print the date in Discordian date format
 
 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 --disable-libblkid --disable-libmount \
 		--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>
diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile
index b806fb62aea9..81950fc97b16 100644
--- a/misc/gnu-watch/Makefile
+++ b/misc/gnu-watch/Makefile
@@ -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>
diff --git a/misc/shc/Makefile b/misc/shc/Makefile
index 988055290675..53b1718bcdab 100644
--- a/misc/shc/Makefile
+++ b/misc/shc/Makefile
@@ -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>