38 files changed, 176 insertions, 208 deletions

diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index c6006faa3346..cceafe2d4ccd 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -18,14 +18,6 @@ RUN_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
 USES=		perl5
 USE_PERL5=	configure patch
 
-NO_MANCOMPRESS=	no
-MAN3=		AMF::Perl.3 AMF::Perl::App::Executive.3 \
-		AMF::Perl::IO::Deserializer.3 AMF::Perl::IO::InputStream.3 \
-		AMF::Perl::IO::OutputStream.3 AMF::Perl::IO::Serializer.3 \
-		AMF::Perl::Sql::MysqlRecordSet.3 AMF::Perl::Util::Object.3 \
-		AMF::Perl::Util::RemotingService.3
-
-NO_STAGE=	yes
 post-patch:
 	@${PERL} -pi -e 's/=(?==head)//g' ${WRKSRC}/lib/AMF/Perl.pm
 
diff --git a/www/p5-AMF-Perl/pkg-plist b/www/p5-AMF-Perl/pkg-plist
index f06626f9606e..bf86df2f518d 100644
--- a/www/p5-AMF-Perl/pkg-plist
+++ b/www/p5-AMF-Perl/pkg-plist
@@ -1,4 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl/.packlist
+%%PERL5_MAN3%%/AMF::Perl.3.gz
+%%PERL5_MAN3%%/AMF::Perl::App::Executive.3.gz
+%%PERL5_MAN3%%/AMF::Perl::IO::Deserializer.3.gz
+%%PERL5_MAN3%%/AMF::Perl::IO::InputStream.3.gz
+%%PERL5_MAN3%%/AMF::Perl::IO::OutputStream.3.gz
+%%PERL5_MAN3%%/AMF::Perl::IO::Serializer.3.gz
+%%PERL5_MAN3%%/AMF::Perl::Sql::MysqlRecordSet.3.gz
+%%PERL5_MAN3%%/AMF::Perl::Util::Object.3.gz
+%%PERL5_MAN3%%/AMF::Perl::Util::RemotingService.3.gz
 %%SITE_PERL%%/AMF/Perl.pm
 %%SITE_PERL%%/AMF/Perl/App/Executive.pm
 %%SITE_PERL%%/AMF/Perl/IO/Deserializer.pm
@@ -8,11 +16,12 @@
 %%SITE_PERL%%/AMF/Perl/Sql/MysqlRecordSet.pm
 %%SITE_PERL%%/AMF/Perl/Util/Object.pm
 %%SITE_PERL%%/AMF/Perl/Util/RemotingService.pm
-@dirrm %%SITE_PERL%%/AMF/Perl/App
-@dirrm %%SITE_PERL%%/AMF/Perl/IO
-@dirrm %%SITE_PERL%%/AMF/Perl/Sql
-@dirrm %%SITE_PERL%%/AMF/Perl/Util
-@dirrm %%SITE_PERL%%/AMF/Perl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl
-@dirrmtry %%SITE_PERL%%/AMF
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF
+@dirrmtry %%SITE_PERL%%/AMF/Perl/Util
+@dirrmtry %%SITE_PERL%%/AMF/Perl/Sql
+@dirrmtry %%SITE_PERL%%/AMF/Perl/IO
+@dirrmtry %%SITE_PERL%%/AMF/Perl/App
+@dirrmtry %%SITE_PERL%%/AMF/Perl
+@dirrmtry %%SITE_PERL%%/AMF
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 5b9269aad3e0..a6303b02a92c 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	${MODPERL_SUFFIX}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Active Server Pages for Apache
 
-RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
 		p5-HTML-Clean>=0:${PORTSDIR}/www/p5-HTML-Clean \
 		p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
 		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
@@ -20,7 +20,7 @@ RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
 		p5-MLDBM-Sync>=0.25:${PORTSDIR}/databases/p5-MLDBM-Sync \
 		p5-Tie-Cache>=0:${PORTSDIR}/devel/p5-Tie-Cache \
 		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT
-
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 # XXX not tested with mod_perl2, but mod_perl was removed ...
 #.if !defined(WITHOUT_MODPERL)
@@ -33,11 +33,4 @@ RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		asp-perl.1
-MAN3=		Apache::ASP.3 \
-		Apache::ASP::CGI::Table.3 \
-		Bundle::Apache::ASP.3 \
-		Bundle::Apache::ASP::Extra.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-ASP/pkg-plist b/www/p5-Apache-ASP/pkg-plist
index 23a7721dcb86..bd362755eed2 100644
--- a/www/p5-Apache-ASP/pkg-plist
+++ b/www/p5-Apache-ASP/pkg-plist
@@ -1,4 +1,8 @@
 bin/asp-perl
+%%PERL5_MAN3%%/Apache::ASP.3.gz
+%%PERL5_MAN3%%/Apache::ASP::CGI::Table.3.gz
+%%PERL5_MAN3%%/Bundle::Apache::ASP.3.gz
+%%PERL5_MAN3%%/Bundle::Apache::ASP::Extra.3.gz
 %%SITE_PERL%%/Apache/ASP.pm
 %%SITE_PERL%%/Apache/ASP/ApacheCommon.pm
 %%SITE_PERL%%/Apache/ASP/Application.pm
@@ -26,14 +30,15 @@ bin/asp-perl
 %%SITE_PERL%%/Bundle/Apache/ASP.pm
 %%SITE_PERL%%/Bundle/Apache/ASP/Extra.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ASP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ASP
+man/man1/asp-perl.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ASP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrm %%SITE_PERL%%/Apache/ASP/CGI
-@dirrm %%SITE_PERL%%/Apache/ASP/Lang
-@dirrm %%SITE_PERL%%/Apache/ASP/Share/CORE
-@dirrm %%SITE_PERL%%/Apache/ASP/Share
-@dirrm %%SITE_PERL%%/Apache/ASP
-@dirrm %%SITE_PERL%%/Bundle/Apache/ASP
+@dirrmtry %%SITE_PERL%%/Bundle/Apache/ASP
 @dirrmtry %%SITE_PERL%%/Bundle/Apache
 @dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/Apache/ASP/Share/CORE
+@dirrmtry %%SITE_PERL%%/Apache/ASP/Share
+@dirrmtry %%SITE_PERL%%/Apache/ASP/Lang
+@dirrmtry %%SITE_PERL%%/Apache/ASP/CGI
+@dirrmtry %%SITE_PERL%%/Apache/ASP
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index 6fa3cea9bb95..a6535bf61895 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -13,12 +13,4 @@ COMMENT=	Perl module to manipulate Apache configuration files
 USES=		perl5
 USE_PERL5=	configure patch
 
-MAN3=		Apache::Admin::Config.3
-
-NO_STAGE=	yes
-post-patch:
-	${PERL} -pi -e 's/(!\$$)/0 && $1/;' \
-		-e 's|(VERSION_FROM\s+=>\s+)(.*)(,.*)$$|$$1$$2$$3\nMAN3PODS=>{$$2=>q!\\\$$(INST_MAN3DIR)/${MAN3}!},|;' \
-		${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist
index 62eb47afcabc..e59e29010b3d 100644
--- a/www/p5-Apache-Admin-Config/pkg-plist
+++ b/www/p5-Apache-Admin-Config/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
+%%PERL5_MAN3%%/Apache::Admin::Config.3.gz
 %%SITE_PERL%%/Apache/Admin/Config.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache/Admin
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index cf5deacd732d..5b90af365b29 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -19,7 +19,6 @@ USE_APACHE=	22+
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 CURUSER?=	`whoami`
@@ -30,13 +29,4 @@ CONFIGURE_ENV+=	APACHE="${HTTPD}" \
 		TESTGRP="${CURGRP}" \
 		TESTPORT="${TESTPORT}"
 
-MAN3=		Apache2::AuthCookie.3 \
-		Apache2::AuthCookie::Params.3 \
-		Apache::AuthCookie.3 \
-		Apache::AuthCookie::Autobox.3 \
-		Apache::AuthCookie::FAQ.3 \
-		Apache::AuthCookie::Params.3 \
-		Apache::AuthCookie::Params::Base.3 \
-		Apache::AuthCookie::Util.3
-
 .include <bsd.port.post.mk>
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index 9ec6af67cb5c..e126d6a9aec8 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -1,4 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
+%%PERL5_MAN3%%/Apache2::AuthCookie.3.gz
+%%PERL5_MAN3%%/Apache2::AuthCookie::Params.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie::Autobox.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie::FAQ.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie::Params.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie::Params::Base.3.gz
+%%PERL5_MAN3%%/Apache::AuthCookie::Util.3.gz
 %%SITE_PERL%%/Apache/AuthCookie.pm
 %%SITE_PERL%%/Apache/AuthCookie/Autobox.pm
 %%SITE_PERL%%/Apache/AuthCookie/FAQ.pod
@@ -7,10 +14,11 @@
 %%SITE_PERL%%/Apache/AuthCookie/Util.pm
 %%SITE_PERL%%/Apache2/AuthCookie.pm
 %%SITE_PERL%%/Apache2/AuthCookie/Params.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache2/AuthCookie
 @dirrmtry %%SITE_PERL%%/Apache2
 @dirrmtry %%SITE_PERL%%/Apache/AuthCookie/Params
 @dirrmtry %%SITE_PERL%%/Apache/AuthCookie
 @dirrmtry %%SITE_PERL%%/Apache
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index dc2009c16373..c3fb859c3df3 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -15,6 +15,7 @@ COMMENT=	Mod_perl interface into HTML::Clean
 
 BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
 
@@ -22,14 +23,12 @@ USES=		perl5
 USE_PERL5=	configure
 USE_APACHE=	22+
 
-MAN3=		Apache::Clean.3
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
-NO_STAGE=	yes
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Clean2/pkg-plist b/www/p5-Apache-Clean2/pkg-plist
index 2ef7e3b83235..084ec8490e15 100644
--- a/www/p5-Apache-Clean2/pkg-plist
+++ b/www/p5-Apache-Clean2/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Apache::Clean.3.gz
 %%SITE_PERL%%/Apache/Clean.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ConfigFile/Makefile b/www/p5-Apache-ConfigFile/Makefile
index 6ac4d1e57487..5448976ce089 100644
--- a/www/p5-Apache-ConfigFile/Makefile
+++ b/www/p5-Apache-ConfigFile/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Apache::ConfigFile - Parse Apache style httpd.conf configuration files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Apache::ConfigFile.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist
index 3150160c9942..a8fa3089ceb8 100644
--- a/www/p5-Apache-ConfigFile/pkg-plist
+++ b/www/p5-Apache-ConfigFile/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
+%%PERL5_MAN3%%/Apache::ConfigFile.3.gz
 %%SITE_PERL%%/Apache/ConfigFile.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ConfigParser/Makefile b/www/p5-Apache-ConfigParser/Makefile
index 19249a41b0f7..473fb8e93b6c 100644
--- a/www/p5-Apache-ConfigParser/Makefile
+++ b/www/p5-Apache-ConfigParser/Makefile
@@ -12,11 +12,9 @@ COMMENT=	Load Apache configuration files
 
 BUILD_DEPENDS=	p5-File-FnMatch>=0:${PORTSDIR}/devel/p5-File-FnMatch \
 		p5-Tree-DAG_Node>=0:${PORTSDIR}/devel/p5-Tree-DAG_Node
-
-MAN3=	Apache::ConfigParser.3 Apache::ConfigParser::Directive.3
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-ConfigParser/pkg-plist b/www/p5-Apache-ConfigParser/pkg-plist
index 274724e009cd..53aaf7bf9e40 100644
--- a/www/p5-Apache-ConfigParser/pkg-plist
+++ b/www/p5-Apache-ConfigParser/pkg-plist
@@ -1,9 +1,11 @@
+%%PERL5_MAN3%%/Apache::ConfigParser.3.gz
+%%PERL5_MAN3%%/Apache::ConfigParser::Directive.3.gz
 %%SITE_PERL%%/Apache/ConfigParser.pm
 %%SITE_PERL%%/Apache/ConfigParser.pod
 %%SITE_PERL%%/Apache/ConfigParser/Directive.pm
 %%SITE_PERL%%/Apache/ConfigParser/Directive.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigParser/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigParser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigParser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrm %%SITE_PERL%%/Apache/ConfigParser
+@dirrmtry %%SITE_PERL%%/Apache/ConfigParser
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 16891d767789..120bee771fac 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -17,8 +17,4 @@ USES=		perl5
 USE_PERL5=	configure
 USE_APACHE_RUN=	22+
 
-MAN3=		Apache::DB.3 Apache::DProf.3 Apache::perl5db.3 \
-		Apache::SmallProf.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-DB/pkg-plist b/www/p5-Apache-DB/pkg-plist
index 11f55c6bb0a3..17710555b9a2 100644
--- a/www/p5-Apache-DB/pkg-plist
+++ b/www/p5-Apache-DB/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Apache::DB.3.gz
+%%PERL5_MAN3%%/Apache::DProf.3.gz
+%%PERL5_MAN3%%/Apache::SmallProf.3.gz
+%%PERL5_MAN3%%/Apache::perl5db.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/DB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/DProf.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SmallProf.pm
@@ -5,6 +9,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 6bb6669f260f..47bfddc0e782 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -23,13 +23,4 @@ USES=		perl5
 USE_PERL5=	configure
 USE_APACHE?=	22+
 
-MAN3=		Apache::DBI.3 Apache::AuthDBI.3
-PLIST_FILES=	%%SITE_PERL%%/Apache/DBI.pm \
-		%%SITE_PERL%%/Apache/AuthDBI.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI
-PLIST_DIRSTRY=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache \
-		%%SITE_PERL%%/Apache
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-DBI/pkg-plist b/www/p5-Apache-DBI/pkg-plist
new file mode 100644
index 000000000000..4948ac79f59a
--- /dev/null
+++ b/www/p5-Apache-DBI/pkg-plist
@@ -0,0 +1,8 @@
+%%PERL5_MAN3%%/Apache::AuthDBI.3.gz
+%%PERL5_MAN3%%/Apache::DBI.3.gz
+%%SITE_PERL%%/Apache/AuthDBI.pm
+%%SITE_PERL%%/Apache/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 87c8078a9431..213d061e4faa 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -22,16 +22,8 @@ USES=		perl5
 USE_PERL5=	configure
 USE_APACHE=	22+
 
-MAN3=		Apache::MP3.3 \
-		Apache::MP3::L10N.3 \
-		Apache::MP3::Playlist.3 \
-		Apache::MP3::Resample.3 \
-		Apache::MP3::Sorted.3
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${DATADIR}
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist
index 56d53f49573e..4d9502481341 100644
--- a/www/p5-Apache-MP3/pkg-plist
+++ b/www/p5-Apache-MP3/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/Apache::MP3.3.gz
+%%PERL5_MAN3%%/Apache::MP3::L10N.3.gz
+%%PERL5_MAN3%%/Apache::MP3::Playlist.3.gz
+%%PERL5_MAN3%%/Apache::MP3::Resample.3.gz
+%%PERL5_MAN3%%/Apache::MP3::Sorted.3.gz
 %%SITE_PERL%%/Apache/MP3.pm
 %%SITE_PERL%%/Apache/MP3/L10N.pm
 %%SITE_PERL%%/Apache/MP3/L10N/Aliases.pm
@@ -43,19 +48,19 @@
 %%SITE_PERL%%/Apache/MP3/Resample.pm
 %%SITE_PERL%%/Apache/MP3/Sorted.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3/.packlist
-share/Apache-MP3/apache_mp3.css
-share/Apache-MP3/apache_mp3_fig1.gif
-share/Apache-MP3/apache_mp3_help.gif
-share/Apache-MP3/back.gif
-share/Apache-MP3/cd_icon.gif
-share/Apache-MP3/cd_icon_small.gif
-share/Apache-MP3/functions.js
-share/Apache-MP3/playlist.gif
-share/Apache-MP3/right_arrow.gif
-share/Apache-MP3/sound.gif
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
+%%DATADIR%%/apache_mp3.css
+%%DATADIR%%/apache_mp3_fig1.gif
+%%DATADIR%%/apache_mp3_help.gif
+%%DATADIR%%/back.gif
+%%DATADIR%%/cd_icon.gif
+%%DATADIR%%/cd_icon_small.gif
+%%DATADIR%%/functions.js
+%%DATADIR%%/playlist.gif
+%%DATADIR%%/right_arrow.gif
+%%DATADIR%%/sound.gif
+@dirrmtry %%DATADIR%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrm %%SITE_PERL%%/Apache/MP3/L10N
-@dirrm %%SITE_PERL%%/Apache/MP3
+@dirrmtry %%SITE_PERL%%/Apache/MP3/L10N
+@dirrmtry %%SITE_PERL%%/Apache/MP3
 @dirrmtry %%SITE_PERL%%/Apache
-@dirrm share/Apache-MP3
diff --git a/www/p5-Apache-Profiler/Makefile b/www/p5-Apache-Profiler/Makefile
index 86e275db7057..7e55c9cf50d5 100644
--- a/www/p5-Apache-Profiler/Makefile
+++ b/www/p5-Apache-Profiler/Makefile
@@ -11,12 +11,9 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Profiles time seconds needed for every request
 
 BUILD_DEPENDS=	mp2bug:${PORTSDIR}/www/mod_perl2
-RUN_DEPENDS=	mp2bug:${PORTSDIR}/www/mod_perl2
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Apache::Profiler.3 Apache2::Profiler.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Profiler/pkg-plist b/www/p5-Apache-Profiler/pkg-plist
index c8d2278ed25a..5d1700c9adb0 100644
--- a/www/p5-Apache-Profiler/pkg-plist
+++ b/www/p5-Apache-Profiler/pkg-plist
@@ -1,7 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler/.packlist
+%%PERL5_MAN3%%/Apache2::Profiler.3.gz
+%%PERL5_MAN3%%/Apache::Profiler.3.gz
 %%SITE_PERL%%/Apache/Profiler.pm
 %%SITE_PERL%%/Apache2/Profiler.pm
-@dirrm %%SITE_PERL%%/Apache2
-@dirrm %%SITE_PERL%%/Apache
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache2
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index 3f47e3b56a2e..24a1ed57e60c 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Apache::Session::PHP.3 Apache::Session::Serialize::PHP.3 Apache::Session::Store::PHP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist
index db58da2fea32..78af0f2e43c9 100644
--- a/www/p5-Apache-Session-PHP/pkg-plist
+++ b/www/p5-Apache-Session-PHP/pkg-plist
@@ -1,8 +1,11 @@
+%%PERL5_MAN3%%/Apache::Session::PHP.3.gz
+%%PERL5_MAN3%%/Apache::Session::Serialize::PHP.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::PHP.3.gz
 %%SITE_PERL%%/Apache/Session/PHP.pm
 %%SITE_PERL%%/Apache/Session/Serialize/PHP.pm
 %%SITE_PERL%%/Apache/Session/Store/PHP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache/Session/Store
diff --git a/www/p5-Apache-Session-SQLite3/Makefile b/www/p5-Apache-Session-SQLite3/Makefile
index 412981cadd79..d5f9e5125ad2 100644
--- a/www/p5-Apache-Session-SQLite3/Makefile
+++ b/www/p5-Apache-Session-SQLite3/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Apache::Session::SQLite3.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-SQLite3/pkg-plist b/www/p5-Apache-Session-SQLite3/pkg-plist
index 0d221c282f17..e42e9798ecf1 100644
--- a/www/p5-Apache-Session-SQLite3/pkg-plist
+++ b/www/p5-Apache-Session-SQLite3/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Apache::Session::SQLite3.3.gz
 %%SITE_PERL%%/Apache/Session/SQLite3.pm
 %%SITE_PERL%%/Apache/Session/Store/SQLite3.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
 @dirrmtry %%SITE_PERL%%/Apache/Session/Store
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index ef94d08c6436..9100f56f327d 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -17,12 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Apache::Session::Store::SharedMem.3 \
-		Apache::Session::SharedMem.3
-
-NO_STAGE=	yes
-#post-patch:
-#	@${CP} ${WRKSRC}/Apache/Session/SharedMem.pm \
-#		${WRKSRC}/lib/Apache/Session
-
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-SharedMem/pkg-plist b/www/p5-Apache-Session-SharedMem/pkg-plist
index 085c05eaa74e..a786372af040 100644
--- a/www/p5-Apache-Session-SharedMem/pkg-plist
+++ b/www/p5-Apache-Session-SharedMem/pkg-plist
@@ -1,6 +1,11 @@
+%%PERL5_MAN3%%/Apache::Session::SharedMem.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::SharedMem.3.gz
 %%SITE_PERL%%/Apache/Session/SharedMem.pm
 %%SITE_PERL%%/Apache/Session/Store/SharedMem.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SharedMem/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SharedMem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SharedMem
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/Session/Store
+@dirrmtry %%SITE_PERL%%/Apache/Session
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index dc201d4bb5d4..71e09ed49fe2 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -18,16 +18,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
-NO_STAGE=	yes
-
-MAN3=		Apache::Session::Wrapper.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-Apache-Session-Wrapper/pkg-plist b/www/p5-Apache-Session-Wrapper/pkg-plist
index b019b7de708a..9ec08bacb8da 100644
--- a/www/p5-Apache-Session-Wrapper/pkg-plist
+++ b/www/p5-Apache-Session-Wrapper/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Apache::Session::Wrapper.3.gz
 %%SITE_PERL%%/Apache/Session/Wrapper.pm
 @dirrmtry %%SITE_PERL%%/Apache/Session
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index cb0fa3fe36ef..49b15d9d9053 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -19,35 +19,4 @@ TEST_DEPENDS+=	p5-Test-Deep>=0.082:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Apache::Session.3 \
-		Apache::Session::DB_File.3 \
-		Apache::Session::File.3 \
-		Apache::Session::Flex.3 \
-		Apache::Session::Generate::MD5.3 \
-		Apache::Session::Generate::ModUniqueId.3 \
-		Apache::Session::Generate::ModUsertrack.3 \
-		Apache::Session::Informix.3 \
-		Apache::Session::Lock::File.3 \
-		Apache::Session::Lock::MySQL.3 \
-		Apache::Session::Lock::Null.3 \
-		Apache::Session::Lock::Semaphore.3 \
-		Apache::Session::Lock::Sybase.3 \
-		Apache::Session::MySQL.3 \
-		Apache::Session::MySQL::NoLock.3 \
-		Apache::Session::Oracle.3 \
-		Apache::Session::Postgres.3 \
-		Apache::Session::Serialize::Base64.3 \
-		Apache::Session::Serialize::Storable.3 \
-		Apache::Session::Serialize::Sybase.3 \
-		Apache::Session::Serialize::UUEncode.3 \
-		Apache::Session::Store::DB_File.3 \
-		Apache::Session::Store::File.3 \
-		Apache::Session::Store::Informix.3 \
-		Apache::Session::Store::MySQL.3 \
-		Apache::Session::Store::Oracle.3 \
-		Apache::Session::Store::Postgres.3 \
-		Apache::Session::Store::Sybase.3 \
-		Apache::Session::Sybase.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist
index feecebe0fa02..a697f8684240 100644
--- a/www/p5-Apache-Session/pkg-plist
+++ b/www/p5-Apache-Session/pkg-plist
@@ -1,3 +1,32 @@
+%%PERL5_MAN3%%/Apache::Session.3.gz
+%%PERL5_MAN3%%/Apache::Session::DB_File.3.gz
+%%PERL5_MAN3%%/Apache::Session::File.3.gz
+%%PERL5_MAN3%%/Apache::Session::Flex.3.gz
+%%PERL5_MAN3%%/Apache::Session::Generate::MD5.3.gz
+%%PERL5_MAN3%%/Apache::Session::Generate::ModUniqueId.3.gz
+%%PERL5_MAN3%%/Apache::Session::Generate::ModUsertrack.3.gz
+%%PERL5_MAN3%%/Apache::Session::Informix.3.gz
+%%PERL5_MAN3%%/Apache::Session::Lock::File.3.gz
+%%PERL5_MAN3%%/Apache::Session::Lock::MySQL.3.gz
+%%PERL5_MAN3%%/Apache::Session::Lock::Null.3.gz
+%%PERL5_MAN3%%/Apache::Session::Lock::Semaphore.3.gz
+%%PERL5_MAN3%%/Apache::Session::Lock::Sybase.3.gz
+%%PERL5_MAN3%%/Apache::Session::MySQL.3.gz
+%%PERL5_MAN3%%/Apache::Session::MySQL::NoLock.3.gz
+%%PERL5_MAN3%%/Apache::Session::Oracle.3.gz
+%%PERL5_MAN3%%/Apache::Session::Postgres.3.gz
+%%PERL5_MAN3%%/Apache::Session::Serialize::Base64.3.gz
+%%PERL5_MAN3%%/Apache::Session::Serialize::Storable.3.gz
+%%PERL5_MAN3%%/Apache::Session::Serialize::Sybase.3.gz
+%%PERL5_MAN3%%/Apache::Session::Serialize::UUEncode.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::DB_File.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::File.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::Informix.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::MySQL.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::Oracle.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::Postgres.3.gz
+%%PERL5_MAN3%%/Apache::Session::Store::Sybase.3.gz
+%%PERL5_MAN3%%/Apache::Session::Sybase.3.gz
 %%SITE_PERL%%/Apache/Session.pm
 %%SITE_PERL%%/Apache/Session/DB_File.pm
 %%SITE_PERL%%/Apache/Session/File.pm
diff --git a/www/p5-Apache-SessionX/Makefile b/www/p5-Apache-SessionX/Makefile
index 28772639205f..fb7509531d6d 100644
--- a/www/p5-Apache-SessionX/Makefile
+++ b/www/p5-Apache-SessionX/Makefile
@@ -13,12 +13,8 @@ COMMENT=	Extented persistence framework for session data
 BUILD_DEPENDS=	p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Apache::SessionX.3 \
-	Apache::SessionX::Generate::MD5.3
-
 USES=		perl5
 USE_PERL5=	configure
-IS_INTERACTIVE=	yes
+CONFIGURE_ARGS=	</dev/null
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-SessionX/pkg-plist b/www/p5-Apache-SessionX/pkg-plist
index ac874ceddb5d..d70026fca781 100644
--- a/www/p5-Apache-SessionX/pkg-plist
+++ b/www/p5-Apache-SessionX/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Apache::SessionX.3.gz
+%%PERL5_MAN3%%/Apache::SessionX::Generate::MD5.3.gz
 %%SITE_PERL%%/Apache/SessionX.pm
 %%SITE_PERL%%/Apache/SessionX/Config.pm
 %%SITE_PERL%%/Apache/SessionX/Generate/MD5.pm
@@ -5,9 +7,9 @@
 %%SITE_PERL%%/Apache/SessionX/Store/File.pm
 %%SITE_PERL%%/Apache/testcount.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SessionX/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SessionX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SessionX
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
-@dirrm %%SITE_PERL%%/Apache/SessionX/Store
-@dirrm %%SITE_PERL%%/Apache/SessionX/Generate
-@dirrm %%SITE_PERL%%/Apache/SessionX
+@dirrmtry %%SITE_PERL%%/Apache/SessionX/Store
+@dirrmtry %%SITE_PERL%%/Apache/SessionX/Generate
+@dirrmtry %%SITE_PERL%%/Apache/SessionX
 @dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index 31a3883288d0..15e679baa95d 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -31,21 +31,6 @@ USE_PERL5=	configure
 
 CONFLICTS=	p5-WebService-NoPaste-[0-9]*
 
-MAN1=		nopaste.1
-MAN3=		App::Nopaste.3 \
-		App::Nopaste::Command.3 \
-		App::Nopaste::Service.3 \
-		App::Nopaste::Service::Codepeek.3 \
-		App::Nopaste::Service::Debian.3 \
-		App::Nopaste::Service::Gist.3 \
-		App::Nopaste::Service::PastebinCom.3 \
-		App::Nopaste::Service::Pastie.3 \
-		App::Nopaste::Service::Shadowcat.3 \
-		App::Nopaste::Service::Snitch.3 \
-		App::Nopaste::Service::Ubuntu.3 \
-		App::Nopaste::Service::ssh.3
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIPBOARD}
diff --git a/www/p5-App-Nopaste/pkg-plist b/www/p5-App-Nopaste/pkg-plist
index 71bc0cb1f00a..6349200d869d 100644
--- a/www/p5-App-Nopaste/pkg-plist
+++ b/www/p5-App-Nopaste/pkg-plist
@@ -1,4 +1,16 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste/.packlist
+bin/nopaste
+%%PERL5_MAN3%%/App::Nopaste.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Command.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Codepeek.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Debian.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Gist.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::PastebinCom.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Pastie.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Shadowcat.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Snitch.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::Ubuntu.3.gz
+%%PERL5_MAN3%%/App::Nopaste::Service::ssh.3.gz
 %%SITE_PERL%%/App/Nopaste.pm
 %%SITE_PERL%%/App/Nopaste/Command.pm
 %%SITE_PERL%%/App/Nopaste/Service.pm
@@ -9,11 +21,12 @@
 %%SITE_PERL%%/App/Nopaste/Service/Pastie.pm
 %%SITE_PERL%%/App/Nopaste/Service/Shadowcat.pm
 %%SITE_PERL%%/App/Nopaste/Service/Snitch.pm
-%%SITE_PERL%%/App/Nopaste/Service/ssh.pm
 %%SITE_PERL%%/App/Nopaste/Service/Ubuntu.pm
-bin/nopaste
-@dirrm %%SITE_PERL%%/App/Nopaste/Service
-@dirrm %%SITE_PERL%%/App/Nopaste
-@dirrm %%SITE_PERL%%/App
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+%%SITE_PERL%%/App/Nopaste/Service/ssh.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste/.packlist
+man/man1/nopaste.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Nopaste
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+@dirrmtry %%SITE_PERL%%/App/Nopaste/Service
+@dirrmtry %%SITE_PERL%%/App/Nopaste
+@dirrmtry %%SITE_PERL%%/App
diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile
index 5ff7dcf881d5..82d7af1c5d84 100644
--- a/www/p5-App-gist/Makefile
+++ b/www/p5-App-gist/Makefile
@@ -26,8 +26,4 @@ CONFLICTS=	gist-[0-9]*
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		gist.1
-MAN3=		App::gist.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/p5-App-gist/pkg-plist b/www/p5-App-gist/pkg-plist
index 1495cd2f7693..681a16c64bdb 100644
--- a/www/p5-App-gist/pkg-plist
+++ b/www/p5-App-gist/pkg-plist
@@ -1,6 +1,8 @@
 bin/gist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/gist/.packlist
+%%PERL5_MAN3%%/App::gist.3.gz
 %%SITE_PERL%%/App/gist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/gist/.packlist
+man/man1/gist.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/gist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
 @dirrmtry %%SITE_PERL%%/App