Support STAGEDIR.

117 files changed, 363 insertions, 471 deletions

diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index e96a5cf0636b..1492384d3b6e 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -16,10 +16,7 @@ USES=		perl5
 USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a$//}
 
-MAN3=		Term::ReadLine::Gnu.3
-
 test:	build
 	@(cd ${WRKSRC}; make test)
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index 400ecf1f0ef8..f9be1a76c37b 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Term::ReadLine::Gnu.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/.packlist
@@ -6,8 +7,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index 9b860fa9a003..4e87df506dd1 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -16,5 +16,4 @@ COMMENT=	Perl 5 module for Term::ReadLine editing without GNU readline
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Readonly/Makefile b/devel/p5-Readonly/Makefile
index 42442990e13a..76bd83210d72 100644
--- a/devel/p5-Readonly/Makefile
+++ b/devel/p5-Readonly/Makefile
@@ -18,9 +18,6 @@ USE_PERL5=	configure
 CONFIGURE_ARGS=	DIR="${PORTNAME}-XS-${PORTVERSION_XS}"
 PORTVERSION_XS=	1.05
 
-MAN3=		Readonly.3 Readonly::XS.3
-
-NO_STAGE=	yes
 post-patch:
 	${MV} ${WRKDIR}/${PORTNAME}-XS-${PORTVERSION_XS} ${WRKSRC}
 	${RM} ${WRKSRC}/*.pl
diff --git a/devel/p5-Readonly/pkg-plist b/devel/p5-Readonly/pkg-plist
index 591d1bcf6495..bc66c2dbb697 100644
--- a/devel/p5-Readonly/pkg-plist
+++ b/devel/p5-Readonly/pkg-plist
@@ -1,8 +1,10 @@
+%%PERL5_MAN3%%/Readonly.3.gz
+%%PERL5_MAN3%%/Readonly::XS.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Readonly.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Readonly/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/XS/XS.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Readonly
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly/XS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Readonly
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Readonly
diff --git a/devel/p5-Regexp-Assemble/Makefile b/devel/p5-Regexp-Assemble/Makefile
index 2ce1205c8f98..efd765ea2728 100644
--- a/devel/p5-Regexp-Assemble/Makefile
+++ b/devel/p5-Regexp-Assemble/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Regexp::Assemble.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Regexp-Assemble/pkg-plist b/devel/p5-Regexp-Assemble/pkg-plist
index 59d206a8bdfc..4ea2ad86c67c 100644
--- a/devel/p5-Regexp-Assemble/pkg-plist
+++ b/devel/p5-Regexp-Assemble/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Regexp::Assemble.3.gz
 %%SITE_PERL%%/Regexp/Assemble.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble
diff --git a/devel/p5-Regexp-Bind/Makefile b/devel/p5-Regexp-Bind/Makefile
index 4dd3d9823a54..3e193866f468 100644
--- a/devel/p5-Regexp-Bind/Makefile
+++ b/devel/p5-Regexp-Bind/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Bind variables to captured buffers
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Regexp::Bind.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Regexp-Bind/pkg-plist b/devel/p5-Regexp-Bind/pkg-plist
index 260be1c84eb8..d008850f55f7 100644
--- a/devel/p5-Regexp-Bind/pkg-plist
+++ b/devel/p5-Regexp-Bind/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Regexp::Bind.3.gz
 %%SITE_PERL%%/Regexp/Bind.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Bind/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Bind
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 42a7cfd62a6e..e4d6555f1a5d 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl5 module to install die() and warn() handlers
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Religion.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Religion/pkg-plist b/devel/p5-Religion/pkg-plist
index 45662563e4e4..32f34cf4f444 100644
--- a/devel/p5-Religion/pkg-plist
+++ b/devel/p5-Religion/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Religion.3.gz
 %%SITE_PERL%%/Religion.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Religion
diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index 43330561c344..89154f5459aa 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -15,21 +15,4 @@ COMMENT=	Generic way to use connection caching for any kind of resources
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	ResourcePool.3 \
-	ResourcePool::BigPicture.3 \
-	ResourcePool::Command.3 \
-	ResourcePool::Command::Exception.3 \
-	ResourcePool::Command::Execute.3 \
-	ResourcePool::Command::NoFailoverException.3 \
-	ResourcePool::ExtensionGuide.3 \
-	ResourcePool::Factory.3 \
-	ResourcePool::LoadBalancer.3 \
-	ResourcePool::Resource.3 \
-	ResourcePool::Singleton.3 \
-	ResourcePool::UML.3
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/devel/p5-ResourcePool/pkg-plist b/devel/p5-ResourcePool/pkg-plist
index 177f99faf5a8..b67787e6bd88 100644
--- a/devel/p5-ResourcePool/pkg-plist
+++ b/devel/p5-ResourcePool/pkg-plist
@@ -1,3 +1,15 @@
+%%PERL5_MAN3%%/ResourcePool.3.gz
+%%PERL5_MAN3%%/ResourcePool::BigPicture.3.gz
+%%PERL5_MAN3%%/ResourcePool::Command.3.gz
+%%PERL5_MAN3%%/ResourcePool::Command::Exception.3.gz
+%%PERL5_MAN3%%/ResourcePool::Command::Execute.3.gz
+%%PERL5_MAN3%%/ResourcePool::Command::NoFailoverException.3.gz
+%%PERL5_MAN3%%/ResourcePool::ExtensionGuide.3.gz
+%%PERL5_MAN3%%/ResourcePool::Factory.3.gz
+%%PERL5_MAN3%%/ResourcePool::LoadBalancer.3.gz
+%%PERL5_MAN3%%/ResourcePool::Resource.3.gz
+%%PERL5_MAN3%%/ResourcePool::Singleton.3.gz
+%%PERL5_MAN3%%/ResourcePool::UML.3.gz
 %%SITE_PERL%%/ResourcePool.pm
 %%SITE_PERL%%/ResourcePool.pod
 %%SITE_PERL%%/ResourcePool/BigPicture.pod
@@ -14,8 +26,8 @@
 %%SITE_PERL%%/ResourcePool/Factory.pod
 %%SITE_PERL%%/ResourcePool/LoadBalancer.pm
 %%SITE_PERL%%/ResourcePool/LoadBalancer.pod
-%%SITE_PERL%%/ResourcePool/LoadBalancer/FailOver.pm
 %%SITE_PERL%%/ResourcePool/LoadBalancer/FailBack.pm
+%%SITE_PERL%%/ResourcePool/LoadBalancer/FailOver.pm
 %%SITE_PERL%%/ResourcePool/LoadBalancer/FallBack.pm
 %%SITE_PERL%%/ResourcePool/LoadBalancer/LeastUsage.pm
 %%SITE_PERL%%/ResourcePool/LoadBalancer/RoundRobin.pm
diff --git a/devel/p5-SOAP-WSDL/Makefile b/devel/p5-SOAP-WSDL/Makefile
index f8d5ba5f8ac1..9d01bfd14dbb 100644
--- a/devel/p5-SOAP-WSDL/Makefile
+++ b/devel/p5-SOAP-WSDL/Makefile
@@ -27,58 +27,4 @@ BUILD_DEPENDS=	p5-Class-Std-Fast>=0:${PORTSDIR}/devel/p5-Class-Std-Fast \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=		wsdl2perl.pl.1
-MAN3=		SOAP::WSDL.3 \
-		SOAP::WSDL::Client.3 \
-		SOAP::WSDL::Client::Base.3 \
-		SOAP::WSDL::Definitions.3 \
-		SOAP::WSDL::Deserializer::Hash.3 \
-		SOAP::WSDL::Deserializer::SOM.3 \
-		SOAP::WSDL::Deserializer::XSD.3 \
-		SOAP::WSDL::Expat::Base.3 \
-		SOAP::WSDL::Expat::Message2Hash.3 \
-		SOAP::WSDL::Expat::MessageParser.3 \
-		SOAP::WSDL::Expat::MessageStreamParser.3 \
-		SOAP::WSDL::Expat::WSDLParser.3 \
-		SOAP::WSDL::Factory::Deserializer.3 \
-		SOAP::WSDL::Factory::Generator.3 \
-		SOAP::WSDL::Factory::Serializer.3 \
-		SOAP::WSDL::Factory::Transport.3 \
-		SOAP::WSDL::Generator::Iterator::WSDL11.3 \
-		SOAP::WSDL::Generator::PrefixResolver.3 \
-		SOAP::WSDL::Generator::Template.3 \
-		SOAP::WSDL::Generator::Template::Plugin::XSD.3 \
-		SOAP::WSDL::Generator::Template::XSD.3 \
-		SOAP::WSDL::Generator::Template::XSD::complexType.tt.3 \
-		SOAP::WSDL::Generator::Template::XSD::complexType::POD::attributeSet.tt.3 \
-		SOAP::WSDL::Generator::Template::XSD::element.tt.3 \
-		SOAP::WSDL::Generator::Visitor.3 \
-		SOAP::WSDL::Generator::Visitor::Typemap.3 \
-		SOAP::WSDL::Manual.3 \
-		SOAP::WSDL::Manual::CodeFirst.3 \
-		SOAP::WSDL::Manual::Cookbook.3 \
-		SOAP::WSDL::Manual::Deserializer.3 \
-		SOAP::WSDL::Manual::FAQ.3 \
-		SOAP::WSDL::Manual::Glossary.3 \
-		SOAP::WSDL::Manual::Parser.3 \
-		SOAP::WSDL::Manual::Serializer.3 \
-		SOAP::WSDL::Manual::WS_I.3 \
-		SOAP::WSDL::Manual::XSD.3 \
-		SOAP::WSDL::SOAP::Typelib::Fault11.3 \
-		SOAP::WSDL::Serializer::XSD.3 \
-		SOAP::WSDL::Server.3 \
-		SOAP::WSDL::Server::CGI.3 \
-		SOAP::WSDL::Server::Mod_Perl2.3 \
-		SOAP::WSDL::Server::Simple.3 \
-		SOAP::WSDL::Transport::HTTP.3 \
-		SOAP::WSDL::Transport::Loopback.3 \
-		SOAP::WSDL::Transport::Test.3 \
-		SOAP::WSDL::XSD::Schema::Builtin.3 \
-		SOAP::WSDL::XSD::Typelib::Builtin.3 \
-		SOAP::WSDL::XSD::Typelib::Builtin::list.3 \
-		SOAP::WSDL::XSD::Typelib::ComplexType.3 \
-		SOAP::WSDL::XSD::Typelib::Element.3 \
-		SOAP::WSDL::XSD::Typelib::SimpleType.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-SOAP-WSDL/pkg-plist b/devel/p5-SOAP-WSDL/pkg-plist
index ba0c52890525..3101e04ff03d 100644
--- a/devel/p5-SOAP-WSDL/pkg-plist
+++ b/devel/p5-SOAP-WSDL/pkg-plist
@@ -1,9 +1,60 @@
 bin/wsdl2perl.pl
+%%PERL5_MAN3%%/SOAP::WSDL.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Client.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Client::Base.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Definitions.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Deserializer::Hash.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Deserializer::SOM.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Deserializer::XSD.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Expat::Base.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Expat::Message2Hash.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Expat::MessageParser.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Expat::MessageStreamParser.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Expat::WSDLParser.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Factory::Deserializer.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Factory::Generator.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Factory::Serializer.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Factory::Transport.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Iterator::WSDL11.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::PrefixResolver.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template::Plugin::XSD.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template::XSD.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template::XSD::complexType.tt.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template::XSD::complexType::POD::attributeSet.tt.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Template::XSD::element.tt.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Visitor.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Generator::Visitor::Typemap.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::CodeFirst.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::Cookbook.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::Deserializer.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::FAQ.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::Glossary.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::Parser.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::Serializer.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::WS_I.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Manual::XSD.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::SOAP::Typelib::Fault11.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Serializer::XSD.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Server.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Server::CGI.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Server::Mod_Perl2.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Server::Simple.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Transport::HTTP.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Transport::Loopback.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::Transport::Test.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Schema::Builtin.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Typelib::Builtin.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Typelib::Builtin::list.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Typelib::ComplexType.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Typelib::Element.3.gz
+%%PERL5_MAN3%%/SOAP::WSDL::XSD::Typelib::SimpleType.3.gz
 %%SITE_PERL%%/SOAP/WSDL.pm
 %%SITE_PERL%%/SOAP/WSDL/Base.pm
 %%SITE_PERL%%/SOAP/WSDL/Binding.pm
-%%SITE_PERL%%/SOAP/WSDL/Client/Base.pm
 %%SITE_PERL%%/SOAP/WSDL/Client.pm
+%%SITE_PERL%%/SOAP/WSDL/Client/Base.pm
 %%SITE_PERL%%/SOAP/WSDL/Definitions.pm
 %%SITE_PERL%%/SOAP/WSDL/Deserializer/Hash.pm
 %%SITE_PERL%%/SOAP/WSDL/Deserializer/SOM.pm
@@ -19,7 +70,10 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/Factory/Transport.pm
 %%SITE_PERL%%/SOAP/WSDL/Generator/Iterator/WSDL11.pm
 %%SITE_PERL%%/SOAP/WSDL/Generator/PrefixResolver.pm
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template.pm
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/Plugin/XSD.pm
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD.pm
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/Body.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/Header.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/Operation.tt
@@ -29,27 +83,27 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Part.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/POD/Type.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/POD/method_info.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/POD/annotation.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD/Message.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD/Operation.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD/OutPart.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD/method_info.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Typemap.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/attribute.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/all.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/attributeSet.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/choice.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/complexContent.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/content_model.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/restriction.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/extension.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent/restriction.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/restriction.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure/simpleContent.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/all.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/atomicTypes.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/attributeSet.tt
@@ -57,13 +111,13 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/contentModel.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/extension.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/restriction.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent/extension.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent/extension.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element/POD/contentModel.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element/POD/structure.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element.tt
+%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/contentModel.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/list.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/POD/restriction.tt
@@ -74,11 +128,9 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/list.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/restriction.tt
 %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/union.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType.tt
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD.pm
-%%SITE_PERL%%/SOAP/WSDL/Generator/Template.pm
-%%SITE_PERL%%/SOAP/WSDL/Generator/Visitor/Typemap.pm
 %%SITE_PERL%%/SOAP/WSDL/Generator/Visitor.pm
+%%SITE_PERL%%/SOAP/WSDL/Generator/Visitor/Typemap.pm
+%%SITE_PERL%%/SOAP/WSDL/Manual.pod
 %%SITE_PERL%%/SOAP/WSDL/Manual/CodeFirst.pod
 %%SITE_PERL%%/SOAP/WSDL/Manual/Cookbook.pod
 %%SITE_PERL%%/SOAP/WSDL/Manual/Deserializer.pod
@@ -88,7 +140,6 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/Manual/Serializer.pod
 %%SITE_PERL%%/SOAP/WSDL/Manual/WS_I.pod
 %%SITE_PERL%%/SOAP/WSDL/Manual/XSD.pod
-%%SITE_PERL%%/SOAP/WSDL/Manual.pod
 %%SITE_PERL%%/SOAP/WSDL/Message.pm
 %%SITE_PERL%%/SOAP/WSDL/OpMessage.pm
 %%SITE_PERL%%/SOAP/WSDL/Operation.pm
@@ -103,10 +154,10 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/SOAP/Typelib/Fault.pm
 %%SITE_PERL%%/SOAP/WSDL/SOAP/Typelib/Fault11.pm
 %%SITE_PERL%%/SOAP/WSDL/Serializer/XSD.pm
+%%SITE_PERL%%/SOAP/WSDL/Server.pm
 %%SITE_PERL%%/SOAP/WSDL/Server/CGI.pm
 %%SITE_PERL%%/SOAP/WSDL/Server/Mod_Perl2.pm
 %%SITE_PERL%%/SOAP/WSDL/Server/Simple.pm
-%%SITE_PERL%%/SOAP/WSDL/Server.pm
 %%SITE_PERL%%/SOAP/WSDL/Service.pm
 %%SITE_PERL%%/SOAP/WSDL/Transport/HTTP.pm
 %%SITE_PERL%%/SOAP/WSDL/Transport/Loopback.pm
@@ -130,12 +181,13 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/XSD/MinInclusive.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/MinLength.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Pattern.pm
-%%SITE_PERL%%/SOAP/WSDL/XSD/Schema/Builtin.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Schema.pm
+%%SITE_PERL%%/SOAP/WSDL/XSD/Schema/Builtin.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/SimpleType.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/TotalDigits.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Attribute.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/AttributeSet.pm
+%%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm
@@ -182,44 +234,44 @@ bin/wsdl2perl.pl
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm
-%%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/ComplexType.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Element.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/SimpleType.pm
 %%SITE_PERL%%/SOAP/WSDL/XSD/WhiteSpace.pm
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Client
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Deserializer
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Expat
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Factory
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Iterator
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/Plugin
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent
+man/man1/wsdl2perl.pl.1.gz
+@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin
+@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib
+@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Schema
+@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Transport
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Server
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Serializer
+@dirrm %%SITE_PERL%%/SOAP/WSDL/SOAP/Typelib
+@dirrm %%SITE_PERL%%/SOAP/WSDL/SOAP
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Manual
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Visitor
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/POD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element/POD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/structure
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD/simpleContent
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType/simpleContent
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/complexType
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/element
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType/POD
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/simpleType
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server/POD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Server
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/POD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface/POD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD/Interface
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/XSD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template/Plugin
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Template
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Visitor
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Generator/Iterator
 @dirrm %%SITE_PERL%%/SOAP/WSDL/Generator
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Manual
-@dirrm %%SITE_PERL%%/SOAP/WSDL/SOAP/Typelib
-@dirrm %%SITE_PERL%%/SOAP/WSDL/SOAP
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Serializer
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Server
-@dirrm %%SITE_PERL%%/SOAP/WSDL/Transport
-@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Schema
-@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib/Builtin
-@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD/Typelib
-@dirrm %%SITE_PERL%%/SOAP/WSDL/XSD
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Factory
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Expat
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Deserializer
+@dirrm %%SITE_PERL%%/SOAP/WSDL/Client
 @dirrm %%SITE_PERL%%/SOAP/WSDL
 @dirrmtry %%SITE_PERL%%/SOAP
diff --git a/devel/p5-SSN-Validate/Makefile b/devel/p5-SSN-Validate/Makefile
index 65c6facb7bca..8b5fc0c08f47 100644
--- a/devel/p5-SSN-Validate/Makefile
+++ b/devel/p5-SSN-Validate/Makefile
@@ -15,10 +15,7 @@ COMMENT=	Perl extension to do SSN Validation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		SSN::Validate.3
-
 test: all
 	cd ${WRKSRC} && ${MAKE} test
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-SSN-Validate/pkg-plist b/devel/p5-SSN-Validate/pkg-plist
index f21b552f82ed..d02369d47e23 100644
--- a/devel/p5-SSN-Validate/pkg-plist
+++ b/devel/p5-SSN-Validate/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/SSN::Validate.3.gz
 %%SITE_PERL%%/SSN/Validate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN
-@dirrmtry %%SITE_PERL%%/SSN
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN
+@dirrm %%SITE_PERL%%/SSN
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index 6b238cfa5314..7f71a65c09a6 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -12,15 +12,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple ACL frontend for subversion
 
-BUILD_DEPENDS=	\
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
+BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		SVN::ACL.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-ACL/pkg-plist b/devel/p5-SVN-ACL/pkg-plist
index ef0d97840980..3089b29f1662 100644
--- a/devel/p5-SVN-ACL/pkg-plist
+++ b/devel/p5-SVN-ACL/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/SVN::ACL.3.gz
 %%SITE_PERL%%/SVN/ACL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/ACL/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/ACL
-@dirrmtry %%SITE_PERL%%/SVN
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
+@dirrmtry %%SITE_PERL%%/SVN
diff --git a/devel/p5-SVN-Dump/Makefile b/devel/p5-SVN-Dump/Makefile
index 26b5ae1510a3..e8b96c256513 100644
--- a/devel/p5-SVN-Dump/Makefile
+++ b/devel/p5-SVN-Dump/Makefile
@@ -13,12 +13,4 @@ COMMENT=	Perl interface to Subversion dumps
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		SVN::Dump.3 \
-		SVN::Dump::Headers.3 \
-		SVN::Dump::Property.3 \
-		SVN::Dump::Reader.3 \
-		SVN::Dump::Record.3 \
-		SVN::Dump::Text.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-Dump/pkg-plist b/devel/p5-SVN-Dump/pkg-plist
index 6d8415fb21b1..0a84f11e9bae 100644
--- a/devel/p5-SVN-Dump/pkg-plist
+++ b/devel/p5-SVN-Dump/pkg-plist
@@ -1,8 +1,14 @@
+%%PERL5_MAN3%%/SVN::Dump.3.gz
+%%PERL5_MAN3%%/SVN::Dump::Headers.3.gz
+%%PERL5_MAN3%%/SVN::Dump::Property.3.gz
+%%PERL5_MAN3%%/SVN::Dump::Reader.3.gz
+%%PERL5_MAN3%%/SVN::Dump::Record.3.gz
+%%PERL5_MAN3%%/SVN::Dump::Text.3.gz
 %%SITE_PERL%%/SVN/Dump.pm
 %%SITE_PERL%%/SVN/Dump/Headers.pm
 %%SITE_PERL%%/SVN/Dump/Property.pm
 %%SITE_PERL%%/SVN/Dump/Reader.pm
 %%SITE_PERL%%/SVN/Dump/Record.pm
 %%SITE_PERL%%/SVN/Dump/Text.pm
-@dirrmtry %%SITE_PERL%%/SVN/Dump
+@dirrm %%SITE_PERL%%/SVN/Dump
 @dirrmtry %%SITE_PERL%%/SVN
diff --git a/devel/p5-SVN-Notify/Makefile b/devel/p5-SVN-Notify/Makefile
index 73b03db502f5..ea00b4ffbeb4 100644
--- a/devel/p5-SVN-Notify/Makefile
+++ b/devel/p5-SVN-Notify/Makefile
@@ -21,9 +21,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=		svnnotify.1
-MAN3=		SVN::Notify.3 SVN::Notify::Alternative.3 SVN::Notify::HTML.3 \
-		SVN::Notify::HTML::ColorDiff.3 SVN::Notify::Filter.3 SVN::Notify::Filter::Trac.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-Notify/pkg-plist b/devel/p5-SVN-Notify/pkg-plist
index 0dc2295b73b4..d8a71c7807d8 100644
--- a/devel/p5-SVN-Notify/pkg-plist
+++ b/devel/p5-SVN-Notify/pkg-plist
@@ -1,11 +1,18 @@
 bin/svnnotify
+%%PERL5_MAN3%%/SVN::Notify.3.gz
+%%PERL5_MAN3%%/SVN::Notify::Alternative.3.gz
+%%PERL5_MAN3%%/SVN::Notify::Filter.3.gz
+%%PERL5_MAN3%%/SVN::Notify::Filter::Trac.3.gz
+%%PERL5_MAN3%%/SVN::Notify::HTML.3.gz
+%%PERL5_MAN3%%/SVN::Notify::HTML::ColorDiff.3.gz
 %%SITE_PERL%%/SVN/Notify.pm
 %%SITE_PERL%%/SVN/Notify/Alternative.pm
 %%SITE_PERL%%/SVN/Notify/Filter.pod
 %%SITE_PERL%%/SVN/Notify/Filter/Trac.pm
 %%SITE_PERL%%/SVN/Notify/HTML.pm
 %%SITE_PERL%%/SVN/Notify/HTML/ColorDiff.pm
-@dirrm %%SITE_PERL%%/SVN/Notify/Filter
+man/man1/svnnotify.1.gz
 @dirrm %%SITE_PERL%%/SVN/Notify/HTML
-@dirrmtry %%SITE_PERL%%/SVN/Notify
+@dirrm %%SITE_PERL%%/SVN/Notify/Filter
+@dirrm %%SITE_PERL%%/SVN/Notify
 @dirrmtry %%SITE_PERL%%/SVN
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index c9d13977ee99..97e456d4b307 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -38,34 +38,10 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	--skip_questions
 
-MAN1=		svnweb-install.1
-MAN3=		SVN::CHANGES.3 \
-		SVN::CONTRIBUTING.3 \
-		SVN::UPDATING.3 \
-		SVN::Web.3 \
-		SVN::Web::Blame.3 \
-		SVN::Web::Browse.3 \
-		SVN::Web::Checkout.3 \
-		SVN::Web::Diff.3 \
-		SVN::Web::DiffParser.3 \
-		SVN::Web::I18N.3 \
-		SVN::Web::List.3 \
-		SVN::Web::Log.3 \
-		SVN::Web::RSS.3 \
-		SVN::Web::Revision.3 \
-		SVN::Web::Test.3 \
-		SVN::Web::View.3 \
-		SVN::Web::X.3 \
-		SVN::Web::action.3
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} -p ${WWWDIR}
-	${CP} -R ${WRKSRC}/SVN-Web.psgi ${WRKSRC}/template ${WRKSRC}/css ${WWWDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/svnweb-install ${PREFIX}/bin
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${MKDIR} -p ${STAGEDIR}${WWWDIR}
+	${CP} -R ${WRKSRC}/SVN-Web.psgi ${WRKSRC}/template ${WRKSRC}/css ${STAGEDIR}${WWWDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/svnweb-install ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p5-SVN-Web/pkg-plist b/devel/p5-SVN-Web/pkg-plist
index c8dbe5ed67bd..6cc099c4e2bb 100644
--- a/devel/p5-SVN-Web/pkg-plist
+++ b/devel/p5-SVN-Web/pkg-plist
@@ -1,4 +1,22 @@
 bin/svnweb-install
+%%PERL5_MAN3%%/SVN::CHANGES.3.gz
+%%PERL5_MAN3%%/SVN::CONTRIBUTING.3.gz
+%%PERL5_MAN3%%/SVN::UPDATING.3.gz
+%%PERL5_MAN3%%/SVN::Web.3.gz
+%%PERL5_MAN3%%/SVN::Web::Blame.3.gz
+%%PERL5_MAN3%%/SVN::Web::Browse.3.gz
+%%PERL5_MAN3%%/SVN::Web::Checkout.3.gz
+%%PERL5_MAN3%%/SVN::Web::Diff.3.gz
+%%PERL5_MAN3%%/SVN::Web::DiffParser.3.gz
+%%PERL5_MAN3%%/SVN::Web::I18N.3.gz
+%%PERL5_MAN3%%/SVN::Web::List.3.gz
+%%PERL5_MAN3%%/SVN::Web::Log.3.gz
+%%PERL5_MAN3%%/SVN::Web::RSS.3.gz
+%%PERL5_MAN3%%/SVN::Web::Revision.3.gz
+%%PERL5_MAN3%%/SVN::Web::Test.3.gz
+%%PERL5_MAN3%%/SVN::Web::View.3.gz
+%%PERL5_MAN3%%/SVN::Web::X.3.gz
+%%PERL5_MAN3%%/SVN::Web::action.3.gz
 %%SITE_PERL%%/SVN/CHANGES.pod
 %%SITE_PERL%%/SVN/CONTRIBUTING.pod
 %%SITE_PERL%%/SVN/UPDATING.pod
@@ -22,53 +40,54 @@ bin/svnweb-install
 %%SITE_PERL%%/SVN/Web/X.pm
 %%SITE_PERL%%/SVN/Web/action.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Web/.packlist
-%%WWWDIR%%/css/trac/feed-icon-16x16.png
+man/man1/svnweb-install.1.gz
+%%WWWDIR%%/SVN-Web.psgi
+%%WWWDIR%%/css/common.css
+%%WWWDIR%%/css/styles-hlb.css
+%%WWWDIR%%/css/trac/browser.css
+%%WWWDIR%%/css/trac/changeset.css
+%%WWWDIR%%/css/trac/code.css
 %%WWWDIR%%/css/trac/diff.css
+%%WWWDIR%%/css/trac/feed-icon-16x16.png
 %%WWWDIR%%/css/trac/file.png
-%%WWWDIR%%/css/trac/trac.css
+%%WWWDIR%%/css/trac/filedeny.png
 %%WWWDIR%%/css/trac/folder.png
+%%WWWDIR%%/css/trac/folderdeny.png
 %%WWWDIR%%/css/trac/parent.png
 %%WWWDIR%%/css/trac/svnweb.css
-%%WWWDIR%%/css/trac/browser.css
-%%WWWDIR%%/css/trac/filedeny.png
-%%WWWDIR%%/css/trac/changeset.css
-%%WWWDIR%%/css/trac/folderdeny.png
 %%WWWDIR%%/css/trac/text-diff-html.css
-%%WWWDIR%%/css/trac/code.css
-%%WWWDIR%%/css/common.css
-%%WWWDIR%%/css/styles-hlb.css
+%%WWWDIR%%/css/trac/trac.css
+%%WWWDIR%%/template/plain/browse
+%%WWWDIR%%/template/plain/diff
+%%WWWDIR%%/template/plain/footer
+%%WWWDIR%%/template/plain/header
+%%WWWDIR%%/template/plain/list
+%%WWWDIR%%/template/plain/log
+%%WWWDIR%%/template/plain/revision
+%%WWWDIR%%/template/plain/view
+%%WWWDIR%%/template/plain/x
 %%WWWDIR%%/template/trac/_action_menu
-%%WWWDIR%%/template/trac/log
-%%WWWDIR%%/template/trac/rss
-%%WWWDIR%%/template/trac/diff
-%%WWWDIR%%/template/trac/view
-%%WWWDIR%%/template/trac/list
-%%WWWDIR%%/template/trac/blame
 %%WWWDIR%%/template/trac/_diff
-%%WWWDIR%%/template/trac/footer
+%%WWWDIR%%/template/trac/_log_msg
+%%WWWDIR%%/template/trac/blame
 %%WWWDIR%%/template/trac/browse
+%%WWWDIR%%/template/trac/diff
+%%WWWDIR%%/template/trac/footer
 %%WWWDIR%%/template/trac/header
-%%WWWDIR%%/template/trac/_log_msg
+%%WWWDIR%%/template/trac/list
+%%WWWDIR%%/template/trac/log
 %%WWWDIR%%/template/trac/revision
+%%WWWDIR%%/template/trac/rss
+%%WWWDIR%%/template/trac/view
 %%WWWDIR%%/template/trac/x
-%%WWWDIR%%/template/plain/revision
-%%WWWDIR%%/template/plain/log
-%%WWWDIR%%/template/plain/diff
-%%WWWDIR%%/template/plain/list
-%%WWWDIR%%/template/plain/view
-%%WWWDIR%%/template/plain/footer
-%%WWWDIR%%/template/plain/browse
-%%WWWDIR%%/template/plain/header
-%%WWWDIR%%/template/plain/x
-%%WWWDIR%%/SVN-Web.psgi
+@dirrm %%WWWDIR%%/template/trac
+@dirrm %%WWWDIR%%/template/plain
+@dirrm %%WWWDIR%%/template
+@dirrm %%WWWDIR%%/css/trac
+@dirrm %%WWWDIR%%/css
+@dirrm %%WWWDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Web
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
 @dirrm %%SITE_PERL%%/SVN/Web/I18N
 @dirrm %%SITE_PERL%%/SVN/Web
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Web
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
 @dirrmtry %%SITE_PERL%%/SVN
-@dirrmtry %%WWWDIR%%/css/trac
-@dirrmtry %%WWWDIR%%/css
-@dirrmtry %%WWWDIR%%/template/trac
-@dirrmtry %%WWWDIR%%/template/plain
-@dirrmtry %%WWWDIR%%/template
-@dirrmtry %%WWWDIR%%
diff --git a/devel/p5-Scalar-Defer/Makefile b/devel/p5-Scalar-Defer/Makefile
index b92b1f79f5d0..a681b2098ef3 100644
--- a/devel/p5-Scalar-Defer/Makefile
+++ b/devel/p5-Scalar-Defer/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Scalar::Defer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Scalar-Defer/pkg-plist b/devel/p5-Scalar-Defer/pkg-plist
index ba7dc1af8d6a..19653e49fbe8 100644
--- a/devel/p5-Scalar-Defer/pkg-plist
+++ b/devel/p5-Scalar-Defer/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Defer/.packlist
+%%PERL5_MAN3%%/Scalar::Defer.3.gz
 %%SITE_PERL%%/Scalar/Defer.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Defer
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Defer/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Defer
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar
 @dirrmtry %%SITE_PERL%%/Scalar
diff --git a/devel/p5-Scalar-Listify/Makefile b/devel/p5-Scalar-Listify/Makefile
index 1f029aad44e1..4babd2649798 100644
--- a/devel/p5-Scalar-Listify/Makefile
+++ b/devel/p5-Scalar-Listify/Makefile
@@ -10,10 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Poduces an array(ref)? from a scalar value or array ref
 
-MAN3=		Scalar::Listify.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Scalar-Listify/pkg-plist b/devel/p5-Scalar-Listify/pkg-plist
index 685530cadfe3..b4b590601933 100644
--- a/devel/p5-Scalar-Listify/pkg-plist
+++ b/devel/p5-Scalar-Listify/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Listify/.packlist
+%%PERL5_MAN3%%/Scalar::Listify.3.gz
 %%SITE_PERL%%/Scalar/Listify.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Listify
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Listify/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar/Listify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scalar
 @dirrmtry %%SITE_PERL%%/Scalar
diff --git a/devel/p5-Scope-Upper/Makefile b/devel/p5-Scope-Upper/Makefile
index 8af4f34c7eb9..dd980c562f1b 100644
--- a/devel/p5-Scope-Upper/Makefile
+++ b/devel/p5-Scope-Upper/Makefile
@@ -17,7 +17,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Scope::Upper.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Scope-Upper/pkg-plist b/devel/p5-Scope-Upper/pkg-plist
index becaff309198..41d5fabc6e47 100644
--- a/devel/p5-Scope-Upper/pkg-plist
+++ b/devel/p5-Scope-Upper/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Scope::Upper.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Scope/Upper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper/Upper.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper/Upper.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope/Upper
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Scope
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Scope
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Scope
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index a478a6481fc6..f623f6d12415 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -23,7 +23,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Set::Array.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Set-Array/pkg-plist b/devel/p5-Set-Array/pkg-plist
index 2e52627f95e2..38f5e3d5af4b 100644
--- a/devel/p5-Set-Array/pkg-plist
+++ b/devel/p5-Set-Array/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Set::Array.3.gz
 %%SITE_PERL%%/Set/Array.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Array/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Array
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index b36472899a89..560a7e108751 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Set::ConsistentHash.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Set-ConsistentHash/pkg-plist b/devel/p5-Set-ConsistentHash/pkg-plist
index bb7e8fb54a42..a97392badd05 100644
--- a/devel/p5-Set-ConsistentHash/pkg-plist
+++ b/devel/p5-Set-ConsistentHash/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/ConsistentHash/.packlist
+%%PERL5_MAN3%%/Set::ConsistentHash.3.gz
 %%SITE_PERL%%/Set/ConsistentHash.pm
-@dirrmtry %%SITE_PERL%%/Set
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/ConsistentHash
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/ConsistentHash/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/ConsistentHash
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Set-Crontab/Makefile b/devel/p5-Set-Crontab/Makefile
index df5f6a585663..6a817829eed1 100644
--- a/devel/p5-Set-Crontab/Makefile
+++ b/devel/p5-Set-Crontab/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Set::Crontab - Expand crontab(5)-style integer lists
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Set::Crontab.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Set-Crontab/pkg-plist b/devel/p5-Set-Crontab/pkg-plist
index 873c43d611c2..ea6933d647b2 100644
--- a/devel/p5-Set-Crontab/pkg-plist
+++ b/devel/p5-Set-Crontab/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Set::Crontab.3.gz
 %%SITE_PERL%%/Set/Crontab.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Crontab/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Crontab
diff --git a/devel/p5-Set-Infinite/Makefile b/devel/p5-Set-Infinite/Makefile
index 666ba5163142..4368fdfbbd2a 100644
--- a/devel/p5-Set-Infinite/Makefile
+++ b/devel/p5-Set-Infinite/Makefile
@@ -15,17 +15,14 @@ OPTIONS_DEFINE=	DOCS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Set::Infinite.3 Set::Infinite::Arithmetic.3 Set::Infinite::Basic.3
 PORTDOCS=	Changes README TODO
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Set-Infinite/pkg-plist b/devel/p5-Set-Infinite/pkg-plist
index 68b8d9509ee5..e8c1aaad8f26 100644
--- a/devel/p5-Set-Infinite/pkg-plist
+++ b/devel/p5-Set-Infinite/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Set::Infinite.3.gz
+%%PERL5_MAN3%%/Set::Infinite::Arithmetic.3.gz
+%%PERL5_MAN3%%/Set::Infinite::Basic.3.gz
 %%SITE_PERL%%/Set/Infinite.pm
 %%SITE_PERL%%/Set/Infinite/Arithmetic.pm
 %%SITE_PERL%%/Set/Infinite/Basic.pm
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index 53ef9c83a322..0c0c020de37a 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -17,17 +17,14 @@ OPTIONS_DEFINE=	DOCS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Set::Changes.3 Set::Object.3 Set::Object::Weak.3
 PORTDOCS=	Changes.pod README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Set-Object/pkg-plist b/devel/p5-Set-Object/pkg-plist
index 81f08f4d1139..4cbabf12bc0b 100644
--- a/devel/p5-Set-Object/pkg-plist
+++ b/devel/p5-Set-Object/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Set::Changes.3.gz
+%%PERL5_MAN3%%/Set::Object.3.gz
+%%PERL5_MAN3%%/Set::Object::Weak.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Set/Changes.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Set/Object.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Set/Object/Weak.pm
@@ -5,7 +8,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/Object.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/Object.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/autosplit.ix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set/Object
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Set/Object
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index 781a20a37218..56b36ebc06c8 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Shell::Base.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Shell-Base/pkg-plist b/devel/p5-Shell-Base/pkg-plist
index ba5f70e829be..021fdf055dc4 100644
--- a/devel/p5-Shell-Base/pkg-plist
+++ b/devel/p5-Shell-Base/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Shell::Base.3.gz
 %%SITE_PERL%%/Shell/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Base/.packlist
-@dirrm %%SITE_PERL%%/Shell
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Base
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
+@dirrmtry %%SITE_PERL%%/Shell
diff --git a/devel/p5-Shell-Parser/Makefile b/devel/p5-Shell-Parser/Makefile
index c7dcf3cca280..50da408fcb65 100644
--- a/devel/p5-Shell-Parser/Makefile
+++ b/devel/p5-Shell-Parser/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simple shell script parser
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Shell::Parser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Shell-Parser/pkg-plist b/devel/p5-Shell-Parser/pkg-plist
index 98bb78ff9bd6..b50039d36cb3 100644
--- a/devel/p5-Shell-Parser/pkg-plist
+++ b/devel/p5-Shell-Parser/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser/.packlist
+%%PERL5_MAN3%%/Shell::Parser.3.gz
 %%SITE_PERL%%/Shell/Parser.pm
-@dirrmtry %%SITE_PERL%%/Shell
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
+@dirrmtry %%SITE_PERL%%/Shell
diff --git a/devel/p5-ShipIt/Makefile b/devel/p5-ShipIt/Makefile
index a9d3b6fa8acb..4f8ccc3ff844 100644
--- a/devel/p5-ShipIt/Makefile
+++ b/devel/p5-ShipIt/Makefile
@@ -14,11 +14,4 @@ COMMENT=	Software release tool
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		shipit.1
-MAN3=		ShipIt.3 ShipIt::Conf.3 ShipIt::ProjectType.3 \
-		ShipIt::State.3 ShipIt::Step.3 ShipIt::Step::AddToSVNDir.3 \
-		ShipIt::VC.3 ShipIt::VC::Git.3 ShipIt::VC::Mercurial.3 \
-		ShipIt::VC::SVK.3 ShipIt::VC::SVN.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-ShipIt/pkg-plist b/devel/p5-ShipIt/pkg-plist
index 1fdf16c8f5a0..39017fd51c31 100644
--- a/devel/p5-ShipIt/pkg-plist
+++ b/devel/p5-ShipIt/pkg-plist
@@ -1,4 +1,15 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt/.packlist
+bin/shipit
+%%PERL5_MAN3%%/ShipIt.3.gz
+%%PERL5_MAN3%%/ShipIt::Conf.3.gz
+%%PERL5_MAN3%%/ShipIt::ProjectType.3.gz
+%%PERL5_MAN3%%/ShipIt::State.3.gz
+%%PERL5_MAN3%%/ShipIt::Step.3.gz
+%%PERL5_MAN3%%/ShipIt::Step::AddToSVNDir.3.gz
+%%PERL5_MAN3%%/ShipIt::VC.3.gz
+%%PERL5_MAN3%%/ShipIt::VC::Git.3.gz
+%%PERL5_MAN3%%/ShipIt::VC::Mercurial.3.gz
+%%PERL5_MAN3%%/ShipIt::VC::SVK.3.gz
+%%PERL5_MAN3%%/ShipIt::VC::SVN.3.gz
 %%SITE_PERL%%/ShipIt.pm
 %%SITE_PERL%%/ShipIt/Conf.pm
 %%SITE_PERL%%/ShipIt/ProjectType.pm
@@ -24,10 +35,11 @@
 %%SITE_PERL%%/ShipIt/VC/Mercurial.pm
 %%SITE_PERL%%/ShipIt/VC/SVK.pm
 %%SITE_PERL%%/ShipIt/VC/SVN.pm
-bin/shipit
-@dirrmtry %%SITE_PERL%%/ShipIt/VC
-@dirrmtry %%SITE_PERL%%/ShipIt/Step
-@dirrmtry %%SITE_PERL%%/ShipIt/ProjectType/Perl
-@dirrmtry %%SITE_PERL%%/ShipIt/ProjectType
-@dirrmtry %%SITE_PERL%%/ShipIt
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt/.packlist
+man/man1/shipit.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ShipIt
+@dirrm %%SITE_PERL%%/ShipIt/VC
+@dirrm %%SITE_PERL%%/ShipIt/Step
+@dirrm %%SITE_PERL%%/ShipIt/ProjectType/Perl
+@dirrm %%SITE_PERL%%/ShipIt/ProjectType
+@dirrm %%SITE_PERL%%/ShipIt
diff --git a/devel/p5-Slurp/Makefile b/devel/p5-Slurp/Makefile
index 75a8c89ee655..778578f34550 100644
--- a/devel/p5-Slurp/Makefile
+++ b/devel/p5-Slurp/Makefile
@@ -16,11 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Slurp.3
-
-PLIST_FILES=	%%SITE_PERL%%/Slurp.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slurp/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slurp
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Slurp/pkg-plist b/devel/p5-Slurp/pkg-plist
new file mode 100644
index 000000000000..e63c8bb47a06
--- /dev/null
+++ b/devel/p5-Slurp/pkg-plist
@@ -0,0 +1,4 @@
+%%PERL5_MAN3%%/Slurp.3.gz
+%%SITE_PERL%%/Slurp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slurp/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slurp
diff --git a/devel/p5-Smart-Comments/Makefile b/devel/p5-Smart-Comments/Makefile
index 8a9c778065c7..ddb8ff3e885c 100644
--- a/devel/p5-Smart-Comments/Makefile
+++ b/devel/p5-Smart-Comments/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Comments that do more than just sit there
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Smart::Comments.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Smart-Comments/pkg-plist b/devel/p5-Smart-Comments/pkg-plist
index 713fd4753936..5c78d47c4429 100644
--- a/devel/p5-Smart-Comments/pkg-plist
+++ b/devel/p5-Smart-Comments/pkg-plist
@@ -1,2 +1,3 @@
+%%PERL5_MAN3%%/Smart::Comments.3.gz
 %%SITE_PERL%%/Smart/Comments.pm
 @dirrmtry %%SITE_PERL%%/Smart
diff --git a/devel/p5-Sort-ArrayOfArrays/Makefile b/devel/p5-Sort-ArrayOfArrays/Makefile
index 6426514579fe..33c1e14c503e 100644
--- a/devel/p5-Sort-ArrayOfArrays/Makefile
+++ b/devel/p5-Sort-ArrayOfArrays/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Sort an arbitrary array of arrays
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sort::ArrayOfArrays.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-ArrayOfArrays/pkg-plist b/devel/p5-Sort-ArrayOfArrays/pkg-plist
index 9848aa689730..20191039ce0d 100644
--- a/devel/p5-Sort-ArrayOfArrays/pkg-plist
+++ b/devel/p5-Sort-ArrayOfArrays/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Sort::ArrayOfArrays.3.gz
 %%SITE_PERL%%/Sort/ArrayOfArrays.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index c05d76872c16..65cb2bf6a417 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS=  ${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sort::Key::DateTime.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Key-DateTime/pkg-plist b/devel/p5-Sort-Key-DateTime/pkg-plist
index 9b9f7e00a097..ec7ecd477c27 100644
--- a/devel/p5-Sort-Key-DateTime/pkg-plist
+++ b/devel/p5-Sort-Key-DateTime/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Sort::Key::DateTime.3.gz
 %%SITE_PERL%%/Sort/Key/DateTime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
 @dirrmtry %%SITE_PERL%%/Sort/Key
diff --git a/devel/p5-Sort-Key-Top/Makefile b/devel/p5-Sort-Key-Top/Makefile
index 5b3347bbebdf..a8cfdedabf0f 100644
--- a/devel/p5-Sort-Key-Top/Makefile
+++ b/devel/p5-Sort-Key-Top/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Select and sort top n elements
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sort::Key::Top.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Key-Top/pkg-plist b/devel/p5-Sort-Key-Top/pkg-plist
index f15dd42af0b5..91dedcab3fd0 100644
--- a/devel/p5-Sort-Key-Top/pkg-plist
+++ b/devel/p5-Sort-Key-Top/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/Sort::Key::Top.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Top.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top/Top.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top/Top.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Top
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort
diff --git a/devel/p5-Sort-Key/Makefile b/devel/p5-Sort-Key/Makefile
index b25cefc8ff95..044ca89e8426 100644
--- a/devel/p5-Sort-Key/Makefile
+++ b/devel/p5-Sort-Key/Makefile
@@ -13,12 +13,4 @@ COMMENT=	Sorts objects by one or several keys really fast
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sort::Key.3 \
-		Sort::Key::Maker.3 \
-		Sort::Key::Multi.3 \
-		Sort::Key::Natural.3 \
-		Sort::Key::Register.3 \
-		Sort::Key::Types.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Key/pkg-plist b/devel/p5-Sort-Key/pkg-plist
index f55be33a5ef7..a500fb3af204 100644
--- a/devel/p5-Sort-Key/pkg-plist
+++ b/devel/p5-Sort-Key/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/Sort::Key.3.gz
+%%PERL5_MAN3%%/Sort::Key::Maker.3.gz
+%%PERL5_MAN3%%/Sort::Key::Multi.3.gz
+%%PERL5_MAN3%%/Sort::Key::Natural.3.gz
+%%PERL5_MAN3%%/Sort::Key::Register.3.gz
+%%PERL5_MAN3%%/Sort::Key::Types.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Maker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key/Multi.pm
@@ -7,7 +13,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Key.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Key.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort
diff --git a/devel/p5-Sort-Maker/Makefile b/devel/p5-Sort-Maker/Makefile
index a9a7743b791b..1ef7b1763ec6 100644
--- a/devel/p5-Sort-Maker/Makefile
+++ b/devel/p5-Sort-Maker/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simple way to make efficient sort subs
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sort::Maker.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Maker/pkg-plist b/devel/p5-Sort-Maker/pkg-plist
index 9f3858506811..a19612bbd052 100644
--- a/devel/p5-Sort-Maker/pkg-plist
+++ b/devel/p5-Sort-Maker/pkg-plist
@@ -1,4 +1,5 @@
+%%PERL5_MAN3%%/Sort::Maker.3.gz
 %%SITE_PERL%%/Sort/Maker.pm
-@dirrmtry %%SITE_PERL%%/Sort
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/devel/p5-Sort-Tree/Makefile b/devel/p5-Sort-Tree/Makefile
index a851bda3d43d..917ae47da689 100644
--- a/devel/p5-Sort-Tree/Makefile
+++ b/devel/p5-Sort-Tree/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module for sorting a objects into a tree structure
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sort::Tree.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sort-Tree/pkg-plist b/devel/p5-Sort-Tree/pkg-plist
index 1ca8d8c860b3..34efffbd5c10 100644
--- a/devel/p5-Sort-Tree/pkg-plist
+++ b/devel/p5-Sort-Tree/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Sort::Tree.3.gz
 %%SITE_PERL%%/Sort/Tree.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Tree/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Tree
-@dirrmtry %%SITE_PERL%%/Sort
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index 0bb716afbdf5..3c6cce8182a9 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -19,17 +19,14 @@ OPTIONS_DEFINE=	DOCS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Spiffy.3
 PORTDOCS=	Changes README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Spiffy/pkg-plist b/devel/p5-Spiffy/pkg-plist
index 088f67cb9a6b..e99064928964 100644
--- a/devel/p5-Spiffy/pkg-plist
+++ b/devel/p5-Spiffy/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Spiffy.3.gz
 %%SITE_PERL%%/Spiffy.pm
 %%SITE_PERL%%/Spiffy.pod
 %%SITE_PERL%%/Spiffy/mixin.pm
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index d9069c8346b8..ab5a2b6444dd 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -20,34 +20,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=		Spoon.3 \
-		Spoon::Base.3 \
-		Spoon::CGI.3 \
-		Spoon::Command.3 \
-		Spoon::ContentObject.3 \
-		Spoon::Cookie.3 \
-		Spoon::DataObject.3 \
-		Spoon::Formatter.3 \
-		Spoon::Hooks.3 \
-		Spoon::Hub.3 \
-		Spoon::Installer.3 \
-		Spoon::MetadataObject.3 \
-		Spoon::Plugin.3 \
-		Spoon::Registry.3 \
-		Spoon::Template.3 \
-		Spoon::Template::TT2.3 \
-		Spoon::Utils.3 \
-		Spoon::Config.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Spoon/pkg-plist b/devel/p5-Spoon/pkg-plist
index d067ab69eb8c..60d5950e85fc 100644
--- a/devel/p5-Spoon/pkg-plist
+++ b/devel/p5-Spoon/pkg-plist
@@ -1,3 +1,21 @@
+%%PERL5_MAN3%%/Spoon.3.gz
+%%PERL5_MAN3%%/Spoon::Base.3.gz
+%%PERL5_MAN3%%/Spoon::CGI.3.gz
+%%PERL5_MAN3%%/Spoon::Command.3.gz
+%%PERL5_MAN3%%/Spoon::Config.3.gz
+%%PERL5_MAN3%%/Spoon::ContentObject.3.gz
+%%PERL5_MAN3%%/Spoon::Cookie.3.gz
+%%PERL5_MAN3%%/Spoon::DataObject.3.gz
+%%PERL5_MAN3%%/Spoon::Formatter.3.gz
+%%PERL5_MAN3%%/Spoon::Hooks.3.gz
+%%PERL5_MAN3%%/Spoon::Hub.3.gz
+%%PERL5_MAN3%%/Spoon::Installer.3.gz
+%%PERL5_MAN3%%/Spoon::MetadataObject.3.gz
+%%PERL5_MAN3%%/Spoon::Plugin.3.gz
+%%PERL5_MAN3%%/Spoon::Registry.3.gz
+%%PERL5_MAN3%%/Spoon::Template.3.gz
+%%PERL5_MAN3%%/Spoon::Template::TT2.3.gz
+%%PERL5_MAN3%%/Spoon::Utils.3.gz
 %%SITE_PERL%%/Spoon.pm
 %%SITE_PERL%%/Spoon/Base.pm
 %%SITE_PERL%%/Spoon/CGI.pm
diff --git a/devel/p5-Stream/Makefile b/devel/p5-Stream/Makefile
index 20d4d8f40ab6..72875570131c 100644
--- a/devel/p5-Stream/Makefile
+++ b/devel/p5-Stream/Makefile
@@ -13,5 +13,4 @@ COMMENT=	Generic stream classes for Perl
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Stream/pkg-plist b/devel/p5-Stream/pkg-plist
index 492404e14628..e412b9c6fbc0 100644
--- a/devel/p5-Stream/pkg-plist
+++ b/devel/p5-Stream/pkg-plist
@@ -8,5 +8,5 @@
 %%SITE_PERL%%/Stream/StringInputStream.pm
 %%SITE_PERL%%/Stream/StringOutputStream.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream
-@dirrm %%SITE_PERL%%/Stream
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream
+@dirrmtry %%SITE_PERL%%/Stream
diff --git a/devel/p5-String-Approx/Makefile b/devel/p5-String-Approx/Makefile
index df4baa1c7b74..2c5e8405bc21 100644
--- a/devel/p5-String-Approx/Makefile
+++ b/devel/p5-String-Approx/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl extension for approximate matching (fuzzy matching)
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Approx.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Approx/pkg-plist b/devel/p5-String-Approx/pkg-plist
index dcef536e1792..58e4be817ae2 100644
--- a/devel/p5-String-Approx/pkg-plist
+++ b/devel/p5-String-Approx/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Approx.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/String/Approx.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.bs
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index 1af96bb54405..00d5335b10e3 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl interface for cyclic redundancy check generation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::CRC32.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-CRC32/pkg-plist b/devel/p5-String-CRC32/pkg-plist
index e1230b967fcd..768feca7d90d 100644
--- a/devel/p5-String-CRC32/pkg-plist
+++ b/devel/p5-String-CRC32/pkg-plist
@@ -1,8 +1,9 @@
+%%PERL5_MAN3%%/String::CRC32.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/String/CRC32.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index 2ab740b38059..ca7e07b20539 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Checker.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist
index 6d8e5d3409cd..db6557315606 100644
--- a/devel/p5-String-Checker/pkg-plist
+++ b/devel/p5-String-Checker/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Checker.3.gz
 %%SITE_PERL%%/String/Checker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker
diff --git a/devel/p5-String-Diff/Makefile b/devel/p5-String-Diff/Makefile
index eee087ae2b97..6a0628ea3fe4 100644
--- a/devel/p5-String-Diff/Makefile
+++ b/devel/p5-String-Diff/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Diff.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Diff/pkg-plist b/devel/p5-String-Diff/pkg-plist
index 27af3d56d267..1136e4f83250 100644
--- a/devel/p5-String-Diff/pkg-plist
+++ b/devel/p5-String-Diff/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/String::Diff.3.gz
 %%SITE_PERL%%/String/Diff.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Diff/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Diff
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Diff
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
 @dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-String-Ediff/Makefile b/devel/p5-String-Ediff/Makefile
index 3682901ba1b9..1c2d2c6b1439 100644
--- a/devel/p5-String-Ediff/Makefile
+++ b/devel/p5-String-Ediff/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl module to produce common sub-string indices for two strings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Ediff.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Ediff/pkg-plist b/devel/p5-String-Ediff/pkg-plist
index 0a517e292cca..adefb3442bfc 100644
--- a/devel/p5-String-Ediff/pkg-plist
+++ b/devel/p5-String-Ediff/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::Ediff.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/String/Ediff.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.bs
diff --git a/devel/p5-String-LRC/Makefile b/devel/p5-String-LRC/Makefile
index b4f4905929d8..33d0bfc2b545 100644
--- a/devel/p5-String-LRC/Makefile
+++ b/devel/p5-String-LRC/Makefile
@@ -13,7 +13,4 @@ COMMENT=	A perl interface for longitudinal redundancy check generation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::LRC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-LRC/pkg-plist b/devel/p5-String-LRC/pkg-plist
index 25464744f8c3..b32cc376f2f0 100644
--- a/devel/p5-String-LRC/pkg-plist
+++ b/devel/p5-String-LRC/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::LRC.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/String/LRC.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/String/bench.pl
@@ -5,5 +6,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/LRC.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC/LRC.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/LRC
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index e5518581c9f8..091991083960 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -13,7 +13,4 @@ COMMENT=	A perl5 module to generate and test even, odd, mark, and space parity
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Parity.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Parity/pkg-plist b/devel/p5-String-Parity/pkg-plist
index 978bbbed4b78..5cfc47cf8405 100644
--- a/devel/p5-String-Parity/pkg-plist
+++ b/devel/p5-String-Parity/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/String::Parity.3.gz
 %%SITE_PERL%%/String/Parity.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Parity/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Parity
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
-@dirrm %%SITE_PERL%%/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-String-Random/Makefile b/devel/p5-String-Random/Makefile
index 9a9e93c932df..950cdf0b8716 100644
--- a/devel/p5-String-Random/Makefile
+++ b/devel/p5-String-Random/Makefile
@@ -14,9 +14,6 @@ COMMENT=	Perl interface to generate "random" strings
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		String::Random.3
-
 PORTSCOUT=	limit:^0\.(\d\.){,2}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-Random/pkg-plist b/devel/p5-String-Random/pkg-plist
index 62a04a00431d..53cf884febec 100644
--- a/devel/p5-String-Random/pkg-plist
+++ b/devel/p5-String-Random/pkg-plist
@@ -1,2 +1,3 @@
+%%PERL5_MAN3%%/String::Random.3.gz
 %%SITE_PERL%%/String/Random.pm
 @dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-String-RexxParse/Makefile b/devel/p5-String-RexxParse/Makefile
index 94a263b62199..8589c58dd533 100644
--- a/devel/p5-String-RexxParse/Makefile
+++ b/devel/p5-String-RexxParse/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module that provides an interface to REXX parsing routines
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::RexxParse.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist
index 3fdb4879285a..10f2a849abb1 100644
--- a/devel/p5-String-RexxParse/pkg-plist
+++ b/devel/p5-String-RexxParse/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/String::RexxParse.3.gz
 %%SITE_PERL%%/String/RexxParse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse
diff --git a/devel/p5-Sub-Current/Makefile b/devel/p5-Sub-Current/Makefile
index 4c9d22a327a4..945447dd29cc 100644
--- a/devel/p5-Sub-Current/Makefile
+++ b/devel/p5-Sub-Current/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Get the current subroutine
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sub::Current.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Current/pkg-plist b/devel/p5-Sub-Current/pkg-plist
index fe082919a2ff..48ecd8590ffd 100644
--- a/devel/p5-Sub-Current/pkg-plist
+++ b/devel/p5-Sub-Current/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Sub::Current.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Current.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current/Current.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current/Current.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Current.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Current
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
diff --git a/devel/p5-Sub-Delete/Makefile b/devel/p5-Sub-Delete/Makefile
index 201ed93d8ee5..40093182f976 100644
--- a/devel/p5-Sub-Delete/Makefile
+++ b/devel/p5-Sub-Delete/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module enabling one to delete subroutines
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sub::Delete.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Delete/pkg-plist b/devel/p5-Sub-Delete/pkg-plist
index 5f2456af4921..0f407ad592ca 100644
--- a/devel/p5-Sub-Delete/pkg-plist
+++ b/devel/p5-Sub-Delete/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Delete/.packlist
+%%PERL5_MAN3%%/Sub::Delete.3.gz
 %%SITE_PERL%%/Sub/Delete.pm
-@dirrmtry %%SITE_PERL%%/Sub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Delete
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Delete/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Delete
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Identify/Makefile b/devel/p5-Sub-Identify/Makefile
index c3d284bbe716..8770a3115ac2 100644
--- a/devel/p5-Sub-Identify/Makefile
+++ b/devel/p5-Sub-Identify/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Retrieve names of code references
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sub::Identify.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Identify/pkg-plist b/devel/p5-Sub-Identify/pkg-plist
index d6161f318d57..5b7a5f5e2cb9 100644
--- a/devel/p5-Sub-Identify/pkg-plist
+++ b/devel/p5-Sub-Identify/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Sub::Identify.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Identify.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/Identify.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/Identify.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Sub/Identify.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify/Identify.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Identify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
diff --git a/devel/p5-Sub-Installer/Makefile b/devel/p5-Sub-Installer/Makefile
index 547f7d7f30cd..f2f11ec8e65d 100644
--- a/devel/p5-Sub-Installer/Makefile
+++ b/devel/p5-Sub-Installer/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sub::Installer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Installer/pkg-plist b/devel/p5-Sub-Installer/pkg-plist
index 128a43b87f74..ae986c893201 100644
--- a/devel/p5-Sub-Installer/pkg-plist
+++ b/devel/p5-Sub-Installer/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Sub::Installer.3.gz
 %%SITE_PERL%%/Sub/Installer.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
 @dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Multi/Makefile b/devel/p5-Sub-Multi/Makefile
index 323b58a899c9..681af4381e8c 100644
--- a/devel/p5-Sub-Multi/Makefile
+++ b/devel/p5-Sub-Multi/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sub::Multi.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Multi/pkg-plist b/devel/p5-Sub-Multi/pkg-plist
index 4405cb19471a..894bb23593f0 100644
--- a/devel/p5-Sub-Multi/pkg-plist
+++ b/devel/p5-Sub-Multi/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Sub::Multi.3.gz
 %%SITE_PERL%%/Sub/Multi.pm
-@dirrmtry %%SITE_PERL%%/Sub
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Multi/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Multi
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index 68f7ebad36a5..7359c2a16f89 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -15,7 +15,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0.0:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sub::Override.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Override/pkg-plist b/devel/p5-Sub-Override/pkg-plist
index 4ccd7358ef6d..1d4bd31548b6 100644
--- a/devel/p5-Sub-Override/pkg-plist
+++ b/devel/p5-Sub-Override/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Sub::Override.3.gz
 %%SITE_PERL%%/Sub/Override.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override
diff --git a/devel/p5-Sub-Prototype/Makefile b/devel/p5-Sub-Prototype/Makefile
index 6a258513a7d5..2755d782cc26 100644
--- a/devel/p5-Sub-Prototype/Makefile
+++ b/devel/p5-Sub-Prototype/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Set a subs prototype
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sub::Prototype.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Prototype/pkg-plist b/devel/p5-Sub-Prototype/pkg-plist
index d40a80332b8f..62ef193d6164 100644
--- a/devel/p5-Sub-Prototype/pkg-plist
+++ b/devel/p5-Sub-Prototype/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Sub::Prototype.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Sub/Prototype.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/Prototype.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/Prototype.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Prototype
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
diff --git a/devel/p5-Sub-Uplevel/Makefile b/devel/p5-Sub-Uplevel/Makefile
index d3c09eca794d..628c11ea09d4 100644
--- a/devel/p5-Sub-Uplevel/Makefile
+++ b/devel/p5-Sub-Uplevel/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Sub::Uplevel - apparently run a function in a higher stack frame
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sub::Uplevel.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Uplevel/pkg-plist b/devel/p5-Sub-Uplevel/pkg-plist
index 9d547501e251..8c9196abda58 100644
--- a/devel/p5-Sub-Uplevel/pkg-plist
+++ b/devel/p5-Sub-Uplevel/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Sub::Uplevel.3.gz
 %%SITE_PERL%%/Sub/Uplevel.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Uplevel/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Uplevel
diff --git a/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index 6b95abda9c25..8d2822208fd0 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sub::WrapPackages.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-WrapPackages/pkg-plist b/devel/p5-Sub-WrapPackages/pkg-plist
index 50c0e5694cf8..8c5719bbac51 100644
--- a/devel/p5-Sub-WrapPackages/pkg-plist
+++ b/devel/p5-Sub-WrapPackages/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Sub::WrapPackages.3.gz
 %%SITE_PERL%%/Sub/WrapPackages.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/WrapPackages/.packlist
-@dirrmtry %%SITE_PERL%%/Sub
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/WrapPackages
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/WrapPackages
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Symbol-Util/Makefile b/devel/p5-Symbol-Util/Makefile
index d1278b8ac7bc..a97eeb9954df 100644
--- a/devel/p5-Symbol-Util/Makefile
+++ b/devel/p5-Symbol-Util/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Additional utils for Perl symbols manipulation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Symbol::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Symbol-Util/pkg-plist b/devel/p5-Symbol-Util/pkg-plist
index 93df99edefc5..2fa157d0ce69 100644
--- a/devel/p5-Symbol-Util/pkg-plist
+++ b/devel/p5-Symbol-Util/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Symbol::Util.3.gz
 %%SITE_PERL%%/Symbol/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol/Util/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol
-@dirrm %%SITE_PERL%%/Symbol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Symbol
+@dirrmtry %%SITE_PERL%%/Symbol
diff --git a/devel/p5-Sys-Mmap/Makefile b/devel/p5-Sys-Mmap/Makefile
index c01368081a4e..0c7a1437f77f 100644
--- a/devel/p5-Sys-Mmap/Makefile
+++ b/devel/p5-Sys-Mmap/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sys::Mmap.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sys-Mmap/pkg-plist b/devel/p5-Sys-Mmap/pkg-plist
index 95597fcc120d..a7637cba0658 100644
--- a/devel/p5-Sys-Mmap/pkg-plist
+++ b/devel/p5-Sys-Mmap/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/.packlist
+%%PERL5_MAN3%%/Sys::Mmap.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Sys/Mmap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
diff --git a/devel/p5-Sys-Sig/Makefile b/devel/p5-Sys-Sig/Makefile
index 97ab911da2f9..7ae4e96276db 100644
--- a/devel/p5-Sys-Sig/Makefile
+++ b/devel/p5-Sys-Sig/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Return signal constants for this host
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sys::Sig.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sys-Sig/pkg-plist b/devel/p5-Sys-Sig/pkg-plist
index a2699183523f..c6141bb7a008 100644
--- a/devel/p5-Sys-Sig/pkg-plist
+++ b/devel/p5-Sys-Sig/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sig/.packlist
+%%PERL5_MAN3%%/Sys::Sig.3.gz
 %%SITE_PERL%%/Sys/Sig.pm
-@dirrmtry %%SITE_PERL%%/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sig
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sig/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Sig
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry %%SITE_PERL%%/Sys
diff --git a/devel/p5-Sys-Syscall/Makefile b/devel/p5-Sys-Syscall/Makefile
index d6c9729a1269..ed303634cf3a 100644
--- a/devel/p5-Sys-Syscall/Makefile
+++ b/devel/p5-Sys-Syscall/Makefile
@@ -14,9 +14,6 @@ COMMENT=	Access system calls that Perl doesn\'t provide access to
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sys::Syscall.3 Sys::README.3
-
-NO_STAGE=	yes
 post-patch:
 	@${RM} ${WRKSRC}/lib/Sys/Syscall.pm.orig
 
diff --git a/devel/p5-Sys-Syscall/pkg-plist b/devel/p5-Sys-Syscall/pkg-plist
index d61a7726b2c0..2e1f9e423789 100644
--- a/devel/p5-Sys-Syscall/pkg-plist
+++ b/devel/p5-Sys-Syscall/pkg-plist
@@ -1,6 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syscall/.packlist
-%%SITE_PERL%%/Sys/Syscall.pm
+%%PERL5_MAN3%%/Sys::README.3.gz
+%%PERL5_MAN3%%/Sys::Syscall.3.gz
 %%SITE_PERL%%/Sys/README.pod
-@dirrmtry %%SITE_PERL%%/Sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syscall
+%%SITE_PERL%%/Sys/Syscall.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syscall/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Syscall
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry %%SITE_PERL%%/Sys
diff --git a/devel/p5-Sys-Trace/Makefile b/devel/p5-Sys-Trace/Makefile
index 03c38a95af30..e5cd9ca76aea 100644
--- a/devel/p5-Sys-Trace/Makefile
+++ b/devel/p5-Sys-Trace/Makefile
@@ -13,11 +13,4 @@ COMMENT=	Interface to system call tracing interfaces
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Sys::Trace.3 \
-		Sys::Trace::Impl::Ktrace.3 \
-		Sys::Trace::Impl::Strace.3 \
-		Sys::Trace::Impl::Truss.3 \
-		Sys::Trace::Results.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sys-Trace/pkg-plist b/devel/p5-Sys-Trace/pkg-plist
index 1c12fe85f2aa..8d7374f495d6 100644
--- a/devel/p5-Sys-Trace/pkg-plist
+++ b/devel/p5-Sys-Trace/pkg-plist
@@ -1,11 +1,16 @@
+%%PERL5_MAN3%%/Sys::Trace.3.gz
+%%PERL5_MAN3%%/Sys::Trace::Impl::Ktrace.3.gz
+%%PERL5_MAN3%%/Sys::Trace::Impl::Strace.3.gz
+%%PERL5_MAN3%%/Sys::Trace::Impl::Truss.3.gz
+%%PERL5_MAN3%%/Sys::Trace::Results.3.gz
+%%SITE_PERL%%/Sys/Trace.pm
 %%SITE_PERL%%/Sys/Trace/Impl/Ktrace.pm
 %%SITE_PERL%%/Sys/Trace/Impl/Strace.pm
 %%SITE_PERL%%/Sys/Trace/Impl/Truss.pm
 %%SITE_PERL%%/Sys/Trace/Results.pm
-%%SITE_PERL%%/Sys/Trace.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Trace/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Trace
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
 @dirrm %%SITE_PERL%%/Sys/Trace/Impl
 @dirrm %%SITE_PERL%%/Sys/Trace
 @dirrmtry %%SITE_PERL%%/Sys
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Trace
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 07e2323068fe..3f31bf07ca73 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -13,9 +13,6 @@ COMMENT=	System2 - like system(), but with STDERR available as well
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		System2.3
-
-NO_STAGE=	yes
 pre-configure:
 	${RM} -f ${WRKSRC}/io_test.pl
 
diff --git a/devel/p5-System2/pkg-plist b/devel/p5-System2/pkg-plist
index f8721e5bffd6..c46eccc1b7ba 100644
--- a/devel/p5-System2/pkg-plist
+++ b/devel/p5-System2/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/System2.3.gz
+%%SITE_PERL%%/System2.pm
 %%SITE_PERL%%/auto/System2/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/System2/.packlist
-%%SITE_PERL%%/System2.pm
-@dirrm %%SITE_PERL%%/auto/System2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/System2
+@dirrm %%SITE_PERL%%/auto/System2