Support STAGEDIR.

62 files changed, 302 insertions, 364 deletions

diff --git a/devel/p5-Lexical-SealRequireHints/Makefile b/devel/p5-Lexical-SealRequireHints/Makefile
index 03d9e68a3cc4..45ce4aad0675 100644
--- a/devel/p5-Lexical-SealRequireHints/Makefile
+++ b/devel/p5-Lexical-SealRequireHints/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to prevent leakage of lexical hints
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lexical::SealRequireHints.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Lexical-SealRequireHints/pkg-plist b/devel/p5-Lexical-SealRequireHints/pkg-plist
index 4320bf687e45..9727f56eac65 100644
--- a/devel/p5-Lexical-SealRequireHints/pkg-plist
+++ b/devel/p5-Lexical-SealRequireHints/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Lexical::SealRequireHints.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Lexical/SealRequireHints.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/SealRequireHints/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/SealRequireHints/SealRequireHints.bs
diff --git a/devel/p5-Lexical-Var/Makefile b/devel/p5-Lexical-Var/Makefile
index de204a70b4c3..0e4f3c524265 100644
--- a/devel/p5-Lexical-Var/Makefile
+++ b/devel/p5-Lexical-Var/Makefile
@@ -16,9 +16,6 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lexical::Sub.3 Lexical::Var.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/Lexical::SealRequireHints/d' ${WRKSRC}/Build.PL ${WRKSRC}/lib/Lexical/Var.pm
 
diff --git a/devel/p5-Lexical-Var/pkg-plist b/devel/p5-Lexical-Var/pkg-plist
index 2872a865d886..a5f5d43a68ce 100644
--- a/devel/p5-Lexical-Var/pkg-plist
+++ b/devel/p5-Lexical-Var/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Lexical::Sub.3.gz
+%%PERL5_MAN3%%/Lexical::Var.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Sub.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Lexical/Var.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lexical/Var/.packlist
diff --git a/devel/p5-Lingua-JA-Fold/Makefile b/devel/p5-Lingua-JA-Fold/Makefile
index c4fbf899d066..0ab7891c1d4e 100644
--- a/devel/p5-Lingua-JA-Fold/Makefile
+++ b/devel/p5-Lingua-JA-Fold/Makefile
@@ -15,7 +15,4 @@ COMMENT=	Lingua::JA::Fold - fold a Japanese text
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lingua::JA::Fold.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Lingua-JA-Fold/pkg-plist b/devel/p5-Lingua-JA-Fold/pkg-plist
index a32dc6cf79ff..d6c0f09ca78a 100644
--- a/devel/p5-Lingua-JA-Fold/pkg-plist
+++ b/devel/p5-Lingua-JA-Fold/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Lingua::JA::Fold.3.gz
 %%SITE_PERL%%/Lingua/JA/Fold.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Fold/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Fold
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Fold
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/JA
+@dirrm %%SITE_PERL%%/Lingua/JA
 @dirrmtry %%SITE_PERL%%/Lingua
diff --git a/devel/p5-List-Cycle/Makefile b/devel/p5-List-Cycle/Makefile
index 0a4e414e0f62..99b6268f6261 100644
--- a/devel/p5-List-Cycle/Makefile
+++ b/devel/p5-List-Cycle/Makefile
@@ -14,7 +14,4 @@ TAGS=		list cycle
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	List::Cycle.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-List-Cycle/pkg-plist b/devel/p5-List-Cycle/pkg-plist
index f13f1344e210..6ac00a3899ab 100644
--- a/devel/p5-List-Cycle/pkg-plist
+++ b/devel/p5-List-Cycle/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/List::Cycle.3.gz
 %%SITE_PERL%%/List/Cycle.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
 @dirrmtry %%SITE_PERL%%/List
diff --git a/devel/p5-List-Permutor/Makefile b/devel/p5-List-Permutor/Makefile
index 52ee9fc85468..64dbb818e26b 100644
--- a/devel/p5-List-Permutor/Makefile
+++ b/devel/p5-List-Permutor/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Allow you to process all possible permutations of a list
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		List::Permutor.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-List-Permutor/pkg-plist b/devel/p5-List-Permutor/pkg-plist
index 9d6ace1315b6..68036caece77 100644
--- a/devel/p5-List-Permutor/pkg-plist
+++ b/devel/p5-List-Permutor/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/List::Permutor.3.gz
 %%SITE_PERL%%/List/Permutor.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Permutor/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Permutor
diff --git a/devel/p5-List-PowerSet/Makefile b/devel/p5-List-PowerSet/Makefile
index 280aa9dec7c9..74af876dde1b 100644
--- a/devel/p5-List-PowerSet/Makefile
+++ b/devel/p5-List-PowerSet/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module that allows you to generate the power set of a list
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		List::PowerSet.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-List-PowerSet/pkg-plist b/devel/p5-List-PowerSet/pkg-plist
index b30b9223b4a3..f3d3b512f389 100644
--- a/devel/p5-List-PowerSet/pkg-plist
+++ b/devel/p5-List-PowerSet/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/List::PowerSet.3.gz
 %%SITE_PERL%%/List/PowerSet.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/PowerSet/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/PowerSet
diff --git a/devel/p5-List-Rotation-Cycle/Makefile b/devel/p5-List-Rotation-Cycle/Makefile
index 0e97fefb1a19..8e58479598ef 100644
--- a/devel/p5-List-Rotation-Cycle/Makefile
+++ b/devel/p5-List-Rotation-Cycle/Makefile
@@ -12,10 +12,7 @@ COMMENT=	Cycle through a list of values
 
 PORTSCOUT=	limitw:1,even
 
-MAN3=		List::Rotation::Cycle.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-List-Rotation-Cycle/pkg-plist b/devel/p5-List-Rotation-Cycle/pkg-plist
index 5d841b98d9a4..03514592a4f9 100644
--- a/devel/p5-List-Rotation-Cycle/pkg-plist
+++ b/devel/p5-List-Rotation-Cycle/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation/Cycle/.packlist
+%%PERL5_MAN3%%/List::Rotation::Cycle.3.gz
 %%SITE_PERL%%/List/Rotation/Cycle.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation/Cycle
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation/Cycle/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation/Cycle
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Rotation
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
 @dirrmtry %%SITE_PERL%%/List/Rotation
diff --git a/devel/p5-Locale-Maketext-Fuzzy/Makefile b/devel/p5-Locale-Maketext-Fuzzy/Makefile
index 97d44feab89e..da772107c0b3 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/Makefile
+++ b/devel/p5-Locale-Maketext-Fuzzy/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Locale::Maketext::Fuzzy - Maketext from already interpolated strings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Locale::Maketext::Fuzzy.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
index 985fd41bad68..bfa854d3e1cc 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
+++ b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy/.packlist
+%%PERL5_MAN3%%/Locale::Maketext::Fuzzy.3.gz
 %%SITE_PERL%%/Locale/Maketext/Fuzzy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
diff --git a/devel/p5-Locale-Maketext-Gettext/Makefile b/devel/p5-Locale-Maketext-Gettext/Makefile
index fbaa830fbf75..b656dbf66a3c 100644
--- a/devel/p5-Locale-Maketext-Gettext/Makefile
+++ b/devel/p5-Locale-Maketext-Gettext/Makefile
@@ -13,19 +13,13 @@ COMMENT=	Joins gettext and Maketext frameworks
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN1=		maketext.1
-MAN3=		Locale::Maketext::Gettext.3 \
-		Locale::Maketext::Gettext::Functions.3
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	BUGS Changes README THANKS
 
 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-Locale-Maketext-Gettext/pkg-plist b/devel/p5-Locale-Maketext-Gettext/pkg-plist
index ea2b52bf13d9..8b7ee1c43f2e 100644
--- a/devel/p5-Locale-Maketext-Gettext/pkg-plist
+++ b/devel/p5-Locale-Maketext-Gettext/pkg-plist
@@ -1,7 +1,10 @@
 bin/maketext
+%%PERL5_MAN3%%/Locale::Maketext::Gettext.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Gettext::Functions.3.gz
 %%SITE_PERL%%/Locale/Maketext/Gettext.pm
 %%SITE_PERL%%/Locale/Maketext/Gettext/Functions.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext-Gettext/.packlist
+man/man1/maketext.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext-Gettext
 @dirrm %%SITE_PERL%%/Locale/Maketext/Gettext
 @dirrmtry %%SITE_PERL%%/Locale/Maketext
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index a6cb5d950642..d344d5fa6464 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -18,35 +18,14 @@ RUN_DEPENDS=	p5-Locale-Maketext>=1.17:${PORTSDIR}/devel/p5-Locale-Maketext
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		xgettext.pl.1
-MAN3=		Locale::Maketext::Extract.3 \
-		Locale::Maketext::Extract::Plugin::Base.3 \
-		Locale::Maketext::Extract::Plugin::FormFu.3 \
-		Locale::Maketext::Extract::Plugin::Generic.3 \
-		Locale::Maketext::Extract::Plugin::Haml.3 \
-		Locale::Maketext::Extract::Plugin::Mason.3 \
-		Locale::Maketext::Extract::Plugin::PPI.3 \
-		Locale::Maketext::Extract::Plugin::Perl.3 \
-		Locale::Maketext::Extract::Plugin::TT2.3 \
-		Locale::Maketext::Extract::Plugin::TextTemplate.3 \
-		Locale::Maketext::Extract::Plugin::YAML.3 \
-		Locale::Maketext::Extract::Run.3 \
-		Locale::Maketext::Lexicon.3 \
-		Locale::Maketext::Lexicon::Auto.3 \
-		Locale::Maketext::Lexicon::Gettext.3 \
-		Locale::Maketext::Lexicon::Msgcat.3 \
-		Locale::Maketext::Lexicon::Tie.3
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS 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-Locale-Maketext-Lexicon/pkg-plist b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
index 3c1bdfc1c6df..46fd5ca47543 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-plist
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
@@ -1,4 +1,21 @@
 bin/xgettext.pl
+%%PERL5_MAN3%%/Locale::Maketext::Extract.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::Base.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::FormFu.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::Generic.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::Haml.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::Mason.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::PPI.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::Perl.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::TT2.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::TextTemplate.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Plugin::YAML.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Extract::Run.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Lexicon.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Lexicon::Auto.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Lexicon::Gettext.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Lexicon::Msgcat.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Lexicon::Tie.3.gz
 %%SITE_PERL%%/Locale/Maketext/Extract.pm
 %%SITE_PERL%%/Locale/Maketext/Extract/Plugin/Base.pm
 %%SITE_PERL%%/Locale/Maketext/Extract/Plugin/FormFu.pm
@@ -17,6 +34,7 @@ bin/xgettext.pl
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Msgcat.pm
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Tie.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon/.packlist
+man/man1/xgettext.pl.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index 6e1d3c52727c..f87d4986df28 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -19,11 +19,4 @@ TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Locale::Maketext.3 \
-		Locale::Maketext::Cookbook.3 \
-		Locale::Maketext::Guts.3 \
-		Locale::Maketext::GutsLoader.3 \
-		Locale::Maketext::TPJ13.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-Maketext/pkg-plist b/devel/p5-Locale-Maketext/pkg-plist
index 811d457130b9..c9e1f483ea85 100644
--- a/devel/p5-Locale-Maketext/pkg-plist
+++ b/devel/p5-Locale-Maketext/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/Locale::Maketext.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Cookbook.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::Guts.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::GutsLoader.3.gz
+%%PERL5_MAN3%%/Locale::Maketext::TPJ13.3.gz
 %%SITE_PERL%%/Locale/Maketext.pm
 %%SITE_PERL%%/Locale/Maketext.pod
 %%SITE_PERL%%/Locale/Maketext/Cookbook.pod
diff --git a/devel/p5-Locale-Msgfmt/Makefile b/devel/p5-Locale-Msgfmt/Makefile
index e225bdf0c0fc..e98d6d0758b6 100644
--- a/devel/p5-Locale-Msgfmt/Makefile
+++ b/devel/p5-Locale-Msgfmt/Makefile
@@ -14,10 +14,4 @@ COMMENT=	Compile .po files to .mo files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Locale::Msgfmt::Utils.3 \
-		Locale::Msgfmt::mo.3 \
-		Locale::Msgfmt::po.3 \
-		Locale::Msgfmt.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-Msgfmt/pkg-plist b/devel/p5-Locale-Msgfmt/pkg-plist
index ed329f147ea5..d34f09072372 100644
--- a/devel/p5-Locale-Msgfmt/pkg-plist
+++ b/devel/p5-Locale-Msgfmt/pkg-plist
@@ -1,12 +1,16 @@
-%%SITE_PERL%%/Locale/Msgfmt/po.pm
+%%PERL5_MAN3%%/Locale::Msgfmt.3.gz
+%%PERL5_MAN3%%/Locale::Msgfmt::Utils.3.gz
+%%PERL5_MAN3%%/Locale::Msgfmt::mo.3.gz
+%%PERL5_MAN3%%/Locale::Msgfmt::po.3.gz
+%%SITE_PERL%%/Locale/Msgfmt.pm
 %%SITE_PERL%%/Locale/Msgfmt/Utils.pm
 %%SITE_PERL%%/Locale/Msgfmt/mo.pm
-%%SITE_PERL%%/Locale/Msgfmt.pm
+%%SITE_PERL%%/Locale/Msgfmt/po.pm
 %%SITE_PERL%%/Module/Install/Msgfmt.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgfmt/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgfmt
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Msgfmt
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
-@dirrmtry %%SITE_PERL%%/Locale/Msgfmt
-@dirrmtry %%SITE_PERL%%/Locale
 @dirrmtry %%SITE_PERL%%/Module/Install
 @dirrmtry %%SITE_PERL%%/Module
+@dirrm %%SITE_PERL%%/Locale/Msgfmt
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 798e79af19ce..7eb00215a51b 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Pure perl implementation of GNU gettext
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		MsgFormat.1 XText.1
-MAN3=		Locale::PGetText.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index cdbab07e2284..f98e78dc3fa2 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -1,7 +1,10 @@
-bin/XText
 bin/MsgFormat
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
+bin/XText
+%%PERL5_MAN3%%/Locale::PGetText.3.gz
 %%SITE_PERL%%/Locale/PGetText.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
+man/man1/MsgFormat.1.gz
+man/man1/XText.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
 @dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index 56a66a55e1ae..e42a964faa12 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -15,155 +15,4 @@ COMMENT=	Internationalization library for Perl
 USES=		perl5 gettext
 USE_PERL5=	configure
 
-MAN3=		Locale::Messages.3 \
-		Locale::Recode.3 \
-		Locale::Recode::_Aliases.3 \
-		Locale::Recode::_Conversions.3 \
-		Locale::RecodeData.3 \
-		Locale::RecodeData::ASMO_449.3 \
-		Locale::RecodeData::ATARI_ST.3 \
-		Locale::RecodeData::ATARI_ST_EURO.3 \
-		Locale::RecodeData::CP10007.3 \
-		Locale::RecodeData::CP1250.3 \
-		Locale::RecodeData::CP1251.3 \
-		Locale::RecodeData::CP1252.3 \
-		Locale::RecodeData::CP1253.3 \
-		Locale::RecodeData::CP1254.3 \
-		Locale::RecodeData::CP1256.3 \
-		Locale::RecodeData::CP1257.3 \
-		Locale::RecodeData::CSN_369103.3 \
-		Locale::RecodeData::CWI.3 \
-		Locale::RecodeData::DEC_MCS.3 \
-		Locale::RecodeData::EBCDIC_AT_DE.3 \
-		Locale::RecodeData::EBCDIC_AT_DE_A.3 \
-		Locale::RecodeData::EBCDIC_CA_FR.3 \
-		Locale::RecodeData::EBCDIC_DK_NO.3 \
-		Locale::RecodeData::EBCDIC_DK_NO_A.3 \
-		Locale::RecodeData::EBCDIC_ES.3 \
-		Locale::RecodeData::EBCDIC_ES_A.3 \
-		Locale::RecodeData::EBCDIC_ES_S.3 \
-		Locale::RecodeData::EBCDIC_FI_SE.3 \
-		Locale::RecodeData::EBCDIC_FI_SE_A.3 \
-		Locale::RecodeData::EBCDIC_FR.3 \
-		Locale::RecodeData::EBCDIC_IS_FRISS.3 \
-		Locale::RecodeData::EBCDIC_IT.3 \
-		Locale::RecodeData::EBCDIC_PT.3 \
-		Locale::RecodeData::EBCDIC_UK.3 \
-		Locale::RecodeData::EBCDIC_US.3 \
-		Locale::RecodeData::ECMA_CYRILLIC.3 \
-		Locale::RecodeData::GEORGIAN_ACADEMY.3 \
-		Locale::RecodeData::GEORGIAN_PS.3 \
-		Locale::RecodeData::GOST_19768_74.3 \
-		Locale::RecodeData::GREEK7.3 \
-		Locale::RecodeData::GREEK7_OLD.3 \
-		Locale::RecodeData::GREEK_CCITT.3 \
-		Locale::RecodeData::HP_ROMAN8.3 \
-		Locale::RecodeData::IBM037.3 \
-		Locale::RecodeData::IBM038.3 \
-		Locale::RecodeData::IBM1004.3 \
-		Locale::RecodeData::IBM1026.3 \
-		Locale::RecodeData::IBM1047.3 \
-		Locale::RecodeData::IBM256.3 \
-		Locale::RecodeData::IBM273.3 \
-		Locale::RecodeData::IBM274.3 \
-		Locale::RecodeData::IBM275.3 \
-		Locale::RecodeData::IBM277.3 \
-		Locale::RecodeData::IBM278.3 \
-		Locale::RecodeData::IBM280.3 \
-		Locale::RecodeData::IBM281.3 \
-		Locale::RecodeData::IBM284.3 \
-		Locale::RecodeData::IBM285.3 \
-		Locale::RecodeData::IBM290.3 \
-		Locale::RecodeData::IBM297.3 \
-		Locale::RecodeData::IBM420.3 \
-		Locale::RecodeData::IBM423.3 \
-		Locale::RecodeData::IBM424.3 \
-		Locale::RecodeData::IBM437.3 \
-		Locale::RecodeData::IBM500.3 \
-		Locale::RecodeData::IBM850.3 \
-		Locale::RecodeData::IBM851.3 \
-		Locale::RecodeData::IBM852.3 \
-		Locale::RecodeData::IBM855.3 \
-		Locale::RecodeData::IBM857.3 \
-		Locale::RecodeData::IBM860.3 \
-		Locale::RecodeData::IBM861.3 \
-		Locale::RecodeData::IBM862.3 \
-		Locale::RecodeData::IBM863.3 \
-		Locale::RecodeData::IBM864.3 \
-		Locale::RecodeData::IBM865.3 \
-		Locale::RecodeData::IBM866.3 \
-		Locale::RecodeData::IBM868.3 \
-		Locale::RecodeData::IBM869.3 \
-		Locale::RecodeData::IBM870.3 \
-		Locale::RecodeData::IBM871.3 \
-		Locale::RecodeData::IBM874.3 \
-		Locale::RecodeData::IBM875.3 \
-		Locale::RecodeData::IBM880.3 \
-		Locale::RecodeData::IBM891.3 \
-		Locale::RecodeData::IBM903.3 \
-		Locale::RecodeData::IBM904.3 \
-		Locale::RecodeData::IBM905.3 \
-		Locale::RecodeData::IBM918.3 \
-		Locale::RecodeData::IEC_P27_1.3 \
-		Locale::RecodeData::INIS.3 \
-		Locale::RecodeData::INIS_8.3 \
-		Locale::RecodeData::INIS_CYRILLIC.3 \
-		Locale::RecodeData::ISO_10367_BOX.3 \
-		Locale::RecodeData::ISO_2033_1983.3 \
-		Locale::RecodeData::ISO_5427.3 \
-		Locale::RecodeData::ISO_5427_EXT.3 \
-		Locale::RecodeData::ISO_5428.3 \
-		Locale::RecodeData::ISO_8859_1.3 \
-		Locale::RecodeData::ISO_8859_10.3 \
-		Locale::RecodeData::ISO_8859_11.3 \
-		Locale::RecodeData::ISO_8859_13.3 \
-		Locale::RecodeData::ISO_8859_14.3 \
-		Locale::RecodeData::ISO_8859_15.3 \
-		Locale::RecodeData::ISO_8859_16.3 \
-		Locale::RecodeData::ISO_8859_2.3 \
-		Locale::RecodeData::ISO_8859_3.3 \
-		Locale::RecodeData::ISO_8859_4.3 \
-		Locale::RecodeData::ISO_8859_5.3 \
-		Locale::RecodeData::ISO_8859_6.3 \
-		Locale::RecodeData::ISO_8859_7.3 \
-		Locale::RecodeData::ISO_8859_8.3 \
-		Locale::RecodeData::ISO_8859_9.3 \
-		Locale::RecodeData::KOI8_R.3 \
-		Locale::RecodeData::KOI8_RU.3 \
-		Locale::RecodeData::KOI8_T.3 \
-		Locale::RecodeData::KOI8_U.3 \
-		Locale::RecodeData::KOI_8.3 \
-		Locale::RecodeData::LATIN_GREEK.3 \
-		Locale::RecodeData::LATIN_GREEK_1.3 \
-		Locale::RecodeData::MACARABIC.3 \
-		Locale::RecodeData::MACCROATIAN.3 \
-		Locale::RecodeData::MACCYRILLIC.3 \
-		Locale::RecodeData::MACGREEK.3 \
-		Locale::RecodeData::MACHEBREW.3 \
-		Locale::RecodeData::MACICELAND.3 \
-		Locale::RecodeData::MACINTOSH.3 \
-		Locale::RecodeData::MACROMANIA.3 \
-		Locale::RecodeData::MACTHAI.3 \
-		Locale::RecodeData::MACTURKISH.3 \
-		Locale::RecodeData::MACUKRAINE.3 \
-		Locale::RecodeData::MAC_IS.3 \
-		Locale::RecodeData::MAC_SAMI.3 \
-		Locale::RecodeData::MAC_UK.3 \
-		Locale::RecodeData::NATS_DANO.3 \
-		Locale::RecodeData::NATS_SEFI.3 \
-		Locale::RecodeData::NEXTSTEP.3 \
-		Locale::RecodeData::SAMI_WS2.3 \
-		Locale::RecodeData::TIS_620.3 \
-		Locale::RecodeData::US_ASCII.3 \
-		Locale::RecodeData::UTF_8.3 \
-		Locale::RecodeData::VISCII.3 \
-		Locale::RecodeData::_Encode.3 \
-		Locale::TextDomain.3 \
-		Locale::Util.3 \
-		Locale::gettext_dumb.3 \
-		Locale::gettext_pp.3 \
-		Locale::gettext_xs.3 \
-		Locale::libintlFAQ.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index d0d292178f94..7633baa1a34a 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -1,3 +1,152 @@
+%%PERL5_MAN3%%/Locale::Messages.3.gz
+%%PERL5_MAN3%%/Locale::Recode.3.gz
+%%PERL5_MAN3%%/Locale::Recode::_Aliases.3.gz
+%%PERL5_MAN3%%/Locale::Recode::_Conversions.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ASMO_449.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ATARI_ST.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ATARI_ST_EURO.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP10007.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1250.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1251.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1252.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1253.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1254.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1256.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CP1257.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CSN_369103.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::CWI.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::DEC_MCS.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_AT_DE.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_AT_DE_A.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_CA_FR.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_DK_NO.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_DK_NO_A.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_ES.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_ES_A.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_ES_S.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_FI_SE.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_FI_SE_A.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_FR.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_IS_FRISS.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_IT.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_PT.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_UK.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::EBCDIC_US.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ECMA_CYRILLIC.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GEORGIAN_ACADEMY.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GEORGIAN_PS.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GOST_19768_74.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GREEK7.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GREEK7_OLD.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::GREEK_CCITT.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::HP_ROMAN8.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM037.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM038.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM1004.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM1026.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM1047.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM256.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM273.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM274.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM275.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM277.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM278.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM280.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM281.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM284.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM285.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM290.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM297.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM420.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM423.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM424.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM437.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM500.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM850.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM851.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM852.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM855.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM857.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM860.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM861.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM862.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM863.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM864.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM865.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM866.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM868.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM869.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM870.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM871.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM874.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM875.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM880.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM891.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM903.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM904.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM905.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IBM918.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::IEC_P27_1.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::INIS.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::INIS_8.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::INIS_CYRILLIC.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_10367_BOX.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_2033_1983.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_5427.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_5427_EXT.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_5428.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_1.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_10.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_11.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_13.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_14.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_15.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_16.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_2.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_3.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_4.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_5.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_6.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_7.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_8.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::ISO_8859_9.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::KOI8_R.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::KOI8_RU.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::KOI8_T.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::KOI8_U.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::KOI_8.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::LATIN_GREEK.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::LATIN_GREEK_1.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACARABIC.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACCROATIAN.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACCYRILLIC.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACGREEK.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACHEBREW.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACICELAND.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACINTOSH.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACROMANIA.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACTHAI.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACTURKISH.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MACUKRAINE.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MAC_IS.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MAC_SAMI.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::MAC_UK.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::NATS_DANO.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::NATS_SEFI.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::NEXTSTEP.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::SAMI_WS2.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::TIS_620.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::US_ASCII.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::UTF_8.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::VISCII.3.gz
+%%PERL5_MAN3%%/Locale::RecodeData::_Encode.3.gz
+%%PERL5_MAN3%%/Locale::TextDomain.3.gz
+%%PERL5_MAN3%%/Locale::Util.3.gz
+%%PERL5_MAN3%%/Locale::gettext_dumb.3.gz
+%%PERL5_MAN3%%/Locale::gettext_pp.3.gz
+%%PERL5_MAN3%%/Locale::gettext_xs.3.gz
+%%PERL5_MAN3%%/Locale::libintlFAQ.3.gz
 %%SITE_PERL%%/Locale/Messages.pm
 %%SITE_PERL%%/Locale/Recode.pm
 %%SITE_PERL%%/Locale/Recode/_Aliases.pm
diff --git a/devel/p5-LockFile-Simple/Makefile b/devel/p5-LockFile-Simple/Makefile
index f5406b08b756..f76b4dbeebcb 100644
--- a/devel/p5-LockFile-Simple/Makefile
+++ b/devel/p5-LockFile-Simple/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl module implementing simple file locking
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		LockFile::Simple.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-LockFile-Simple/pkg-plist b/devel/p5-LockFile-Simple/pkg-plist
index b94a9a45f627..4cce5da0c493 100644
--- a/devel/p5-LockFile-Simple/pkg-plist
+++ b/devel/p5-LockFile-Simple/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/LockFile::Simple.3.gz
 %%SITE_PERL%%/LockFile/Lock.pm
 %%SITE_PERL%%/LockFile/Lock/Simple.pm
 %%SITE_PERL%%/LockFile/Manager.pm
 %%SITE_PERL%%/LockFile/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile/Simple/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile/Simple
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LockFile
 @dirrm %%SITE_PERL%%/LockFile/Lock
-@dirrm %%SITE_PERL%%/LockFile
+@dirrmtry %%SITE_PERL%%/LockFile
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index d84d60362ba4..252e13e7bf5f 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Agent::Logger.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Agent-Logger/pkg-plist b/devel/p5-Log-Agent-Logger/pkg-plist
index 7a9044f45020..3a8aaf4bc671 100644
--- a/devel/p5-Log-Agent-Logger/pkg-plist
+++ b/devel/p5-Log-Agent-Logger/pkg-plist
@@ -1,4 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
+%%PERL5_MAN3%%/Log::Agent::Logger.3.gz
 %%SITE_PERL%%/Log/Agent/Logger.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/Log/Agent
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Agent/Makefile b/devel/p5-Log-Agent/Makefile
index 9240d4f9c5ed..f163fbb52647 100644
--- a/devel/p5-Log-Agent/Makefile
+++ b/devel/p5-Log-Agent/Makefile
@@ -15,30 +15,4 @@ LICENSE=	ART20
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Agent.3 \
-		Log::Agent::Channel.3 \
-		Log::Agent::Channel::File.3 \
-		Log::Agent::Channel::Handle.3 \
-		Log::Agent::Channel::Syslog.3 \
-		Log::Agent::Driver.3 \
-		Log::Agent::Driver::Datum.3 \
-		Log::Agent::Driver::Default.3 \
-		Log::Agent::Driver::File.3 \
-		Log::Agent::Driver::Fork.3 \
-		Log::Agent::Driver::Mail.3 \
-		Log::Agent::Driver::Silent.3 \
-		Log::Agent::Driver::Syslog.3 \
-		Log::Agent::File::Native.3 \
-		Log::Agent::Message.3 \
-		Log::Agent::Priorities.3 \
-		Log::Agent::Stamping.3 \
-		Log::Agent::Tag.3 \
-		Log::Agent::Tag::Callback.3 \
-		Log::Agent::Tag::Caller.3 \
-		Log::Agent::Tag::Priority.3 \
-		Log::Agent::Tag::String.3 \
-		Log::Agent::Tag_List.3 \
-		Log::changes.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Agent/pkg-plist b/devel/p5-Log-Agent/pkg-plist
index a1feeb2242ea..7b241ca00def 100644
--- a/devel/p5-Log-Agent/pkg-plist
+++ b/devel/p5-Log-Agent/pkg-plist
@@ -1,3 +1,27 @@
+%%PERL5_MAN3%%/Log::Agent.3.gz
+%%PERL5_MAN3%%/Log::Agent::Channel.3.gz
+%%PERL5_MAN3%%/Log::Agent::Channel::File.3.gz
+%%PERL5_MAN3%%/Log::Agent::Channel::Handle.3.gz
+%%PERL5_MAN3%%/Log::Agent::Channel::Syslog.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Datum.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Default.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::File.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Fork.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Mail.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Silent.3.gz
+%%PERL5_MAN3%%/Log::Agent::Driver::Syslog.3.gz
+%%PERL5_MAN3%%/Log::Agent::File::Native.3.gz
+%%PERL5_MAN3%%/Log::Agent::Message.3.gz
+%%PERL5_MAN3%%/Log::Agent::Priorities.3.gz
+%%PERL5_MAN3%%/Log::Agent::Stamping.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag::Callback.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag::Caller.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag::Priority.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag::String.3.gz
+%%PERL5_MAN3%%/Log::Agent::Tag_List.3.gz
+%%PERL5_MAN3%%/Log::changes.3.gz
 %%SITE_PERL%%/Log/Agent.pm
 %%SITE_PERL%%/Log/Agent/Channel.pm
 %%SITE_PERL%%/Log/Agent/Channel/File.pm
@@ -50,14 +74,14 @@
 %%SITE_PERL%%/auto/Log/Agent/logxcroak.al
 %%SITE_PERL%%/auto/Log/Agent/prio_tag.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
 @dirrm %%SITE_PERL%%/auto/Log/Agent/Priorities
+@dirrm %%SITE_PERL%%/auto/Log/Agent
+@dirrmtry %%SITE_PERL%%/auto/Log
 @dirrm %%SITE_PERL%%/Log/Agent/Tag
 @dirrm %%SITE_PERL%%/Log/Agent/File
 @dirrm %%SITE_PERL%%/Log/Agent/Driver
 @dirrm %%SITE_PERL%%/Log/Agent/Channel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
-@dirrmtry %%SITE_PERL%%/auto/Log/Agent
-@dirrmtry %%SITE_PERL%%/auto/Log
-@dirrmtry %%SITE_PERL%%/Log/Agent
+@dirrm %%SITE_PERL%%/Log/Agent
 @dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/Makefile b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
index 003923f827fb..169f3c77ef7a 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/Makefile
+++ b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Any::Adapter::Log4perl.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist b/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
index ccddf1dfe7c0..177dc1b6cc73 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
+++ b/devel/p5-Log-Any-Adapter-Log4perl/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Log::Any::Adapter::Log4perl.3.gz
 %%SITE_PERL%%/Log/Any/Adapter/Log4perl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/Log4perl/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Any/Adapter/Log4perl
diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile
index 25454df03df0..1f5aa834efa4 100644
--- a/devel/p5-Log-Any-App/Makefile
+++ b/devel/p5-Log-Any-App/Makefile
@@ -25,7 +25,4 @@ TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Log::Any::App.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Any-App/pkg-plist b/devel/p5-Log-Any-App/pkg-plist
index b28fda5b54f6..6594ce11c29f 100644
--- a/devel/p5-Log-Any-App/pkg-plist
+++ b/devel/p5-Log-Any-App/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Log::Any::App.3.gz
 %%SITE_PERL%%/Log/Any/App.pm
 @dirrmtry %%SITE_PERL%%/Log/Any
 @dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index b5f52a7cb1d1..cfac7acfc27a 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -18,9 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Dispatch::Config.3 \
-		Log::Dispatch::Configurator.3 \
-		Log::Dispatch::Configurator::AppConfig.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Config/pkg-plist b/devel/p5-Log-Dispatch-Config/pkg-plist
index c502375bdea2..4d07d44eca75 100644
--- a/devel/p5-Log-Dispatch-Config/pkg-plist
+++ b/devel/p5-Log-Dispatch-Config/pkg-plist
@@ -1,7 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config/.packlist
-%%SITE_PERL%%/Log/Dispatch/Configurator.pm
+%%PERL5_MAN3%%/Log::Dispatch::Config.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Configurator.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Configurator::AppConfig.3.gz
 %%SITE_PERL%%/Log/Dispatch/Config.pm
+%%SITE_PERL%%/Log/Dispatch/Configurator.pm
 %%SITE_PERL%%/Log/Dispatch/Configurator/AppConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
index 7f16551c148e..e7b452b884d7 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		${PORTNAME:S/-/::/g}.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/pkg-plist b/devel/p5-Log-Dispatch-Email-EmailSend/pkg-plist
index 7d1d36ca374f..d194b6bd4297 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/pkg-plist
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Log::Dispatch::Email::EmailSend.3.gz
 %%SITE_PERL%%/Log/Dispatch/Email/EmailSend.pm
 @dirrmtry %%SITE_PERL%%/Log/Dispatch/Email
 @dirrmtry %%SITE_PERL%%/Log/Dispatch
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index 188f5204d1b2..841afe042ab5 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Dispatch::FileShared.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-FileShared/pkg-plist b/devel/p5-Log-Dispatch-FileShared/pkg-plist
index 8f088b7e84c9..eb5f24cc8f21 100644
--- a/devel/p5-Log-Dispatch-FileShared/pkg-plist
+++ b/devel/p5-Log-Dispatch-FileShared/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Log::Dispatch::FileShared.3.gz
 %%SITE_PERL%%/Log/Dispatch/FileShared.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileShared/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileShared
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log
+@dirrmtry %%SITE_PERL%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index 78762a066d6f..5d285516a22f 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Dispatch::Perl.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Perl/pkg-plist b/devel/p5-Log-Dispatch-Perl/pkg-plist
index 864ef3f08a97..71e79bcee544 100644
--- a/devel/p5-Log-Dispatch-Perl/pkg-plist
+++ b/devel/p5-Log-Dispatch-Perl/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Log::Dispatch::Perl.3.gz
 %%SITE_PERL%%/Log/Dispatch/Perl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Perl/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Perl
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log
+@dirrmtry %%SITE_PERL%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index 82480b9b853e..e234c082ce2d 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -20,8 +20,4 @@ TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		scribe_cat.pl.1
-MAN3=		Log::Dispatch::Scribe.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch-Scribe/pkg-plist b/devel/p5-Log-Dispatch-Scribe/pkg-plist
index 9cb4e5d6a0ad..2001cd97109b 100644
--- a/devel/p5-Log-Dispatch-Scribe/pkg-plist
+++ b/devel/p5-Log-Dispatch-Scribe/pkg-plist
@@ -1,8 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Scribe/.packlist
-%%SITE_PERL%%/Log/Dispatch/Scribe.pm
 bin/scribe_cat.pl
-@dirrmtry %%SITE_PERL%%/Log/Dispatch
-@dirrmtry %%SITE_PERL%%/Log
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Scribe
+%%PERL5_MAN3%%/Log::Dispatch::Scribe.3.gz
+%%SITE_PERL%%/Log/Dispatch/Scribe.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Scribe/.packlist
+man/man1/scribe_cat.pl.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Scribe
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index d7471d1c50fb..7f18a2108a59 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -28,26 +28,8 @@ MAILSENDMAIL_DESC=	Mail::Sendmail support
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Log::Dispatch.3 \
-		Log::Dispatch::ApacheLog.3 \
-		Log::Dispatch::Base.3 \
-		Log::Dispatch::Code.3 \
-		Log::Dispatch::Conflicts.3 \
-		Log::Dispatch::Email.3 \
-		Log::Dispatch::Email::MIMELite.3 \
-		Log::Dispatch::Email::MailSend.3 \
-		Log::Dispatch::Email::MailSender.3 \
-		Log::Dispatch::Email::MailSendmail.3 \
-		Log::Dispatch::File.3 \
-		Log::Dispatch::File::Locked.3 \
-		Log::Dispatch::Handle.3 \
-		Log::Dispatch::Null.3 \
-		Log::Dispatch::Output.3 \
-		Log::Dispatch::Screen.3 \
-		Log::Dispatch::Syslog.3
 PORTDOCS=	Changes README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHELOG}
@@ -73,9 +55,8 @@ RUN_DEPENDS+=	p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail
 
 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-Log-Dispatch/pkg-plist b/devel/p5-Log-Dispatch/pkg-plist
index ef0871e4bcac..e8f57f273506 100644
--- a/devel/p5-Log-Dispatch/pkg-plist
+++ b/devel/p5-Log-Dispatch/pkg-plist
@@ -1,3 +1,20 @@
+%%PERL5_MAN3%%/Log::Dispatch.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::ApacheLog.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Base.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Code.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Conflicts.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Email.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Email::MIMELite.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Email::MailSend.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Email::MailSender.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Email::MailSendmail.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::File.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::File::Locked.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Handle.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Null.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Output.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Screen.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::Syslog.3.gz
 %%SITE_PERL%%/Log/Dispatch.pm
 %%SITE_PERL%%/Log/Dispatch/ApacheLog.pm
 %%SITE_PERL%%/Log/Dispatch/Base.pm
@@ -17,8 +34,8 @@
 %%SITE_PERL%%/Log/Dispatch/Syslog.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
 @dirrm %%SITE_PERL%%/Log/Dispatch/File
 @dirrm %%SITE_PERL%%/Log/Dispatch/Email
 @dirrm %%SITE_PERL%%/Log/Dispatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
 @dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 7d5db15134c7..92354ed59031 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -13,10 +13,7 @@ COMMENT=	Provides standardized logging facilities using the Log::Message module
 BUILD_DEPENDS=	p5-Log-Message>=0:${PORTSDIR}/devel/p5-Log-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Log::Message::Simple.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Message-Simple/pkg-plist b/devel/p5-Log-Message-Simple/pkg-plist
index 73fa1c6333fd..a11ceaeffdc5 100644
--- a/devel/p5-Log-Message-Simple/pkg-plist
+++ b/devel/p5-Log-Message-Simple/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Log::Message::Simple.3.gz
 %%SITE_PERL%%/Log/Message/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Message/Simple/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Message/Simple
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index c81ed0f4ae7b..158bb8fcdf19 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -16,13 +16,7 @@ BUILD_DEPENDS=	p5-Params-Check>=0:${PORTSDIR}/devel/p5-Params-Check \
 		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Log::Message.3 \
-	Log::Message::Config.3 \
-	Log::Message::Handlers.3 \
-	Log::Message::Item.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Message/pkg-plist b/devel/p5-Log-Message/pkg-plist
index cb075603bd2b..b03fee3da85a 100644
--- a/devel/p5-Log-Message/pkg-plist
+++ b/devel/p5-Log-Message/pkg-plist
@@ -1,3 +1,7 @@
+%%PERL5_MAN3%%/Log::Message.3.gz
+%%PERL5_MAN3%%/Log::Message::Config.3.gz
+%%PERL5_MAN3%%/Log::Message::Handlers.3.gz
+%%PERL5_MAN3%%/Log::Message::Item.3.gz
 %%SITE_PERL%%/Log/Message.pm
 %%SITE_PERL%%/Log/Message/Config.pm
 %%SITE_PERL%%/Log/Message/Handlers.pm
diff --git a/devel/p5-Log-Minimal/Makefile b/devel/p5-Log-Minimal/Makefile
index bff78e5378cd..c15eb161fe86 100644
--- a/devel/p5-Log-Minimal/Makefile
+++ b/devel/p5-Log-Minimal/Makefile
@@ -16,12 +16,6 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	modbuild
 
-PLIST_FILES=	%%SITE_PERL%%/Log/Minimal.pm
-PLIST_DIRSTRY=	%%SITE_PERL%%/Log
-
-MAN3=		Log::Minimal.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/devel/p5-Log-Minimal/pkg-plist b/devel/p5-Log-Minimal/pkg-plist
new file mode 100644
index 000000000000..2aa10b7253ed
--- /dev/null
+++ b/devel/p5-Log-Minimal/pkg-plist
@@ -0,0 +1,3 @@
+%%PERL5_MAN3%%/Log::Minimal.3.gz
+%%SITE_PERL%%/Log/Minimal.pm
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index e2282c276dab..dcb92a411888 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Log::TraceMessages.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-TraceMessages/pkg-plist b/devel/p5-Log-TraceMessages/pkg-plist
index 47dc29952a50..88067f1d40e3 100644
--- a/devel/p5-Log-TraceMessages/pkg-plist
+++ b/devel/p5-Log-TraceMessages/pkg-plist
@@ -1,8 +1,9 @@
+%%PERL5_MAN3%%/Log::TraceMessages.3.gz
 %%SITE_PERL%%/Log/TraceMessages.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
 %%SITE_PERL%%/auto/Log/TraceMessages/autosplit.ix
-@dirrm %%SITE_PERL%%/auto/Log/TraceMessages
-@dirrmtry %%SITE_PERL%%/auto/Log
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrm %%SITE_PERL%%/auto/Log/TraceMessages
+@dirrmtry %%SITE_PERL%%/auto/Log
 @dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Logfile-Rotate/Makefile b/devel/p5-Logfile-Rotate/Makefile
index 5a6efd07381f..4b3b8506c8e7 100644
--- a/devel/p5-Logfile-Rotate/Makefile
+++ b/devel/p5-Logfile-Rotate/Makefile
@@ -12,7 +12,4 @@ COMMENT=	Perl module to rotate logfiles
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Logfile::Rotate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Logfile-Rotate/pkg-plist b/devel/p5-Logfile-Rotate/pkg-plist
index 7d301816872c..807ae9ee23e7 100644
--- a/devel/p5-Logfile-Rotate/pkg-plist
+++ b/devel/p5-Logfile-Rotate/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Logfile::Rotate.3.gz
 %%SITE_PERL%%/Logfile/Rotate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Logfile/Rotate/.packlist
-@dirrmtry %%SITE_PERL%%/Logfile
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Logfile/Rotate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Logfile
+@dirrmtry %%SITE_PERL%%/Logfile
diff --git a/devel/p5-Lvalue/Makefile b/devel/p5-Lvalue/Makefile
index c7703dd68a72..292f609bff0f 100644
--- a/devel/p5-Lvalue/Makefile
+++ b/devel/p5-Lvalue/Makefile
@@ -19,9 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lvalue.3
-
-NO_STAGE=	yes
 post-patch::
 	@${REINPLACE_CMD} -e 's|qw(can isa DOES VERSION)|(qw(can isa DOES VERSION))|g' \
 		${WRKSRC}/lib/Lvalue.pm
diff --git a/devel/p5-Lvalue/pkg-plist b/devel/p5-Lvalue/pkg-plist
index c9f434d84c55..5c0227771184 100644
--- a/devel/p5-Lvalue/pkg-plist
+++ b/devel/p5-Lvalue/pkg-plist
@@ -1,5 +1,4 @@
-@comment $FreeBSD$
+%%PERL5_MAN3%%/Lvalue.3.gz
 %%SITE_PERL%%/Lvalue.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lvalue/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lvalue/Path
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lvalue