support STAGEDIR.

author: Vanilla I. Shu <vanilla@FreeBSD.org> 2013-11-07 08:28:22 +0000
committer: Vanilla I. Shu <vanilla@FreeBSD.org> 2013-11-07 08:28:22 +0000
commit: dad9cc37811dcd8a8cdb7489aa4390bf651991b2 (patch)
tree: 4128ecf3a93b45c5ff23bacbfb3ad7182e0b1111 /www
parent: 8213d25ad49274ddcbc712f4e3aac2719aa19fbc (diff)
download: ports-dad9cc37811dcd8a8cdb7489aa4390bf651991b2.tar.gz
ports-dad9cc37811dcd8a8cdb7489aa4390bf651991b2.zip
194 files changed, 604 insertions, 758 deletions
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
index 1358aab3c8e5..bad1be891f38 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/Makefile
@@ -19,14 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::AnyTemplate.3 \
-	CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplate.3 \
-	CGI::Application::Plugin::AnyTemplate::Base.3 \
-	CGI::Application::Plugin::AnyTemplate::Driver::TemplateToolkit.3 \
-	CGI::Application::Plugin::AnyTemplate::ComponentHandler.3 \
-	CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplatePluggable.3 \
-	CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplateExpr.3 \
-	CGI::Application::Plugin::AnyTemplate::Driver::Petal.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist b/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
index bdd8dbb9648c..a23ca3e1e14a 100644
--- a/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-AnyTemplate/pkg-plist
@@ -1,11 +1,19 @@
-%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/Petal.pm
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Base.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::ComponentHandler.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplate.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplateExpr.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Driver::HTMLTemplatePluggable.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Driver::Petal.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AnyTemplate::Driver::TemplateToolkit.3.gz
+%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate.pm
+%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Base.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/ComponentHandler.pm
-%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/HTMLTemplatePluggable.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/HTMLTemplate.pm
-%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Base.pm
-%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/TemplateToolkit.pm
-%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate.pm
 %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/HTMLTemplateExpr.pm
+%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/HTMLTemplatePluggable.pm
+%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/Petal.pm
+%%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver/TemplateToolkit.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate/Driver
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AnyTemplate
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-Apache/Makefile b/www/p5-CGI-Application-Plugin-Apache/Makefile
index f5541cc42396..2816c34c65ee 100644
--- a/www/p5-CGI-Application-Plugin-Apache/Makefile
+++ b/www/p5-CGI-Application-Plugin-Apache/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides easy access to Apache::* modules for CGI::Application
 
-RUN_DEPENDS=	p5-CGI-Application>=3.22:${PORTSDIR}/www/p5-CGI-Application \
+BUILD_DEPENDS=	p5-CGI-Application>=3.22:${PORTSDIR}/www/p5-CGI-Application \
 		p5-HTML-GenerateUtil>=0:${PORTSDIR}/www/p5-HTML-GenerateUtil \
 		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE_COMB=	dual
 LICENSE=	ART10 GPLv1
@@ -21,9 +21,4 @@ LICENSE=	ART10 GPLv1
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		CGI::Application::Plugin::Apache.3 \
-		CGI::Application::Plugin::Apache::Request.3 \
-		CGI::Application::Plugin::Apache2::Request.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Apache/pkg-plist b/www/p5-CGI-Application-Plugin-Apache/pkg-plist
index c55409527018..c43d47c708fe 100644
--- a/www/p5-CGI-Application-Plugin-Apache/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Apache/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Apache.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Apache2::Request.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Apache::Request.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Apache.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Apache/Request.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Apache2/Request.pm
diff --git a/www/p5-CGI-Application-Plugin-Authentication/Makefile b/www/p5-CGI-Application-Plugin-Authentication/Makefile
index c679e24c5769..8f2bc9b691d1 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authentication/Makefile
@@ -10,37 +10,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support for authenticating requests in CGI::Application
 
-RUN_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
+BUILD_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
 		p5-CGI-Application>=4:${PORTSDIR}/www/p5-CGI-Application \
 		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
+		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
+		p5-Color-Calc>=1.073:${PORTSDIR}/graphics/p5-Color-Calc
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::Authentication::Display.3 \
-	CGI::Application::Plugin::Authentication::Display::Basic.3 \
-	CGI::Application::Plugin::Authentication::Display::Classic.3 \
-	CGI::Application::Plugin::Authentication::Driver.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::strip.3 \
-	CGI::Application::Plugin::Authentication::Driver::DBI.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::sha1.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::lc.3 \
-	CGI::Application::Plugin::Authentication::Store::Session.3 \
-	CGI::Application::Plugin::Authentication.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::uc.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::crypt.3 \
-	CGI::Application::Plugin::Authentication::Store.3 \
-	CGI::Application::Plugin::Authentication::Driver::Generic.3 \
-	CGI::Application::Plugin::Authentication::Store::Cookie.3 \
-	CGI::Application::Plugin::Authentication::Driver::Authen::Simple.3 \
-	CGI::Application::Plugin::Authentication::Driver::Filter::md5.3 \
-	CGI::Application::Plugin::Authentication::Driver::HTPasswd.3 \
-	CGI::Application::Plugin::Authentication::Driver::Dummy.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Authentication/pkg-plist b/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
index 3089c67bf416..8d3bcab73e97 100644
--- a/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Authentication/pkg-plist
@@ -1,7 +1,26 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Display.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Display::Basic.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Display::Classic.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Authen::Simple.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::DBI.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Dummy.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::crypt.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::lc.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::md5.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::sha1.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::strip.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Filter::uc.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::Generic.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Driver::HTPasswd.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Store.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Store::Cookie.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authentication::Store::Session.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication.pm
+%%SITE_PERL%%/CGI/Application/Plugin/Authentication/Display.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Display/Basic.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Display/Classic.pm
-%%SITE_PERL%%/CGI/Application/Plugin/Authentication/Display.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver/Authen/Simple.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authentication/Driver/DBI.pm
@@ -25,3 +44,4 @@
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authentication
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile
index 2bd64fb7916f..2091b3bbe227 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile
@@ -22,13 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::Authorization::Driver::Generic.3 \
-	CGI::Application::Plugin::Authorization::Driver.3 \
-	CGI::Application::Plugin::Authorization::Driver::DBI.3 \
-	CGI::Application::Plugin::Authorization::Driver::Dummy.3 \
-	CGI::Application::Plugin::Authorization::Driver::SimpleGroup.3 \
-	CGI::Application::Plugin::Authorization.3 \
-	CGI::Application::Plugin::Authorization::Driver::HTGroup.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Authorization/pkg-plist b/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
index ec45a99d56f2..ac464ded4dc3 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Authorization/pkg-plist
@@ -1,3 +1,10 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver::DBI.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver::Dummy.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver::Generic.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver::HTGroup.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::Authorization::Driver::SimpleGroup.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver.pm
 %%SITE_PERL%%/CGI/Application/Plugin/Authorization/Driver/DBI.pm
@@ -9,3 +16,4 @@
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Authorization
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index 37c921429099..d17574756251 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -16,8 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	CGI::Application::Plugin::AutoRunmode.3 \
-    	CGI::Application::Plugin::AutoRunmode::FileDelegate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist b/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
index c149e554308e..45b662567b87 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/pkg-plist
@@ -1,7 +1,13 @@
-%%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode/FileDelegate.pm
+%%PERL5_MAN3%%/CGI::Application::Plugin::AutoRunmode.3.gz
+%%PERL5_MAN3%%/CGI::Application::Plugin::AutoRunmode::FileDelegate.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode.pm
+%%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode/FileDelegate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/AutoRunmode/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/AutoRunmode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/AutoRunmode
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/AutoRunmode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/
+@dirrmtry %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index 474ec60d0e27..c25c43d49a1e 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	CGI::Application::Plugin::DebugScreen.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist b/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
index 43f4d6d02f5e..0263c15a8b3b 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::DebugScreen.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/DebugScreen.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DebugScreen/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DebugScreen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
 @dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/DebugScreen
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index d0ed00550988..0e85b2cce429 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::HTMLPrototype.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist b/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
index 780eaeee1c02..1af48fcdd3e5 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::HTMLPrototype.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/HTMLPrototype.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
index 8ef598f6ef98..7888ba70e3f7 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	CGI::Application::Plugin::HtmlTidy.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist b/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
index 23fe9e65f561..17f994fa8d21 100644
--- a/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HtmlTidy/pkg-plist
@@ -1,12 +1,13 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::HtmlTidy.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy.pm
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy/tidy.conf
 %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy/validate.tmpl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HtmlTidy/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HtmlTidy
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/HtmlTidy
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
 @dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HtmlTidy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index 5d7c1a2ec411..506a0245e157 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::LinkIntegrity.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist b/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
index 004164f1326c..45a3d8c2b7e1 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::LinkIntegrity.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/LinkIntegrity.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index da373be7474b..d8461d5f62ee 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::LogDispatch.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist b/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
index eb073d6714a2..ec9fed85e039 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::LogDispatch.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/LogDispatch.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index 3109b09a18d0..a094882270e8 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::MessageStack.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist b/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
index 2d91766eaf1e..bb47352050df 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-MessageStack/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::MessageStack.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/MessageStack.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index c10d5d82bda2..5e083d3331e4 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -10,13 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy external redirects in CGI::Application
 
-RUN_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::Redirect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Redirect/pkg-plist b/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
index e7adefac9586..0ca50e57fdc9 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Redirect/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Redirect.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Redirect.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index bc50099aee5e..29797fd1bf4d 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::Session.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Session/pkg-plist b/www/p5-CGI-Application-Plugin-Session/pkg-plist
index d3acc7b9bc66..449f1f694a89 100644
--- a/www/p5-CGI-Application-Plugin-Session/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Session/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Session.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Session.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index 833b4edfcdf0..65d03f539a4c 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::Stream.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-Stream/pkg-plist b/www/p5-CGI-Application-Plugin-Stream/pkg-plist
index ecae73f21e3d..1420969c1fed 100644
--- a/www/p5-CGI-Application-Plugin-Stream/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Stream/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::Stream.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/Stream.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index da33ee384a6e..68d58d069316 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::TT.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-TT/pkg-plist b/www/p5-CGI-Application-Plugin-TT/pkg-plist
index fb35913e0a22..f0ba3340efb3 100644
--- a/www/p5-CGI-Application-Plugin-TT/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-TT/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::TT.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/TT.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index 1def28335379..48ad4871e879 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -10,17 +10,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View the source of the running application
 
-RUN_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
 		p5-CGI-Application-Plugin-Forward>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Forward \
 		p5-Syntax-Highlight-Perl-Improved>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Perl-Improved \
 		p5-Pod-Xhtml>=0:${PORTSDIR}/textproc/p5-Pod-Xhtml \
 		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	CGI::Application::Plugin::ViewCode.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist b/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
index 6fea4b5a2f0e..1ec4f065d163 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-ViewCode/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CGI::Application::Plugin::ViewCode.3.gz
 %%SITE_PERL%%/CGI/Application/Plugin/ViewCode.pm
 @dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/CGI/Application
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 0d13a1517b8b..1ca57e32b931 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Application.3 CGI::Application::Mailform.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist
index e25357986579..543fbd027b33 100644
--- a/www/p5-CGI-Application/pkg-plist
+++ b/www/p5-CGI-Application/pkg-plist
@@ -1,7 +1,9 @@
+%%PERL5_MAN3%%/CGI::Application.3.gz
+%%PERL5_MAN3%%/CGI::Application::Mailform.3.gz
 %%SITE_PERL%%/CGI/Application.pm
 %%SITE_PERL%%/CGI/Application/Mailform.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI/Application
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index cf737aab978d..87e81b5e64df 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::ArgChecker.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index b2821305f25e..0742c66b5950 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/CGI::ArgChecker.3.gz
 %%SITE_PERL%%/CGI/ArgChecker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Builder-TT2/Makefile b/www/p5-CGI-Builder-TT2/Makefile
index 2b113bdb2fd4..c9ac13f170ef 100644
--- a/www/p5-CGI-Builder-TT2/Makefile
+++ b/www/p5-CGI-Builder-TT2/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Builder::TT2.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Builder-TT2/pkg-plist b/www/p5-CGI-Builder-TT2/pkg-plist
index 0fd13b9ed761..d7cadd1d1210 100644
--- a/www/p5-CGI-Builder-TT2/pkg-plist
+++ b/www/p5-CGI-Builder-TT2/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/CGI::Builder::TT2.3.gz
 %%SITE_PERL%%/CGI/Builder/TT2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/TT2/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/TT2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/TT2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI/Builder
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Builder/Makefile b/www/p5-CGI-Builder/Makefile
index 5d3b4444e366..efe36ad1686a 100644
--- a/www/p5-CGI-Builder/Makefile
+++ b/www/p5-CGI-Builder/Makefile
@@ -17,11 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Bundle::CGI::Builder::Complete.3 \
-	CGI::Builder.3 \
-	CGI::Builder::Conf.3 \
-	CGI::Builder::Const.3 \
-	CGI::Builder::Test.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Builder/pkg-plist b/www/p5-CGI-Builder/pkg-plist
index d6a9b2e20d5a..2680144c9974 100644
--- a/www/p5-CGI-Builder/pkg-plist
+++ b/www/p5-CGI-Builder/pkg-plist
@@ -1,13 +1,18 @@
+%%PERL5_MAN3%%/Bundle::CGI::Builder::Complete.3.gz
+%%PERL5_MAN3%%/CGI::Builder.3.gz
+%%PERL5_MAN3%%/CGI::Builder::Conf.3.gz
+%%PERL5_MAN3%%/CGI::Builder::Const.3.gz
+%%PERL5_MAN3%%/CGI::Builder::Test.3.gz
 %%SITE_PERL%%/Bundle/CGI/Builder/Complete.pm
 %%SITE_PERL%%/CGI/Builder.pm
 %%SITE_PERL%%/CGI/Builder/Conf.pm
 %%SITE_PERL%%/CGI/Builder/Const.pm
 %%SITE_PERL%%/CGI/Builder/Test.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Builder
+@dirrmtry %%SITE_PERL%%/CGI/Builder
 @dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/Bundle/CGI/Builder
+@dirrmtry %%SITE_PERL%%/Bundle/CGI/Builder
 @dirrmtry %%SITE_PERL%%/Bundle/CGI
 @dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile
index 3c2f5ddce68c..2ac9a2ad0a32 100644
--- a/www/p5-CGI-Ex/Makefile
+++ b/www/p5-CGI-Ex/Makefile
@@ -11,23 +11,17 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CGI utility suite - makes powerful application writing fun and easy
 
 BUILD_DEPENDS=	p5-Template-Alloy>=1.004:${PORTSDIR}/www/p5-Template-Alloy
-RUN_DEPENDS=	p5-Template-Alloy>=1.004:${PORTSDIR}/www/p5-Template-Alloy
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Ex.3 CGI::Ex::App.3 CGI::Ex::App::Constants.3 \
-		CGI::Ex::Auth.3 CGI::Ex::Conf.3 \
-		CGI::Ex::Die.3 CGI::Ex::Dump.3 CGI::Ex::Fill.3 \
-		CGI::Ex::JSONDump.3 CGI::Ex::Template.3 CGI::Ex::Validate.3
-
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 post-install:
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/
-	${CP} -R ${WRKSRC}/samples/* ${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Ex/pkg-plist b/www/p5-CGI-Ex/pkg-plist
index 9183e1162c44..b6bba1c9625e 100644
--- a/www/p5-CGI-Ex/pkg-plist
+++ b/www/p5-CGI-Ex/pkg-plist
@@ -1,8 +1,18 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex/.packlist
-%%SITE_PERL%%/CGI/Ex/App/Constants.pm
+%%PERL5_MAN3%%/CGI::Ex.3.gz
+%%PERL5_MAN3%%/CGI::Ex::App.3.gz
+%%PERL5_MAN3%%/CGI::Ex::App::Constants.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Auth.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Conf.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Die.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Dump.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Fill.3.gz
+%%PERL5_MAN3%%/CGI::Ex::JSONDump.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Template.3.gz
+%%PERL5_MAN3%%/CGI::Ex::Validate.3.gz
 %%SITE_PERL%%/CGI/Ex.pm
 %%SITE_PERL%%/CGI/Ex/App.pm
 %%SITE_PERL%%/CGI/Ex/App.pod
+%%SITE_PERL%%/CGI/Ex/App/Constants.pm
 %%SITE_PERL%%/CGI/Ex/Auth.pm
 %%SITE_PERL%%/CGI/Ex/Conf.pm
 %%SITE_PERL%%/CGI/Ex/Die.pm
@@ -16,6 +26,7 @@
 %%SITE_PERL%%/CGI/Ex/sha1.js
 %%SITE_PERL%%/CGI/Ex/validate.js
 %%SITE_PERL%%/CGI/Ex/yaml_load.js
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ex
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Ex/App
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index de4cb6719058..65b0d3a92ff9 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module for manage templates and parses templates
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::FastTemplate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist
index f23628bad891..4ea554210c4a 100644
--- a/www/p5-CGI-FastTemplate/pkg-plist
+++ b/www/p5-CGI-FastTemplate/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/CGI::FastTemplate.3.gz
 %%SITE_PERL%%/CGI/FastTemplate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
-@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index b3985ee8e9c0..c75f58450993 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -17,16 +17,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=		CGI::Framework.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/www/p5-CGI-Framework/pkg-plist b/www/p5-CGI-Framework/pkg-plist
index 9688c11f8122..29dcbcc5b239 100644
--- a/www/p5-CGI-Framework/pkg-plist
+++ b/www/p5-CGI-Framework/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/CGI::Framework.3.gz
 %%SITE_PERL%%/CGI/Framework.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 568f7c0eb614..17e99feba885 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -18,24 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		kwiki-install.1
-MAN3=		CGI::Kwiki.3 \
-		CGI::Kwiki::Blog.3 CGI::Kwiki::CGI.3 CGI::Kwiki::Changes.3 \
-		CGI::Kwiki::Config.3 CGI::Kwiki::Config_yaml.3 \
-		CGI::Kwiki::Cookie.3 CGI::Kwiki::Database.3 \
-		CGI::Kwiki::Display.3 CGI::Kwiki::Driver.3 CGI::Kwiki::Edit.3 \
-		CGI::Kwiki::Formatter.3 CGI::Kwiki::Import.3 \
-		CGI::Kwiki::Javascript.3 CGI::Kwiki::Metadata.3 \
-		CGI::Kwiki::New.3 CGI::Kwiki::Pages.3 \
-		CGI::Kwiki::Pages::zh_cn.3 CGI::Kwiki::Pages::zh_tw.3 \
-		CGI::Kwiki::Plugin.3 CGI::Kwiki::Plugin::Diff.3 \
-		CGI::Kwiki::Prefs.3 CGI::Kwiki::Privacy.3 \
-		CGI::Kwiki::Scripts.3 CGI::Kwiki::Search.3 \
-		CGI::Kwiki::Slides.3 CGI::Kwiki::Style.3 \
-		CGI::Kwiki::Template.3
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist
index ae2f308c1ffc..10363fc32299 100644
--- a/www/p5-CGI-Kwiki/pkg-plist
+++ b/www/p5-CGI-Kwiki/pkg-plist
@@ -1,4 +1,32 @@
 bin/kwiki-install
+%%PERL5_MAN3%%/CGI::Kwiki.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Blog.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::CGI.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Changes.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Config.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Config_yaml.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Cookie.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Database.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Display.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Driver.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Edit.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Formatter.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Import.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Javascript.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Metadata.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::New.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_cn.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Pages::zh_tw.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Plugin.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Plugin::Diff.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Prefs.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Privacy.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Scripts.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Search.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Slides.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Style.3.gz
+%%PERL5_MAN3%%/CGI::Kwiki::Template.3.gz
 %%SITE_PERL%%/CGI/Kwiki.pm
 %%SITE_PERL%%/CGI/Kwiki/Backup.pm
 %%SITE_PERL%%/CGI/Kwiki/Backup/Rcs.pm
@@ -37,10 +65,11 @@ bin/kwiki-install
 %%SITE_PERL%%/CGI/Kwiki/Style.pm
 %%SITE_PERL%%/CGI/Kwiki/Template.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI-Kwiki/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI-Kwiki
-@dirrm %%SITE_PERL%%/CGI/Kwiki/Plugin
-@dirrm %%SITE_PERL%%/CGI/Kwiki/Pages
-@dirrm %%SITE_PERL%%/CGI/Kwiki/I18N
-@dirrm %%SITE_PERL%%/CGI/Kwiki/Backup
-@dirrm %%SITE_PERL%%/CGI/Kwiki
+man/man1/kwiki-install.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI-Kwiki
+@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Plugin
+@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Pages
+@dirrmtry %%SITE_PERL%%/CGI/Kwiki/I18N
+@dirrmtry %%SITE_PERL%%/CGI/Kwiki/Backup
+@dirrmtry %%SITE_PERL%%/CGI/Kwiki
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index d4d61e81065b..de9509dae0d2 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -12,16 +12,13 @@ COMMENT=	Extremely lightweight CGI processing package
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=		CGI::Minimal.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README TODO
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist
index 5248f39ccbc3..f4b0ec89c3aa 100644
--- a/www/p5-CGI-Minimal/pkg-plist
+++ b/www/p5-CGI-Minimal/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/CGI::Minimal.3.gz
 %%SITE_PERL%%/CGI/Minimal.pm
 %%SITE_PERL%%/CGI/Minimal.pod
 %%SITE_PERL%%/CGI/Minimal/Misc.pm
 %%SITE_PERL%%/CGI/Minimal/Multipart.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Minimal
+@dirrmtry %%SITE_PERL%%/CGI/Minimal
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Response/Makefile b/www/p5-CGI-Response/Makefile
index 7c47c0a22907..d273c79853a7 100644
--- a/www/p5-CGI-Response/Makefile
+++ b/www/p5-CGI-Response/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module allowing response construction for CGI applications
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Response.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Response/pkg-plist b/www/p5-CGI-Response/pkg-plist
index ebf63603dc91..e13547086808 100644
--- a/www/p5-CGI-Response/pkg-plist
+++ b/www/p5-CGI-Response/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response/.packlist
+%%PERL5_MAN3%%/CGI::Response.3.gz
 %%SITE_PERL%%/CGI/Response.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response
-@dirrmtry %%SITE_PERL%%/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Untaint-date/Makefile b/www/p5-CGI-Untaint-date/Makefile
index b63a7bb9defb..b21db4ad7df7 100644
--- a/www/p5-CGI-Untaint-date/Makefile
+++ b/www/p5-CGI-Untaint-date/Makefile
@@ -15,10 +15,7 @@ BUILD_DEPENDS=	p5-CGI-Untaint>=0:${PORTSDIR}/www/p5-CGI-Untaint \
 		p5-Date-Simple>=0:${PORTSDIR}/devel/p5-Date-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	CGI::Untaint::date.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Untaint-date/pkg-plist b/www/p5-CGI-Untaint-date/pkg-plist
index 8cf5445be644..6c0553bfb258 100644
--- a/www/p5-CGI-Untaint-date/pkg-plist
+++ b/www/p5-CGI-Untaint-date/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/CGI::Untaint::date.3.gz
 %%SITE_PERL%%/CGI/Untaint/date.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/date/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/date
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/date
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI/Untaint
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 9d1f11390d5b..84267828b385 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -16,17 +16,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=		CGI::Untaint.3 CGI::Untaint::hex.3 CGI::Untaint::integer.3 \
-       		CGI::Untaint::object.3 CGI::Untaint::printable.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/www/p5-CGI-Untaint/pkg-plist b/www/p5-CGI-Untaint/pkg-plist
index 39b2719924bd..1320b3a234af 100644
--- a/www/p5-CGI-Untaint/pkg-plist
+++ b/www/p5-CGI-Untaint/pkg-plist
@@ -1,10 +1,15 @@
+%%PERL5_MAN3%%/CGI::Untaint.3.gz
+%%PERL5_MAN3%%/CGI::Untaint::hex.3.gz
+%%PERL5_MAN3%%/CGI::Untaint::integer.3.gz
+%%PERL5_MAN3%%/CGI::Untaint::object.3.gz
+%%PERL5_MAN3%%/CGI::Untaint::printable.3.gz
 %%SITE_PERL%%/CGI/Untaint.pm
 %%SITE_PERL%%/CGI/Untaint/hex.pm
 %%SITE_PERL%%/CGI/Untaint/integer.pm
 %%SITE_PERL%%/CGI/Untaint/object.pm
 %%SITE_PERL%%/CGI/Untaint/printable.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI/Untaint
+@dirrmtry %%SITE_PERL%%/CGI/Untaint
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Upload/Makefile b/www/p5-CGI-Upload/Makefile
index 653ef8b058ec..df1ba67ff068 100644
--- a/www/p5-CGI-Upload/Makefile
+++ b/www/p5-CGI-Upload/Makefile
@@ -13,11 +13,9 @@ COMMENT=	CGI class for handling browser file uploads
 BUILD_DEPENDS=	p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
 		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
 		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Upload.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist
index 87220b0260e2..a9ad58856397 100644
--- a/www/p5-CGI-Upload/pkg-plist
+++ b/www/p5-CGI-Upload/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
+%%PERL5_MAN3%%/CGI::Upload.3.gz
 %%SITE_PERL%%/CGI/Upload.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
-@dirrmtry %%SITE_PERL%%/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index a44646823adf..b80c7a747790 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -10,23 +10,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object Oriented Interface for CGI Script Applications
 
-RUN_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
 		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::XMLApplication.3
-
-NO_STAGE=	yes
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl	${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.pm		${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.xsl	${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.pm ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.xsl ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-XMLApplication/pkg-plist b/www/p5-CGI-XMLApplication/pkg-plist
index 402aadb2b8a6..479deb009f70 100644
--- a/www/p5-CGI-XMLApplication/pkg-plist
+++ b/www/p5-CGI-XMLApplication/pkg-plist
@@ -1,8 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist
+%%PERL5_MAN3%%/CGI::XMLApplication.3.gz
 %%SITE_PERL%%/CGI/XMLApplication.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex2_finish.xsl
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex2_form.xsl
 %%PORTDOCS%%%%EXAMPLESDIR%%/example1.pl
@@ -17,3 +15,6 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/minimal.xsl
 %%PORTDOCS%%%%EXAMPLESDIR%%/minimalapp.pm
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 88749aa05404..73e6948ca0e3 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -16,10 +16,6 @@ BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
-		CGI::MiniSvr.3 CGI::Request.3
-
-NO_STAGE=	yes
 post-patch:
 	@${RM} ${WRKSRC}/CGI/*.orig
 
diff --git a/www/p5-CGI-modules/pkg-plist b/www/p5-CGI-modules/pkg-plist
index 949636b3fa66..36c3ef37e137 100644
--- a/www/p5-CGI-modules/pkg-plist
+++ b/www/p5-CGI-modules/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/CGI::Base.3.gz
+%%PERL5_MAN3%%/CGI::BasePlus.3.gz
+%%PERL5_MAN3%%/CGI::Carp.3.gz
+%%PERL5_MAN3%%/CGI::Form.3.gz
+%%PERL5_MAN3%%/CGI::MiniSvr.3.gz
+%%PERL5_MAN3%%/CGI::Request.3.gz
 %%SITE_PERL%%/CGI/Base.pm
 %%SITE_PERL%%/CGI/BasePlus.pm
 %%SITE_PERL%%/CGI/Carp.pm
@@ -6,5 +12,5 @@
 %%SITE_PERL%%/CGI/Request.pm
 %%SITE_PERL%%/CGI/test.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrm %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile
index 3f445b693dc3..6829324d33d9 100644
--- a/www/p5-CSS-DOM/Makefile
+++ b/www/p5-CSS-DOM/Makefile
@@ -14,34 +14,10 @@ COMMENT=	Document Object Model for Cascading Style Sheets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Clone>=0.09:${PORTSDIR}/devel/p5-Clone
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+BUILD_DEPENDS=	p5-Clone>=0.09:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CSS::DOM.3 \
-		CSS::DOM::Array.3 \
-		CSS::DOM::Constants.3 \
-		CSS::DOM::Exception.3 \
-		CSS::DOM::Interface.3 \
-		CSS::DOM::MediaList.3 \
-		CSS::DOM::Parser.3 \
-		CSS::DOM::PropertyParser.3 \
-		CSS::DOM::Rule.3 \
-		CSS::DOM::Rule::Charset.3 \
-		CSS::DOM::Rule::FontFace.3 \
-		CSS::DOM::Rule::Import.3 \
-		CSS::DOM::Rule::Media.3 \
-		CSS::DOM::Rule::Page.3 \
-		CSS::DOM::Rule::Style.3 \
-		CSS::DOM::RuleList.3 \
-		CSS::DOM::Style.3 \
-		CSS::DOM::StyleSheetList.3 \
-		CSS::DOM::Util.3 \
-		CSS::DOM::Value.3 \
-		CSS::DOM::Value::List.3 \
-		CSS::DOM::Value::Primitive.3 \
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CSS-DOM/pkg-plist b/www/p5-CSS-DOM/pkg-plist
index cfdda76f2960..4e03dd61bbcb 100644
--- a/www/p5-CSS-DOM/pkg-plist
+++ b/www/p5-CSS-DOM/pkg-plist
@@ -1,4 +1,25 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM/.packlist
+%%PERL5_MAN3%%/CSS::DOM.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Array.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Constants.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Exception.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Interface.3.gz
+%%PERL5_MAN3%%/CSS::DOM::MediaList.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Parser.3.gz
+%%PERL5_MAN3%%/CSS::DOM::PropertyParser.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::Charset.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::FontFace.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::Import.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::Media.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::Page.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Rule::Style.3.gz
+%%PERL5_MAN3%%/CSS::DOM::RuleList.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Style.3.gz
+%%PERL5_MAN3%%/CSS::DOM::StyleSheetList.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Util.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Value.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Value::List.3.gz
+%%PERL5_MAN3%%/CSS::DOM::Value::Primitive.3.gz
 %%SITE_PERL%%/CSS/DOM.pm
 %%SITE_PERL%%/CSS/DOM/Array.pm
 %%SITE_PERL%%/CSS/DOM/Constants.pm
@@ -22,10 +43,11 @@
 %%SITE_PERL%%/CSS/DOM/Value/List.pm
 %%SITE_PERL%%/CSS/DOM/Value/Primitive.pm
 %%SITE_PERL%%/CSS/DOM/Value/Primitive/colours.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
 @dirrmtry %%SITE_PERL%%/CSS/DOM/Value/Primitive
 @dirrmtry %%SITE_PERL%%/CSS/DOM/Value
 @dirrmtry %%SITE_PERL%%/CSS/DOM/Rule
 @dirrmtry %%SITE_PERL%%/CSS/DOM
 @dirrmtry %%SITE_PERL%%/CSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/DOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index c54b32573198..15e259eb5a51 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -30,17 +30,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	--default
 
-MAN3=		Catalyst::Action::Deserialize.3 \
-		Catalyst::Action::DeserializeMultiPart.3 \
-		Catalyst::Action::REST.3 \
-		Catalyst::Action::REST::ForBrowsers.3 \
-		Catalyst::Action::Serialize.3 \
-		Catalyst::Action::SerializeBase.3 \
-		Catalyst::Controller::REST.3 \
-		Catalyst::Request::REST.3 \
-		Catalyst::Request::REST::ForBrowsers.3 \
-		Catalyst::TraitFor::Request::REST.3 \
-		Catalyst::TraitFor::Request::REST::ForBrowsers.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Action-REST/pkg-plist b/www/p5-Catalyst-Action-REST/pkg-plist
index 441f4b754308..24240e9c4369 100644
--- a/www/p5-Catalyst-Action-REST/pkg-plist
+++ b/www/p5-Catalyst-Action-REST/pkg-plist
@@ -1,3 +1,14 @@
+%%PERL5_MAN3%%/Catalyst::Action::Deserialize.3.gz
+%%PERL5_MAN3%%/Catalyst::Action::DeserializeMultiPart.3.gz
+%%PERL5_MAN3%%/Catalyst::Action::REST.3.gz
+%%PERL5_MAN3%%/Catalyst::Action::REST::ForBrowsers.3.gz
+%%PERL5_MAN3%%/Catalyst::Action::Serialize.3.gz
+%%PERL5_MAN3%%/Catalyst::Action::SerializeBase.3.gz
+%%PERL5_MAN3%%/Catalyst::Controller::REST.3.gz
+%%PERL5_MAN3%%/Catalyst::Request::REST.3.gz
+%%PERL5_MAN3%%/Catalyst::Request::REST::ForBrowsers.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Request::REST.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Request::REST::ForBrowsers.3.gz
 %%SITE_PERL%%/Catalyst/Action/Deserialize.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/Callback.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/JSON.pm
@@ -36,12 +47,10 @@
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/YAML
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/XML
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/JSON
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize/Data
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Serialize
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/REST
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/XML
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/JSON
-@dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize/Data
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize
 @dirrmtry %%SITE_PERL%%/Catalyst/Action
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index 5ec99e19aa05..643b3bf70e69 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -13,18 +13,14 @@ COMMENT=	Sensible default end action for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.70:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.70:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-HTTP-Request-AsCGI>=0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Action::RenderView.3
-
-NO_STAGE=	yes
 post-extract:
 	@${REINPLACE_CMD} -i '' '/test_requires/d' ${WRKSRC}/Makefile.PL
 
diff --git a/www/p5-Catalyst-Action-RenderView/pkg-plist b/www/p5-Catalyst-Action-RenderView/pkg-plist
index 01d1a7ba58dc..c3f19832ba04 100644
--- a/www/p5-Catalyst-Action-RenderView/pkg-plist
+++ b/www/p5-Catalyst-Action-RenderView/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Action::RenderView.3.gz
 %%SITE_PERL%%/Catalyst/Action/RenderView.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/RenderView/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/RenderView
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 42dba19313ed..aeab03bf9b4b 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -22,7 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Controller::BindLex.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Controller-BindLex/pkg-plist b/www/p5-Catalyst-Controller-BindLex/pkg-plist
index 2fd9aa426416..1d3197385fc9 100644
--- a/www/p5-Catalyst-Controller-BindLex/pkg-plist
+++ b/www/p5-Catalyst-Controller-BindLex/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Controller::BindLex.3.gz
 %%SITE_PERL%%/Catalyst/Controller/BindLex.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Controller
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Controller-RateLimit/Makefile b/www/p5-Catalyst-Controller-RateLimit/Makefile
index 69f86d658d70..d19636920d76 100644
--- a/www/p5-Catalyst-Controller-RateLimit/Makefile
+++ b/www/p5-Catalyst-Controller-RateLimit/Makefile
@@ -23,7 +23,5 @@ TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Me
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=	Catalyst::Controller::RateLimit.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Controller-RateLimit/pkg-plist b/www/p5-Catalyst-Controller-RateLimit/pkg-plist
index 850e37d5cf60..c9af5d38f804 100644
--- a/www/p5-Catalyst-Controller-RateLimit/pkg-plist
+++ b/www/p5-Catalyst-Controller-RateLimit/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::Controller::RateLimit.3.gz
 %%SITE_PERL%%/Catalyst/Controller/RateLimit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RateLimit/.packlist
-@dirrmtry %%SITE_PERL%%/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/Catalyst
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RateLimit
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Controller
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Devel/Makefile b/www/p5-Catalyst-Devel/Makefile
index b87a2ad055dd..b271c7ea4741 100644
--- a/www/p5-Catalyst-Devel/Makefile
+++ b/www/p5-Catalyst-Devel/Makefile
@@ -37,12 +37,4 @@ TEST_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Devel.3 \
-		Catalyst::Helper.3 \
-		Catalyst::Restarter.3 \
-		Catalyst::Restarter::Forking.3 \
-		Catalyst::Restarter::Win32.3 \
-		Module::Install::Catalyst.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Devel/pkg-plist b/www/p5-Catalyst-Devel/pkg-plist
index 1959c4360702..3e4e383bfc70 100644
--- a/www/p5-Catalyst-Devel/pkg-plist
+++ b/www/p5-Catalyst-Devel/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/Catalyst::Devel.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper.3.gz
+%%PERL5_MAN3%%/Catalyst::Restarter.3.gz
+%%PERL5_MAN3%%/Catalyst::Restarter::Forking.3.gz
+%%PERL5_MAN3%%/Catalyst::Restarter::Win32.3.gz
+%%PERL5_MAN3%%/Module::Install::Catalyst.3.gz
 %%SITE_PERL%%/Catalyst/Devel.pm
 %%SITE_PERL%%/Catalyst/Helper.pm
 %%SITE_PERL%%/Catalyst/Restarter.pm
@@ -44,8 +50,8 @@
 @dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib/Helper
 @dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel/lib
 @dirrmtry %%SITE_PERL%%/auto/share/dist/Catalyst-Devel
-@dirrmtry %%SITE_PERL%%/auto/share/dist/
-@dirrmtry %%SITE_PERL%%/auto/share/
+@dirrmtry %%SITE_PERL%%/auto/share/dist
+@dirrmtry %%SITE_PERL%%/auto/share
 @dirrmtry %%SITE_PERL%%/Module/Install
 @dirrmtry %%SITE_PERL%%/Module
 @dirrmtry %%SITE_PERL%%/Catalyst/Restarter
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
index d57562ebcb3c..1037a134fa9e 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/Makefile
@@ -20,9 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Engine::HTTP::Prefork.3
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -i '' -e 's/Cookie::XS/CGI::Cookie::XS/g' \
 		${WRKSRC}/lib/Catalyst/Engine/HTTP/Prefork/Handler.pm
diff --git a/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist b/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
index b8deba4cb674..c173fa8ce777 100644
--- a/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
+++ b/www/p5-Catalyst-Engine-HTTP-Prefork/pkg-plist
@@ -1,12 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork/.packlist
+%%PERL5_MAN3%%/Catalyst::Engine::HTTP::Prefork.3.gz
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork.pm
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork/Handler.pm
 %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork/Restarter.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP/Prefork
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine/HTTP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Engine
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrm %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP/Prefork
 @dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP
 @dirrmtry %%SITE_PERL%%/Catalyst/Engine
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index cc249255cdb0..221c39b3f5f6 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -11,38 +11,27 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CRUD framework for Catalyst
 
-BUILD_DEPENDS=	\
-	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
-	p5-Catalyst-Model-CDBI>=0.1:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
-	p5-Catalyst-Plugin-DefaultEnd>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-DefaultEnd \
-	p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
-	p5-Catalyst-View-TT-ControllerLocal>=0:${PORTSDIR}/www/p5-Catalyst-View-TT-ControllerLocal \
-	p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
-	p5-Class-DBI-AsForm>=2.42:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
-	p5-Class-DBI-FromForm>=0.03:${PORTSDIR}/www/p5-Class-DBI-FromForm \
-	p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager \
-	p5-Class-DBI-Plugin-Type>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \
-	p5-Class-DBI-SQLite>=0.09:${PORTSDIR}/databases/p5-Class-DBI-SQLite \
-	p5-Data-FormValidator>=4.02:${PORTSDIR}/textproc/p5-Data-FormValidator \
-	p5-DBI-Shell>=0:${PORTSDIR}/databases/p5-DBI-Shell \
-	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
+		p5-Catalyst-Model-CDBI>=0.1:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
+		p5-Catalyst-Plugin-DefaultEnd>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-DefaultEnd \
+		p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
+		p5-Catalyst-View-TT-ControllerLocal>=0:${PORTSDIR}/www/p5-Catalyst-View-TT-ControllerLocal \
+		p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
+		p5-Class-DBI-AsForm>=2.42:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
+		p5-Class-DBI-FromForm>=0.03:${PORTSDIR}/www/p5-Class-DBI-FromForm \
+		p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager \
+		p5-Class-DBI-Plugin-Type>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \
+		p5-Class-DBI-SQLite>=0.09:${PORTSDIR}/databases/p5-Class-DBI-SQLite \
+		p5-Data-FormValidator>=4.02:${PORTSDIR}/textproc/p5-Data-FormValidator \
+		p5-DBI-Shell>=0:${PORTSDIR}/databases/p5-DBI-Shell \
+		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
+		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Enzyme.3 \
-	Catalyst::Enzyme::CRUD::Controller.3 \
-	Catalyst::Enzyme::CRUD::Model.3 \
-	Catalyst::Enzyme::CRUD::View.3 \
-	Catalyst::Enzyme::Controller.3 \
-	Catalyst::Helper::Controller::Enzyme::CRUD.3 \
-	Catalyst::Helper::Model::Enzyme::CDBI.3 \
-	Catalyst::Helper::View::Enzyme::TT.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Enzyme/pkg-plist b/www/p5-Catalyst-Enzyme/pkg-plist
index 6a050ddcc5b4..c0335f0e54f4 100644
--- a/www/p5-Catalyst-Enzyme/pkg-plist
+++ b/www/p5-Catalyst-Enzyme/pkg-plist
@@ -1,3 +1,11 @@
+%%PERL5_MAN3%%/Catalyst::Enzyme.3.gz
+%%PERL5_MAN3%%/Catalyst::Enzyme::CRUD::Controller.3.gz
+%%PERL5_MAN3%%/Catalyst::Enzyme::CRUD::Model.3.gz
+%%PERL5_MAN3%%/Catalyst::Enzyme::CRUD::View.3.gz
+%%PERL5_MAN3%%/Catalyst::Enzyme::Controller.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::Controller::Enzyme::CRUD.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::Model::Enzyme::CDBI.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::View::Enzyme::TT.3.gz
 %%SITE_PERL%%/Catalyst/Enzyme.pm
 %%SITE_PERL%%/Catalyst/Enzyme/CRUD/Controller.pm
 %%SITE_PERL%%/Catalyst/Enzyme/CRUD/Model.pm
diff --git a/www/p5-Catalyst-Manual/Makefile b/www/p5-Catalyst-Manual/Makefile
index 317332a4b055..9315451e3020 100644
--- a/www/p5-Catalyst-Manual/Makefile
+++ b/www/p5-Catalyst-Manual/Makefile
@@ -17,41 +17,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Manual.3 \
-		Catalyst::Manual::About.3 \
-		Catalyst::Manual::Actions.3 \
-		Catalyst::Manual::CatalystAndMoose.3 \
-		Catalyst::Manual::Components.3 \
-		Catalyst::Manual::Cookbook.3 \
-		Catalyst::Manual::Deployment.3 \
-		Catalyst::Manual::Deployment::Apache::FastCGI.3 \
-		Catalyst::Manual::Deployment::Apache::mod_perl.3 \
-		Catalyst::Manual::Deployment::DevelopmentServer.3 \
-		Catalyst::Manual::Deployment::FastCGI.3 \
-		Catalyst::Manual::Deployment::IIS::FastCGI.3 \
-		Catalyst::Manual::Deployment::SharedHosting.3 \
-		Catalyst::Manual::Deployment::lighttpd::FastCGI.3 \
-		Catalyst::Manual::Deployment::nginx::FastCGI.3 \
-		Catalyst::Manual::DevelopmentProcess.3 \
-		Catalyst::Manual::ExtendingCatalyst.3 \
-		Catalyst::Manual::Internals.3 \
-		Catalyst::Manual::Intro.3 \
-		Catalyst::Manual::Plugins.3 \
-		Catalyst::Manual::Tutorial.3 \
-		Catalyst::Manual::Tutorial::01_Intro.3 \
-		Catalyst::Manual::Tutorial::02_CatalystBasics.3 \
-		Catalyst::Manual::Tutorial::03_MoreCatalystBasics.3 \
-		Catalyst::Manual::Tutorial::04_BasicCRUD.3 \
-		Catalyst::Manual::Tutorial::05_Authentication.3 \
-		Catalyst::Manual::Tutorial::06_Authorization.3 \
-		Catalyst::Manual::Tutorial::07_Debugging.3 \
-		Catalyst::Manual::Tutorial::08_Testing.3 \
-		Catalyst::Manual::Tutorial::09_AdvancedCRUD.3 \
-		Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormBuilder.3 \
-		Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormFu.3 \
-		Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormHandler.3 \
-		Catalyst::Manual::Tutorial::10_Appendices.3 \
-		Catalyst::Manual::WritingPlugins.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Manual/pkg-plist b/www/p5-Catalyst-Manual/pkg-plist
index 29ad37b7864f..7639e426d8a5 100644
--- a/www/p5-Catalyst-Manual/pkg-plist
+++ b/www/p5-Catalyst-Manual/pkg-plist
@@ -1,3 +1,38 @@
+%%PERL5_MAN3%%/Catalyst::Manual.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::About.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Actions.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::CatalystAndMoose.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Components.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Cookbook.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::Apache::FastCGI.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::Apache::mod_perl.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::DevelopmentServer.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::FastCGI.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::IIS::FastCGI.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::SharedHosting.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::lighttpd::FastCGI.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Deployment::nginx::FastCGI.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::DevelopmentProcess.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::ExtendingCatalyst.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Internals.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Intro.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Plugins.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::01_Intro.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::02_CatalystBasics.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::03_MoreCatalystBasics.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::04_BasicCRUD.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::05_Authentication.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::06_Authorization.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::07_Debugging.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::08_Testing.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::09_AdvancedCRUD.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormBuilder.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormFu.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormHandler.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::Tutorial::10_Appendices.3.gz
+%%PERL5_MAN3%%/Catalyst::Manual::WritingPlugins.3.gz
 %%SITE_PERL%%/Catalyst/Manual.pm
 %%SITE_PERL%%/Catalyst/Manual/About.pod
 %%SITE_PERL%%/Catalyst/Manual/Actions.pod
@@ -34,14 +69,14 @@
 %%SITE_PERL%%/Catalyst/Manual/Tutorial/10_Appendices.pod
 %%SITE_PERL%%/Catalyst/Manual/WritingPlugins.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Manual/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Manual
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Manual
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Tutorial/09_AdvancedCRUD
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Tutorial
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Deployment/nginx
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Deployment/lighttpd
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Deployment/IIS
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Deployment/Apache
-@dirrm %%SITE_PERL%%/Catalyst/Manual/Deployment
-@dirrm %%SITE_PERL%%/Catalyst/Manual
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Tutorial/09_AdvancedCRUD
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Tutorial
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/nginx
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/lighttpd
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/IIS
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment/Apache
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual/Deployment
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index c0075f26deb9..3d8c9b16acf7 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Catalyst::Model::CDBI::Sweet.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
index 66858beee67f..76475cd9ec59 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Catalyst::Model::CDBI::Sweet.3.gz
 %%SITE_PERL%%/Catalyst/Model/CDBI/Sweet.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Model/CDBI
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-CDBI/Makefile b/www/p5-Catalyst-Model-CDBI/Makefile
index 06f6de44ffc3..f935fc3da8ce 100644
--- a/www/p5-Catalyst-Model-CDBI/Makefile
+++ b/www/p5-Catalyst-Model-CDBI/Makefile
@@ -20,8 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::Model::CDBI.3 \
-	Catalyst::Model::CDBI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-CDBI/pkg-plist b/www/p5-Catalyst-Model-CDBI/pkg-plist
index 6d77b145ef21..6cf7e435af2e 100644
--- a/www/p5-Catalyst-Model-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI/pkg-plist
@@ -1,10 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Model::CDBI.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::CDBI.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/CDBI.pm
 %%SITE_PERL%%/Catalyst/Model/CDBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrm %%SITE_PERL%%/Catalyst/Helper/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index 7f810c4c2706..2fadbbf876c3 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::Model::DBIC::Plain.3 \
-	Catalyst::Model::DBIC::Plain.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
index ce3552ecb930..9cf4bd314627 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
@@ -1,13 +1,15 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Model::DBIC::Plain.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::DBIC::Plain.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/DBIC/Plain.pm
 %%SITE_PERL%%/Catalyst/Model/DBIC/Plain.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC
+@dirrmtry %%SITE_PERL%%/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/DBIC
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 6c37eba1574c..703ce5cf4763 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -34,18 +34,6 @@ TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
 USES=		perl5
-#USE_PERL5=	configure extract
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Helper::Model::DBIC::Schema.3 \
-		Catalyst::Model::DBIC::Schema.3 \
-		Catalyst::TraitFor::Model::DBIC::Schema::Caching.3 \
-		Catalyst::TraitFor::Model::DBIC::Schema::PerRequestSchema.3 \
-		Catalyst::TraitFor::Model::DBIC::Schema::Replicated.3 \
-		Catalyst::TraitFor::Model::DBIC::Schema::SchemaProxy.3
-
-NO_STAGE=	yes
-#post-patch:
-#	@${PERL} -i.bak -ne 'print unless m,^feature, .. m,;$$,' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist b/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
index b49b7e4250cb..9db858ccc4bd 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC-Schema/pkg-plist
@@ -1,11 +1,21 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Model::DBIC::Schema.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::DBIC::Schema.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Model::DBIC::Schema::Caching.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Model::DBIC::Schema::PerRequestSchema.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Model::DBIC::Schema::Replicated.3.gz
+%%PERL5_MAN3%%/Catalyst::TraitFor::Model::DBIC::Schema::SchemaProxy.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/DBIC/Schema.pm
 %%SITE_PERL%%/Catalyst/Model/DBIC/Schema.pm
 %%SITE_PERL%%/Catalyst/Model/DBIC/Schema/Types.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm
-%%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/PerRequestSchema.pm
+%%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/SchemaProxy.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Schema/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Schema
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Model
@@ -17,7 +27,3 @@
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Schema
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
index 52d9be70bf4b..599bf6a65b80 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Model::DynamicAdaptor.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
index 2fc3ad0c1790..2c641128f637 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Model::DynamicAdaptor.3.gz
 %%SITE_PERL%%/Catalyst/Model/DynamicAdaptor.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor
diff --git a/www/p5-Catalyst-Model-LDAP/Makefile b/www/p5-Catalyst-Model-LDAP/Makefile
index b23a4e5d44f9..1f9e629bbeaf 100644
--- a/www/p5-Catalyst-Model-LDAP/Makefile
+++ b/www/p5-Catalyst-Model-LDAP/Makefile
@@ -9,19 +9,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	LDAP model class for Catalyst
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
 		p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
 		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Model::LDAP::Entry.3 Catalyst::Model::LDAP::Search.3 \
-	Catalyst::Helper::Model::LDAP.3 Catalyst::Model::LDAP::Connection.3 \
-	Catalyst::Model::LDAP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-LDAP/pkg-plist b/www/p5-Catalyst-Model-LDAP/pkg-plist
index f96692288a6b..40579c05d628 100644
--- a/www/p5-Catalyst-Model-LDAP/pkg-plist
+++ b/www/p5-Catalyst-Model-LDAP/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Model::LDAP.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::LDAP.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::LDAP::Connection.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::LDAP::Entry.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::LDAP::Search.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/LDAP.pm
 %%SITE_PERL%%/Catalyst/Model/LDAP.pm
 %%SITE_PERL%%/Catalyst/Model/LDAP/Connection.pm
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index 785abf985c2f..99e38c20dc13 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -18,8 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::Model::Oryx.3 \
-	Catalyst::Model::Oryx.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-Oryx/pkg-plist b/www/p5-Catalyst-Model-Oryx/pkg-plist
index bc937fa6c555..c71b884cca93 100644
--- a/www/p5-Catalyst-Model-Oryx/pkg-plist
+++ b/www/p5-Catalyst-Model-Oryx/pkg-plist
@@ -1,10 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Model::Oryx.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::Oryx.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/Oryx.pm
 %%SITE_PERL%%/Catalyst/Model/Oryx.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Oryx/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Oryx
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-XML-Feed/Makefile b/www/p5-Catalyst-Model-XML-Feed/Makefile
index 5c219c5226be..2b4c743b597e 100644
--- a/www/p5-Catalyst-Model-XML-Feed/Makefile
+++ b/www/p5-Catalyst-Model-XML-Feed/Makefile
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Model::XML::Feed.3 \
-	Catalyst::Model::XML::Feed::Item.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-XML-Feed/pkg-plist b/www/p5-Catalyst-Model-XML-Feed/pkg-plist
index 8e19bfd3eb32..b3606539f988 100644
--- a/www/p5-Catalyst-Model-XML-Feed/pkg-plist
+++ b/www/p5-Catalyst-Model-XML-Feed/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Catalyst::Model::XML::Feed.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::XML::Feed::Item.3.gz
 %%SITE_PERL%%/Catalyst/Model/XML/Feed.pm
 %%SITE_PERL%%/Catalyst/Model/XML/Feed/Item.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/XML/Feed/.packlist
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index 7c261a0f27cd..2f8bf8509d3d 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -21,8 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Model::Xapian.3 \
-	Catalyst::Helper::Model::Xapian.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-Xapian/pkg-plist b/www/p5-Catalyst-Model-Xapian/pkg-plist
index 666fc260e709..f4aa440ba6a2 100644
--- a/www/p5-Catalyst-Model-Xapian/pkg-plist
+++ b/www/p5-Catalyst-Model-Xapian/pkg-plist
@@ -1,12 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
+%%PERL5_MAN3%%/Catalyst::Helper::Model::Xapian.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::Xapian.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian/Result.pm
 %%SITE_PERL%%/Catalyst/Model/sample-indexer.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Model/Xapian
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
diff --git a/www/p5-Catalyst-Model-Xapian10/Makefile b/www/p5-Catalyst-Model-Xapian10/Makefile
index 2cc538a2afb0..8642a9a31a05 100644
--- a/www/p5-Catalyst-Model-Xapian10/Makefile
+++ b/www/p5-Catalyst-Model-Xapian10/Makefile
@@ -22,8 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Model::Xapian.3 \
-	Catalyst::Helper::Model::Xapian.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Model-Xapian10/pkg-plist b/www/p5-Catalyst-Model-Xapian10/pkg-plist
index 666fc260e709..f4aa440ba6a2 100644
--- a/www/p5-Catalyst-Model-Xapian10/pkg-plist
+++ b/www/p5-Catalyst-Model-Xapian10/pkg-plist
@@ -1,12 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
+%%PERL5_MAN3%%/Catalyst::Helper::Model::Xapian.3.gz
+%%PERL5_MAN3%%/Catalyst::Model::Xapian.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian.pm
 %%SITE_PERL%%/Catalyst/Model/Xapian/Result.pm
 %%SITE_PERL%%/Catalyst/Model/sample-indexer.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Model/Xapian
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/Xapian
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 1e0378c65bb6..9d5f272606f2 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::Authentication::CDBI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
index c41b3f74d6d6..b64679510105 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::CDBI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/CDBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
index 0016015cc718..172f10831f36 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/Makefile
@@ -19,9 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Plugin::Authentication::Store::Htpasswd::User.3 \
-	Catalyst::Plugin::Authentication::Store::Htpasswd.3 \
-	Catalyst::Plugin::Authentication::Store::Htpasswd::Backend.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
index 17f11853f711..7a3440de3ca8 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
@@ -1,6 +1,9 @@
-%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
-%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/Backend.pm
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Store::Htpasswd.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Store::Htpasswd::Backend.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Store::Htpasswd::User.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd.pm
+%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/Backend.pm
+%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 1e9e3384ae4f..39461d344406 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -33,23 +33,4 @@ PORTSCOUT=	skipv:0.100091,0.100092
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Authentication::Credential::NoPassword.3 \
-	Catalyst::Authentication::Credential::Password.3 \
-	Catalyst::Authentication::Credential::Remote.3 \
-	Catalyst::Authentication::Realm.3 \
-	Catalyst::Authentication::Realm::Compatibility.3 \
-	Catalyst::Authentication::Realm::Progressive.3 \
-	Catalyst::Authentication::Store.3 \
-	Catalyst::Authentication::Store::Minimal.3 \
-	Catalyst::Authentication::Store::Null.3 \
-	Catalyst::Authentication::User.3 \
-	Catalyst::Authentication::User::Hash.3 \
-	Catalyst::Plugin::Authentication.3 \
-	Catalyst::Plugin::Authentication::Credential::Password.3 \
-	Catalyst::Plugin::Authentication::Internals.3 \
-	Catalyst::Plugin::Authentication::Store::Minimal.3 \
-	Catalyst::Plugin::Authentication::User.3 \
-	Catalyst::Plugin::Authentication::User::Hash.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Authentication/pkg-plist b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
index f38eb81de249..7e6145620a09 100644
--- a/www/p5-Catalyst-Plugin-Authentication/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
@@ -1,3 +1,20 @@
+%%PERL5_MAN3%%/Catalyst::Authentication::Credential::NoPassword.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Credential::Password.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Credential::Remote.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Realm.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Realm::Compatibility.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Realm::Progressive.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Store.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Store::Minimal.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::Store::Null.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::User.3.gz
+%%PERL5_MAN3%%/Catalyst::Authentication::User::Hash.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Credential::Password.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Internals.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::Store::Minimal.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::User.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Authentication::User::Hash.3.gz
 %%SITE_PERL%%/Catalyst/Authentication/Credential/NoPassword.pm
 %%SITE_PERL%%/Catalyst/Authentication/Credential/Password.pm
 %%SITE_PERL%%/Catalyst/Authentication/Credential/Remote.pm
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index cfcfa4fc6106..7775630c03e2 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -20,9 +20,6 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Authorization::Roles.3
-
-NO_STAGE=	yes
 post-extract:
 	@${REINPLACE_CMD} -e '/^test_requires/d' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
index 699054305f39..8ffd983dde92 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Authorization::Roles.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Authorization/Roles.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/Roles/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authorization/Roles
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
index 8bcb647978cf..86a741ddba47 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/Makefile
@@ -34,10 +34,4 @@ TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::AutoCRUD.3 \
-		Catalyst::Plugin::AutoCRUD::Manual::DBICTips.3 \
-		Catalyst::Plugin::AutoCRUD::Manual::Limitations.3 \
-		Catalyst::Plugin::AutoCRUD::Manual::Troubleshooting.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist b/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
index 6a17e5bf8f37..a741ed54d4b7 100644
--- a/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
+++ b/www/p5-Catalyst-Plugin-AutoCRUD/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::AutoCRUD.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::AutoCRUD::Manual::DBICTips.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::AutoCRUD::Manual::Limitations.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::AutoCRUD::Manual::Troubleshooting.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD.pm
 %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller/AJAX.pm
 %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller/DisplayEngine/ExtJS2.pm
@@ -72,29 +76,32 @@
 %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC/Relationships.pm
 %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC/ViewsAsTables.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AutoCRUD/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AutoCRUD
-@dirrm %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC
-@dirrm %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine
-@dirrm %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD
-@dirrm %%SITE_PERL%%/SQL/Translator/AutoCRUD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/AutoCRUD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine/DBIC
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD/StorageEngine
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter/AutoCRUD
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Filter
+@dirrmtry %%SITE_PERL%%/SQL/Translator/AutoCRUD
 @dirrmtry %%SITE_PERL%%/SQL/Translator
 @dirrmtry %%SITE_PERL%%/SQL
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny/wrapper
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/wrapper
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/update
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/grid
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/static
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/View
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine/DBIC
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Manual
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller/DisplayEngine
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller
-@dirrm %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny/wrapper
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/skinny
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/wrapper
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/update
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript/grid
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2/javascript
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates/extjs2
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/templates
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/static
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine/DBIC
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model/StorageEngine
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Manual
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller/DisplayEngine
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD/Controller
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/AutoCRUD
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Browser/Makefile b/www/p5-Catalyst-Plugin-Browser/Makefile
index e7755bc8c5e8..f49369a4e0f3 100644
--- a/www/p5-Catalyst-Plugin-Browser/Makefile
+++ b/www/p5-Catalyst-Plugin-Browser/Makefile
@@ -10,13 +10,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Browser Detection for Catalyst
 
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-	p5-Catalyst-TraitFor-Request-BrowserDetect>=0:${PORTSDIR}/www/p5-Catalyst-TraitFor-Request-BrowserDetect
+		p5-Catalyst-TraitFor-Request-BrowserDetect>=0:${PORTSDIR}/www/p5-Catalyst-TraitFor-Request-BrowserDetect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Browser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Browser/pkg-plist b/www/p5-Catalyst-Plugin-Browser/pkg-plist
index 377b82f0084b..9a4a6b7a6339 100644
--- a/www/p5-Catalyst-Plugin-Browser/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Browser/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Browser.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Browser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Browser/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Browser
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-C3/Makefile b/www/p5-Catalyst-Plugin-C3/Makefile
index fcc69bb86cbc..e3970837bc50 100644
--- a/www/p5-Catalyst-Plugin-C3/Makefile
+++ b/www/p5-Catalyst-Plugin-C3/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::C3.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-C3/pkg-plist b/www/p5-Catalyst-Plugin-C3/pkg-plist
index 1aaa5de834b4..5f1abd4d1496 100644
--- a/www/p5-Catalyst-Plugin-C3/pkg-plist
+++ b/www/p5-Catalyst-Plugin-C3/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::C3.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/C3.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/C3/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/C3
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index dabc0df3aedb..ec2deb96f752 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -22,7 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Cache::FastMmap.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
index ed7660dc2344..901f36fe3bc7 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::FastMmap.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Cache/FastMmap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/FastMmap/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/FastMmap
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index 41e418c27472..f5fe23700e33 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Cache::Memcached.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
index d77c2db629a2..7b06aad7645a 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Memcached.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache/Memcached
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Cache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-Cache/Makefile b/www/p5-Catalyst-Plugin-Cache/Makefile
index 721de3a4083e..4fe48f78f0a2 100644
--- a/www/p5-Catalyst-Plugin-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache/Makefile
@@ -14,7 +14,6 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.8000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
@@ -22,15 +21,6 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=	Catalyst::Plugin::Cache.3 \
-	Catalyst::Plugin::Cache::Backend.3 \
-	Catalyst::Plugin::Cache::Backend::Memory.3 \
-	Catalyst::Plugin::Cache::Choose::KeyRegexes.3 \
-	Catalyst::Plugin::Cache::Curried.3 \
-	Catalyst::Plugin::Cache::Store.3 \
-	Catalyst::Plugin::Cache::Store::Memory.3
-
-NO_STAGE=	yes
 post-patch:
 	@${PERL} -i.bak -ne 'print unless m,ok|Test::,' ${WRKSRC}/Makefile.PL
 
diff --git a/www/p5-Catalyst-Plugin-Cache/pkg-plist b/www/p5-Catalyst-Plugin-Cache/pkg-plist
index b0d2889a9a21..0e49aa49815b 100644
--- a/www/p5-Catalyst-Plugin-Cache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache/pkg-plist
@@ -1,3 +1,10 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Backend.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Backend::Memory.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Choose::KeyRegexes.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Curried.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Store.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Cache::Store::Memory.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Cache.pm
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Backend.pm
 %%SITE_PERL%%/Catalyst/Plugin/Cache/Backend/Memory.pm
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index e076d4209f9e..c7651059b1ab 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::Captcha.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Captcha/pkg-plist b/www/p5-Catalyst-Plugin-Captcha/pkg-plist
index 072823e0cf6e..c88a66f02fa2 100644
--- a/www/p5-Catalyst-Plugin-Captcha/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Captcha/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::Captcha.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Captcha.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Captcha
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
index 0b08aa623bc9..d649f73131fc 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/Makefile
@@ -10,17 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Load config files of various types
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7008:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7008:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
 		p5-Config-Any>=0.20:${PORTSDIR}/devel/p5-Config-Any \
 		p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::ConfigLoader.3 \
-	Catalyst::Plugin::ConfigLoader::Manual.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist b/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
index bdcda1f18767..2b04bc702a5f 100644
--- a/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
+++ b/www/p5-Catalyst-Plugin-ConfigLoader/pkg-plist
@@ -1,5 +1,7 @@
-%%SITE_PERL%%/Catalyst/Plugin/ConfigLoader/Manual.pod
+%%PERL5_MAN3%%/Catalyst::Plugin::ConfigLoader.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ConfigLoader::Manual.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/ConfigLoader.pm
+%%SITE_PERL%%/Catalyst/Plugin/ConfigLoader/Manual.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/ConfigLoader
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index ec660b0f00b2..7eb65840923e 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -10,13 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sensible default end action
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.2000:${PORTSDIR}/www/p5-Catalyst-Runtime
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.2000:${PORTSDIR}/www/p5-Catalyst-Runtime
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Plugin::DefaultEnd.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
index 28c32042d23b..1ae3bdfafa00 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::DefaultEnd.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/DefaultEnd.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Email/Makefile b/www/p5-Catalyst-Plugin-Email/Makefile
index 387a388071f9..d165f7d9f73a 100644
--- a/www/p5-Catalyst-Plugin-Email/Makefile
+++ b/www/p5-Catalyst-Plugin-Email/Makefile
@@ -11,15 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Send emails with Catalyst
 
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Email-Send>=0:${PORTSDIR}/mail/p5-Email-Send \
 		p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Email.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Email/pkg-plist b/www/p5-Catalyst-Plugin-Email/pkg-plist
index d696f2ef6c11..7461a11a1cb5 100644
--- a/www/p5-Catalyst-Plugin-Email/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Email/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Email.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Email.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Email/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Email
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
index 0c928bc1fcb1..b53b5d4ad17b 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/Makefile
@@ -43,15 +43,4 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::ErrorCatcher.3 \
-		Catalyst::Plugin::ErrorCatcher::Email.3 \
-		Catalyst::Plugin::ErrorCatcher::File.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::CaughtException.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::ForeignKeyConstraint.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::MissingColumn.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::TransactionAborted.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::UniqueConstraintViolation.3 \
-		Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::TxnDo.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist b/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
index 19a807b5a1ae..a3961b23bf1c 100644
--- a/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
+++ b/www/p5-Catalyst-Plugin-ErrorCatcher/pkg-plist
@@ -1,3 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Email.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::File.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::CaughtException.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::ForeignKeyConstraint.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::MissingColumn.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::TransactionAborted.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::Pg::UniqueConstraintViolation.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::ErrorCatcher::Plugin::CleanUp::TxnDo.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher.pm
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/Email.pm
 %%SITE_PERL%%/Catalyst/Plugin/ErrorCatcher/File.pm
diff --git a/www/p5-Catalyst-Plugin-FillInForm/Makefile b/www/p5-Catalyst-Plugin-FillInForm/Makefile
index 162704d663c6..5bd65f681c5f 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/www/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -13,13 +13,9 @@ COMMENT=	Automatically fill in forms in Catalyst using HTML::FillInForms
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
 		p5-Catalyst-Action-RenderView>=0:${PORTSDIR}/www/p5-Catalyst-Action-RenderView
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::FillInForm.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
index a45e3142dca1..d2ce1e5d5e39 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::FillInForm.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/FillInForm.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/Makefile b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
index d58a1b40fef9..72ab9010fdad 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Plugin-FormBuilder/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::FormBuilder.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist b/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
index defc9e2452e5..de9a35baf4e6 100644
--- a/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FormBuilder/pkg-plist
@@ -1,9 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::FormBuilder.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/FormBuilder.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormBuilder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%
diff --git a/www/p5-Catalyst-Plugin-I18N/Makefile b/www/p5-Catalyst-Plugin-I18N/Makefile
index 438bfe04697f..53534a935e0e 100644
--- a/www/p5-Catalyst-Plugin-I18N/Makefile
+++ b/www/p5-Catalyst-Plugin-I18N/Makefile
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::I18N.3 \
-		Catalyst::Plugin::I18N::Manual.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-I18N/pkg-plist b/www/p5-Catalyst-Plugin-I18N/pkg-plist
index 61cbb0777b9b..fa07da8ef99a 100644
--- a/www/p5-Catalyst-Plugin-I18N/pkg-plist
+++ b/www/p5-Catalyst-Plugin-I18N/pkg-plist
@@ -1,5 +1,7 @@
-%%SITE_PERL%%/Catalyst/Plugin/I18N/Manual.pod
+%%PERL5_MAN3%%/Catalyst::Plugin::I18N.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::I18N::Manual.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/I18N.pm
+%%SITE_PERL%%/Catalyst/Plugin/I18N/Manual.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/Makefile b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
index b83b02f5f734..cc90064cf2f4 100644
--- a/www/p5-Catalyst-Plugin-Log-Handler/Makefile
+++ b/www/p5-Catalyst-Plugin-Log-Handler/Makefile
@@ -10,18 +10,11 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst log handler
 
 BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-  				p5-Log-Handler>=0:${PORTSDIR}/devel/p5-Log-Handler \
-  				p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+  		p5-Log-Handler>=0:${PORTSDIR}/devel/p5-Log-Handler \
+  		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Plugin::Log::Handler.3
-
-PLIST_FILES=	%%SITE_PERL%%/Catalyst/Plugin/Log/Handler.pm
-PLIST_DIRS=		%%SITE_PERL%%/Catalyst/Plugin/Log \
-				%%SITE_PERL%%/Catalyst/Plugin \
-				%%SITE_PERL%%/Catalyst
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist b/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist
new file mode 100644
index 000000000000..b2bca68340c2
--- /dev/null
+++ b/www/p5-Catalyst-Plugin-Log-Handler/pkg-plist
@@ -0,0 +1,5 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Log::Handler.3.gz
+%%SITE_PERL%%/Catalyst/Plugin/Log/Handler.pm
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Log
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/Makefile b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
index 35596529d08f..742c40cbb117 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/Makefile
+++ b/www/p5-Catalyst-Plugin-LogWarnings/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::LogWarnings.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist b/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
index b5e2fddd1f53..8f809ec802f9 100644
--- a/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
+++ b/www/p5-Catalyst-Plugin-LogWarnings/pkg-plist
@@ -1,8 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::LogWarnings.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/LogWarnings.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/LogWarnings/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/LogWarnings
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/LogWarnings
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-PageCache/Makefile b/www/p5-Catalyst-Plugin-PageCache/Makefile
index 4b9707720da0..83f8caa995cd 100644
--- a/www/p5-Catalyst-Plugin-PageCache/Makefile
+++ b/www/p5-Catalyst-Plugin-PageCache/Makefile
@@ -22,7 +22,4 @@ TEST_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::PageCache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-PageCache/pkg-plist b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
index e07dca154967..20262f59214d 100644
--- a/www/p5-Catalyst-Plugin-PageCache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::PageCache.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/PageCache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/PageCache/.packlist
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/PageCache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/Makefile b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
index 87f7918aff62..959cb5f139e5 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/Makefile
+++ b/www/p5-Catalyst-Plugin-Params-Nested/Makefile
@@ -10,16 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nested params (ala Ruby on Rails or PHP-style param arrays)
 
-BUILD_DEPENDS=	p5-CGI-Expand>=1.06:${PORTSDIR}/www/p5-CGI-Expand 
-RUN_DEPENDS=	p5-CGI-Expand>=1.06:${PORTSDIR}/www/p5-CGI-Expand \
+BUILD_DEPENDS=	p5-CGI-Expand>=1.06:${PORTSDIR}/www/p5-CGI-Expand \
 		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Params::Nested.3 \
-	Catalyst::Plugin::Params::Nested::Expander.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist b/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
index e243a6175ec0..4db373bf119b 100644
--- a/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Params-Nested/pkg-plist
@@ -1,11 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params/Nested/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::Params::Nested.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Params::Nested::Expander.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Params/Nested.pm
 %%SITE_PERL%%/Catalyst/Plugin/Params/Nested/Expander.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params/Nested
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params/Nested/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params/Nested
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Params
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params/Nested
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Params
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 6c9ede3c5ec6..dd4db767b6e2 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -20,10 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::Prototype.3 \
-	Catalyst::Plugin::Prototype.3
-
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC} -name '._Prototype.pm' -delete
 
diff --git a/www/p5-Catalyst-Plugin-Prototype/pkg-plist b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
index c0f2211278a2..6e656122d1ef 100644
--- a/www/p5-Catalyst-Plugin-Prototype/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
@@ -1,9 +1,11 @@
+%%PERL5_MAN3%%/Catalyst::Helper::Prototype.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::Prototype.3.gz
 %%SITE_PERL%%/Catalyst/Helper/Prototype.pm
 %%SITE_PERL%%/Catalyst/Plugin/Prototype.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
index 1c1aa57e653e..2754c4530d05 100644
--- a/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-RunAfterRequest/Makefile
@@ -10,21 +10,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run code after the response has been sent
 
-RUN_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
+BUILD_DEPENDS=	p5-Catalyst-Component-InstancePerContext>=0:${PORTSDIR}/www/p5-Catalyst-Component-InstancePerContext \
 		p5-Catalyst-Runtime>=5.80004:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
+RUN_DEPENDS:=	${RUN_DEPENDS}
+TEST_DEPENDS+=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::RunAfterRequest.3 \
-			Catalyst::Model::Role::RunAfterRequest.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist b/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
index 33ef08c4cd75..2c26f8dd886c 100644
--- a/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
+++ b/www/p5-Catalyst-Plugin-RunAfterRequest/pkg-plist
@@ -1,9 +1,12 @@
-%%SITE_PERL%%/Catalyst/Plugin/RunAfterRequest.pm
+%%PERL5_MAN3%%/Catalyst::Model::Role::RunAfterRequest.3.gz
+%%PERL5_MAN3%%/Catalyst::Plugin::RunAfterRequest.3.gz
 %%SITE_PERL%%/Catalyst/Model/Role/RunAfterRequest.pm
+%%SITE_PERL%%/Catalyst/Plugin/RunAfterRequest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/RunAfterRequest/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/RunAfterRequest
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst/Model/Role
 @dirrmtry %%SITE_PERL%%/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Scheduler/Makefile b/www/p5-Catalyst-Plugin-Scheduler/Makefile
index bd4828bdaf32..e4ee03e9e74c 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/Makefile
+++ b/www/p5-Catalyst-Plugin-Scheduler/Makefile
@@ -21,7 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Scheduler.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Scheduler/pkg-plist b/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
index 4aab3a820ebb..707ae5964815 100644
--- a/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Scheduler/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Scheduler.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Scheduler.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Scheduler/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Scheduler
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
index 5054c6909523..dcc9b1808bca 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Saves Catalyst Session IDs by rewriting URIs
 
-RUN_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
+BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
 		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
 		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
@@ -20,13 +20,10 @@ RUN_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
 		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-MockObject>=1.01:${PORTSDIR}/devel/p5-Test-MockObject
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-MockObject>=1.01:${PORTSDIR}/devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Session::State::URI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
index 1bf43bf714bc..45a31baf732d 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
@@ -1,11 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Session::State::URI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/State/URI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/URI/.packlist
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State/URI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/State
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
index 7489493eedbd..60262bf817b1 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile
@@ -11,12 +11,9 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store sessions using a Catalyst::Plugin::Cache
 
 BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.06:${PORTSDIR}/www/p5-Catalyst-Plugin-Session
-RUN_DEPENDS=	p5-Catalyst-Plugin-Session>=0.06:${PORTSDIR}/www/p5-Catalyst-Plugin-Session
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Session::Store::Cache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
index c58cf911bb7e..c15dc0bc119a 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/pkg-plist
@@ -1,11 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Cache/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Cache.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Cache.pm
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Cache/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Cache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
index 82296d8bf0e0..f1e9db9cc8f4 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
@@ -15,16 +15,9 @@ BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-
 		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
-RUN_DEPENDS=	p5-Catalyst-Plugin-Session>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
-		p5-Catalyst-Runtime>=5.49:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Session::Store::DBI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
index 1f4cd282dd97..2462880727dc 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::DBI.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBI/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/DBI
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index 12a25fddc90d..5ac8f314ebfb 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -18,7 +18,4 @@ TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Session::Store::Delegate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
index 8d56adea264d..46c531d553e9 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/pkg-plist
@@ -1,11 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
+%%PERL5_MAN3%%/Catalyst::Plugin::Session::Store::Delegate.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Delegate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/Delegate
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
-@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/Catalyst
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Setenv/Makefile b/www/p5-Catalyst-Plugin-Setenv/Makefile
index 0e2e56633805..0a46af7d9aba 100644
--- a/www/p5-Catalyst-Plugin-Setenv/Makefile
+++ b/www/p5-Catalyst-Plugin-Setenv/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Plugin::Setenv.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Setenv/pkg-plist b/www/p5-Catalyst-Plugin-Setenv/pkg-plist
index a60f2f688c75..695b161861f9 100644
--- a/www/p5-Catalyst-Plugin-Setenv/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Setenv/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Setenv.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Setenv.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index ed6c65926268..fcc4dd99c2a1 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -14,13 +14,9 @@ COMMENT=	Singleton accessors to context
 
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Catalyst::Plugin::Singleton.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-plist b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
index d606fb7e74b6..3631c127f077 100644
--- a/www/p5-Catalyst-Plugin-Singleton/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Singleton.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Singleton.pm
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-SubRequest/Makefile b/www/p5-Catalyst-Plugin-SubRequest/Makefile
index 2b67301ff3ca..864b3344d4cd 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Plugin::SubRequest.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
index 0fc4ee69b8ab..e8d37ac8c119 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
+++ b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::SubRequest.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/SubRequest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index 7f06b20a14a7..9b366245509a 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Textile.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-Textile/pkg-plist b/www/p5-Catalyst-Plugin-Textile/pkg-plist
index cafe5d8ef4fb..9d696104027a 100644
--- a/www/p5-Catalyst-Plugin-Textile/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Textile/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Textile.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Textile.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/Plugin
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index f05e1387725e..228a825a0769 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -20,9 +20,6 @@ TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Plugin::Unicode.3
-
-NO_STAGE=	yes
 post-extract:
 	@${REINPLACE_CMD} -e '/build_requires/d' ${WRKSRC}/Makefile.PL
 
diff --git a/www/p5-Catalyst-Plugin-Unicode/pkg-plist b/www/p5-Catalyst-Plugin-Unicode/pkg-plist
index adf1e022bb05..34deea460806 100644
--- a/www/p5-Catalyst-Plugin-Unicode/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Unicode/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Catalyst::Plugin::Unicode.3.gz
 %%SITE_PERL%%/Catalyst/Plugin/Unicode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
index 5bdb7268093b..9a4d318c7734 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::TraitFor::Request::BrowserDetect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
index 3cfd1fac415d..56a000bc03b8 100644
--- a/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
+++ b/www/p5-Catalyst-TraitFor-Request-BrowserDetect/pkg-plist
@@ -1,7 +1,10 @@
+%%PERL5_MAN3%%/Catalyst::TraitFor::Request::BrowserDetect.3.gz
 %%SITE_PERL%%/Catalyst/TraitFor/Request/BrowserDetect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request/BrowserDetect/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request/BrowserDetect
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor/Request
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/TraitFor
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Email/Makefile b/www/p5-Catalyst-View-Email/Makefile
index 8d34aacec656..107d6d080e48 100644
--- a/www/p5-Catalyst-View-Email/Makefile
+++ b/www/p5-Catalyst-View-Email/Makefile
@@ -27,10 +27,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Helper::View::Email.3 \
-		Catalyst::Helper::View::Email::Template.3 \
-		Catalyst::View::Email.3 \
-		Catalyst::View::Email::Template.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-Email/pkg-plist b/www/p5-Catalyst-View-Email/pkg-plist
index 059d64affe03..035f533e1a6e 100644
--- a/www/p5-Catalyst-View-Email/pkg-plist
+++ b/www/p5-Catalyst-View-Email/pkg-plist
@@ -1,8 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email/.packlist
-%%SITE_PERL%%/Catalyst/View/Email.pm
-%%SITE_PERL%%/Catalyst/View/Email/Template.pm
+%%PERL5_MAN3%%/Catalyst::Helper::View::Email.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::View::Email::Template.3.gz
+%%PERL5_MAN3%%/Catalyst::View::Email.3.gz
+%%PERL5_MAN3%%/Catalyst::View::Email::Template.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/Email.pm
 %%SITE_PERL%%/Catalyst/Helper/View/Email/Template.pm
+%%SITE_PERL%%/Catalyst/View/Email.pm
+%%SITE_PERL%%/Catalyst/View/Email/Template.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index eb13c8bc089b..51fa261f945b 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -18,9 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::View::GraphView.3 \
-	Catalyst::Helper::View::GraphViz.3 \
-	Catalyst::View::GraphViz.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-GraphViz/pkg-plist b/www/p5-Catalyst-View-GraphViz/pkg-plist
index e7514fb5dac2..7883dfba9c57 100644
--- a/www/p5-Catalyst-View-GraphViz/pkg-plist
+++ b/www/p5-Catalyst-View-GraphViz/pkg-plist
@@ -1,11 +1,14 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::GraphView.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::View::GraphViz.3.gz
+%%PERL5_MAN3%%/Catalyst::View::GraphViz.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/GraphView.pm
 %%SITE_PERL%%/Catalyst/Helper/View/GraphViz.pm
 %%SITE_PERL%%/Catalyst/View/GraphViz.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/GraphViz/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/GraphViz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/GraphViz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
-@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index 49383400ed4f..a9e4966d0efb 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Catalyst::Helper::View::HTML::Template::Compiled.3 \
-		Catalyst::View::HTML::Template::Compiled.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist b/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
index f173aa701a5e..9546ea0f3cd0 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/pkg-plist
@@ -1,9 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::HTML::Template::Compiled.3.gz
+%%PERL5_MAN3%%/Catalyst::View::HTML::Template::Compiled.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/HTML/Template/Compiled.pm
 %%SITE_PERL%%/Catalyst/View/HTML/Template/Compiled.pm
+@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML/Template
+@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML
+@dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML/Template
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML/Template
-@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML
-@dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile
index 75e39af1102e..73ba16af4fbf 100644
--- a/www/p5-Catalyst-View-RRDGraph/Makefile
+++ b/www/p5-Catalyst-View-RRDGraph/Makefile
@@ -19,8 +19,4 @@ TEST_DEPENDS=	p5-Test-MockObject>=1.07:${PORTSDIR}/devel/p5-Test-MockObject
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::View::RRDGraph.3 \
-	Catalyst::View::RRDGraph.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-RRDGraph/pkg-plist b/www/p5-Catalyst-View-RRDGraph/pkg-plist
index 9134b02b8dca..6ec8005d769c 100644
--- a/www/p5-Catalyst-View-RRDGraph/pkg-plist
+++ b/www/p5-Catalyst-View-RRDGraph/pkg-plist
@@ -1,9 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::RRDGraph.3.gz
+%%PERL5_MAN3%%/Catalyst::View::RRDGraph.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/RRDGraph.pm
 %%SITE_PERL%%/Catalyst/View/RRDGraph.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/RRDGraph/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/RRDGraph
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index c5c95f6e4a66..ee8d4826069d 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -24,9 +24,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::Helper::View::TT.3 \
-		Catalyst::Helper::View::TTSite.3 \
-		Catalyst::View::TT.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-TT/pkg-plist b/www/p5-Catalyst-View-TT/pkg-plist
index b43431f895ea..8372f8e76a28 100644
--- a/www/p5-Catalyst-View-TT/pkg-plist
+++ b/www/p5-Catalyst-View-TT/pkg-plist
@@ -1,11 +1,14 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::TT.3.gz
+%%PERL5_MAN3%%/Catalyst::Helper::View::TTSite.3.gz
+%%PERL5_MAN3%%/Catalyst::View::TT.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/TT.pm
 %%SITE_PERL%%/Catalyst/Helper/View/TTSite.pm
 %%SITE_PERL%%/Catalyst/View/TT.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Template-Declare/Makefile b/www/p5-Catalyst-View-Template-Declare/Makefile
index 51c9acacd789..0b3c2f03af7c 100644
--- a/www/p5-Catalyst-View-Template-Declare/Makefile
+++ b/www/p5-Catalyst-View-Template-Declare/Makefile
@@ -20,8 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::Helper::View::Template::Declare.3 \
-	Catalyst::View::Template::Declare.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-Template-Declare/pkg-plist b/www/p5-Catalyst-View-Template-Declare/pkg-plist
index 5e74bd6b34c9..a7393c479b35 100644
--- a/www/p5-Catalyst-View-Template-Declare/pkg-plist
+++ b/www/p5-Catalyst-View-Template-Declare/pkg-plist
@@ -1,9 +1,15 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::Template::Declare.3.gz
+%%PERL5_MAN3%%/Catalyst::View::Template::Declare.3.gz
 %%SITE_PERL%%/Catalyst/Helper/View/Template/Declare.pm
 %%SITE_PERL%%/Catalyst/View/Template/Declare.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template/Declare/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template/Declare
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/View/Template
+@dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Template
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
-@dirrmtry %%SITE_PERL%%/Catalyst/View/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template/Declare
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Template
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index 1335ea04acc3..89c5f76b33a3 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -22,7 +22,4 @@ TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Catalyst::View::Templated.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-Templated/pkg-plist b/www/p5-Catalyst-View-Templated/pkg-plist
index db2f051ada5f..bf22b66b0ba4 100644
--- a/www/p5-Catalyst-View-Templated/pkg-plist
+++ b/www/p5-Catalyst-View-Templated/pkg-plist
@@ -1,5 +1,8 @@
+%%PERL5_MAN3%%/Catalyst::View::Templated.3.gz
 %%SITE_PERL%%/Catalyst/View/Templated.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Templated/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Templated
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Templated
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-XSLT/Makefile b/www/p5-Catalyst-View-XSLT/Makefile
index 3f6445ef744e..1c54b92a2d4a 100644
--- a/www/p5-Catalyst-View-XSLT/Makefile
+++ b/www/p5-Catalyst-View-XSLT/Makefile
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Catalyst::Helper::View::XSLT.3 Catalyst::View::XSLT.3 \
-		Catalyst::View::XSLT::XML::LibXSLT.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-XSLT/pkg-plist b/www/p5-Catalyst-View-XSLT/pkg-plist
index af50e5ad90a5..18f4621c60b5 100644
--- a/www/p5-Catalyst-View-XSLT/pkg-plist
+++ b/www/p5-Catalyst-View-XSLT/pkg-plist
@@ -1,8 +1,12 @@
+%%PERL5_MAN3%%/Catalyst::Helper::View::XSLT.3.gz
+%%PERL5_MAN3%%/Catalyst::View::XSLT.3.gz
+%%PERL5_MAN3%%/Catalyst::View::XSLT::XML::LibXSLT.3.gz
+%%SITE_PERL%%/Catalyst/Helper/View/XSLT.pm
 %%SITE_PERL%%/Catalyst/View/XSLT.pm
 %%SITE_PERL%%/Catalyst/View/XSLT/XML/LibXSLT.pm
-%%SITE_PERL%%/Catalyst/Helper/View/XSLT.pm
-@dirrm %%SITE_PERL%%/Catalyst/View/XSLT/XML
-@dirrm %%SITE_PERL%%/Catalyst/View/XSLT
+@dirrmtry %%SITE_PERL%%/Catalyst/View/XSLT/XML
+@dirrmtry %%SITE_PERL%%/Catalyst/View/XSLT
 @dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
 @dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-CatalystX-LeakChecker/Makefile b/www/p5-CatalystX-LeakChecker/Makefile
index 0a4f04c4f7fb..54c75b59a5bf 100644
--- a/www/p5-CatalystX-LeakChecker/Makefile
+++ b/www/p5-CatalystX-LeakChecker/Makefile
@@ -14,14 +14,9 @@ COMMENT=	Debug memory leaks in Catalyst applications
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Devel-Cycle>0:${PORTSDIR}/devel/p5-Devel-Cycle \
 		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker
-RUN_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Devel-Cycle>0:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CatalystX::LeakChecker.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CatalystX-LeakChecker/pkg-plist b/www/p5-CatalystX-LeakChecker/pkg-plist
index eecb1e75ac8f..9ead30ff0d56 100644
--- a/www/p5-CatalystX-LeakChecker/pkg-plist
+++ b/www/p5-CatalystX-LeakChecker/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CatalystX::LeakChecker.3.gz
 %%SITE_PERL%%/CatalystX/LeakChecker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/LeakChecker/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/LeakChecker
diff --git a/www/p5-CatalystX-RoleApplicator/Makefile b/www/p5-CatalystX-RoleApplicator/Makefile
index 8f366e053fa3..ad80924e9677 100644
--- a/www/p5-CatalystX-RoleApplicator/Makefile
+++ b/www/p5-CatalystX-RoleApplicator/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	CatalystX::RoleApplicator.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CatalystX-RoleApplicator/pkg-plist b/www/p5-CatalystX-RoleApplicator/pkg-plist
index d35751ed9a78..1a264cc52f9e 100644
--- a/www/p5-CatalystX-RoleApplicator/pkg-plist
+++ b/www/p5-CatalystX-RoleApplicator/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/CatalystX::RoleApplicator.3.gz
 %%SITE_PERL%%/CatalystX/RoleApplicator.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/RoleApplicator/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/RoleApplicator
diff --git a/www/p5-ClearSilver/Makefile b/www/p5-ClearSilver/Makefile
index 8227328b7c26..bdddde4d6298 100644
--- a/www/p5-ClearSilver/Makefile
+++ b/www/p5-ClearSilver/Makefile
@@ -18,8 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include/ClearSilver"
 
-MAN3=		ClearSilver.3
 WRKSRC=		${WRKDIR}/${DISTNAME}/perl
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-ClearSilver/pkg-plist b/www/p5-ClearSilver/pkg-plist
index 3b26874cd001..3c0685ec2c75 100644
--- a/www/p5-ClearSilver/pkg-plist
+++ b/www/p5-ClearSilver/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/ClearSilver.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/ClearSilver.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ClearSilver/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ClearSilver/ClearSilver.bs
diff --git a/www/p5-Compress-LeadingBlankSpaces/Makefile b/www/p5-Compress-LeadingBlankSpaces/Makefile
index c1a2fb25e617..3cf0b2b1d7df 100644
--- a/www/p5-Compress-LeadingBlankSpaces/Makefile
+++ b/www/p5-Compress-LeadingBlankSpaces/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl class to compress leading blank spaces in web content
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Compress::LeadingBlankSpaces.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Compress-LeadingBlankSpaces/pkg-plist b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
index c7ec216728be..9b0c1af892bd 100644
--- a/www/p5-Compress-LeadingBlankSpaces/pkg-plist
+++ b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Compress::LeadingBlankSpaces.3.gz
 %%SITE_PERL%%/Compress/LeadingBlankSpaces.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress
 @dirrmtry %%SITE_PERL%%/Compress
author	Vanilla I. Shu <vanilla@FreeBSD.org>	2013-11-07 08:28:22 +0000
committer	Vanilla I. Shu <vanilla@FreeBSD.org>	2013-11-07 08:28:22 +0000
commit	dad9cc37811dcd8a8cdb7489aa4390bf651991b2 (patch)
tree	4128ecf3a93b45c5ff23bacbfb3ad7182e0b1111 /www
parent	8213d25ad49274ddcbc712f4e3aac2719aa19fbc (diff)
download	ports-dad9cc37811dcd8a8cdb7489aa4390bf651991b2.tar.gz ports-dad9cc37811dcd8a8cdb7489aa4390bf651991b2.zip