28 files changed, 42 insertions, 69 deletions

diff --git a/www/p5-CGI-Application-Dispatch/Makefile b/www/p5-CGI-Application-Dispatch/Makefile
index 67ab014e027d..53bbc8058c28 100644
--- a/www/p5-CGI-Application-Dispatch/Makefile
+++ b/www/p5-CGI-Application-Dispatch/Makefile
@@ -25,9 +25,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		CGI::Application::Dispatch.3 \
-		CGI::Application::Dispatch::PSGI.3 \
-		CGI::Application::Dispatch::Regexp.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Dispatch/pkg-plist b/www/p5-CGI-Application-Dispatch/pkg-plist
index fc9cc7a7b94d..45536b850134 100644
--- a/www/p5-CGI-Application-Dispatch/pkg-plist
+++ b/www/p5-CGI-Application-Dispatch/pkg-plist
@@ -1,6 +1,9 @@
 %%SITE_PERL%%/CGI/Application/Dispatch.pm
 %%SITE_PERL%%/CGI/Application/Dispatch/PSGI.pm
 %%SITE_PERL%%/CGI/Application/Dispatch/Regexp.pm
+%%PERL5_MAN3%%/CGI::Application::Dispatch.3.gz
+%%PERL5_MAN3%%/CGI::Application::Dispatch::PSGI.3.gz
+%%PERL5_MAN3%%/CGI::Application::Dispatch::Regexp.3.gz
 @dirrmtry %%SITE_PERL%%/CGI/Application/Dispatch
 @dirrmtry %%SITE_PERL%%/CGI/Application
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 54aad6a19749..107beec477cd 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -27,24 +27,6 @@ CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate support
 CGI_SSI_DESC=	CGI::SSI support
 CGI_SESSION_DESC=	CGI::Session support
 
-MAN3=	CGI::FormBuilder.3 \
-	CGI::FormBuilder::Field.3 \
-	CGI::FormBuilder::Messages.3 \
-	CGI::FormBuilder::Multi.3 \
-	CGI::FormBuilder::Source.3 \
-	CGI::FormBuilder::Source::File.3 \
-	CGI::FormBuilder::Template.3 \
-	CGI::FormBuilder::Template::Builtin.3 \
-	CGI::FormBuilder::Template::CGI_SSI.3 \
-	CGI::FormBuilder::Template::Div.3 \
-	CGI::FormBuilder::Template::Fast.3 \
-	CGI::FormBuilder::Template::HTML.3 \
-	CGI::FormBuilder::Template::TT2.3 \
-	CGI::FormBuilder::Template::Text.3 \
-	CGI::FormBuilder::Test.3 \
-	CGI::FormBuilder::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTT}
diff --git a/www/p5-CGI-FormBuilder/pkg-plist b/www/p5-CGI-FormBuilder/pkg-plist
index cc30a8365a63..1a3ca5411892 100644
--- a/www/p5-CGI-FormBuilder/pkg-plist
+++ b/www/p5-CGI-FormBuilder/pkg-plist
@@ -59,6 +59,22 @@
 %%SITE_PERL%%/CGI/FormBuilder/Test.pm
 %%SITE_PERL%%/CGI/FormBuilder/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder/.packlist
+%%PERL5_MAN3%%/CGI::FormBuilder.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Field.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Messages.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Multi.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Source.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Source::File.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::Builtin.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::CGI_SSI.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::Div.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::Fast.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::HTML.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::TT2.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Template::Text.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Test.3.gz
+%%PERL5_MAN3%%/CGI::FormBuilder::Util.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FormBuilder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrm %%SITE_PERL%%/CGI/FormBuilder/Field
diff --git a/www/p5-File-Mork/Makefile b/www/p5-File-Mork/Makefile
index e76323508ea8..3e7d191ea461 100644
--- a/www/p5-File-Mork/Makefile
+++ b/www/p5-File-Mork/Makefile
@@ -17,8 +17,4 @@ RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		mork.1
-MAN3=		File::Mork.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-File-Mork/pkg-plist b/www/p5-File-Mork/pkg-plist
index 58b5eac4d572..34b21148a444 100644
--- a/www/p5-File-Mork/pkg-plist
+++ b/www/p5-File-Mork/pkg-plist
@@ -1,6 +1,8 @@
 bin/mork
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Mork/.packlist
 %%SITE_PERL%%/File/Mork.pm
+%%PERL5_MAN3%%/File::Mork.3.gz
+man/man1/mork.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Mork
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
 @dirrmtry %%SITE_PERL%%/File
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index a87b1bc55b00..ae413e0ca49b 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -19,10 +19,6 @@ USES=		perl5
 USE_PERL5=	configure
 INSTALL_TARGET=	pure_install
 
-MAN3=		HTML::Template::JIT.3 HTML::Template::JIT::Compiler.3 \
-		HTML::Template::JIT::Base.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/www/p5-HTML-Template-JIT/pkg-plist b/www/p5-HTML-Template-JIT/pkg-plist
index a8e05d5f48f2..d5ab40c1ef5c 100644
--- a/www/p5-HTML-Template-JIT/pkg-plist
+++ b/www/p5-HTML-Template-JIT/pkg-plist
@@ -2,6 +2,9 @@
 %%SITE_PERL%%/HTML/Template/JIT/Base.pm
 %%SITE_PERL%%/HTML/Template/JIT/Compiler.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT/.packlist
+%%PERL5_MAN3%%/HTML::Template::JIT.3.gz
+%%PERL5_MAN3%%/HTML::Template::JIT::Base.3.gz
+%%PERL5_MAN3%%/HTML::Template::JIT::Compiler.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTTP-Headers-Fast/Makefile b/www/p5-HTTP-Headers-Fast/Makefile
index eb26a3f38bd2..80dd80229cfd 100644
--- a/www/p5-HTTP-Headers-Fast/Makefile
+++ b/www/p5-HTTP-Headers-Fast/Makefile
@@ -16,7 +16,4 @@ TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		HTTP::Headers::Fast.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-Headers-Fast/pkg-plist b/www/p5-HTTP-Headers-Fast/pkg-plist
index 2ab3240f0fe3..ef30fed73d79 100644
--- a/www/p5-HTTP-Headers-Fast/pkg-plist
+++ b/www/p5-HTTP-Headers-Fast/pkg-plist
@@ -1,2 +1,3 @@
 %%SITE_PERL%%/HTTP/Headers/Fast.pm
+%%PERL5_MAN3%%/HTTP::Headers::Fast.3.gz
 @dirrmtry %%SITE_PERL%%/HTTP/Headers
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index 9baae5cf387d..785d62d09f7b 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	HTTP::Server::Simple::Static.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-Server-Simple-Static/pkg-plist b/www/p5-HTTP-Server-Simple-Static/pkg-plist
index 7ae46c3a83bb..524842309bc2 100644
--- a/www/p5-HTTP-Server-Simple-Static/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Static/pkg-plist
@@ -1,4 +1,5 @@
 %%SITE_PERL%%/HTTP/Server/Simple/Static.pm
+%%PERL5_MAN3%%/HTTP::Server::Simple::Static.3.gz
 @dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
 @dirrmtry %%SITE_PERL%%/HTTP/Server
 @dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
index 146516300787..fb69ddf0df33 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/Makefile
@@ -15,9 +15,6 @@ COMMENT=	Track sessions and, optionally, users
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=		Maypole::Authentication::UserSessionCookie.3
-
-NO_STAGE=	yes
 post-patch:
 	@${PERL} -pi -e 's/^our (\S+)/use vars qw($$1); $$1/' ${WRKSRC}/UserSessionCookie.pm
 
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
index c74dc46c4209..b5f375fc71a0 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Maypole/Authentication/UserSessionCookie.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie/.packlist
+%%PERL5_MAN3%%/Maypole::Authentication::UserSessionCookie.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
diff --git a/www/p5-Net-FireEagle/Makefile b/www/p5-Net-FireEagle/Makefile
index 1db9aa1e883d..867a33b389c1 100644
--- a/www/p5-Net-FireEagle/Makefile
+++ b/www/p5-Net-FireEagle/Makefile
@@ -20,8 +20,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		fireeagle.1
-MAN3=		Net::FireEagle.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Net-FireEagle/pkg-plist b/www/p5-Net-FireEagle/pkg-plist
index 4c4406f419f2..6967c22a3964 100644
--- a/www/p5-Net-FireEagle/pkg-plist
+++ b/www/p5-Net-FireEagle/pkg-plist
@@ -1,4 +1,6 @@
 bin/fireeagle
+%%PERL5_MAN3%%/Net::FireEagle.3.gz
+man/man1/fireeagle.1.gz
 %%SITE_PERL%%/Net/FireEagle.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FireEagle/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FireEagle
diff --git a/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index 3be77cfa2c6f..86a647227f3e 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -27,10 +27,6 @@ PODT_DESC=	Include Pod package tests
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=		podsite.1
-MAN3=		Pod::Site.3
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPODT}
diff --git a/www/p5-Pod-Site/pkg-plist b/www/p5-Pod-Site/pkg-plist
index 5bd187e5e09c..2ceb4bfa59bb 100644
--- a/www/p5-Pod-Site/pkg-plist
+++ b/www/p5-Pod-Site/pkg-plist
@@ -1,4 +1,6 @@
 bin/podsite
+%%PERL5_MAN3%%/Pod::Site.3.gz
+man/man1/podsite.1.gz
 %%SITE_PERL%%/Pod/Site.pm
 %%SITE_PERL%%/Pod/Site/podsite.css
 %%SITE_PERL%%/Pod/Site/podsite.js
diff --git a/www/p5-Scrappy/Makefile b/www/p5-Scrappy/Makefile
index 519de1a6cb76..046b866baf03 100644
--- a/www/p5-Scrappy/Makefile
+++ b/www/p5-Scrappy/Makefile
@@ -33,15 +33,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	scrappy.1
-MAN3=	Scrappy.3 \
-	Scrappy::Logger.3 \
-	Scrappy::Queue.3 \
-	Scrappy::Scraper::Control.3 \
-	Scrappy::Scraper::Parser.3 \
-	Scrappy::Session.3
-
-NO_STAGE=	yes
 post-patch:
 	rm -f ${WRKSRC}/perltidy.pl
 	rm -f ${WRKSRC}/lib/Scrappy.pm.bak
diff --git a/www/p5-Scrappy/pkg-plist b/www/p5-Scrappy/pkg-plist
index 6a702587aeae..4d1aa4f3288a 100644
--- a/www/p5-Scrappy/pkg-plist
+++ b/www/p5-Scrappy/pkg-plist
@@ -21,6 +21,13 @@ bin/scrappy
 %%SITE_PERL%%/auto/share/dist/Scrappy/support/opera.txt
 %%SITE_PERL%%/auto/share/dist/Scrappy/support/safari.txt
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scrappy/.packlist
+%%PERL5_MAN3%%/Scrappy.3.gz
+%%PERL5_MAN3%%/Scrappy::Logger.3.gz
+%%PERL5_MAN3%%/Scrappy::Queue.3.gz
+%%PERL5_MAN3%%/Scrappy::Scraper::Control.3.gz
+%%PERL5_MAN3%%/Scrappy::Scraper::Parser.3.gz
+%%PERL5_MAN3%%/Scrappy::Session.3.gz
+man/man1/scrappy.1.gz
 @dirrmtry %%SITE_PERL%%/auto/share/dist/Scrappy/support
 @dirrmtry %%SITE_PERL%%/auto/share/dist/Scrappy
 @dirrmtry %%SITE_PERL%%/auto/share/dist
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index 4fc9e6fbbf41..d98274aaa94d 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=	Template::Plugin::Subst.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Template-Plugin-Subst/pkg-plist b/www/p5-Template-Plugin-Subst/pkg-plist
index cc1ff5444776..70f0b3566185 100644
--- a/www/p5-Template-Plugin-Subst/pkg-plist
+++ b/www/p5-Template-Plugin-Subst/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Template::Plugin::Subst.3.gz
 %%SITE_PERL%%/Template/Plugin/Subst.pm
 @dirrmtry %%SITE_PERL%%/Template/Plugin
 @dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Provider-FromDATA/Makefile b/www/p5-Template-Provider-FromDATA/Makefile
index 8f481266925a..6a87d6d3b3d3 100644
--- a/www/p5-Template-Provider-FromDATA/Makefile
+++ b/www/p5-Template-Provider-FromDATA/Makefile
@@ -20,9 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Template::Provider::FromDATA.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501502
diff --git a/www/p5-Template-Provider-FromDATA/pkg-plist b/www/p5-Template-Provider-FromDATA/pkg-plist
index 28f18e022f9a..c386eb2ed9bc 100644
--- a/www/p5-Template-Provider-FromDATA/pkg-plist
+++ b/www/p5-Template-Provider-FromDATA/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/FromDATA/.packlist
 %%SITE_PERL%%/Template/Provider/FromDATA.pm
+%%PERL5_MAN3%%/Template::Provider::FromDATA.3.gz
 @dirrmtry %%SITE_PERL%%/Template/Provider
 @dirrmtry %%SITE_PERL%%/Template
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Provider/FromDATA
diff --git a/www/p5-WWW-TinySong/Makefile b/www/p5-WWW-TinySong/Makefile
index 4ce323c71159..55f93c1f6bc9 100644
--- a/www/p5-WWW-TinySong/Makefile
+++ b/www/p5-WWW-TinySong/Makefile
@@ -18,9 +18,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	WWW::TinySong.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/www/p5-WWW-TinySong/pkg-plist b/www/p5-WWW-TinySong/pkg-plist
index f789580f3088..3c577a6dfbe5 100644
--- a/www/p5-WWW-TinySong/pkg-plist
+++ b/www/p5-WWW-TinySong/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/WWW/TinySong.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TinySong/.packlist
+%%PERL5_MAN3%%/WWW::TinySong.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/TinySong
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrmtry %%SITE_PERL%%//WWW
diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile
index 8162a6dd0400..6e0830fd342d 100644
--- a/www/p5-Web-Query/Makefile
+++ b/www/p5-Web-Query/Makefile
@@ -19,9 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Web::Query.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/www/p5-Web-Query/pkg-plist b/www/p5-Web-Query/pkg-plist
index ec36d69079cf..3f734d4183da 100644
--- a/www/p5-Web-Query/pkg-plist
+++ b/www/p5-Web-Query/pkg-plist
@@ -1,2 +1,3 @@
 %%SITE_PERL%%/Web/Query.pm
+%%PERL5_MAN3%%/Web::Query.3.gz
 @dirrmtry %%SITE_PERL%%/Web