Support STAGEDIR.

97 files changed, 302 insertions, 356 deletions

diff --git a/devel/p5-PAR-Dist/Makefile b/devel/p5-PAR-Dist/Makefile
index 6bd1b932d506..a2b85257e544 100644
--- a/devel/p5-PAR-Dist/Makefile
+++ b/devel/p5-PAR-Dist/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		PAR::Dist.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-PAR-Dist/pkg-plist b/devel/p5-PAR-Dist/pkg-plist
index 661d09a6d506..7740744691dc 100644
--- a/devel/p5-PAR-Dist/pkg-plist
+++ b/devel/p5-PAR-Dist/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/Dist/.packlist
+%%PERL5_MAN3%%/PAR::Dist.3.gz
 %%SITE_PERL%%/PAR/Dist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/Dist/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/Dist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR
 @dirrmtry %%SITE_PERL%%/PAR
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index caf61b3a006c..5edc3742efbd 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -18,9 +18,6 @@ USES=		perl5 pkgconfig
 USE_PERL5=	configure
 MAKE_ENV=	"LOCALBASE=${LOCALBASE}"
 
-MAN3=		Chipcard::PCSC::Card.3 Chipcard::PCSC.3
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e "s,-I/usr/local/pcsc/include,${LOCALBASE}/include/PCSC," \
 		${WRKSRC}/Makefile.PL
diff --git a/devel/p5-PCSC-Card/pkg-plist b/devel/p5-PCSC-Card/pkg-plist
index bc5dabf9807a..3f16826f3c83 100644
--- a/devel/p5-PCSC-Card/pkg-plist
+++ b/devel/p5-PCSC-Card/pkg-plist
@@ -1,11 +1,13 @@
+%%PERL5_MAN3%%/Chipcard::PCSC.3.gz
+%%PERL5_MAN3%%/Chipcard::PCSC::Card.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC/PCSC.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard
diff --git a/devel/p5-PHP-Serialization/Makefile b/devel/p5-PHP-Serialization/Makefile
index 828fa097be8c..00f3b5e783a0 100644
--- a/devel/p5-PHP-Serialization/Makefile
+++ b/devel/p5-PHP-Serialization/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Converting the output of PHP serialize() into the Perl
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		PHP::Serialization.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-PHP-Serialization/pkg-plist b/devel/p5-PHP-Serialization/pkg-plist
index aa8cf907ab76..6d5d293044b1 100644
--- a/devel/p5-PHP-Serialization/pkg-plist
+++ b/devel/p5-PHP-Serialization/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Serialization/.packlist
+%%PERL5_MAN3%%/PHP::Serialization.3.gz
 %%SITE_PERL%%/PHP/Serialization.pm
-@dirrmtry %%SITE_PERL%%/PHP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Serialization
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Serialization/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Serialization
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP
+@dirrmtry %%SITE_PERL%%/PHP
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index bd7e851b6d76..7920a35e9d2c 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::API::Hooks.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-API-Hooks/pkg-plist b/devel/p5-POE-API-Hooks/pkg-plist
index 9e74c1128768..38047e493722 100644
--- a/devel/p5-POE-API-Hooks/pkg-plist
+++ b/devel/p5-POE-API-Hooks/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks/.packlist
+%%PERL5_MAN3%%/POE::API::Hooks.3.gz
 %%SITE_PERL%%/POE/API/Hooks.pm
-@dirrmtry %%SITE_PERL%%/POE/API
-@dirrmtry %%SITE_PERL%%/POE
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/API
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index 3ab7011b785e..662ff1d19c6a 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Child.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Child/pkg-plist b/devel/p5-POE-Component-Child/pkg-plist
index 63ce76bcadb4..de8397029d78 100644
--- a/devel/p5-POE-Component-Child/pkg-plist
+++ b/devel/p5-POE-Component-Child/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/POE::Component::Child.3.gz
 %%SITE_PERL%%/POE/Component/Child.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Child/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Child
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Cron/Makefile b/devel/p5-POE-Component-Cron/Makefile
index 80e5dd74c523..0c5baf6beb38 100644
--- a/devel/p5-POE-Component-Cron/Makefile
+++ b/devel/p5-POE-Component-Cron/Makefile
@@ -23,7 +23,4 @@ RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Cron.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Cron/pkg-plist b/devel/p5-POE-Component-Cron/pkg-plist
index 527490752749..ae49d4233bb3 100644
--- a/devel/p5-POE-Component-Cron/pkg-plist
+++ b/devel/p5-POE-Component-Cron/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/POE::Component::Cron.3.gz
 %%SITE_PERL%%/POE/Component/Cron.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Cron/.packlist
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Cron
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Cron
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index cabcb262f1de..a94f972d1be4 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -19,23 +19,20 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Daemon.3
-
 PORTDOCS=	*
 
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	for i in ${WRKSRC}/eg/*forking; do \
 		${PERL} -pi -e '$$_ = undef if m{use FindBin}o;' \
 			-e 's{.FindBin::Dir(.+)$$}{/tmp$$1\nwarn "Logging to \$$logfile\\n";}o' $${i}; \
-		${INSTALL_SCRIPT} $${i} ${EXAMPLESDIR}; \
+		${INSTALL_SCRIPT} $${i} ${STAGEDIR}${EXAMPLESDIR}; \
 	done
 
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for i in ${WRKSRC}/eg/*.png ${WRKSRC}/eg/*.dot; do \
-		${INSTALL_DATA} $${i} ${DOCSDIR}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}; \
 	done
 .endif
 
diff --git a/devel/p5-POE-Component-Daemon/pkg-plist b/devel/p5-POE-Component-Daemon/pkg-plist
index 860a5448a93a..81df35b5dc00 100644
--- a/devel/p5-POE-Component-Daemon/pkg-plist
+++ b/devel/p5-POE-Component-Daemon/pkg-plist
@@ -1,10 +1,11 @@
+%%PERL5_MAN3%%/POE::Component::Daemon.3.gz
 %%SITE_PERL%%/POE/Component/Daemon.pm
 %%SITE_PERL%%/POE/Component/Daemon/Scoreboard.pm
 %%SITE_PERL%%/POE/Component/Daemon/ScoreboardSemaphore.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Daemon/.packlist
-%%EXAMPLESDIR%%/forking
-%%EXAMPLESDIR%%/preforking
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forking
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/preforking
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Daemon
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index 805f091c5662..083160872046 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -18,7 +18,4 @@ TEST_DEPENDS=	p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::DebugShell.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-DebugShell/pkg-plist b/devel/p5-POE-Component-DebugShell/pkg-plist
index e2b0487fcb0b..0d2c8bd44bc7 100644
--- a/devel/p5-POE-Component-DebugShell/pkg-plist
+++ b/devel/p5-POE-Component-DebugShell/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DebugShell/.packlist
+%%PERL5_MAN3%%/POE::Component::DebugShell.3.gz
 %%SITE_PERL%%/POE/Component/DebugShell.pm
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DebugShell/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DebugShell
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index dd72a5eec534..eafde170047a 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -23,14 +23,6 @@ USES=		perl5
 USE_PERL5=	configure
 INSTALL_TARGET=	pure_install
 
-MAN3=	POE::Component::DirWatch.3 \
-	POE::Component::DirWatch::Modified.3 \
-	POE::Component::DirWatch::New.3 \
-	POE::Component::DirWatch::Role::AIO.3 \
-	POE::Component::DirWatch::Role::Signatures.3 \
-	POE::Component::DirWatch::Unmodified.3
-
-NO_STAGE=	yes
 regression-test:
 	@(cd ${WRKSRC} && ${PERL} ${CONFIGURE_SCRIPT} && ${MAKE} test)
 
diff --git a/devel/p5-POE-Component-DirWatch/pkg-plist b/devel/p5-POE-Component-DirWatch/pkg-plist
index b22b2d1fda03..49f8cf251a9a 100644
--- a/devel/p5-POE-Component-DirWatch/pkg-plist
+++ b/devel/p5-POE-Component-DirWatch/pkg-plist
@@ -1,14 +1,20 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
+%%PERL5_MAN3%%/POE::Component::DirWatch.3.gz
+%%PERL5_MAN3%%/POE::Component::DirWatch::Modified.3.gz
+%%PERL5_MAN3%%/POE::Component::DirWatch::New.3.gz
+%%PERL5_MAN3%%/POE::Component::DirWatch::Role::AIO.3.gz
+%%PERL5_MAN3%%/POE::Component::DirWatch::Role::Signatures.3.gz
+%%PERL5_MAN3%%/POE::Component::DirWatch::Unmodified.3.gz
 %%SITE_PERL%%/POE/Component/DirWatch.pm
+%%SITE_PERL%%/POE/Component/DirWatch/Modified.pm
+%%SITE_PERL%%/POE/Component/DirWatch/New.pm
 %%SITE_PERL%%/POE/Component/DirWatch/Role/AIO.pm
 %%SITE_PERL%%/POE/Component/DirWatch/Role/Signatures.pm
 %%SITE_PERL%%/POE/Component/DirWatch/Unmodified.pm
-%%SITE_PERL%%/POE/Component/DirWatch/New.pm
-%%SITE_PERL%%/POE/Component/DirWatch/Modified.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
 @dirrm %%SITE_PERL%%/POE/Component/DirWatch/Role
 @dirrm %%SITE_PERL%%/POE/Component/DirWatch
 @dirrmtry %%SITE_PERL%%/POE/Component
 @dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 1645c19e1a92..8e3158ddff70 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::JobQueue.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-JobQueue/pkg-plist b/devel/p5-POE-Component-JobQueue/pkg-plist
index 273f06a672c0..c472c5630373 100644
--- a/devel/p5-POE-Component-JobQueue/pkg-plist
+++ b/devel/p5-POE-Component-JobQueue/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/POE::Component::JobQueue.3.gz
 %%SITE_PERL%%/POE/Component/JobQueue.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/JobQueue/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/JobQueue
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 650b69a1a586..60395360a0bd 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -19,7 +19,4 @@ TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Logger.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Logger/pkg-plist b/devel/p5-POE-Component-Logger/pkg-plist
index 8a9c2e092cb1..9c0073a02d1d 100644
--- a/devel/p5-POE-Component-Logger/pkg-plist
+++ b/devel/p5-POE-Component-Logger/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
+%%PERL5_MAN3%%/POE::Component::Logger.3.gz
 %%SITE_PERL%%/POE/Component/Logger.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index 69d1a932fd19..944ae4779d5a 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -17,8 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Pluggable.3 POE::Component::Pluggable::Pipeline.3 \
-		POE::Component::Pluggable::Constants.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Pluggable/pkg-plist b/devel/p5-POE-Component-Pluggable/pkg-plist
index ff26860cc478..ad43c2b91b15 100644
--- a/devel/p5-POE-Component-Pluggable/pkg-plist
+++ b/devel/p5-POE-Component-Pluggable/pkg-plist
@@ -1,11 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pluggable/.packlist
+%%PERL5_MAN3%%/POE::Component::Pluggable.3.gz
+%%PERL5_MAN3%%/POE::Component::Pluggable::Constants.3.gz
+%%PERL5_MAN3%%/POE::Component::Pluggable::Pipeline.3.gz
 %%SITE_PERL%%/POE/Component/Pluggable.pm
-%%SITE_PERL%%/POE/Component/Pluggable/Pipeline.pm
 %%SITE_PERL%%/POE/Component/Pluggable/Constants.pm
+%%SITE_PERL%%/POE/Component/Pluggable/Pipeline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pluggable/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pluggable
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Pluggable
+@dirrm %%SITE_PERL%%/POE/Component/Pluggable
 @dirrmtry %%SITE_PERL%%/POE/Component
 @dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 4c5c29d0ab03..8b41394b4e53 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::RSS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-RSS/pkg-plist b/devel/p5-POE-Component-RSS/pkg-plist
index 8f00185ed75e..25ac6140f373 100644
--- a/devel/p5-POE-Component-RSS/pkg-plist
+++ b/devel/p5-POE-Component-RSS/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/POE::Component::RSS.3.gz
 %%SITE_PERL%%/POE/Component/RSS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSS/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSS
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 0006dd56fbbb..8b51dec1ca2b 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::RSSAggregator.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-RSSAggregator/pkg-plist b/devel/p5-POE-Component-RSSAggregator/pkg-plist
index e2a8f68903f0..089f90070efd 100644
--- a/devel/p5-POE-Component-RSSAggregator/pkg-plist
+++ b/devel/p5-POE-Component-RSSAggregator/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/POE::Component::RSSAggregator.3.gz
 %%SITE_PERL%%/POE/Component/RSSAggregator.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSSAggregator/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSSAggregator
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index dbc135c62987..0762fb77f69e 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::TSTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-TSTP/pkg-plist b/devel/p5-POE-Component-TSTP/pkg-plist
index b188fe9266ac..d6ae2d3ed68b 100644
--- a/devel/p5-POE-Component-TSTP/pkg-plist
+++ b/devel/p5-POE-Component-TSTP/pkg-plist
@@ -1,6 +1,8 @@
+%%PERL5_MAN3%%/POE::Component::TSTP.3.gz
 %%SITE_PERL%%/POE/Component/TSTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
 @dirrmtry %%SITE_PERL%%/POE/Component
 @dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index 4a212a70deb2..078c032cc3a4 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -16,8 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		poepp.1
-MAN3=		POE::Devel::Profiler.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Devel-Profiler/pkg-plist b/devel/p5-POE-Devel-Profiler/pkg-plist
index f6d2ec60b07e..28b7014c49ee 100644
--- a/devel/p5-POE-Devel-Profiler/pkg-plist
+++ b/devel/p5-POE-Devel-Profiler/pkg-plist
@@ -1,13 +1,15 @@
 bin/poepp
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler/.packlist
+%%PERL5_MAN3%%/POE::Devel::Profiler.3.gz
 %%SITE_PERL%%/POE/Devel/Profiler.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Parser.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicGraphViz.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicSummary.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler/.packlist
+man/man1/poepp.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
 @dirrm %%SITE_PERL%%/POE/Devel/Profiler/Visualizer
 @dirrm %%SITE_PERL%%/POE/Devel/Profiler
 @dirrmtry %%SITE_PERL%%/POE/Devel
 @dirrmtry %%SITE_PERL%%/POE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index c953ae7c3c75..0647cb8124cc 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -11,13 +11,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Callback dispatch for session events
 
 RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
-BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS:=	${RUN_DEPENDS}
+TEST_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Session::MultiDispatch.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Session-MultiDispatch/pkg-plist b/devel/p5-POE-Session-MultiDispatch/pkg-plist
index 6f4a1b2a285c..d503b1bb043c 100644
--- a/devel/p5-POE-Session-MultiDispatch/pkg-plist
+++ b/devel/p5-POE-Session-MultiDispatch/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch/.packlist
+%%PERL5_MAN3%%/POE::Session::MultiDispatch.3.gz
 %%SITE_PERL%%/POE/Session/MultiDispatch.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch
-@dirrmtry %%SITE_PERL%%/POE/Session
-@dirrmtry %%SITE_PERL%%/POE
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Session
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index d6da5641aca3..97e5930ef127 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -22,13 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Callback.3 POE::Request.3 POE::Request::Emit.3 \
-		POE::Request::Recall.3 POE::Request::Return.3 \
-		POE::Request::Upward.3 POE::Stage.3 POE::Stage::App.3 \
-		POE::Stage::Echoer.3 POE::Stage::Receiver.3 \
-		POE::Stage::Resolver.3 POE::Stage::Ticker.3 \
-		POE::Watcher.3 POE::Watcher::Delay.3 POE::Watcher::Input.3 \
-		POE::Watcher::Wheel.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Stage/pkg-plist b/devel/p5-POE-Stage/pkg-plist
index 2cd3448022d5..ff7f9e44e610 100644
--- a/devel/p5-POE-Stage/pkg-plist
+++ b/devel/p5-POE-Stage/pkg-plist
@@ -1,4 +1,19 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Stage/.packlist
+%%PERL5_MAN3%%/POE::Callback.3.gz
+%%PERL5_MAN3%%/POE::Request.3.gz
+%%PERL5_MAN3%%/POE::Request::Emit.3.gz
+%%PERL5_MAN3%%/POE::Request::Recall.3.gz
+%%PERL5_MAN3%%/POE::Request::Return.3.gz
+%%PERL5_MAN3%%/POE::Request::Upward.3.gz
+%%PERL5_MAN3%%/POE::Stage.3.gz
+%%PERL5_MAN3%%/POE::Stage::App.3.gz
+%%PERL5_MAN3%%/POE::Stage::Echoer.3.gz
+%%PERL5_MAN3%%/POE::Stage::Receiver.3.gz
+%%PERL5_MAN3%%/POE::Stage::Resolver.3.gz
+%%PERL5_MAN3%%/POE::Stage::Ticker.3.gz
+%%PERL5_MAN3%%/POE::Watcher.3.gz
+%%PERL5_MAN3%%/POE::Watcher::Delay.3.gz
+%%PERL5_MAN3%%/POE::Watcher::Input.3.gz
+%%PERL5_MAN3%%/POE::Watcher::Wheel.3.gz
 %%SITE_PERL%%/POE/Callback.pm
 %%SITE_PERL%%/POE/Request.pm
 %%SITE_PERL%%/POE/Request/Emit.pm
@@ -18,10 +33,11 @@
 %%SITE_PERL%%/POE/Watcher/Wheel/ReadWrite.pm
 %%SITE_PERL%%/POE/Watcher/Wheel/Run.pm
 %%SITE_PERL%%/POE/Watcher/Wheel/SocketFactory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Stage/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Stage
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
 @dirrm %%SITE_PERL%%/POE/Watcher/Wheel
 @dirrm %%SITE_PERL%%/POE/Watcher
 @dirrm %%SITE_PERL%%/POE/Stage
 @dirrm %%SITE_PERL%%/POE/Request
 @dirrmtry %%SITE_PERL%%/POE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Stage
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-XS-Loop-Poll/Makefile b/devel/p5-POE-XS-Loop-Poll/Makefile
index d2d8d46a1850..a695ea23fbc9 100644
--- a/devel/p5-POE-XS-Loop-Poll/Makefile
+++ b/devel/p5-POE-XS-Loop-Poll/Makefile
@@ -18,7 +18,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_SCRIPT+=	Makefile.PL --default
 
-MAN3=	POE::XS::Loop::Poll.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-XS-Loop-Poll/pkg-plist b/devel/p5-POE-XS-Loop-Poll/pkg-plist
index e1f69175d204..ce42ef70aa73 100644
--- a/devel/p5-POE-XS-Loop-Poll/pkg-plist
+++ b/devel/p5-POE-XS-Loop-Poll/pkg-plist
@@ -1,11 +1,12 @@
+%%PERL5_MAN3%%/POE::XS::Loop::Poll.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Loop/Poll.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll/Poll.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll/Poll.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop/Poll
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Loop
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Loop
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Loop
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE
diff --git a/devel/p5-POE-XS-Queue-Array/Makefile b/devel/p5-POE-XS-Queue-Array/Makefile
index e957e43b8982..6631466bf991 100644
--- a/devel/p5-POE-XS-Queue-Array/Makefile
+++ b/devel/p5-POE-XS-Queue-Array/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	POE::XS::Queue::Array.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-XS-Queue-Array/pkg-plist b/devel/p5-POE-XS-Queue-Array/pkg-plist
index 111d5f40a5d4..8c9959abd969 100644
--- a/devel/p5-POE-XS-Queue-Array/pkg-plist
+++ b/devel/p5-POE-XS-Queue-Array/pkg-plist
@@ -1,11 +1,12 @@
+%%PERL5_MAN3%%/POE::XS::Queue::Array.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Queue/Array.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array/Array.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array/Array.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue/Array
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS/Queue
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Queue
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS/Queue
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 58d88e8cf0e3..458106e28d1a 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -29,36 +29,12 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	--default
 
-MAN3=		POE.3 POE::Component.3 POE::Component::Client::TCP.3 \
-		POE::Component::Server::TCP.3 POE::Driver.3 \
-		POE::Driver::SysRW.3 POE::Filter.3 \
-		POE::Filter::Block.3 POE::Filter::Grep.3 \
-		POE::Filter::HTTPD.3 POE::Filter::Line.3 \
-		POE::Filter::Map.3 POE::Filter::RecordBlock.3 \
-		POE::Filter::Reference.3 POE::Filter::Stackable.3 \
-		POE::Filter::Stream.3 POE::Kernel.3 POE::Loop.3 \
-		POE::Loop::IO_Poll.3 POE::Loop::PerlSignals.3 \
-		POE::Loop::Select.3 POE::NFA.3 POE::Pipe.3 \
-		POE::Pipe::OneWay.3 POE::Pipe::TwoWay.3 POE::Queue.3 \
-		POE::Queue::Array.3 POE::Resource.3 \
-		POE::Resource::Aliases.3 POE::Resource::Events.3 \
-		POE::Resource::Extrefs.3 POE::Resource::FileHandles.3 \
-		POE::Resource::SIDs.3 POE::Resource::Sessions.3 \
-		POE::Resource::Signals.3 POE::Resource::Clock.3 \
-		POE::Resources.3 POE::Session.3 POE::Wheel.3 \
-		POE::Wheel::Curses.3 POE::Wheel::FollowTail.3 \
-		POE::Wheel::ListenAccept.3 POE::Wheel::ReadLine.3 \
-		POE::Wheel::ReadWrite.3 POE::Wheel::Run.3 \
-		POE::Wheel::SocketFactory.3
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 test: build
diff --git a/devel/p5-POE/pkg-plist b/devel/p5-POE/pkg-plist
index bd050bb285f7..f9cd5bbb6d86 100644
--- a/devel/p5-POE/pkg-plist
+++ b/devel/p5-POE/pkg-plist
@@ -1,4 +1,49 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/.packlist
+%%PERL5_MAN3%%/POE.3.gz
+%%PERL5_MAN3%%/POE::Component.3.gz
+%%PERL5_MAN3%%/POE::Component::Client::TCP.3.gz
+%%PERL5_MAN3%%/POE::Component::Server::TCP.3.gz
+%%PERL5_MAN3%%/POE::Driver.3.gz
+%%PERL5_MAN3%%/POE::Driver::SysRW.3.gz
+%%PERL5_MAN3%%/POE::Filter.3.gz
+%%PERL5_MAN3%%/POE::Filter::Block.3.gz
+%%PERL5_MAN3%%/POE::Filter::Grep.3.gz
+%%PERL5_MAN3%%/POE::Filter::HTTPD.3.gz
+%%PERL5_MAN3%%/POE::Filter::Line.3.gz
+%%PERL5_MAN3%%/POE::Filter::Map.3.gz
+%%PERL5_MAN3%%/POE::Filter::RecordBlock.3.gz
+%%PERL5_MAN3%%/POE::Filter::Reference.3.gz
+%%PERL5_MAN3%%/POE::Filter::Stackable.3.gz
+%%PERL5_MAN3%%/POE::Filter::Stream.3.gz
+%%PERL5_MAN3%%/POE::Kernel.3.gz
+%%PERL5_MAN3%%/POE::Loop.3.gz
+%%PERL5_MAN3%%/POE::Loop::IO_Poll.3.gz
+%%PERL5_MAN3%%/POE::Loop::PerlSignals.3.gz
+%%PERL5_MAN3%%/POE::Loop::Select.3.gz
+%%PERL5_MAN3%%/POE::NFA.3.gz
+%%PERL5_MAN3%%/POE::Pipe.3.gz
+%%PERL5_MAN3%%/POE::Pipe::OneWay.3.gz
+%%PERL5_MAN3%%/POE::Pipe::TwoWay.3.gz
+%%PERL5_MAN3%%/POE::Queue.3.gz
+%%PERL5_MAN3%%/POE::Queue::Array.3.gz
+%%PERL5_MAN3%%/POE::Resource.3.gz
+%%PERL5_MAN3%%/POE::Resource::Aliases.3.gz
+%%PERL5_MAN3%%/POE::Resource::Clock.3.gz
+%%PERL5_MAN3%%/POE::Resource::Events.3.gz
+%%PERL5_MAN3%%/POE::Resource::Extrefs.3.gz
+%%PERL5_MAN3%%/POE::Resource::FileHandles.3.gz
+%%PERL5_MAN3%%/POE::Resource::SIDs.3.gz
+%%PERL5_MAN3%%/POE::Resource::Sessions.3.gz
+%%PERL5_MAN3%%/POE::Resource::Signals.3.gz
+%%PERL5_MAN3%%/POE::Resources.3.gz
+%%PERL5_MAN3%%/POE::Session.3.gz
+%%PERL5_MAN3%%/POE::Wheel.3.gz
+%%PERL5_MAN3%%/POE::Wheel::Curses.3.gz
+%%PERL5_MAN3%%/POE::Wheel::FollowTail.3.gz
+%%PERL5_MAN3%%/POE::Wheel::ListenAccept.3.gz
+%%PERL5_MAN3%%/POE::Wheel::ReadLine.3.gz
+%%PERL5_MAN3%%/POE::Wheel::ReadWrite.3.gz
+%%PERL5_MAN3%%/POE::Wheel::Run.3.gz
+%%PERL5_MAN3%%/POE::Wheel::SocketFactory.3.gz
 %%SITE_PERL%%/POE.pm
 %%SITE_PERL%%/POE/Component.pm
 %%SITE_PERL%%/POE/Component/Client/TCP.pm
@@ -45,18 +90,7 @@
 %%SITE_PERL%%/POE/Wheel/ReadWrite.pm
 %%SITE_PERL%%/POE/Wheel/Run.pm
 %%SITE_PERL%%/POE/Wheel/SocketFactory.pm
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrm %%SITE_PERL%%/POE/Driver
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Loop
-@dirrm %%SITE_PERL%%/POE/Pipe
-@dirrm %%SITE_PERL%%/POE/Queue
-@dirrm %%SITE_PERL%%/POE/Resource
-@dirrm %%SITE_PERL%%/POE/Wheel
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.samples
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/create.perl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fakelogin.perl
@@ -73,4 +107,16 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thrash.perl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/watermarks.perl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wheels2.perl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrm %%SITE_PERL%%/POE/Wheel
+@dirrm %%SITE_PERL%%/POE/Resource
+@dirrm %%SITE_PERL%%/POE/Queue
+@dirrm %%SITE_PERL%%/POE/Pipe
+@dirrm %%SITE_PERL%%/POE/Loop
+@dirrm %%SITE_PERL%%/POE/Filter
+@dirrm %%SITE_PERL%%/POE/Driver
+@dirrm %%SITE_PERL%%/POE/Component/Server
+@dirrm %%SITE_PERL%%/POE/Component/Client
+@dirrm %%SITE_PERL%%/POE/Component
+@dirrm %%SITE_PERL%%/POE
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 160d172f6615..bda3bbb290ba 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -18,9 +18,8 @@ USES=		perl5
 NO_BUILD=	YES
 PLIST_FILES=	%%SITE_PERL%%/PV.pm
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} -m 755 ${PREFIX}/${SITE_PERL_REL}/
-	${INSTALL_DATA} ${WRKSRC}/PV.pm ${PREFIX}/${SITE_PERL_REL}/
+	${MKDIR} -m 755 ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/
+	${INSTALL_DATA} ${WRKSRC}/PV.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 2f37807353b4..8b019ef53db2 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Routines for manipulating stashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	\
-	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-	p5-Module-Implementation>=0.06:${PORTSDIR}/devel/p5-Module-Implementation \
-	p5-Package-Stash-XS>=0.22:${PORTSDIR}/devel/p5-Package-Stash-XS
+BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
+		p5-Module-Implementation>=0.06:${PORTSDIR}/devel/p5-Module-Implementation \
+		p5-Package-Stash-XS>=0.22:${PORTSDIR}/devel/p5-Package-Stash-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
@@ -24,10 +23,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		package-stash-conflicts.1
-MAN3=		Package::Stash.3 \
-		Package::Stash::Conflicts.3 \
-		Package::Stash::PP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Package-Stash/pkg-plist b/devel/p5-Package-Stash/pkg-plist
index 570e98d3d4d2..60294a4132ee 100644
--- a/devel/p5-Package-Stash/pkg-plist
+++ b/devel/p5-Package-Stash/pkg-plist
@@ -1,8 +1,12 @@
 bin/package-stash-conflicts
+%%PERL5_MAN3%%/Package::Stash.3.gz
+%%PERL5_MAN3%%/Package::Stash::Conflicts.3.gz
+%%PERL5_MAN3%%/Package::Stash::PP.3.gz
 %%SITE_PERL%%/Package/Stash.pm
 %%SITE_PERL%%/Package/Stash/Conflicts.pm
 %%SITE_PERL%%/Package/Stash/PP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash/.packlist
+man/man1/package-stash-conflicts.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Stash
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package
 @dirrmtry %%SITE_PERL%%/Package/Stash
diff --git a/devel/p5-Package-Variant/Makefile b/devel/p5-Package-Variant/Makefile
index 164a05065bb6..7335da80dabe 100644
--- a/devel/p5-Package-Variant/Makefile
+++ b/devel/p5-Package-Variant/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Package::Variant.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Package-Variant/pkg-plist b/devel/p5-Package-Variant/pkg-plist
index 2a591899ac9c..2fb827c5d5a0 100644
--- a/devel/p5-Package-Variant/pkg-plist
+++ b/devel/p5-Package-Variant/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Package::Variant.3.gz
 %%SITE_PERL%%/Package/Variant.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Variant/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Variant
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Variant
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package
 @dirrmtry %%SITE_PERL%%/Package
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index 984c7c1e36c6..8517f832c1b5 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Parallel::ForkManager.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Parallel-ForkManager/pkg-plist b/devel/p5-Parallel-ForkManager/pkg-plist
index 3c87f0110b6c..189534416c52 100644
--- a/devel/p5-Parallel-ForkManager/pkg-plist
+++ b/devel/p5-Parallel-ForkManager/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Parallel::ForkManager.3.gz
 %%SITE_PERL%%/Parallel/ForkManager.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/ForkManager/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/ForkManager
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index 7212fe8399b4..5800a82ca8c9 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -18,8 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Params::Callback.3 Params::CallbackRequest.3 \
-		Params::CallbackRequest::Exceptions.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Params-CallbackRequest/pkg-plist b/devel/p5-Params-CallbackRequest/pkg-plist
index 05b59e224075..bd54185e2a8c 100644
--- a/devel/p5-Params-CallbackRequest/pkg-plist
+++ b/devel/p5-Params-CallbackRequest/pkg-plist
@@ -1,5 +1,8 @@
-%%SITE_PERL%%/Params/CallbackRequest.pm
+%%PERL5_MAN3%%/Params::Callback.3.gz
+%%PERL5_MAN3%%/Params::CallbackRequest.3.gz
+%%PERL5_MAN3%%/Params::CallbackRequest::Exceptions.3.gz
 %%SITE_PERL%%/Params/Callback.pm
+%%SITE_PERL%%/Params/CallbackRequest.pm
 %%SITE_PERL%%/Params/CallbackRequest/Exceptions.pm
 @dirrm %%SITE_PERL%%/Params/CallbackRequest
 @dirrmtry %%SITE_PERL%%/Params
diff --git a/devel/p5-Params-Check/Makefile b/devel/p5-Params-Check/Makefile
index cbd2926b6401..31b9d0a60936 100644
--- a/devel/p5-Params-Check/Makefile
+++ b/devel/p5-Params-Check/Makefile
@@ -16,17 +16,14 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Params::Check.3
 PORTDOCS=	CHANGES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Params-Check/pkg-plist b/devel/p5-Params-Check/pkg-plist
index e8c257ee5eab..6778ede3b9a7 100644
--- a/devel/p5-Params-Check/pkg-plist
+++ b/devel/p5-Params-Check/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Params::Check.3.gz
 %%SITE_PERL%%/Params/Check.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check
diff --git a/devel/p5-Params-Classify/Makefile b/devel/p5-Params-Classify/Makefile
index 1d581369d35a..39ee42fd3a60 100644
--- a/devel/p5-Params-Classify/Makefile
+++ b/devel/p5-Params-Classify/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Argument type classification
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Params::Classify.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Params-Classify/pkg-plist b/devel/p5-Params-Classify/pkg-plist
index a3ed5ab4bbc8..027d91c295ae 100644
--- a/devel/p5-Params-Classify/pkg-plist
+++ b/devel/p5-Params-Classify/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Params::Classify.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Params/Classify.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Classify/Classify.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Classify/Classify.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Classify
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Classify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Params
diff --git a/devel/p5-Params-Util/Makefile b/devel/p5-Params-Util/Makefile
index 19122539f00c..fccc0ae790a7 100644
--- a/devel/p5-Params-Util/Makefile
+++ b/devel/p5-Params-Util/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Utility functions to aid in parameter checking
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Params::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Params-Util/pkg-plist b/devel/p5-Params-Util/pkg-plist
index f4c6f3086e18..77641bc66763 100644
--- a/devel/p5-Params-Util/pkg-plist
+++ b/devel/p5-Params-Util/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Params::Util.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Params/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util/Util.bs
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 3e290189e745..f1de53cf3137 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -21,8 +21,4 @@ TEST_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Attribute::Params::Validate.3 \
-		Params::Validate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Params-Validate/pkg-plist b/devel/p5-Params-Validate/pkg-plist
index f427d1dfd3a7..9c9e54fa6bfa 100644
--- a/devel/p5-Params-Validate/pkg-plist
+++ b/devel/p5-Params-Validate/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Attribute::Params::Validate.3.gz
+%%PERL5_MAN3%%/Params::Validate.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Attribute/Params/Validate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate/Constants.pm
@@ -7,7 +9,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Params/ValidateXS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/XS/XS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Params/Validate
diff --git a/devel/p5-Parse-ExuberantCTags/Makefile b/devel/p5-Parse-ExuberantCTags/Makefile
index 89202f83acd7..ca62efeaca27 100644
--- a/devel/p5-Parse-ExuberantCTags/Makefile
+++ b/devel/p5-Parse-ExuberantCTags/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to efficiently parse exuberant ctags files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Parse::ExuberantCTags.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Parse-ExuberantCTags/pkg-plist b/devel/p5-Parse-ExuberantCTags/pkg-plist
index ef25d846f9ee..a4370e5b3523 100644
--- a/devel/p5-Parse-ExuberantCTags/pkg-plist
+++ b/devel/p5-Parse-ExuberantCTags/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Parse::ExuberantCTags.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Parse/ExuberantCTags.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/ExuberantCTags.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/ExuberantCTags.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ExuberantCTags
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parse
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index ad4fedae6aaa..8aeadd3955bd 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -19,20 +19,14 @@ OPTIONS_DEFINE=	DOCS
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Path::Class.3 \
-		Path::Class::Dir.3 \
-		Path::Class::Entity.3 \
-		Path::Class::File.3
 PORTDOCS=	Changes README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Path-Class/pkg-plist b/devel/p5-Path-Class/pkg-plist
index 6c1fa2a9715c..85b4418b5c12 100644
--- a/devel/p5-Path-Class/pkg-plist
+++ b/devel/p5-Path-Class/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Path::Class.3.gz
+%%PERL5_MAN3%%/Path::Class::Dir.3.gz
+%%PERL5_MAN3%%/Path::Class::Entity.3.gz
+%%PERL5_MAN3%%/Path::Class::File.3.gz
 %%SITE_PERL%%/Path/Class.pm
 %%SITE_PERL%%/Path/Class/Dir.pm
 %%SITE_PERL%%/Path/Class/Entity.pm
diff --git a/devel/p5-Path-Dispatcher-Declarative/Makefile b/devel/p5-Path-Dispatcher-Declarative/Makefile
index 96d884e72459..77c49f0d9001 100644
--- a/devel/p5-Path-Dispatcher-Declarative/Makefile
+++ b/devel/p5-Path-Dispatcher-Declarative/Makefile
@@ -16,13 +16,9 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Path-Dispatcher>=1.02:${PORTSDIR}/devel/p5-Path-Dispatcher \
 		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
 		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Path::Dispatcher::Declarative.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Path-Dispatcher-Declarative/pkg-plist b/devel/p5-Path-Dispatcher-Declarative/pkg-plist
index dbfd69e2545c..402bf06fa3ed 100644
--- a/devel/p5-Path-Dispatcher-Declarative/pkg-plist
+++ b/devel/p5-Path-Dispatcher-Declarative/pkg-plist
@@ -1,5 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/Declarative/.packlist
-%%SITE_PERL%%/Path/Dispatcher/Declarative/Builder.pm
+%%PERL5_MAN3%%/Path::Dispatcher::Declarative.3.gz
 %%SITE_PERL%%/Path/Dispatcher/Declarative.pm
+%%SITE_PERL%%/Path/Dispatcher/Declarative/Builder.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/Declarative/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/Declarative
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path
 @dirrm %%SITE_PERL%%/Path/Dispatcher/Declarative
+@dirrmtry %%SITE_PERL%%/Path/Dispatcher
+@dirrmtry %%SITE_PERL%%/Path
diff --git a/devel/p5-Path-Dispatcher/Makefile b/devel/p5-Path-Dispatcher/Makefile
index cf796c06e5d4..2ece26d12fba 100644
--- a/devel/p5-Path-Dispatcher/Makefile
+++ b/devel/p5-Path-Dispatcher/Makefile
@@ -21,26 +21,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Path::Dispatcher.3 \
-		Path::Dispatcher::Cookbook.3 \
-		Path::Dispatcher::Dispatch.3 \
-		Path::Dispatcher::Match.3 \
-		Path::Dispatcher::Path.3 \
-		Path::Dispatcher::Role::Rules.3 \
-		Path::Dispatcher::Rule.3 \
-		Path::Dispatcher::Rule::Alternation.3 \
-		Path::Dispatcher::Rule::Always.3 \
-		Path::Dispatcher::Rule::CodeRef.3 \
-		Path::Dispatcher::Rule::Dispatch.3 \
-		Path::Dispatcher::Rule::Empty.3 \
-		Path::Dispatcher::Rule::Enum.3 \
-		Path::Dispatcher::Rule::Eq.3 \
-		Path::Dispatcher::Rule::Intersection.3 \
-		Path::Dispatcher::Rule::Metadata.3 \
-		Path::Dispatcher::Rule::Regex.3 \
-		Path::Dispatcher::Rule::Sequence.3 \
-		Path::Dispatcher::Rule::Tokens.3 \
-		Path::Dispatcher::Rule::Under.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Path-Dispatcher/pkg-plist b/devel/p5-Path-Dispatcher/pkg-plist
index 12c2d09a70c8..b791758b7855 100644
--- a/devel/p5-Path-Dispatcher/pkg-plist
+++ b/devel/p5-Path-Dispatcher/pkg-plist
@@ -1,28 +1,48 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/.packlist
+%%PERL5_MAN3%%/Path::Dispatcher.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Cookbook.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Dispatch.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Match.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Path.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Role::Rules.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Alternation.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Always.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::CodeRef.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Dispatch.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Empty.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Enum.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Eq.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Intersection.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Metadata.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Regex.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Sequence.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Tokens.3.gz
+%%PERL5_MAN3%%/Path::Dispatcher::Rule::Under.3.gz
+%%SITE_PERL%%/Path/Dispatcher.pm
+%%SITE_PERL%%/Path/Dispatcher/Cookbook.pod
 %%SITE_PERL%%/Path/Dispatcher/Dispatch.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule.pm
+%%SITE_PERL%%/Path/Dispatcher/Match.pm
 %%SITE_PERL%%/Path/Dispatcher/Path.pm
 %%SITE_PERL%%/Path/Dispatcher/Role/Rules.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Eq.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Intersection.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Alternation.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Always.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Chain.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/CodeRef.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Dispatch.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Empty.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Tokens.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Alternation.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Under.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Sequence.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Enum.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Eq.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Intersection.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Metadata.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Chain.pm
 %%SITE_PERL%%/Path/Dispatcher/Rule/Regex.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Enum.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/CodeRef.pm
-%%SITE_PERL%%/Path/Dispatcher/Rule/Always.pm
-%%SITE_PERL%%/Path/Dispatcher/Cookbook.pod
-%%SITE_PERL%%/Path/Dispatcher/Match.pm
-%%SITE_PERL%%/Path/Dispatcher.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Sequence.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Tokens.pm
+%%SITE_PERL%%/Path/Dispatcher/Rule/Under.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path/Dispatcher
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Path
 @dirrm %%SITE_PERL%%/Path/Dispatcher/Rule
 @dirrm %%SITE_PERL%%/Path/Dispatcher/Role
 @dirrm %%SITE_PERL%%/Path/Dispatcher
-@dirrm %%SITE_PERL%%/Path
+@dirrmtry %%SITE_PERL%%/Path
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index b2c8356423b7..08efa890da92 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -15,9 +15,4 @@ COMMENT=	Perl module for portably manipulating file specifications
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Cwd.3 File::Spec.3 File::Spec::Cygwin.3 File::Spec::Epoc.3 \
-		File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
-		File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index 6fd722160efb..4211b8f3de6b 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -1,4 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist
+%%PERL5_MAN3%%/Cwd.3.gz
+%%PERL5_MAN3%%/File::Spec.3.gz
+%%PERL5_MAN3%%/File::Spec::Cygwin.3.gz
+%%PERL5_MAN3%%/File::Spec::Epoc.3.gz
+%%PERL5_MAN3%%/File::Spec::Functions.3.gz
+%%PERL5_MAN3%%/File::Spec::Mac.3.gz
+%%PERL5_MAN3%%/File::Spec::OS2.3.gz
+%%PERL5_MAN3%%/File::Spec::Unix.3.gz
+%%PERL5_MAN3%%/File::Spec::VMS.3.gz
+%%PERL5_MAN3%%/File::Spec::Win32.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Cwd.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Cygwin.pm
@@ -9,8 +18,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Unix.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/VMS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Win32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index e07055882780..91f0266ea83b 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Perl6::Builtins.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl6-Builtins/pkg-plist b/devel/p5-Perl6-Builtins/pkg-plist
index 0382674a1ef5..c037b150c7d9 100644
--- a/devel/p5-Perl6-Builtins/pkg-plist
+++ b/devel/p5-Perl6-Builtins/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Builtins/.packlist
+%%PERL5_MAN3%%/Perl6::Builtins.3.gz
 %%SITE_PERL%%/Perl6/Builtins.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Builtins
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Builtins/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Builtins
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
 @dirrmtry %%SITE_PERL%%/Perl6
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index a863ac407a8f..d7364b68f3cd 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Perl6::Export::Attrs.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl6-Export-Attrs/pkg-plist b/devel/p5-Perl6-Export-Attrs/pkg-plist
index 19c8c599d3fe..ca997cf0eb13 100644
--- a/devel/p5-Perl6-Export-Attrs/pkg-plist
+++ b/devel/p5-Perl6-Export-Attrs/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/Attrs/.packlist
+%%PERL5_MAN3%%/Perl6::Export::Attrs.3.gz
 %%SITE_PERL%%/Perl6/Export/Attrs.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/Attrs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/Attrs/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/Attrs
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
 @dirrmtry %%SITE_PERL%%/Perl6/Export
diff --git a/devel/p5-Perl6-Junction/Makefile b/devel/p5-Perl6-Junction/Makefile
index 554d18f47fbe..f26aeda8f1fd 100644
--- a/devel/p5-Perl6-Junction/Makefile
+++ b/devel/p5-Perl6-Junction/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Perl6::Junction.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl6-Junction/pkg-plist b/devel/p5-Perl6-Junction/pkg-plist
index 77df2bc3f399..f366d5494b1f 100644
--- a/devel/p5-Perl6-Junction/pkg-plist
+++ b/devel/p5-Perl6-Junction/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Perl6::Junction.3.gz
 %%SITE_PERL%%/Perl6/Junction.pm
 %%SITE_PERL%%/Perl6/Junction/All.pm
 %%SITE_PERL%%/Perl6/Junction/Any.pm
@@ -6,6 +7,6 @@
 %%SITE_PERL%%/Perl6/Junction/One.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Junction/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Junction
-@dirrm %%SITE_PERL%%/Perl6/Junction
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
+@dirrm %%SITE_PERL%%/Perl6/Junction
 @dirrmtry %%SITE_PERL%%/Perl6
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 85a6c69458fb..9665ebdc2d60 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Perl6::Rules.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl6-Rules/pkg-plist b/devel/p5-Perl6-Rules/pkg-plist
index c56f44a51de2..3cf4b8521de5 100644
--- a/devel/p5-Perl6-Rules/pkg-plist
+++ b/devel/p5-Perl6-Rules/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Rules/.packlist
+%%PERL5_MAN3%%/Perl6::Rules.3.gz
 %%SITE_PERL%%/Perl6/Rules.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Rules
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Rules/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Rules
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
 @dirrmtry %%SITE_PERL%%/Perl6
diff --git a/devel/p5-Perl6-Say/Makefile b/devel/p5-Perl6-Say/Makefile
index 18b80d8b2013..53201edc1c1d 100644
--- a/devel/p5-Perl6-Say/Makefile
+++ b/devel/p5-Perl6-Say/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl 6 say (print, but no newline needed) function
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Perl6::Say.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl6-Say/pkg-plist b/devel/p5-Perl6-Say/pkg-plist
index 2fb825eef67e..fc9c1b5b8598 100644
--- a/devel/p5-Perl6-Say/pkg-plist
+++ b/devel/p5-Perl6-Say/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Say/.packlist
+%%PERL5_MAN3%%/Perl6::Say.3.gz
 %%SITE_PERL%%/Perl6/Say.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Say
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Say/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Say
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
 @dirrmtry %%SITE_PERL%%/Perl6
diff --git a/devel/p5-PerlIO-locale/Makefile b/devel/p5-PerlIO-locale/Makefile
index d9496a8e0900..fbb0497d2003 100644
--- a/devel/p5-PerlIO-locale/Makefile
+++ b/devel/p5-PerlIO-locale/Makefile
@@ -13,7 +13,4 @@ COMMENT=	PerlIO layer to use the encoding of the current locale
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	PerlIO::locale.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-PerlIO-locale/pkg-plist b/devel/p5-PerlIO-locale/pkg-plist
index bcc5b264067b..36b6d2145af3 100644
--- a/devel/p5-PerlIO-locale/pkg-plist
+++ b/devel/p5-PerlIO-locale/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/PerlIO::locale.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/locale.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/locale.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/locale.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/locale
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PerlIO
diff --git a/devel/p5-PerlIO-via-MD5/Makefile b/devel/p5-PerlIO-via-MD5/Makefile
index bd1a2d420c96..6df265b8ca66 100644
--- a/devel/p5-PerlIO-via-MD5/Makefile
+++ b/devel/p5-PerlIO-via-MD5/Makefile
@@ -13,7 +13,4 @@ COMMENT=	PerlIO layer for creating an MD5 digest of a file
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		PerlIO::via::MD5.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-PerlIO-via-MD5/pkg-plist b/devel/p5-PerlIO-via-MD5/pkg-plist
index 6df9e4c8e019..287a4ca9a441 100644
--- a/devel/p5-PerlIO-via-MD5/pkg-plist
+++ b/devel/p5-PerlIO-via-MD5/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/PerlIO::via::MD5.3.gz
 %%SITE_PERL%%/PerlIO/via/MD5.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/MD5/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/MD5
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index 687b2c62d8bf..5009e03d50e1 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -15,13 +15,9 @@ BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
 		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
 		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Pod::Coverage::Moose.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Pod-Coverage-Moose/pkg-plist b/devel/p5-Pod-Coverage-Moose/pkg-plist
index 8bebacc04a0e..100108554b93 100644
--- a/devel/p5-Pod-Coverage-Moose/pkg-plist
+++ b/devel/p5-Pod-Coverage-Moose/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/Moose/.packlist
+%%PERL5_MAN3%%/Pod::Coverage::Moose.3.gz
 %%SITE_PERL%%/Pod/Coverage/Moose.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/Moose
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/Moose/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage/Moose
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
 @dirrmtry %%SITE_PERL%%/Pod/Coverage
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index 5a6b5399f875..a0dd65f9fcc0 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -18,25 +18,17 @@ TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Pod::Coverage.3 \
-		Pod::Coverage::CountParents.3 \
-		Pod::Coverage::ExportOnly.3 \
-		Pod::Coverage::Overloader.3
-
 PORTDOCS=	Changes
 PORTEXAMPLES=	check_installed script-covered
 
-NO_STAGE=	yes
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 .endif
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}/
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Pod-Coverage/pkg-plist b/devel/p5-Pod-Coverage/pkg-plist
index 73b3abf51a8e..07f208b44d98 100644
--- a/devel/p5-Pod-Coverage/pkg-plist
+++ b/devel/p5-Pod-Coverage/pkg-plist
@@ -1,4 +1,8 @@
 bin/pod_cover
+%%PERL5_MAN3%%/Pod::Coverage.3.gz
+%%PERL5_MAN3%%/Pod::Coverage::CountParents.3.gz
+%%PERL5_MAN3%%/Pod::Coverage::ExportOnly.3.gz
+%%PERL5_MAN3%%/Pod::Coverage::Overloader.3.gz
 %%SITE_PERL%%/Pod/Coverage.pm
 %%SITE_PERL%%/Pod/Coverage/CountParents.pm
 %%SITE_PERL%%/Pod/Coverage/ExportOnly.pm
diff --git a/devel/p5-Pod-Tests/Makefile b/devel/p5-Pod-Tests/Makefile
index 47cc8e0d762f..3209f3b97fb9 100644
--- a/devel/p5-Pod-Tests/Makefile
+++ b/devel/p5-Pod-Tests/Makefile
@@ -14,8 +14,4 @@ COMMENT=	Extracts embedded tests and code examples from POD
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		pod2test.1
-MAN3=		Pod::Tests.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Pod-Tests/pkg-plist b/devel/p5-Pod-Tests/pkg-plist
index c974a6ce1c05..ed792d4136d1 100644
--- a/devel/p5-Pod-Tests/pkg-plist
+++ b/devel/p5-Pod-Tests/pkg-plist
@@ -1,6 +1,8 @@
 bin/pod2test
+%%PERL5_MAN3%%/Pod::Tests.3.gz
 %%SITE_PERL%%/Pod/Tests.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tests/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tests
+man/man1/pod2test.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tests
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
 @dirrmtry %%SITE_PERL%%/Pod
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index c73108924992..f5d96d8e3f54 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Proc::Fork.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Proc-Fork/pkg-plist b/devel/p5-Proc-Fork/pkg-plist
index d3975683ba35..d2ddc29f8164 100644
--- a/devel/p5-Proc-Fork/pkg-plist
+++ b/devel/p5-Proc-Fork/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Proc::Fork.3.gz
 %%SITE_PERL%%/Proc/Fork.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
 @dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-ProcessTable/Makefile b/devel/p5-Proc-ProcessTable/Makefile
index ab5a1248f814..e32d78b6adc4 100644
--- a/devel/p5-Proc-ProcessTable/Makefile
+++ b/devel/p5-Proc-ProcessTable/Makefile
@@ -14,17 +14,12 @@ COMMENT=	Perl interface to the unix process table
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Proc::ProcessTable::Process.3 \
-		Proc::Killall.3 \
-		Proc::ProcessTable.3 \
-		Proc::Killfam.3
 PORTDOCS=	README README.freebsd-kvm README.freebsd-procfs
 
-NO_STAGE=	yes
 .if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Proc-ProcessTable/pkg-plist b/devel/p5-Proc-ProcessTable/pkg-plist
index 558c508b4c47..cf0c41218e7b 100644
--- a/devel/p5-Proc-ProcessTable/pkg-plist
+++ b/devel/p5-Proc-ProcessTable/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Proc::Killall.3.gz
+%%PERL5_MAN3%%/Proc::Killfam.3.gz
+%%PERL5_MAN3%%/Proc::ProcessTable.3.gz
+%%PERL5_MAN3%%/Proc::ProcessTable::Process.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Proc/Killall.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Proc/Killfam.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable.pm
@@ -9,6 +13,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/ProcessTable.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/Process
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Proc
diff --git a/devel/p5-Proc-Reliable/Makefile b/devel/p5-Proc-Reliable/Makefile
index 961536a818b4..d1f4d52b3fc6 100644
--- a/devel/p5-Proc-Reliable/Makefile
+++ b/devel/p5-Proc-Reliable/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Run external processes reliably with many options
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Proc::Reliable.3 Proc::test_intercept.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Proc-Reliable/pkg-plist b/devel/p5-Proc-Reliable/pkg-plist
index d5bc7ef66148..32a6640cb4ae 100644
--- a/devel/p5-Proc-Reliable/pkg-plist
+++ b/devel/p5-Proc-Reliable/pkg-plist
@@ -1,9 +1,11 @@
+%%PERL5_MAN3%%/Proc::Reliable.3.gz
+%%PERL5_MAN3%%/Proc::test_intercept.3.gz
+%%SITE_PERL%%/Proc/Reliable.pm
 %%SITE_PERL%%/Proc/test_intercept.pl
 %%SITE_PERL%%/auto/Proc/Reliable/autosplit.ix
-%%SITE_PERL%%/Proc/Reliable.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable/.packlist
-@dirrmtry %%SITE_PERL%%/auto/Proc/Reliable
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrm %%SITE_PERL%%/auto/Proc/Reliable
 @dirrmtry %%SITE_PERL%%/auto/Proc
 @dirrmtry %%SITE_PERL%%/Proc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index dce6e122c1ba..d8d5ba98c884 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -19,7 +19,4 @@ USES=		perl5
 USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/Gantt
 
-MAN3=		Project::Gantt.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Project-Gantt/pkg-plist b/devel/p5-Project-Gantt/pkg-plist
index 8f6f7449ce1c..01da7e19d423 100644
--- a/devel/p5-Project-Gantt/pkg-plist
+++ b/devel/p5-Project-Gantt/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Project::Gantt.3.gz
 %%SITE_PERL%%/Project/Gantt.pm
 %%SITE_PERL%%/Project/Gantt/DateUtils.pm
 %%SITE_PERL%%/Project/Gantt/GanttHeader.pm
@@ -11,7 +12,7 @@
 %%SITE_PERL%%/Project/Gantt/TimeSpan.pm
 %%SITE_PERL%%/Project/Gantt/Vera.ttf
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Gantt/.packlist
-@dirrm %%SITE_PERL%%/Project/Gantt
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Gantt
-@dirrmtry %%SITE_PERL%%/Project
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Project
+@dirrm %%SITE_PERL%%/Project/Gantt
+@dirrmtry %%SITE_PERL%%/Project