5 files changed, 25 insertions, 20 deletions

diff --git a/sysutils/enteruser/Makefile b/sysutils/enteruser/Makefile
index 12dc7902a213..e8b83f737ef2 100644
--- a/sysutils/enteruser/Makefile
+++ b/sysutils/enteruser/Makefile
@@ -18,13 +18,12 @@ NO_BUILD=	yes
 
 SHEBANG_FILES=	enteruser
 
-NO_STAGE=	yes
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/enteruser ${PREFIX}/sbin
-	${LN} -f ${PREFIX}/sbin/enteruser ${PREFIX}/sbin/queueuser
+	${INSTALL_SCRIPT} ${WRKSRC}/enteruser ${STAGEDIR}${PREFIX}/sbin
+	@cd ${STAGEDIR}${PREFIX}/sbin; ${LN} -sf enteruser queueuser
 
 .include <bsd.port.mk>
diff --git a/sysutils/enteruser/pkg-plist b/sysutils/enteruser/pkg-plist
index 42066b28f1fb..fe35aa31f7a2 100644
--- a/sysutils/enteruser/pkg-plist
+++ b/sysutils/enteruser/pkg-plist
@@ -1,3 +1,2 @@
 sbin/enteruser
-@exec ln -f %D/sbin/enteruser %D/sbin/queueuser
-@unexec rm -f %D/sbin/queueuser
+sbin/queueuser
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile
index 9749acbd2270..b5df4911e82e 100644
--- a/sysutils/etcmerge/Makefile
+++ b/sysutils/etcmerge/Makefile
@@ -16,12 +16,10 @@ NO_WRKSUBDIR=	yes
 
 SRC=		${.CURDIR}/src
 
-MAN8=		${PORTNAME}.8
-PLIST_FILES=	sbin/etcmerge
+PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/etcmerge
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${PREFIX}/sbin/${PORTNAME}
-	${INSTALL_MAN} ${SRC}/${PORTNAME}.8 ${PREFIX}/man/man8
+	${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
+	${INSTALL_MAN} ${SRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 9f3d5a0c68c8..6d8cab93d316 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -14,12 +14,10 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+OPTIONS_DEFINE=	DOCS
 
-MAN8=		${PORTNAME}.8
-PORTDOCS=	*
-PLIST_FILES=	sbin/${PORTNAME}
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	cd ${WRKSRC}; \
 	${SED} -e 's|!!DOCDIR!!|${DOCSDIR}|g' \
@@ -28,13 +26,13 @@ post-patch:
 		-e 's/(DIR)[\t]*[?]=/$$1=/;' Makefile
 
 do-install:
-	${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MAN8PREFIX}/man/man8
+	${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/English
-	${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${DOCSDIR}/English
-	@${MKDIR} ${DOCSDIR}/Japanese
-	${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${DOCSDIR}/Japanese
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/English
+	${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${STAGEDIR}${DOCSDIR}/English
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/Japanese
+	${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${STAGEDIR}${DOCSDIR}/Japanese
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/extipl/pkg-plist b/sysutils/extipl/pkg-plist
new file mode 100644
index 000000000000..9500656114de
--- /dev/null
+++ b/sysutils/extipl/pkg-plist
@@ -0,0 +1,11 @@
+man/man8/extipl.8.gz
+sbin/extipl
+%%PORTDOCS%%%%DOCSDIR%%/English/extipl.txt
+%%PORTDOCS%%%%DOCSDIR%%/English/scorpius.txt
+%%PORTDOCS%%%%DOCSDIR%%/English/techical.txt
+%%PORTDOCS%%%%DOCSDIR%%/Japanese/extipl.txt
+%%PORTDOCS%%%%DOCSDIR%%/Japanese/scorpius.txt
+%%PORTDOCS%%%%DOCSDIR%%/Japanese/techical.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Japanese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/English
+%%PORTDOCS%%@dirrm %%DOCSDIR%%