35 files changed, 33 insertions, 63 deletions

diff --git a/www/p5-Amon2-Plugin-LogDispatch/Makefile b/www/p5-Amon2-Plugin-LogDispatch/Makefile
index 18ed17b2767f..f81fc5a5c4fb 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/Makefile
+++ b/www/p5-Amon2-Plugin-LogDispatch/Makefile
@@ -19,8 +19,4 @@ TEST_DEPENDS=	\
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Amon2::Plugin::LogDispatch.3 \
-	Amon2::Plugin::README.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Amon2-Plugin-LogDispatch/pkg-plist b/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
index 0226159849c7..b805f4a7a08f 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
+++ b/www/p5-Amon2-Plugin-LogDispatch/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin/LogDispatch/.packlist
 %%SITE_PERL%%/Amon2/Plugin/LogDispatch.pm
 %%SITE_PERL%%/Amon2/Plugin/README.pod
+%%PERL5_MAN3%%/Amon2::Plugin::LogDispatch.3.gz
+%%PERL5_MAN3%%/Amon2::Plugin::README.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin/LogDispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Amon2
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index 827fb1eb8405..ea4256baa3ee 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -18,9 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 USE_APACHE=	22+
 
-MAN3=		Apache::ParseFormData.3
-
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
diff --git a/www/p5-Apache-ParseFormData/pkg-plist b/www/p5-Apache-ParseFormData/pkg-plist
index 6dee2911ca1c..8d05f5eda728 100644
--- a/www/p5-Apache-ParseFormData/pkg-plist
+++ b/www/p5-Apache-ParseFormData/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Apache/ParseFormData.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData/.packlist
+%%PERL5_MAN3%%/Apache::ParseFormData.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Singleton/Makefile b/www/p5-Apache-Singleton/Makefile
index b53299ac0065..59d5bad2084c 100644
--- a/www/p5-Apache-Singleton/Makefile
+++ b/www/p5-Apache-Singleton/Makefile
@@ -18,9 +18,4 @@ RUN_DEPENDS=	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Apache::Singleton.3 \
-	Apache::Singleton::Process.3 \
-	Apache::Singleton::Request.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Singleton/pkg-descr b/www/p5-Apache-Singleton/pkg-descr
index 6ceedcb55e31..bf3a13af2940 100644
--- a/www/p5-Apache-Singleton/pkg-descr
+++ b/www/p5-Apache-Singleton/pkg-descr
@@ -1,5 +1,4 @@
 Apache::Singleton works the same as Class::Singleton, but with
 various object lifetime adapted for use under Apache.
 
-Author:	Tatsuhiko Miyagawa <miyagawa@bulknews.net>
-WWW:	http://search.cpan.org/dist/Apache-Singleton/
+WWW: http://search.cpan.org/dist/Apache-Singleton/
diff --git a/www/p5-Apache-Singleton/pkg-plist b/www/p5-Apache-Singleton/pkg-plist
index 72d034294db6..679e18bfa93e 100644
--- a/www/p5-Apache-Singleton/pkg-plist
+++ b/www/p5-Apache-Singleton/pkg-plist
@@ -1,4 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton/.packlist
+%%PERL5_MAN3%%/Apache::Singleton.3.gz
+%%PERL5_MAN3%%/Apache::Singleton::Process.3.gz
+%%PERL5_MAN3%%/Apache::Singleton::Request.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 %%SITE_PERL%%/Apache/Singleton.pm
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index e18eab58ae95..202e16149e26 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Application::Plugin::HTDot.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Plugin-HTDot/pkg-plist b/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
index 960f7149a112..1d077b467250 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-HTDot/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/CGI/Application/Plugin/HTDot.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HTDot/.packlist
+%%PERL5_MAN3%%/CGI::Application::Plugin::HTDot.3.gz
 @dirrm    %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/HTDot
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
diff --git a/www/p5-Catalyst-View-REST-XML/Makefile b/www/p5-Catalyst-View-REST-XML/Makefile
index 83113e67d19f..bfa9e942f2ab 100644
--- a/www/p5-Catalyst-View-REST-XML/Makefile
+++ b/www/p5-Catalyst-View-REST-XML/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Catalyst::View::REST::XML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-View-REST-XML/pkg-plist b/www/p5-Catalyst-View-REST-XML/pkg-plist
index 12a6b36ab8cf..b80812077d9e 100644
--- a/www/p5-Catalyst-View-REST-XML/pkg-plist
+++ b/www/p5-Catalyst-View-REST-XML/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/REST/XML/.packlist
 %%SITE_PERL%%/Catalyst/View/REST/XML.pm
+%%PERL5_MAN3%%/Catalyst::View::REST::XML.3.gz
 @dirrmtry %%SITE_PERL%%/Catalyst/View/REST
 @dirrmtry %%SITE_PERL%%/Catalyst/View
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/REST/XML
diff --git a/www/p5-Emplacken/Makefile b/www/p5-Emplacken/Makefile
index 3809170ecbce..c5b9c0ac2ad8 100644
--- a/www/p5-Emplacken/Makefile
+++ b/www/p5-Emplacken/Makefile
@@ -28,8 +28,4 @@ RUN_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Emplacken.3 \
-		Emplacken::Types.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Emplacken/pkg-descr b/www/p5-Emplacken/pkg-descr
index ca2f30e370ee..5ce7db0f6a21 100644
--- a/www/p5-Emplacken/pkg-descr
+++ b/www/p5-Emplacken/pkg-descr
@@ -9,4 +9,4 @@ Catalyst, Mojo, and Mason app files natively. For other apps, or more
 complicated setups, you can supply a template to Emplacken and it
 will use that to generate the PSGI app.
 
-WWW:	http://search.cpan.org/dist/Emplacken/
+WWW: http://search.cpan.org/dist/Emplacken/
diff --git a/www/p5-Emplacken/pkg-plist b/www/p5-Emplacken/pkg-plist
index 54ad19bbe625..d453c944a412 100644
--- a/www/p5-Emplacken/pkg-plist
+++ b/www/p5-Emplacken/pkg-plist
@@ -13,6 +13,8 @@ bin/emplacken
 %%SITE_PERL%%/Emplacken/Stderr.pm
 %%SITE_PERL%%/Emplacken/Types.pm
 %%SITE_PERL%%/Emplacken/Types/Internal.pm
+%%PERL5_MAN3%%/Emplacken.3.gz
+%%PERL5_MAN3%%/Emplacken::Types.3.gz
 @dirrmtry %%SITE_PERL%%/Emplacken/Types
 @dirrmtry %%SITE_PERL%%/Emplacken/Role
 @dirrmtry %%SITE_PERL%%/Emplacken/CodeBuilder
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index ed5b13afebda..05f4d20f9919 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -14,10 +14,7 @@ COMMENT=	Cookie storage and management for w3m
 BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=		HTTP::Cookies::w3m.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-Cookies-w3m/pkg-descr b/www/p5-HTTP-Cookies-w3m/pkg-descr
index 36196bfcdced..b1678620d424 100644
--- a/www/p5-HTTP-Cookies-w3m/pkg-descr
+++ b/www/p5-HTTP-Cookies-w3m/pkg-descr
@@ -1,4 +1,3 @@
 Cookie storage and management for w3m
 
-Author:	Kazuhiro Osawa <ko@yappo.ne.jp>
-WWW:	http://search.cpan.org/dist/HTTP-Cookies-w3m/
+WWW: http://search.cpan.org/dist/HTTP-Cookies-w3m/
diff --git a/www/p5-HTTP-Cookies-w3m/pkg-plist b/www/p5-HTTP-Cookies-w3m/pkg-plist
index d8e64ec6b4e7..433d2171a344 100644
--- a/www/p5-HTTP-Cookies-w3m/pkg-plist
+++ b/www/p5-HTTP-Cookies-w3m/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/w3m/.packlist
 %%SITE_PERL%%/HTTP/Cookies/w3m.pm
+%%PERL5_MAN3%%/HTTP::Cookies::w3m.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies/w3m
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cookies
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-LWP-Online/Makefile b/www/p5-LWP-Online/Makefile
index ae973ef112e6..01f354c3dc9d 100644
--- a/www/p5-LWP-Online/Makefile
+++ b/www/p5-LWP-Online/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS+=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		LWP::Online.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-LWP-Online/pkg-plist b/www/p5-LWP-Online/pkg-plist
index e1116fb87e85..49e99daf5322 100644
--- a/www/p5-LWP-Online/pkg-plist
+++ b/www/p5-LWP-Online/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/LWP/Online.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Online/.packlist
+%%PERL5_MAN3%%/LWP::Online.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Online
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
 @dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-Net-FastCGI/Makefile b/www/p5-Net-FastCGI/Makefile
index 97d36e4f18da..c93bc4453320 100644
--- a/www/p5-Net-FastCGI/Makefile
+++ b/www/p5-Net-FastCGI/Makefile
@@ -16,10 +16,4 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Net::FastCGI.3 \
-	Net::FastCGI::Constant.3 \
-	Net::FastCGI::IO.3 \
-	Net::FastCGI::Protocol.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Net-FastCGI/pkg-plist b/www/p5-Net-FastCGI/pkg-plist
index dcd3fc09550f..209ade6a9090 100644
--- a/www/p5-Net-FastCGI/pkg-plist
+++ b/www/p5-Net-FastCGI/pkg-plist
@@ -8,6 +8,10 @@
 %%SITE_PERL%%/Net/FastCGI/Protocol.pm
 %%SITE_PERL%%/Net/FastCGI/Protocol.pod
 %%SITE_PERL%%/Net/FastCGI/Protocol/PP.pm
+%%PERL5_MAN3%%/Net::FastCGI.3.gz
+%%PERL5_MAN3%%/Net::FastCGI::Constant.3.gz
+%%PERL5_MAN3%%/Net::FastCGI::IO.3.gz
+%%PERL5_MAN3%%/Net::FastCGI::Protocol.3.gz
 @dirrmtry %%SITE_PERL%%/Net/FastCGI/Protocol
 @dirrmtry %%SITE_PERL%%/Net/FastCGI
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/www/p5-Plack-Middleware-File-Sass/Makefile b/www/p5-Plack-Middleware-File-Sass/Makefile
index 16eb3b9d40be..69352ea464f5 100644
--- a/www/p5-Plack-Middleware-File-Sass/Makefile
+++ b/www/p5-Plack-Middleware-File-Sass/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Plack::Middleware::File::Sass.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Plack-Middleware-File-Sass/pkg-plist b/www/p5-Plack-Middleware-File-Sass/pkg-plist
index 62ff4ed48f5a..5d3220c2a72f 100644
--- a/www/p5-Plack-Middleware-File-Sass/pkg-plist
+++ b/www/p5-Plack-Middleware-File-Sass/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File/Sass/.packlist
 %%SITE_PERL%%/Plack/Middleware/File/Sass.pm
+%%PERL5_MAN3%%/Plack::Middleware::File::Sass.3.gz
 @dirrmtry %%SITE_PERL%%/Plack/Middleware/File
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File/Sass
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/File
diff --git a/www/p5-Plack-Middleware-Reproxy/Makefile b/www/p5-Plack-Middleware-Reproxy/Makefile
index 281bacc533c8..52a7170b5684 100644
--- a/www/p5-Plack-Middleware-Reproxy/Makefile
+++ b/www/p5-Plack-Middleware-Reproxy/Makefile
@@ -18,9 +18,4 @@ TEST_DEPENDS=	p5-TEST-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Plack::Middleware::Reproxy.3 \
-	Plack::Middleware::Reproxy::Callback.3 \
-	Plack::Middleware::Reproxy::Furl.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Plack-Middleware-Reproxy/pkg-plist b/www/p5-Plack-Middleware-Reproxy/pkg-plist
index 4a0ebaa1868f..4fc620cc3a65 100644
--- a/www/p5-Plack-Middleware-Reproxy/pkg-plist
+++ b/www/p5-Plack-Middleware-Reproxy/pkg-plist
@@ -2,6 +2,9 @@
 %%SITE_PERL%%/Plack/Middleware/Reproxy.pm
 %%SITE_PERL%%/Plack/Middleware/Reproxy/Callback.pm
 %%SITE_PERL%%/Plack/Middleware/Reproxy/Furl.pm
+%%PERL5_MAN3%%/Plack::Middleware::Reproxy.3.gz
+%%PERL5_MAN3%%/Plack::Middleware::Reproxy::Callback.3.gz
+%%PERL5_MAN3%%/Plack::Middleware::Reproxy::Furl.3.gz
 @dirrm %%SITE_PERL%%/Plack/Middleware/Reproxy
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware/Reproxy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Middleware
diff --git a/www/p5-Plack-Server-Coro/Makefile b/www/p5-Plack-Server-Coro/Makefile
index 4bc255bfec7e..00433da7b052 100644
--- a/www/p5-Plack-Server-Coro/Makefile
+++ b/www/p5-Plack-Server-Coro/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Plack::Server::Coro.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Plack-Server-Coro/pkg-plist b/www/p5-Plack-Server-Coro/pkg-plist
index 6a19f056f7c7..f620203a14bd 100644
--- a/www/p5-Plack-Server-Coro/pkg-plist
+++ b/www/p5-Plack-Server-Coro/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/Coro/.packlist
 %%SITE_PERL%%/Plack/Server/Coro.pm
+%%PERL5_MAN3%%/Plack::Server::Coro.3.gz
 @dirrmtry %%SITE_PERL%%/Plack/Server
 @dirrmtry %%SITE_PERL%%/Plack
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plack/Server/Coro
diff --git a/www/p5-REST-Client/Makefile b/www/p5-REST-Client/Makefile
index 80673db27fa3..8fc2e08ea2de 100644
--- a/www/p5-REST-Client/Makefile
+++ b/www/p5-REST-Client/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pauls@utdallas.edu
-COMMENT=	A simple client for interacting with RESTful http/https resources
+COMMENT=	Simple client for interacting with RESTful http/https resources
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
@@ -21,7 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		REST::Client.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-REST-Client/pkg-plist b/www/p5-REST-Client/pkg-plist
index f0735752eaee..23fb9ee979ed 100644
--- a/www/p5-REST-Client/pkg-plist
+++ b/www/p5-REST-Client/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/REST/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Client/.packlist
+%%PERL5_MAN3%%/REST::Client.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST/Client
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/REST
 @dirrmtry %%SITE_PERL%%/REST
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index 3c9be4d9ab1e..dda1d3f4a07e 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Template::Plugin::Class.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Template-Plugin-Class/pkg-plist b/www/p5-Template-Plugin-Class/pkg-plist
index 65a97d92c1ef..e7182e7f5bcc 100644
--- a/www/p5-Template-Plugin-Class/pkg-plist
+++ b/www/p5-Template-Plugin-Class/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Template/Plugin/Class.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Class/.packlist
+%%PERL5_MAN3%%/Template::Plugin::Class.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Class
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
 @dirrmtry %%SITE_PERL%%/Template/Plugin
diff --git a/www/p5-WWW-FreeProxy/Makefile b/www/p5-WWW-FreeProxy/Makefile
index 139867fdcd06..1117164ffdc1 100644
--- a/www/p5-WWW-FreeProxy/Makefile
+++ b/www/p5-WWW-FreeProxy/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		WWW::FreeProxy.3 WWW::FreeProxy::Proxy4Free.3 WWW::FreeProxy::Samair.3 WWW::FreeProxy::Look.3 WWW::FreeProxy::PublicProxyServers.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-FreeProxy/pkg-plist b/www/p5-WWW-FreeProxy/pkg-plist
index 5aabad3c2ac7..7ab1c329a2a3 100644
--- a/www/p5-WWW-FreeProxy/pkg-plist
+++ b/www/p5-WWW-FreeProxy/pkg-plist
@@ -4,6 +4,11 @@
 %%SITE_PERL%%/WWW/FreeProxy/PublicProxyServers.pm
 %%SITE_PERL%%/WWW/FreeProxy/Samair.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/FreeProxy/.packlist
+%%PERL5_MAN3%%/WWW::FreeProxy.3.gz
+%%PERL5_MAN3%%/WWW::FreeProxy::Proxy4Free.3.gz
+%%PERL5_MAN3%%/WWW::FreeProxy::Samair.3.gz
+%%PERL5_MAN3%%/WWW::FreeProxy::Look.3.gz
+%%PERL5_MAN3%%/WWW::FreeProxy::PublicProxyServers.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/FreeProxy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrmtry %%SITE_PERL%%/WWW/FreeProxy
diff --git a/www/p5-WWW-LongURL/Makefile b/www/p5-WWW-LongURL/Makefile
index a7611b8ee83a..ad0d99557e31 100644
--- a/www/p5-WWW-LongURL/Makefile
+++ b/www/p5-WWW-LongURL/Makefile
@@ -24,7 +24,4 @@ TEST_DEPENDS=	p5-LWP-Online>0:${PORTSDIR}/www/p5-LWP-Online
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		WWW::LongURL.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-LongURL/pkg-plist b/www/p5-WWW-LongURL/pkg-plist
index dcd6a30e00a2..fcc57a5e7603 100644
--- a/www/p5-WWW-LongURL/pkg-plist
+++ b/www/p5-WWW-LongURL/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/WWW/LongURL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/LongURL/.packlist
+%%PERL5_MAN3%%/WWW::LongURL.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/LongURL
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrmtry %%SITE_PERL%%/WWW