- add stage support

Approved by:	portmgr (blanket infrastructure)

110 files changed, 114 insertions, 206 deletions

diff --git a/devel/p5-Acme-Comment/Makefile b/devel/p5-Acme-Comment/Makefile
index 468fea3519d7..c58de1ed5cb7 100644
--- a/devel/p5-Acme-Comment/Makefile
+++ b/devel/p5-Acme-Comment/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Acme::Comment.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Acme-Comment/pkg-plist b/devel/p5-Acme-Comment/pkg-plist
index 4d1558dc02ee..1c5fe808c0d9 100644
--- a/devel/p5-Acme-Comment/pkg-plist
+++ b/devel/p5-Acme-Comment/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Acme/Comment.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Comment/.packlist
+%%PERL5_MAN3%%/Acme::Comment.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Comment
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme
 @dirrmtry %%SITE_PERL%%/Acme
diff --git a/devel/p5-AnyEvent-DBI/Makefile b/devel/p5-AnyEvent-DBI/Makefile
index 3307a94afe46..b73d4161ef0e 100644
--- a/devel/p5-AnyEvent-DBI/Makefile
+++ b/devel/p5-AnyEvent-DBI/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		AnyEvent::DBI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-AnyEvent-DBI/pkg-plist b/devel/p5-AnyEvent-DBI/pkg-plist
index fe77b5e0794c..d58ede2cf1a4 100644
--- a/devel/p5-AnyEvent-DBI/pkg-plist
+++ b/devel/p5-AnyEvent-DBI/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/AnyEvent/DBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBI/.packlist
+%%PERL5_MAN3%%/AnyEvent::DBI.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/DBI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
 @dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/devel/p5-B-Size2/Makefile b/devel/p5-B-Size2/Makefile
index 37c2f9dc7ab8..e7e3bb3d4473 100644
--- a/devel/p5-B-Size2/Makefile
+++ b/devel/p5-B-Size2/Makefile
@@ -9,11 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to measure size of Perl OPs and SVs
 
-USES=	perl5
+USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	B::Size2.3 \
-	B::Size2::Terse.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Size2/pkg-plist b/devel/p5-B-Size2/pkg-plist
index 02c570cc3e8e..cad410f47723 100644
--- a/devel/p5-B-Size2/pkg-plist
+++ b/devel/p5-B-Size2/pkg-plist
@@ -3,6 +3,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size2/Size2.so
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Size2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Size2/Terse.pm
+%%PERL5_MAN3%%/B::Size2.3.gz
+%%PERL5_MAN3%%/B::Size2::Terse.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/B/Size2
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size2
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 4a7ee912edbb..c40b312f646f 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to access BSD resource limit and priority functions
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		BSD::Resource.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-BSD-Resource/pkg-descr b/devel/p5-BSD-Resource/pkg-descr
index 5873e1dc551c..673f64fef224 100644
--- a/devel/p5-BSD-Resource/pkg-descr
+++ b/devel/p5-BSD-Resource/pkg-descr
@@ -14,5 +14,4 @@ Also is provided
 which provides the same functionality as the one in core Perl, only with
 better time resolution.
 
-Author: Jarkko Hietaniemi <jhi@iki.fi>
 WWW: http://search.cpan.org/dist/BSD-Resource/
diff --git a/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index a7d9dc604a29..675363a54e31 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -32,6 +32,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/stime.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
+%%PERL5_MAN3%%/BSD::Resource.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/devel/p5-Bundle-Perl6/Makefile b/devel/p5-Bundle-Perl6/Makefile
index 1921457295f9..6d2628961f6c 100644
--- a/devel/p5-Bundle-Perl6/Makefile
+++ b/devel/p5-Bundle-Perl6/Makefile
@@ -8,12 +8,9 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ychsiao@ychsiao.org
-COMMENT=	A bundle to install Perl6-related modules
+COMMENT=	Bundle to install Perl6-related modules
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Bundle::Perl6.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Bundle-Perl6/pkg-plist b/devel/p5-Bundle-Perl6/pkg-plist
index 0a32bd325544..4faabceacba7 100644
--- a/devel/p5-Bundle-Perl6/pkg-plist
+++ b/devel/p5-Bundle-Perl6/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Bundle/Perl6.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6/.packlist
+%%PERL5_MAN3%%/Bundle::Perl6.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
 @dirrmtry %%SITE_PERL%%/Bundle
diff --git a/devel/p5-Config-MVP-Reader-INI/Makefile b/devel/p5-Config-MVP-Reader-INI/Makefile
index 4fe4a872f3b6..c0aac0cf72cb 100644
--- a/devel/p5-Config-MVP-Reader-INI/Makefile
+++ b/devel/p5-Config-MVP-Reader-INI/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	geraud@gcu.info
-COMMENT=	An MVP config reader for .ini files
+COMMENT=	MVP config reader for .ini files
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
@@ -20,7 +20,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Config::MVP::Reader::INI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-MVP-Reader-INI/pkg-plist b/devel/p5-Config-MVP-Reader-INI/pkg-plist
index ec6c7b41ddd0..a479f815e37b 100644
--- a/devel/p5-Config-MVP-Reader-INI/pkg-plist
+++ b/devel/p5-Config-MVP-Reader-INI/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Config/MVP/Reader/INI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP/Reader/INI/.packlist
+%%PERL5_MAN3%%/Config::MVP::Reader::INI.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP/Reader/INI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP/Reader
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/MVP
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index f8edbca384da..237cb6625de9 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -18,10 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Config::Objective::List.3 Config::Objective::Boolean.3 \
-		Config::Objective::Table.3 Config::Objective.3 \
-		Config::Objective::Hash.3 Config::Objective::Integer.3 \
-		Config::Objective::String.3 Config::Objective::DataType.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-Objective/pkg-plist b/devel/p5-Config-Objective/pkg-plist
index 22021d686f71..3dc6c4266f89 100644
--- a/devel/p5-Config-Objective/pkg-plist
+++ b/devel/p5-Config-Objective/pkg-plist
@@ -8,6 +8,14 @@
 %%SITE_PERL%%/Config/Objective/String.pm
 %%SITE_PERL%%/Config/Objective/DataType.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective/.packlist
+%%PERL5_MAN3%%/Config::Objective::List.3.gz
+%%PERL5_MAN3%%/Config::Objective::Boolean.3.gz
+%%PERL5_MAN3%%/Config::Objective::Table.3.gz
+%%PERL5_MAN3%%/Config::Objective.3.gz
+%%PERL5_MAN3%%/Config::Objective::Hash.3.gz
+%%PERL5_MAN3%%/Config::Objective::Integer.3.gz
+%%PERL5_MAN3%%/Config::Objective::String.3.gz
+%%PERL5_MAN3%%/Config::Objective::DataType.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
 @dirrmtry %%SITE_PERL%%/Config/Objective
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index 5eb7a3bd7d1e..f1c883416922 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl extension for simple-minded recipe-controlled build of data
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Data::Flow.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index 329bb5b20726..49cddc93237d 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/Data/Flow.pm
 %%SITE_PERL%%/auto/Data/Flow/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Flow/.packlist
+%%PERL5_MAN3%%/Data::Flow.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Flow
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
 @dirrm %%SITE_PERL%%/auto/Data/Flow
diff --git a/devel/p5-Data-Inspect/Makefile b/devel/p5-Data-Inspect/Makefile
index aa46dc2e7557..f64d3e8a3b1c 100644
--- a/devel/p5-Data-Inspect/Makefile
+++ b/devel/p5-Data-Inspect/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Another pretty-printer for perl objects
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Data::Inspect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Inspect/pkg-descr b/devel/p5-Data-Inspect/pkg-descr
index b312f2928169..c1f7443e063a 100644
--- a/devel/p5-Data-Inspect/pkg-descr
+++ b/devel/p5-Data-Inspect/pkg-descr
@@ -1,3 +1,3 @@
 Another perl object pretty-printer
 
-WWW:	http://search.cpan.org/dist/Data-Inspect/
+WWW: http://search.cpan.org/dist/Data-Inspect/
diff --git a/devel/p5-Data-Inspect/pkg-plist b/devel/p5-Data-Inspect/pkg-plist
index 924d2bea55e4..d8f689444839 100644
--- a/devel/p5-Data-Inspect/pkg-plist
+++ b/devel/p5-Data-Inspect/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Data/Inspect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Inspect/.packlist
+%%PERL5_MAN3%%/Data::Inspect.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Inspect
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
 @dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile
index 8e5ab2613e68..f9b02ce9dd57 100644
--- a/devel/p5-Data-MessagePack-Stream/Makefile
+++ b/devel/p5-Data-MessagePack-Stream/Makefile
@@ -16,7 +16,4 @@ USES=		perl5
 USE_PERL5=	configure
 MAKE_JOBS_UNSAFE=	yes
 
-MAN3=	Data::MessagePack::Stream.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-MessagePack-Stream/pkg-plist b/devel/p5-Data-MessagePack-Stream/pkg-plist
index 6381c57aa406..0d8ca301b421 100644
--- a/devel/p5-Data-MessagePack-Stream/pkg-plist
+++ b/devel/p5-Data-MessagePack-Stream/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream/Stream.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream/Stream.so
+%%PERL5_MAN3%%/Data::MessagePack::Stream.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack/Stream
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/MessagePack
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index 3d8dc69bee36..8214da6a9fcd 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -18,8 +18,4 @@ TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Data::Page::NoTotalEntries.3 \
-	Data::Page::README.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Page-NoTotalEntries/pkg-plist b/devel/p5-Data-Page-NoTotalEntries/pkg-plist
index c387224e728c..82e4759bdb77 100644
--- a/devel/p5-Data-Page-NoTotalEntries/pkg-plist
+++ b/devel/p5-Data-Page-NoTotalEntries/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Page/NoTotalEntries/.packlist
 %%SITE_PERL%%/Data/Page/NoTotalEntries.pm
 %%SITE_PERL%%/Data/Page/README.pod
+%%PERL5_MAN3%%/Data::Page::NoTotalEntries.3.gz
+%%PERL5_MAN3%%/Data::Page::README.3.gz
 @dirrmtry %%SITE_PERL%%/Data/Page
 @dirrmtry %%SITE_PERL%%/Data
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Page/NoTotalEntries
diff --git a/devel/p5-Data-Thunk/Makefile b/devel/p5-Data-Thunk/Makefile
index 50a0d59128b2..9ea122959673 100644
--- a/devel/p5-Data-Thunk/Makefile
+++ b/devel/p5-Data-Thunk/Makefile
@@ -22,10 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Data::Thunk.3 \
-	Data::Thunk::Code.3 \
-	Data::Thunk::Object.3 \
-	Data::Thunk::ScalarValue.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Thunk/pkg-plist b/devel/p5-Data-Thunk/pkg-plist
index aebc9e3a1a12..e302a7592785 100644
--- a/devel/p5-Data-Thunk/pkg-plist
+++ b/devel/p5-Data-Thunk/pkg-plist
@@ -3,6 +3,10 @@
 %%SITE_PERL%%/Data/Thunk/Object.pm
 %%SITE_PERL%%/Data/Thunk/ScalarValue.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Thunk/.packlist
+%%PERL5_MAN3%%/Data::Thunk.3.gz
+%%PERL5_MAN3%%/Data::Thunk::Code.3.gz
+%%PERL5_MAN3%%/Data::Thunk::Object.3.gz
+%%PERL5_MAN3%%/Data::Thunk::ScalarValue.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Thunk
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
 @dirrmtry %%SITE_PERL%%/Data/Thunk
diff --git a/devel/p5-Data-Validate/Makefile b/devel/p5-Data-Validate/Makefile
index 6709660ae90b..971db3f19449 100644
--- a/devel/p5-Data-Validate/Makefile
+++ b/devel/p5-Data-Validate/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Common data validation methods
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Data::Validate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Validate/pkg-plist b/devel/p5-Data-Validate/pkg-plist
index c494d4f1e88b..0c8a620d1756 100644
--- a/devel/p5-Data-Validate/pkg-plist
+++ b/devel/p5-Data-Validate/pkg-plist
@@ -15,6 +15,7 @@
 %%SITE_PERL%%/auto/Data/Validate/length_is_between.al
 %%SITE_PERL%%/auto/Data/Validate/new.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/.packlist
+%%PERL5_MAN3%%/Data::Validate.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
 @dirrmtry %%SITE_PERL%%/auto/Data/Validate
diff --git a/devel/p5-Data-Visitor-Encode/Makefile b/devel/p5-Data-Visitor-Encode/Makefile
index 6447754e2039..939a6e88d604 100644
--- a/devel/p5-Data-Visitor-Encode/Makefile
+++ b/devel/p5-Data-Visitor-Encode/Makefile
@@ -17,7 +17,4 @@ TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Data::Visitor::Encode.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Visitor-Encode/pkg-plist b/devel/p5-Data-Visitor-Encode/pkg-plist
index 3af4c7e5d506..3b0e3ccd16e3 100644
--- a/devel/p5-Data-Visitor-Encode/pkg-plist
+++ b/devel/p5-Data-Visitor-Encode/pkg-plist
@@ -1,3 +1,4 @@
 %%SITE_PERL%%/Data/Visitor/Encode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Visitor/Encode/.packlist
+%%PERL5_MAN3%%/Data::Visitor::Encode.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Visitor/Encode
diff --git a/devel/p5-DateTime-Format-XSD/Makefile b/devel/p5-DateTime-Format-XSD/Makefile
index 8c065293b6d5..1250bd591965 100644
--- a/devel/p5-DateTime-Format-XSD/Makefile
+++ b/devel/p5-DateTime-Format-XSD/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		DateTime::Format::XSD.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-XSD/pkg-plist b/devel/p5-DateTime-Format-XSD/pkg-plist
index 261195291799..0e505db7b5b1 100644
--- a/devel/p5-DateTime-Format-XSD/pkg-plist
+++ b/devel/p5-DateTime-Format-XSD/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/DateTime/Format/XSD.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/XSD/.packlist
+%%PERL5_MAN3%%/DateTime::Format::XSD.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/XSD
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
diff --git a/devel/p5-Devel-Gladiator/Makefile b/devel/p5-Devel-Gladiator/Makefile
index adcfb120d3e8..b89e5514c096 100644
--- a/devel/p5-Devel-Gladiator/Makefile
+++ b/devel/p5-Devel-Gladiator/Makefile
@@ -13,7 +13,5 @@ COMMENT=	Perl 5 module to walk Perls arena
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Devel::Gladiator.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Gladiator/pkg-plist b/devel/p5-Devel-Gladiator/pkg-plist
index ff7f40439031..e36b8debf6d7 100644
--- a/devel/p5-Devel-Gladiator/pkg-plist
+++ b/devel/p5-Devel-Gladiator/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator/Gladiator.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator/Gladiator.so
+%%PERL5_MAN3%%/Devel::Gladiator.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Gladiator
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
diff --git a/devel/p5-Devel-Timer/Makefile b/devel/p5-Devel-Timer/Makefile
index 4129e1ca2a76..5eaddbba52ef 100644
--- a/devel/p5-Devel-Timer/Makefile
+++ b/devel/p5-Devel-Timer/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Track and report execution time for parts of code
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Devel::Timer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Timer/pkg-plist b/devel/p5-Devel-Timer/pkg-plist
index 0c6d4b9d3bee..41ad36e23b13 100644
--- a/devel/p5-Devel-Timer/pkg-plist
+++ b/devel/p5-Devel-Timer/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Devel/Timer.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Timer/.packlist
+%%PERL5_MAN3%%/Devel::Timer.3.gz
 @dirrmtry %%SITE_PERL%%/Devel
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Timer
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index 75255ea55fe4..c8df16d3fc78 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -19,9 +19,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ENV=	PERL_MM_USE_DEFAULT="YES"
 
-MAN3=		EV.3 \
-		EV::MakeMaker.3 \
-		EV::libev.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-EV/pkg-plist b/devel/p5-EV/pkg-plist
index 7aab4c721bcc..b1b37f5b7649 100644
--- a/devel/p5-EV/pkg-plist
+++ b/devel/p5-EV/pkg-plist
@@ -6,5 +6,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/EV/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/EV/EV.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/EV/EV.so
+%%PERL5_MAN3%%/EV.3.gz
+%%PERL5_MAN3%%/EV::MakeMaker.3.gz
+%%PERL5_MAN3%%/EV::libev.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/EV
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/EV
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index eadbde4363f3..d72abb784770 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Event::Notify.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Event-Notify/pkg-descr b/devel/p5-Event-Notify/pkg-descr
index 03a2fcb92597..123f37f20ce1 100644
--- a/devel/p5-Event-Notify/pkg-descr
+++ b/devel/p5-Event-Notify/pkg-descr
@@ -1,3 +1,3 @@
 Event::Notify implements a simple Observer pattern.
 
-WWW:	http://search.cpan.org/dist/Event-Notify/
+WWW: http://search.cpan.org/dist/Event-Notify/
diff --git a/devel/p5-Event-Notify/pkg-plist b/devel/p5-Event-Notify/pkg-plist
index c40bbf072a26..aeba0292ef76 100644
--- a/devel/p5-Event-Notify/pkg-plist
+++ b/devel/p5-Event-Notify/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Notify/.packlist
 %%SITE_PERL%%/Event/Notify.pm
+%%PERL5_MAN3%%/Event::Notify.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Notify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event
 @dirrmtry %%SITE_PERL%%/Event
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 7967a54d1371..a007402545c4 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl5 module interface to the UNIX sync(2) and POSIX.1b fsync(2)
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		File::Sync.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index c50e15f6e3ba..e85ed32104a4 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -3,6 +3,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/Sync.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/Sync.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
+%%PERL5_MAN3%%/File::Sync.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-Hash-MultiKey/Makefile b/devel/p5-Hash-MultiKey/Makefile
index c3e1405528e1..7e8651e55c17 100644
--- a/devel/p5-Hash-MultiKey/Makefile
+++ b/devel/p5-Hash-MultiKey/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Hashes whose keys can be multiple
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Hash::MultiKey.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Hash-MultiKey/pkg-plist b/devel/p5-Hash-MultiKey/pkg-plist
index fff42caa55d0..c432a09e83e4 100644
--- a/devel/p5-Hash-MultiKey/pkg-plist
+++ b/devel/p5-Hash-MultiKey/pkg-plist
@@ -1,4 +1,5 @@
 %%SITE_PERL%%/Hash/MultiKey.pm
+%%PERL5_MAN3%%/Hash::MultiKey.3.gz
 @dirrmtry %%SITE_PERL%%/Hash
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/MultiKey/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/MultiKey
diff --git a/devel/p5-Hash-Union/Makefile b/devel/p5-Hash-Union/Makefile
index 1e6b2dd1b1e7..acfee6d93f8a 100644
--- a/devel/p5-Hash-Union/Makefile
+++ b/devel/p5-Hash-Union/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Smart hashes merging
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Hash::Union.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Hash-Union/pkg-descr b/devel/p5-Hash-Union/pkg-descr
index 83a114219520..a17cbff5649b 100644
--- a/devel/p5-Hash-Union/pkg-descr
+++ b/devel/p5-Hash-Union/pkg-descr
@@ -1,3 +1,3 @@
 Smart hashes merging
 
-WWW:	http://search.cpan.org/dist/Hash-Union/
+WWW: http://search.cpan.org/dist/Hash-Union/
diff --git a/devel/p5-Hash-Union/pkg-plist b/devel/p5-Hash-Union/pkg-plist
index 4a04c196742e..123b229dbf67 100644
--- a/devel/p5-Hash-Union/pkg-plist
+++ b/devel/p5-Hash-Union/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Hash/Union.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Union/.packlist
+%%PERL5_MAN3%%/Hash::Union.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Union
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash
 @dirrmtry %%SITE_PERL%%/Hash
diff --git a/devel/p5-IO-Null/Makefile b/devel/p5-IO-Null/Makefile
index cd95a2df2361..1aa692163a7d 100644
--- a/devel/p5-IO-Null/Makefile
+++ b/devel/p5-IO-Null/Makefile
@@ -13,7 +13,4 @@ COMMENT=	IO::Null - class for null filehandles
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::Null.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Null/pkg-descr b/devel/p5-IO-Null/pkg-descr
index 93d339a2bb46..e7ac9ea820da 100644
--- a/devel/p5-IO-Null/pkg-descr
+++ b/devel/p5-IO-Null/pkg-descr
@@ -7,4 +7,4 @@ operation, and returns true. Reading from any object of this class is
 always nooperation, and returns empty-string or empty-list, as
 appropriate.
 
-WWW: http://search.cpan.org/dist/IO-Null/ 
+WWW: http://search.cpan.org/dist/IO-Null/
diff --git a/devel/p5-IO-Null/pkg-plist b/devel/p5-IO-Null/pkg-plist
index 86d7b874c9e1..e60114ed823b 100644
--- a/devel/p5-IO-Null/pkg-plist
+++ b/devel/p5-IO-Null/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/IO/Null.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Null/.packlist
+%%PERL5_MAN3%%/IO::Null.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Null
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 2dfc367b7dce..cc322a2e2ed6 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Log::Dispatch::Array.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Array/pkg-plist b/devel/p5-Log-Dispatch-Array/pkg-plist
index da3e626eef30..0dcc918f836d 100644
--- a/devel/p5-Log-Dispatch-Array/pkg-plist
+++ b/devel/p5-Log-Dispatch-Array/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Log/Dispatch/Array.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Array/.packlist
+%%PERL5_MAN3%%/Log::Dispatch::Array.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Array
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index ea5e65fe9e13..b02751aeebdc 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -25,7 +25,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Luka.3 Luka::Conf.3 Luka::Exceptions.3 Luka::Mailer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Luka/pkg-descr b/devel/p5-Luka/pkg-descr
index 4e1ef6fe2e5b..3a47b4ae3820 100644
--- a/devel/p5-Luka/pkg-descr
+++ b/devel/p5-Luka/pkg-descr
@@ -19,4 +19,4 @@ errors and reporting. Luka is an attempt to standardize that process.
 Its primary goal is to make it easier for smaller number of people to
 keep larger number of applications and networks running.
 
-WWW:	http://port.home.page/
+WWW: http://port.home.page/
diff --git a/devel/p5-Luka/pkg-plist b/devel/p5-Luka/pkg-plist
index 5ec8e6b23cf8..60c7fc59c972 100644
--- a/devel/p5-Luka/pkg-plist
+++ b/devel/p5-Luka/pkg-plist
@@ -5,5 +5,9 @@
 %%SITE_PERL%%/Luka/ExceptionBase.pm
 %%SITE_PERL%%/Luka/Exceptions.pm
 %%SITE_PERL%%/Luka/Mailer.pm
+%%PERL5_MAN3%%/Luka.3.gz
+%%PERL5_MAN3%%/Luka::Conf.3.gz
+%%PERL5_MAN3%%/Luka::Exceptions.3.gz
+%%PERL5_MAN3%%/Luka::Mailer.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Luka
 @dirrmtry %%SITE_PERL%%/Luka
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 0d43644fd4ed..b6673c941593 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -14,14 +14,4 @@ COMMENT=	Transparently speed up perl functions by caching return values
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Memoize.3 \
-		Memoize::AnyDBM_File.3 \
-		Memoize::Expire.3 \
-		Memoize::ExpireFile.3 \
-		Memoize::ExpireTest.3 \
-		Memoize::NDBM_File.3 \
-		Memoize::SDBM_File.3 \
-		Memoize::Storable.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Memoize/pkg-descr b/devel/p5-Memoize/pkg-descr
index 8ea21fee64c8..6283a27f97b8 100644
--- a/devel/p5-Memoize/pkg-descr
+++ b/devel/p5-Memoize/pkg-descr
@@ -4,5 +4,4 @@ you call the function again with the same arguments, memoize jumps in
 and gives you the value out of the table, instead of letting the
 function compute the value all over again.
 
-Author: Mark-Jason Dominus <mjd-perl-memoize+@plover.com>
 WWW: http://search.cpan.org/dist/Memoize/
diff --git a/devel/p5-Memoize/pkg-plist b/devel/p5-Memoize/pkg-plist
index 72bb3a4cf5e4..3d84b15a6bc6 100644
--- a/devel/p5-Memoize/pkg-plist
+++ b/devel/p5-Memoize/pkg-plist
@@ -7,5 +7,13 @@
 %%SITE_PERL%%/Memoize/SDBM_File.pm
 %%SITE_PERL%%/Memoize/ExpireFile.pm
 %%SITE_PERL%%/Memoize/NDBM_File.pm
+%%PERL5_MAN3%%/Memoize.3.gz
+%%PERL5_MAN3%%/Memoize::AnyDBM_File.3.gz
+%%PERL5_MAN3%%/Memoize::Expire.3.gz
+%%PERL5_MAN3%%/Memoize::ExpireFile.3.gz
+%%PERL5_MAN3%%/Memoize::ExpireTest.3.gz
+%%PERL5_MAN3%%/Memoize::NDBM_File.3.gz
+%%PERL5_MAN3%%/Memoize::SDBM_File.3.gz
+%%PERL5_MAN3%%/Memoize::Storable.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize
 @dirrmtry %%SITE_PERL%%/Memoize
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index ccce1a080fc5..b92db0dc2ab1 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -16,11 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Module::Compile.3 \
-		Module::Compile::Opt.3 \
-		Module::Install::Admin::PMC.3 \
-		Module::Install::PMC.3\
-		Module::Optimize.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Module-Compile/pkg-descr b/devel/p5-Module-Compile/pkg-descr
index c3439b9e22ed..5483de2c2741 100644
--- a/devel/p5-Module-Compile/pkg-descr
+++ b/devel/p5-Module-Compile/pkg-descr
@@ -8,5 +8,4 @@ altered form the first time they are run. The result is cached into
 Perl has native support for ".pmc" files. It always checks for them,
 before loading a ".pm" file.
 
-Author:	Ingy  <ingy@cpan.org>
-WWW:	http://search.cpan.org/dist/Module-Compile/
+WWW: http://search.cpan.org/dist/Module-Compile/
diff --git a/devel/p5-Module-Compile/pkg-plist b/devel/p5-Module-Compile/pkg-plist
index 37ca6fa3497c..4cc48d834162 100644
--- a/devel/p5-Module-Compile/pkg-plist
+++ b/devel/p5-Module-Compile/pkg-plist
@@ -9,6 +9,11 @@
 %%SITE_PERL%%/Module/Install/PMC.pod
 %%SITE_PERL%%/Module/Optimize.pm
 %%SITE_PERL%%/Module/Optimize.pod
+%%PERL5_MAN3%%/Module::Compile.3.gz
+%%PERL5_MAN3%%/Module::Compile::Opt.3.gz
+%%PERL5_MAN3%%/Module::Install::Admin::PMC.3.gz
+%%PERL5_MAN3%%/Module::Install::PMC.3.gz
+%%PERL5_MAN3%%/Module::Optimize.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Compile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
 @dirrmtry %%SITE_PERL%%/Module/Compile
diff --git a/devel/p5-Module-Install-Repository/Makefile b/devel/p5-Module-Install-Repository/Makefile
index 3382651d33f1..0e537a909fd8 100644
--- a/devel/p5-Module-Install-Repository/Makefile
+++ b/devel/p5-Module-Install-Repository/Makefile
@@ -12,7 +12,4 @@ COMMENT=	Perl extension to set repository URL from svn/svk/Git checkout
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Module::Install::Repository.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Module-Install-Repository/pkg-plist b/devel/p5-Module-Install-Repository/pkg-plist
index 8ea99654b3e5..e52b713aa213 100644
--- a/devel/p5-Module-Install-Repository/pkg-plist
+++ b/devel/p5-Module-Install-Repository/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/Repository/.packlist
 %%SITE_PERL%%/Module/Install/Repository.pm
+%%PERL5_MAN3%%/Module::Install::Repository.3.gz
 @dirrmtry %%SITE_PERL%%/Module/Install
 @dirrmtry %%SITE_PERL%%/Module
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Install/Repository
diff --git a/devel/p5-MooseX-Aliases/Makefile b/devel/p5-MooseX-Aliases/Makefile
index d1007d18b22c..4c8b22d2b261 100644
--- a/devel/p5-MooseX-Aliases/Makefile
+++ b/devel/p5-MooseX-Aliases/Makefile
@@ -21,9 +21,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	MooseX::Aliases.3 \
-	MooseX::Aliases::Meta::Trait::Attribute.3 \
-	MooseX::Aliases::Meta::Trait::Method.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-Aliases/pkg-plist b/devel/p5-MooseX-Aliases/pkg-plist
index 0d62c86321c2..a669de0c3d15 100644
--- a/devel/p5-MooseX-Aliases/pkg-plist
+++ b/devel/p5-MooseX-Aliases/pkg-plist
@@ -7,6 +7,9 @@
 %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Role/ApplicationToClass.pm
 %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Role/ApplicationToRole.pm
 %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Role/Composite.pm
+%%PERL5_MAN3%%/MooseX::Aliases.3.gz
+%%PERL5_MAN3%%/MooseX::Aliases::Meta::Trait::Attribute.3.gz
+%%PERL5_MAN3%%/MooseX::Aliases::Meta::Trait::Method.3.gz
 @dirrmtry %%SITE_PERL%%/MooseX/Aliases/Meta/Trait/Role
 @dirrmtry %%SITE_PERL%%/MooseX/Aliases/Meta/Trait
 @dirrmtry %%SITE_PERL%%/MooseX/Aliases/Meta
diff --git a/devel/p5-MooseX-MultiMethods/Makefile b/devel/p5-MooseX-MultiMethods/Makefile
index 1d951726dd30..4087dd5c0821 100644
--- a/devel/p5-MooseX-MultiMethods/Makefile
+++ b/devel/p5-MooseX-MultiMethods/Makefile
@@ -23,8 +23,4 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		MooseX::MultiMethods.3 \
-		MooseX::MultiMethods::Meta::Method.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-MultiMethods/pkg-plist b/devel/p5-MooseX-MultiMethods/pkg-plist
index 5613e0bc2096..fbd62bea75a3 100644
--- a/devel/p5-MooseX-MultiMethods/pkg-plist
+++ b/devel/p5-MooseX-MultiMethods/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/MooseX/MultiMethods.pm
 %%SITE_PERL%%/MooseX/MultiMethods/Meta/Method.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MultiMethods/.packlist
+%%PERL5_MAN3%%/MooseX::MultiMethods.3.gz
+%%PERL5_MAN3%%/MooseX::MultiMethods::Meta::Method.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/MultiMethods
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX
 @dirrmtry %%SITE_PERL%%/MooseX/MultiMethods/Meta
diff --git a/devel/p5-MooseX-Role-Matcher/Makefile b/devel/p5-MooseX-Role-Matcher/Makefile
index 1adb4f3597a9..73b08f1a4870 100644
--- a/devel/p5-MooseX-Role-Matcher/Makefile
+++ b/devel/p5-MooseX-Role-Matcher/Makefile
@@ -18,10 +18,7 @@ BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 
-NO_STAGE=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-MAN3=		MooseX::Role::Matcher.3
-
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-Role-Matcher/pkg-plist b/devel/p5-MooseX-Role-Matcher/pkg-plist
index 94f02471f11a..318001152957 100644
--- a/devel/p5-MooseX-Role-Matcher/pkg-plist
+++ b/devel/p5-MooseX-Role-Matcher/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/MooseX/Role/Matcher.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Matcher/.packlist
+%%PERL5_MAN3%%/MooseX::Role::Matcher.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role/Matcher
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Role
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX
diff --git a/devel/p5-Object-Tiny-Lvalue/Makefile b/devel/p5-Object-Tiny-Lvalue/Makefile
index afbb43cfd986..2be6a3be6162 100644
--- a/devel/p5-Object-Tiny-Lvalue/Makefile
+++ b/devel/p5-Object-Tiny-Lvalue/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Minimal class builder with lvalue accessors
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Object::Tiny::Lvalue.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Object-Tiny-Lvalue/pkg-plist b/devel/p5-Object-Tiny-Lvalue/pkg-plist
index ee5e0a189272..eec5926ea4a5 100644
--- a/devel/p5-Object-Tiny-Lvalue/pkg-plist
+++ b/devel/p5-Object-Tiny-Lvalue/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Object/Tiny/Lvalue.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Tiny/Lvalue/.packlist
+%%PERL5_MAN3%%/Object::Tiny::Lvalue.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Tiny/Lvalue
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Tiny
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 6be72dda13a6..1a2905c3e2c8 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -20,7 +20,5 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	POEx::Types.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-POEx-Types/pkg-plist b/devel/p5-POEx-Types/pkg-plist
index a74280087402..c488cc022060 100644
--- a/devel/p5-POEx-Types/pkg-plist
+++ b/devel/p5-POEx-Types/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Types/.packlist
 %%SITE_PERL%%/POEx/Types.pm
+%%PERL5_MAN3%%/POEx::Types.3.gz
 @dirrmtry %%SITE_PERL%%/POEx
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx/Types
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POEx
diff --git a/devel/p5-Package-Constants/Makefile b/devel/p5-Package-Constants/Makefile
index 5d4f4ae369db..030eed331676 100644
--- a/devel/p5-Package-Constants/Makefile
+++ b/devel/p5-Package-Constants/Makefile
@@ -10,10 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	List all constants declared in a package
 
-MAN3=	Package::Constants.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Package-Constants/pkg-descr b/devel/p5-Package-Constants/pkg-descr
index 9f010e6df270..4da8a6b13e08 100644
--- a/devel/p5-Package-Constants/pkg-descr
+++ b/devel/p5-Package-Constants/pkg-descr
@@ -2,5 +2,4 @@ Package::Constants lists all the constants defined in a certain package.
 This can be useful for, among others, setting up an auto-generated 
 @EXPORT/@EXPORT_OK for a Constants.pm file.
 
-Author: Jos Boumans <kane@cpan.org>
-WWW: http://search.cpan.org/dist/Package-Constants
+WWW: http://search.cpan.org/dist/Package-Constants/
diff --git a/devel/p5-Package-Constants/pkg-plist b/devel/p5-Package-Constants/pkg-plist
index aa5ec0bc0425..1aa4f9abed9a 100644
--- a/devel/p5-Package-Constants/pkg-plist
+++ b/devel/p5-Package-Constants/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Package/Constants.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Constants/.packlist
+%%PERL5_MAN3%%/Package::Constants.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package/Constants
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Package
 @dirrmtry %%SITE_PERL%%/Package
diff --git a/devel/p5-Paranoid/Makefile b/devel/p5-Paranoid/Makefile
index 683bfd28444e..dd3ea6010cb3 100644
--- a/devel/p5-Paranoid/Makefile
+++ b/devel/p5-Paranoid/Makefile
@@ -23,26 +23,4 @@ TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Paranoid::Data.3 \
-		Paranoid::Log::File.3 \
-		Paranoid::Log::Email.3 \
-		Paranoid::Args.3 \
-		Paranoid::Lockfile.3 \
-		Paranoid.3 \
-		Paranoid::Log.3 \
-		Paranoid::Glob.3 \
-		Paranoid::Input.3 \
-		Paranoid::Log::Syslog.3 \
-		Paranoid::Filesystem.3 \
-		Paranoid::Process.3 \
-		Paranoid::BerkeleyDB.3 \
-		Paranoid::Module.3 \
-		Paranoid::Network.3 \
-		Paranoid::Network::IPv4.3 \
-		Paranoid::Network::IPv6.3 \
-		Paranoid::Network::Socket.3 \
-		Paranoid::Log::Buffer.3 \
-		Paranoid::Debug.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Paranoid/pkg-plist b/devel/p5-Paranoid/pkg-plist
index d0099bc89766..aee7a5625ab4 100644
--- a/devel/p5-Paranoid/pkg-plist
+++ b/devel/p5-Paranoid/pkg-plist
@@ -19,6 +19,26 @@
 %%SITE_PERL%%/Paranoid/Debug.pm
 %%SITE_PERL%%/Paranoid.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Paranoid/.packlist
+%%PERL5_MAN3%%/Paranoid::Data.3.gz
+%%PERL5_MAN3%%/Paranoid::Log::File.3.gz
+%%PERL5_MAN3%%/Paranoid::Log::Email.3.gz
+%%PERL5_MAN3%%/Paranoid::Args.3.gz
+%%PERL5_MAN3%%/Paranoid::Lockfile.3.gz
+%%PERL5_MAN3%%/Paranoid.3.gz
+%%PERL5_MAN3%%/Paranoid::Log.3.gz
+%%PERL5_MAN3%%/Paranoid::Glob.3.gz
+%%PERL5_MAN3%%/Paranoid::Input.3.gz
+%%PERL5_MAN3%%/Paranoid::Log::Syslog.3.gz
+%%PERL5_MAN3%%/Paranoid::Filesystem.3.gz
+%%PERL5_MAN3%%/Paranoid::Process.3.gz
+%%PERL5_MAN3%%/Paranoid::BerkeleyDB.3.gz
+%%PERL5_MAN3%%/Paranoid::Module.3.gz
+%%PERL5_MAN3%%/Paranoid::Network.3.gz
+%%PERL5_MAN3%%/Paranoid::Network::IPv4.3.gz
+%%PERL5_MAN3%%/Paranoid::Network::IPv6.3.gz
+%%PERL5_MAN3%%/Paranoid::Network::Socket.3.gz
+%%PERL5_MAN3%%/Paranoid::Log::Buffer.3.gz
+%%PERL5_MAN3%%/Paranoid::Debug.3.gz
 @dirrm %%SITE_PERL%%/Paranoid/Log
 @dirrm %%SITE_PERL%%/Paranoid/Network
 @dirrm %%SITE_PERL%%/Paranoid
diff --git a/devel/p5-Pid-File-Flock/Makefile b/devel/p5-Pid-File-Flock/Makefile
index 5907a6f963d3..1148a7e1449e 100644
--- a/devel/p5-Pid-File-Flock/Makefile
+++ b/devel/p5-Pid-File-Flock/Makefile
@@ -14,7 +14,4 @@ COMMENT=	PID file operations
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Pid::File::Flock.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Pid-File-Flock/pkg-descr b/devel/p5-Pid-File-Flock/pkg-descr
index 1a8a9676b06c..768dde2d7f68 100644
--- a/devel/p5-Pid-File-Flock/pkg-descr
+++ b/devel/p5-Pid-File-Flock/pkg-descr
@@ -1,3 +1,3 @@
 PID file operations
 
-WWW:	http://search.cpan.org/dist/Pid-File-Flock/
+WWW: http://search.cpan.org/dist/Pid-File-Flock/
diff --git a/devel/p5-Pid-File-Flock/pkg-plist b/devel/p5-Pid-File-Flock/pkg-plist
index 86a72987b2f4..9b74e62ce34a 100644
--- a/devel/p5-Pid-File-Flock/pkg-plist
+++ b/devel/p5-Pid-File-Flock/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Pid/File/Flock.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pid/File/Flock/.packlist
+%%PERL5_MAN3%%/Pid::File::Flock.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pid/File/Flock
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pid/File
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pid
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index 5a49b206feda..018c1aa709d9 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module that provides a method to daemonify a Perl script
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Proc::Daemon.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Proc-Daemon/pkg-descr b/devel/p5-Proc-Daemon/pkg-descr
index f93af5c8b515..99b2123e97dc 100644
--- a/devel/p5-Proc-Daemon/pkg-descr
+++ b/devel/p5-Proc-Daemon/pkg-descr
@@ -1,4 +1,4 @@
 Proc::Daemon provides a method for a Perl script to run as a Unix
 daemon process.
 
-Author: Earl Hood <earlhood@usa.net>
+WWW: http://search.cpan.org/dist/Proc-Daemon/
diff --git a/devel/p5-Proc-Daemon/pkg-plist b/devel/p5-Proc-Daemon/pkg-plist
index 3d18dd1386cd..b5c511a5253d 100644
--- a/devel/p5-Proc-Daemon/pkg-plist
+++ b/devel/p5-Proc-Daemon/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/Proc/Daemon.pm
 %%SITE_PERL%%/Proc/Daemon.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
+%%PERL5_MAN3%%/Proc::Daemon.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
 @dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-Guard/Makefile b/devel/p5-Proc-Guard/Makefile
index 1cfceaf7511c..c7f224e74a4f 100644
--- a/devel/p5-Proc-Guard/Makefile
+++ b/devel/p5-Proc-Guard/Makefile
@@ -17,7 +17,4 @@ TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Proc::Guard.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Proc-Guard/pkg-plist b/devel/p5-Proc-Guard/pkg-plist
index f4026c93ea8b..fecf4e01a9a3 100644
--- a/devel/p5-Proc-Guard/pkg-plist
+++ b/devel/p5-Proc-Guard/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Guard/.packlist
 %%SITE_PERL%%/Proc/Guard.pm
+%%PERL5_MAN3%%/Proc::Guard.3.gz
 @dirrmtry %%SITE_PERL%%/Proc
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Guard
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
diff --git a/devel/p5-Shape/Makefile b/devel/p5-Shape/Makefile
index bc6b612f50fc..d18120512b0a 100644
--- a/devel/p5-Shape/Makefile
+++ b/devel/p5-Shape/Makefile
@@ -11,11 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pedersen@meridian-enviro.com
 COMMENT=	Perl5 module to read and write shapefiles via shapelib
 
-LIB_DEPENDS=	shp:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		Shape.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Shape/pkg-plist b/devel/p5-Shape/pkg-plist
index 3f89d04879bd..51a7c04ca952 100644
--- a/devel/p5-Shape/pkg-plist
+++ b/devel/p5-Shape/pkg-plist
@@ -3,5 +3,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/Shape.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/.packlist
+%%PERL5_MAN3%%/Shape.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
diff --git a/devel/p5-Stream-Buffered/Makefile b/devel/p5-Stream-Buffered/Makefile
index f26bd9182de6..4aa70835dd6c 100644
--- a/devel/p5-Stream-Buffered/Makefile
+++ b/devel/p5-Stream-Buffered/Makefile
@@ -12,7 +12,4 @@ COMMENT=	Perl extension for temporary buffer to save bytes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Stream::Buffered.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Stream-Buffered/pkg-plist b/devel/p5-Stream-Buffered/pkg-plist
index dd21b4144b59..bf1c00e10901 100644
--- a/devel/p5-Stream-Buffered/pkg-plist
+++ b/devel/p5-Stream-Buffered/pkg-plist
@@ -3,6 +3,7 @@
 %%SITE_PERL%%/Stream/Buffered/Auto.pm
 %%SITE_PERL%%/Stream/Buffered/File.pm
 %%SITE_PERL%%/Stream/Buffered/PerlIO.pm
+%%PERL5_MAN3%%/Stream::Buffered.3.gz
 @dirrm %%SITE_PERL%%/Stream/Buffered
 @dirrmtry %%SITE_PERL%%/Stream
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stream/Buffered
diff --git a/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index 973296760dd5..604a87578d0e 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Sub::Name - (re)name a sub
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Sub::Name.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Sub-Name/pkg-plist b/devel/p5-Sub-Name/pkg-plist
index 3d03f0db8853..49076bd21236 100644
--- a/devel/p5-Sub-Name/pkg-plist
+++ b/devel/p5-Sub-Name/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/Name.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/Name.so
+%%PERL5_MAN3%%/Sub::Name.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
diff --git a/devel/p5-Test-Able-Runner/Makefile b/devel/p5-Test-Able-Runner/Makefile
index d3a853c35fa2..8ca2624b6c35 100644
--- a/devel/p5-Test-Able-Runner/Makefile
+++ b/devel/p5-Test-Able-Runner/Makefile
@@ -18,11 +18,7 @@ BUILD_DEPENDS=	p5-Module-Pluggable>=3.6:${PORTSDIR}/devel/p5-Module-Pluggable \
 		p5-Test-Able>=0.09:${PORTSDIR}/devel/p5-Test-Able
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_STAGE=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-MAN3=		Test::Able::Runner.3 \
-		Test::Able::Runner::Role::Meta::Class.3
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Able-Runner/pkg-plist b/devel/p5-Test-Able-Runner/pkg-plist
index 47081fae1b40..292a0839ab68 100644
--- a/devel/p5-Test-Able-Runner/pkg-plist
+++ b/devel/p5-Test-Able-Runner/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/Test/Able/Runner.pm
 %%SITE_PERL%%/Test/Able/Runner/Role/Meta/Class.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Able/Runner/.packlist
+%%PERL5_MAN3%%/Test::Able::Runner.3.gz
+%%PERL5_MAN3%%/Test::Able::Runner::Role::Meta::Class.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Able/Runner
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Able
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
diff --git a/devel/p5-Test-Declare/Makefile b/devel/p5-Test-Declare/Makefile
index ae83431ff981..a9e0ace39ba8 100644
--- a/devel/p5-Test-Declare/Makefile
+++ b/devel/p5-Test-Declare/Makefile
@@ -26,7 +26,4 @@ TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Test::Declare.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Declare/pkg-plist b/devel/p5-Test-Declare/pkg-plist
index 240f750c5f64..4832a1967201 100644
--- a/devel/p5-Test-Declare/pkg-plist
+++ b/devel/p5-Test-Declare/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Declare/.packlist
 %%SITE_PERL%%/Test/Declare.pm
+%%PERL5_MAN3%%/Test::Declare.3.gz
 @dirrmtry %%SITE_PERL%%/Test
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Declare
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
diff --git a/devel/p5-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index 53ff306e6cac..88ea0be0b1a0 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Pod-Coverage \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Test::EOL.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-EOL/pkg-plist b/devel/p5-Test-EOL/pkg-plist
index 6cd014507c82..7dc4b14c45b3 100644
--- a/devel/p5-Test-EOL/pkg-plist
+++ b/devel/p5-Test-EOL/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Test/EOL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/EOL/.packlist
+%%PERL5_MAN3%%/Test::EOL.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/EOL
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
 @dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index 19c105dd09a0..abf0aaa57d6e 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Test::Singleton.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Singleton/pkg-descr b/devel/p5-Test-Singleton/pkg-descr
index f3978ae0fd4b..213814f0cb94 100644
--- a/devel/p5-Test-Singleton/pkg-descr
+++ b/devel/p5-Test-Singleton/pkg-descr
@@ -8,4 +8,4 @@ spooler or system registry, or any kind of central dispatcher.
 For a description and discussion of the Singleton class, see "Design
 Patterns", Gamma et al, Addison-Wesley, 1995, ISBN 0-201-63361-2.
 
-WWW:	http://search.cpan.org/dist/Test-Singleton/
+WWW: http://search.cpan.org/dist/Test-Singleton/
diff --git a/devel/p5-Test-Singleton/pkg-plist b/devel/p5-Test-Singleton/pkg-plist
index 25278667017b..d11e05725344 100644
--- a/devel/p5-Test-Singleton/pkg-plist
+++ b/devel/p5-Test-Singleton/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Singleton/.packlist
 %%SITE_PERL%%/Test/Singleton.pm
+%%PERL5_MAN3%%/Test::Singleton.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Singleton
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
 @dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-asa/Makefile b/devel/p5-asa/Makefile
index fea8eeb9e0ac..7972156de465 100644
--- a/devel/p5-asa/Makefile
+++ b/devel/p5-asa/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl extension to say your class/object working like something else
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	asa.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-asa/pkg-plist b/devel/p5-asa/pkg-plist
index e69f27be0608..80a051b8bb4c 100644
--- a/devel/p5-asa/pkg-plist
+++ b/devel/p5-asa/pkg-plist
@@ -1,3 +1,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/asa/.packlist
 %%SITE_PERL%%/asa.pm
+%%PERL5_MAN3%%/asa.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/asa
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
index 86b8fbc9c649..7c2f7d34e624 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		FreeBSD::Pkgs::FindUpdates.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
index df47161449e0..ed51135c8ea2 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
@@ -1,6 +1,7 @@
 bin/pkg_findupdates
 %%SITE_PERL%%/FreeBSD/Pkgs/FindUpdates.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates/.packlist
+%%PERL5_MAN3%%/FreeBSD::Pkgs::FindUpdates.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
index a4c92127f061..ea5db318fafd 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS=	p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		FreeBSD::Pkgs.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
index daac0555fff0..1e646c98b980 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/FreeBSD/Pkgs.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/.packlist
+%%PERL5_MAN3%%/FreeBSD::Pkgs.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
 @dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
index 46fc4cb14f06..6af629e324dd 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Make a hash out of the index file for the ports tree
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		FreeBSD::Ports::INDEXhash.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
index d266ab7bb3e6..2a56efa6d5c9 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/FreeBSD/Ports/INDEXhash.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash/.packlist
+%%PERL5_MAN3%%/FreeBSD::Ports::INDEXhash.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD