diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile
index 2d64e9287300..6480ff1ace1c 100644
--- a/sysutils/hourglass/Makefile
+++ b/sysutils/hourglass/Makefile
@@ -17,7 +17,6 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/busy bin/hourglass
 PORTDOCS=	CALIBRATION
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 THREAD_LIBS=	-pthread
@@ -32,9 +31,9 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 . endfor
 .endif
 
diff --git a/sysutils/p5-Unix-Processors/Makefile b/sysutils/p5-Unix-Processors/Makefile
index 224835fa8e20..abb43147ac0a 100644
--- a/sysutils/p5-Unix-Processors/Makefile
+++ b/sysutils/p5-Unix-Processors/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Interface to processor (CPU) information
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unix::Processors.3 Unix::Processors::Info.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Unix-Processors/pkg-plist b/sysutils/p5-Unix-Processors/pkg-plist
index 76f757a4df8b..e7855172b0b5 100644
--- a/sysutils/p5-Unix-Processors/pkg-plist
+++ b/sysutils/p5-Unix-Processors/pkg-plist
@@ -3,6 +3,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors/Info.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/Processors.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/Processors.so
+%%PERL5_MAN3%%/Unix::Processors.3.gz
+%%PERL5_MAN3%%/Unix::Processors::Info.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile
index ceab11f26405..915a09009946 100644
--- a/sysutils/tenshi/Makefile
+++ b/sysutils/tenshi/Makefile
@@ -12,34 +12,34 @@ COMMENT=		Tenshi is a log monitoring program, designed to watch multiple logs
 RUN_DEPENDS=		${LOCALBASE}/bin/gtail:${PORTSDIR}/sysutils/coreutils \
 			p5-IO-BufferedSelect>=0:${PORTSDIR}/devel/p5-IO-BufferedSelect
 
-MAN8=			tenshi.8
-
 USES=			perl5
 USE_PERL5=		run build patch
 NO_BUILD=		yes
 USE_RC_SUBR=		tenshi
 SUB_LIST=		PERL=${PERL}
 
-PLIST_FILES=		bin/tenshi etc/tenshi.conf.sample
-MAN8=			tenshi.8
+OPTIONS_DEFINE=		DOCS
+
+PLIST_FILES=		bin/tenshi etc/tenshi.conf.sample man/man8/tenshi.8.gz
 
 PORTDOCS=		README Changelog
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${PERL5} -pi.bak -e ' \
 		s"/usr/bin/perl"${PERL}" if $$. == 1; \
-		s"/etc/tenshi/tenshi\.conf"${PREFIX}/etc/tenshi.conf"; \
+		s"/etc/tenshi/tenshi\.conf"${STAGEDIR}${PREFIX}/etc/tenshi.conf"; \
 		s"/usr/bin/tail"${LOCALBASE}/bin/gtail"; \
 		' ${WRKSRC}/tenshi
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${PREFIX}/etc/tenshi.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${MAN8PREFIX}/man/man8
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${STAGEDIR}${PREFIX}/etc/tenshi.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index c2dfb367fb8d..f027d1cd525b 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -12,7 +12,5 @@ COMMENT=	A perl script to convert text files to PDF files
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		PDF::Create.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index 5992c7dff01d..0c799812df98 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -6,6 +6,7 @@
 %%SITE_PERL%%/PDF/Create.pm
 %%SITE_PERL%%/PDF/Image/GIF.pm
 %%SITE_PERL%%/PDF/Image/JPEG.pm
+%%PERL5_MAN3%%/PDF::Create.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create
 @dirrm %%SITE_PERL%%/PDF/Create
 @dirrm %%SITE_PERL%%/PDF/Image
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index f9f7bd382527..298faa93a0bf 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -16,8 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=	txt2html.1
-MAN3=	HTML::TextToHTML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/txt2html/pkg-plist b/textproc/txt2html/pkg-plist
index 478f6cdfc48d..d306dadee7e2 100644
--- a/textproc/txt2html/pkg-plist
+++ b/textproc/txt2html/pkg-plist
@@ -1,3 +1,5 @@
 bin/txt2html
 %%SITE_PERL%%/HTML/TextToHTML.pm
+%%PERL5_MAN3%%/HTML::TextToHTML.3.gz
+man/man1/txt2html.1.gz
 @dirrmtry %%SITE_PERL%%/HTML