Support STAGEDIR.

58 files changed, 185 insertions, 231 deletions

diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index 7d99bf58dce8..a577b9169dd7 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Convert binary octets into ASCII armoured messages
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::ASCII::Armour.3 Convert::ASCII::Armor.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index 9b71419e8dac..74a60c300807 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -1,8 +1,10 @@
+%%PERL5_MAN3%%/Convert::ASCII::Armor.3.gz
+%%PERL5_MAN3%%/Convert::ASCII::Armour.3.gz
 %%SITE_PERL%%/Convert/ASCII/Armor.pm
 %%SITE_PERL%%/Convert/ASCII/Armour.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
-@dirrmtry %%SITE_PERL%%/Convert/ASCII
+@dirrm %%SITE_PERL%%/Convert/ASCII
 @dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index a8e802d4aeb1..008354027eac 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-Math-BigInt>=1.997:${PORTSDIR}/math/p5-Math-BigInt
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::ASN1.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-ASN1/pkg-plist b/converters/p5-Convert-ASN1/pkg-plist
index 7afe07fd0216..5cb0e2ad97f7 100644
--- a/converters/p5-Convert-ASN1/pkg-plist
+++ b/converters/p5-Convert-ASN1/pkg-plist
@@ -1,12 +1,13 @@
+%%PERL5_MAN3%%/Convert::ASN1.3.gz
 %%SITE_PERL%%/Convert/ASN1.pm
 %%SITE_PERL%%/Convert/ASN1.pod
-%%SITE_PERL%%/Convert/ASN1/_decode.pm
-%%SITE_PERL%%/Convert/ASN1/_encode.pm
 %%SITE_PERL%%/Convert/ASN1/Debug.pm
 %%SITE_PERL%%/Convert/ASN1/IO.pm
+%%SITE_PERL%%/Convert/ASN1/_decode.pm
+%%SITE_PERL%%/Convert/ASN1/_encode.pm
 %%SITE_PERL%%/Convert/ASN1/parser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
-@dirrm %%SITE_PERL%%/Convert/ASN1
+@dirrmtry %%SITE_PERL%%/Convert/ASN1
 @dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 7c02b8fe0b8d..18e575fb0df7 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl5 module to encode and decode objects using Basic Encoding Rules (B
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::BER.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index 04bdf85996b7..47496b3c01a2 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/Convert/BER.pod
+%%PERL5_MAN3%%/Convert::BER.3.gz
 %%SITE_PERL%%/Convert/BER.pm
+%%SITE_PERL%%/Convert/BER.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
index 2befff818e6c..0d85ed8b8197 100644
--- a/converters/p5-Convert-Bencode_XS/Makefile
+++ b/converters/p5-Convert-Bencode_XS/Makefile
@@ -15,11 +15,8 @@ RUN_DEPENDS=	p5-Convert-Bencode>=0:${PORTSDIR}/converters/p5-Convert-Bencode
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::Bencode_XS.3
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/extras/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/extras/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-Bencode_XS/pkg-plist b/converters/p5-Convert-Bencode_XS/pkg-plist
index f7356ef5992c..2047ecd6d298 100644
--- a/converters/p5-Convert-Bencode_XS/pkg-plist
+++ b/converters/p5-Convert-Bencode_XS/pkg-plist
@@ -1,10 +1,11 @@
-%%EXAMPLESDIR%%/bench_decode.pl
-%%EXAMPLESDIR%%/bench_encode.pl
+%%PERL5_MAN3%%/Convert::Bencode_XS.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Bencode_XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS/Bencode_XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS/Bencode_XS.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS
+%%EXAMPLESDIR%%/bench_decode.pl
+%%EXAMPLESDIR%%/bench_encode.pl
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Bencode_XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
-@dirrmtry %%EXAMPLESDIR%%
diff --git a/converters/p5-Convert-BinHex/Makefile b/converters/p5-Convert-BinHex/Makefile
index ad90d1b45a8b..098f80198265 100644
--- a/converters/p5-Convert-BinHex/Makefile
+++ b/converters/p5-Convert-BinHex/Makefile
@@ -19,9 +19,4 @@ TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		binhex.pl.1 \
-		debinhex.pl.1
-MAN3=		Convert::BinHex.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-BinHex/pkg-plist b/converters/p5-Convert-BinHex/pkg-plist
index 648cff813b8e..5497a0fe2f10 100644
--- a/converters/p5-Convert-BinHex/pkg-plist
+++ b/converters/p5-Convert-BinHex/pkg-plist
@@ -1,7 +1,10 @@
 bin/binhex.pl
 bin/debinhex.pl
+%%PERL5_MAN3%%/Convert::BinHex.3.gz
 %%SITE_PERL%%/Convert/BinHex.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex/.packlist
+man/man1/binhex.pl.1.gz
+man/man1/debinhex.pl.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex
-@dirrmtry %%SITE_PERL%%/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-Binary-C/Makefile b/converters/p5-Convert-Binary-C/Makefile
index 82467e0deb0b..4081add03006 100644
--- a/converters/p5-Convert-Binary-C/Makefile
+++ b/converters/p5-Convert-Binary-C/Makefile
@@ -18,8 +18,4 @@ MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		ccconfig.1
-MAN3=		Convert::Binary::C.3 Convert::Binary::C::Cached.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-Binary-C/pkg-plist b/converters/p5-Convert-Binary-C/pkg-plist
index 57805048b5cc..e3ddf78f9864 100644
--- a/converters/p5-Convert-Binary-C/pkg-plist
+++ b/converters/p5-Convert-Binary-C/pkg-plist
@@ -1,12 +1,15 @@
 bin/ccconfig
+%%PERL5_MAN3%%/Convert::Binary::C.3.gz
+%%PERL5_MAN3%%/Convert::Binary::C::Cached.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C/Cached.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/C.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/C.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C
+man/man1/ccconfig.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
diff --git a/converters/p5-Convert-IBM390/Makefile b/converters/p5-Convert-IBM390/Makefile
index d9308d27610e..abed2e4759e8 100644
--- a/converters/p5-Convert-IBM390/Makefile
+++ b/converters/p5-Convert-IBM390/Makefile
@@ -13,32 +13,4 @@ COMMENT=	Functions for manipulating mainframe data
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Convert::IBM390.3 \
-	Convert::IBM390::CP00037.3 \
-	Convert::IBM390::CP00273.3 \
-	Convert::IBM390::CP00275.3 \
-	Convert::IBM390::CP00277.3 \
-	Convert::IBM390::CP00278.3 \
-	Convert::IBM390::CP00280.3 \
-	Convert::IBM390::CP00281.3 \
-	Convert::IBM390::CP00282.3 \
-	Convert::IBM390::CP00284.3 \
-	Convert::IBM390::CP00285.3 \
-	Convert::IBM390::CP00297.3 \
-	Convert::IBM390::CP00500.3 \
-	Convert::IBM390::CP00871.3 \
-	Convert::IBM390::CP01047.3 \
-	Convert::IBM390::CP01140.3 \
-	Convert::IBM390::CP01141.3 \
-	Convert::IBM390::CP01142.3 \
-	Convert::IBM390::CP01143.3 \
-	Convert::IBM390::CP01144.3 \
-	Convert::IBM390::CP01145.3 \
-	Convert::IBM390::CP01146.3 \
-	Convert::IBM390::CP01147.3 \
-	Convert::IBM390::CP01148.3 \
-	Convert::IBM390::CP01149.3
-	
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-IBM390/pkg-plist b/converters/p5-Convert-IBM390/pkg-plist
index 42a1ae4d196c..a7b423a81535 100644
--- a/converters/p5-Convert-IBM390/pkg-plist
+++ b/converters/p5-Convert-IBM390/pkg-plist
@@ -1,3 +1,28 @@
+%%PERL5_MAN3%%/Convert::IBM390.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00037.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00273.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00275.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00277.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00278.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00280.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00281.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00282.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00284.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00285.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00297.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00500.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP00871.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01047.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01140.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01141.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01142.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01143.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01144.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01145.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01146.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01147.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01148.3.gz
+%%PERL5_MAN3%%/Convert::IBM390::CP01149.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/IBM390/CP00037.pm
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index f2d483f00b45..f9a1ad78591f 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to convert between ASCII and Morse codes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::Morse.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist
index 0a3a5c62d38b..ab1b567ecd6b 100644
--- a/converters/p5-Convert-Morse/pkg-plist
+++ b/converters/p5-Convert-Morse/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Convert::Morse.3.gz
 %%SITE_PERL%%/Convert/Morse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index cd2071271415..bba18b2607ea 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::PEM.3 Convert::PEM::CBC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-PEM/pkg-plist b/converters/p5-Convert-PEM/pkg-plist
index 7fb99b11fda9..e0a5b8394308 100644
--- a/converters/p5-Convert-PEM/pkg-plist
+++ b/converters/p5-Convert-PEM/pkg-plist
@@ -1,5 +1,9 @@
+%%PERL5_MAN3%%/Convert::PEM.3.gz
+%%PERL5_MAN3%%/Convert::PEM::CBC.3.gz
 %%SITE_PERL%%/Convert/PEM.pm
 %%SITE_PERL%%/Convert/PEM/CBC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
-@dirrm %%SITE_PERL%%/Convert/PEM
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrm %%SITE_PERL%%/Convert/PEM
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 5fe655050978..8c3c6865ccad 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::TNEF.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-TNEF/pkg-plist b/converters/p5-Convert-TNEF/pkg-plist
index e04fcc990b72..e636200750a8 100644
--- a/converters/p5-Convert-TNEF/pkg-plist
+++ b/converters/p5-Convert-TNEF/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Convert::TNEF.3.gz
 %%SITE_PERL%%/Convert/TNEF.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF
-@dirrmtry %%SITE_PERL%%/Convert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 0a87dea63292..46382d57c857 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -16,16 +16,12 @@ COMMENT=	Perl5 interface to the uulib library (a.k.a. uudeview/uuenview)
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Convert::UUlib.3
-NO_STAGE=	yes
-
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-UUlib/pkg-plist b/converters/p5-Convert-UUlib/pkg-plist
index 13ad94957684..a75fb40e43f4 100644
--- a/converters/p5-Convert-UUlib/pkg-plist
+++ b/converters/p5-Convert-UUlib/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Convert::UUlib.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Convert/UUlib.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.bs
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 3f9aeb81a310..2054b9c146ec 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -15,8 +15,4 @@ COMMENT=	Tools for dealing with Czech encodings in Perl
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		cssort.1 cstocs.1 dbfcstocs.1
-MAN3=		Cz::Cstocs.3 Cz::Sort.3 Cz::Time.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index 3a5be7a06eda..b81766b7bdd1 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -1,7 +1,11 @@
 bin/cssort
 bin/cstocs
 bin/dbfcstocs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz/.packlist
+%%PERL5_MAN3%%/Cz::Cstocs.3.gz
+%%PERL5_MAN3%%/Cz::Sort.3.gz
+%%PERL5_MAN3%%/Cz::Time.3.gz
+%%SITE_PERL%%/Cz/Cstocs.pm
+%%SITE_PERL%%/Cz/Cstocs/Getopt.pm
 %%SITE_PERL%%/Cz/Cstocs/enc/1250.enc
 %%SITE_PERL%%/Cz/Cstocs/enc/1252.enc
 %%SITE_PERL%%/Cz/Cstocs/enc/accent
@@ -17,13 +21,15 @@ bin/dbfcstocs
 %%SITE_PERL%%/Cz/Cstocs/enc/pc2.enc
 %%SITE_PERL%%/Cz/Cstocs/enc/pc2a.enc
 %%SITE_PERL%%/Cz/Cstocs/enc/tex.enc
-%%SITE_PERL%%/Cz/Cstocs/enc/vga.enc
 %%SITE_PERL%%/Cz/Cstocs/enc/utf8.enc
-%%SITE_PERL%%/Cz/Cstocs/Getopt.pm
-%%SITE_PERL%%/Cz/Cstocs.pm
+%%SITE_PERL%%/Cz/Cstocs/enc/vga.enc
 %%SITE_PERL%%/Cz/Sort.pm
 %%SITE_PERL%%/Cz/Time.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz/.packlist
+man/man1/cssort.1.gz
+man/man1/cstocs.1.gz
+man/man1/dbfcstocs.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz
 @dirrm %%SITE_PERL%%/Cz/Cstocs/enc
 @dirrm %%SITE_PERL%%/Cz/Cstocs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz
-@dirrmtry %%SITE_PERL%%/Cz
+@dirrm %%SITE_PERL%%/Cz
diff --git a/converters/p5-Encode-Detect/Makefile b/converters/p5-Encode-Detect/Makefile
index 4a31c8757c62..022633286803 100644
--- a/converters/p5-Encode-Detect/Makefile
+++ b/converters/p5-Encode-Detect/Makefile
@@ -16,7 +16,4 @@ BUILD_DEPENDS+=	p5-ExtUtils-CBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Encode::Detect.3 Encode::Detect::Detector.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Encode-Detect/pkg-plist b/converters/p5-Encode-Detect/pkg-plist
index edc89b1a431f..809a43a85d78 100644
--- a/converters/p5-Encode-Detect/pkg-plist
+++ b/converters/p5-Encode-Detect/pkg-plist
@@ -1,9 +1,11 @@
+%%PERL5_MAN3%%/Encode::Detect.3.gz
+%%PERL5_MAN3%%/Encode::Detect::Detector.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect/Detector.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/Detector/Detector.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/Detector/Detector.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/Detector
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect/Detector
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Detect
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Detect
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/converters/p5-Encode-IMAPUTF7/Makefile b/converters/p5-Encode-IMAPUTF7/Makefile
index 912b1296a177..6f72a9418791 100644
--- a/converters/p5-Encode-IMAPUTF7/Makefile
+++ b/converters/p5-Encode-IMAPUTF7/Makefile
@@ -10,13 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Modification of UTF-7 encoding for IMAP
 
-BUILD_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Encode::IMAPUTF7.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Encode-IMAPUTF7/pkg-plist b/converters/p5-Encode-IMAPUTF7/pkg-plist
index 0122116cd30a..557535e54720 100644
--- a/converters/p5-Encode-IMAPUTF7/pkg-plist
+++ b/converters/p5-Encode-IMAPUTF7/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/IMAPUTF7/.packlist
+%%PERL5_MAN3%%/Encode::IMAPUTF7.3.gz
 %%SITE_PERL%%/Encode/IMAPUTF7.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/IMAPUTF7
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/IMAPUTF7/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/IMAPUTF7
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
 @dirrmtry %%SITE_PERL%%/Encode
diff --git a/converters/p5-Format-Human-Bytes/Makefile b/converters/p5-Format-Human-Bytes/Makefile
index dc26ab473f96..67822ed2e316 100644
--- a/converters/p5-Format-Human-Bytes/Makefile
+++ b/converters/p5-Format-Human-Bytes/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module to format a bytecount and make it human readable
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Format::Human::Bytes.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Format-Human-Bytes/pkg-plist b/converters/p5-Format-Human-Bytes/pkg-plist
index c5c48bf9637e..17db829fc372 100644
--- a/converters/p5-Format-Human-Bytes/pkg-plist
+++ b/converters/p5-Format-Human-Bytes/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Format::Human::Bytes.3.gz
 %%SITE_PERL%%/Format/Human/Bytes.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human/Bytes/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human/Bytes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human/Bytes
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format/Human
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Format
-@dirrmtry %%SITE_PERL%%/Format/Human
+@dirrm %%SITE_PERL%%/Format/Human
 @dirrmtry %%SITE_PERL%%/Format
diff --git a/converters/p5-JSON-Any/Makefile b/converters/p5-JSON-Any/Makefile
index 927c6dab63b3..7c47e9b2d087 100644
--- a/converters/p5-JSON-Any/Makefile
+++ b/converters/p5-JSON-Any/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-JSON>=2.02:${PORTSDIR}/converters/p5-JSON
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		JSON::Any.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-JSON-Any/pkg-plist b/converters/p5-JSON-Any/pkg-plist
index 269e2ca9985c..da8e097a1735 100644
--- a/converters/p5-JSON-Any/pkg-plist
+++ b/converters/p5-JSON-Any/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/JSON::Any.3.gz
 %%SITE_PERL%%/JSON/Any.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Any/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Any
diff --git a/converters/p5-JSON-DWIW/Makefile b/converters/p5-JSON-DWIW/Makefile
index 5ca3be6a4b9a..e50ce92d1de5 100644
--- a/converters/p5-JSON-DWIW/Makefile
+++ b/converters/p5-JSON-DWIW/Makefile
@@ -10,10 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	JSON converter that Does What I Want
 
-MAN3=		JSON::DWIW.3 JSON::DWIW::Boolean.3 JSON::DWIW::Changes.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-JSON-DWIW/pkg-plist b/converters/p5-JSON-DWIW/pkg-plist
index 4a8c713a7e03..5c6161cf27c3 100644
--- a/converters/p5-JSON-DWIW/pkg-plist
+++ b/converters/p5-JSON-DWIW/pkg-plist
@@ -1,10 +1,13 @@
+%%PERL5_MAN3%%/JSON::DWIW.3.gz
+%%PERL5_MAN3%%/JSON::DWIW::Boolean.3.gz
+%%PERL5_MAN3%%/JSON::DWIW::Changes.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW/Boolean.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW/Changes.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW/DWIW.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW/DWIW.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/DWIW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON/
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/JSON/DWIW
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
diff --git a/converters/p5-JSON-XS/Makefile b/converters/p5-JSON-XS/Makefile
index 2cf6cd64dffb..36f37f58c463 100644
--- a/converters/p5-JSON-XS/Makefile
+++ b/converters/p5-JSON-XS/Makefile
@@ -16,10 +16,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		json_xs.1
-MAN3=		JSON::XS.3 JSON::XS::Boolean.3
-
 PORTSCOUT=	skipv:2.232
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-JSON-XS/pkg-plist b/converters/p5-JSON-XS/pkg-plist
index 12203963624f..59841e2437fa 100644
--- a/converters/p5-JSON-XS/pkg-plist
+++ b/converters/p5-JSON-XS/pkg-plist
@@ -1,10 +1,13 @@
 bin/json_xs
+%%PERL5_MAN3%%/JSON::XS.3.gz
+%%PERL5_MAN3%%/JSON::XS::Boolean.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS/Boolean.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS/XS.so
+man/man1/json_xs.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/JSON/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index cae02e15260f..bf9949b5c69d 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Perl5 module for Base64 and Quoted-Printable encodings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		MIME::Base64.3 \
-		MIME::QuotedPrint.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-MIME-Base64/pkg-plist b/converters/p5-MIME-Base64/pkg-plist
index b05f9c28a6cf..92f758a4baed 100644
--- a/converters/p5-MIME-Base64/pkg-plist
+++ b/converters/p5-MIME-Base64/pkg-plist
@@ -1,8 +1,10 @@
+%%PERL5_MAN3%%/MIME::Base64.3.gz
+%%PERL5_MAN3%%/MIME::QuotedPrint.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Base64.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/Base64.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64/Base64.so
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Base64.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
diff --git a/converters/p5-String-Multibyte/Makefile b/converters/p5-String-Multibyte/Makefile
index 1fab2359d1f6..97b06321b043 100644
--- a/converters/p5-String-Multibyte/Makefile
+++ b/converters/p5-String-Multibyte/Makefile
@@ -17,25 +17,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		String::Multibyte.3 \
-		String::Multibyte::Big5.3 \
-		String::Multibyte::Big5Plus.3 \
-		String::Multibyte::Bytes.3 \
-		String::Multibyte::EUC.3 \
-		String::Multibyte::EUC_JP.3 \
-		String::Multibyte::EUC_TW.3 \
-		String::Multibyte::GB18030.3 \
-		String::Multibyte::GBK.3 \
-		String::Multibyte::Grapheme.3 \
-		String::Multibyte::Johab.3 \
-		String::Multibyte::ShiftJIS.3 \
-		String::Multibyte::UHC.3 \
-		String::Multibyte::UTF16BE.3 \
-		String::Multibyte::UTF16LE.3 \
-		String::Multibyte::UTF32BE.3 \
-		String::Multibyte::UTF32LE.3 \
-		String::Multibyte::UTF8.3 \
-		String::Multibyte::Unicode.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-String-Multibyte/pkg-plist b/converters/p5-String-Multibyte/pkg-plist
index 9c503ea78720..0901069a0a4c 100644
--- a/converters/p5-String-Multibyte/pkg-plist
+++ b/converters/p5-String-Multibyte/pkg-plist
@@ -1,24 +1,43 @@
-%%SITE_PERL%%/String/Multibyte/Unicode.pm
-%%SITE_PERL%%/String/Multibyte/UTF8.pm
-%%SITE_PERL%%/String/Multibyte/UTF32LE.pm
-%%SITE_PERL%%/String/Multibyte/UTF32BE.pm
-%%SITE_PERL%%/String/Multibyte/UTF16LE.pm
-%%SITE_PERL%%/String/Multibyte/UTF16BE.pm
-%%SITE_PERL%%/String/Multibyte/UHC.pm
-%%SITE_PERL%%/String/Multibyte/ShiftJIS.pm
-%%SITE_PERL%%/String/Multibyte/Johab.pm
-%%SITE_PERL%%/String/Multibyte/Grapheme.pm
-%%SITE_PERL%%/String/Multibyte/GBK.pm
-%%SITE_PERL%%/String/Multibyte/GB18030.pm
-%%SITE_PERL%%/String/Multibyte/EUC_TW.pm
-%%SITE_PERL%%/String/Multibyte/EUC_JP.pm
-%%SITE_PERL%%/String/Multibyte/EUC.pm
-%%SITE_PERL%%/String/Multibyte/Bytes.pm
-%%SITE_PERL%%/String/Multibyte/Big5Plus.pm
-%%SITE_PERL%%/String/Multibyte/Big5.pm
+%%PERL5_MAN3%%/String::Multibyte.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Big5.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Big5Plus.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Bytes.3.gz
+%%PERL5_MAN3%%/String::Multibyte::EUC.3.gz
+%%PERL5_MAN3%%/String::Multibyte::EUC_JP.3.gz
+%%PERL5_MAN3%%/String::Multibyte::EUC_TW.3.gz
+%%PERL5_MAN3%%/String::Multibyte::GB18030.3.gz
+%%PERL5_MAN3%%/String::Multibyte::GBK.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Grapheme.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Johab.3.gz
+%%PERL5_MAN3%%/String::Multibyte::ShiftJIS.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UHC.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UTF16BE.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UTF16LE.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UTF32BE.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UTF32LE.3.gz
+%%PERL5_MAN3%%/String::Multibyte::UTF8.3.gz
+%%PERL5_MAN3%%/String::Multibyte::Unicode.3.gz
 %%SITE_PERL%%/String/Multibyte.pm
+%%SITE_PERL%%/String/Multibyte/Big5.pm
+%%SITE_PERL%%/String/Multibyte/Big5Plus.pm
+%%SITE_PERL%%/String/Multibyte/Bytes.pm
+%%SITE_PERL%%/String/Multibyte/EUC.pm
+%%SITE_PERL%%/String/Multibyte/EUC_JP.pm
+%%SITE_PERL%%/String/Multibyte/EUC_TW.pm
+%%SITE_PERL%%/String/Multibyte/GB18030.pm
+%%SITE_PERL%%/String/Multibyte/GBK.pm
+%%SITE_PERL%%/String/Multibyte/Grapheme.pm
+%%SITE_PERL%%/String/Multibyte/Johab.pm
+%%SITE_PERL%%/String/Multibyte/ShiftJIS.pm
+%%SITE_PERL%%/String/Multibyte/UHC.pm
+%%SITE_PERL%%/String/Multibyte/UTF16BE.pm
+%%SITE_PERL%%/String/Multibyte/UTF16LE.pm
+%%SITE_PERL%%/String/Multibyte/UTF32BE.pm
+%%SITE_PERL%%/String/Multibyte/UTF32LE.pm
+%%SITE_PERL%%/String/Multibyte/UTF8.pm
+%%SITE_PERL%%/String/Multibyte/Unicode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte/.packlist
-@dirrmtry %%SITE_PERL%%/String/Multibyte
-@dirrmtry %%SITE_PERL%%/String
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrm %%SITE_PERL%%/String/Multibyte
+@dirrmtry %%SITE_PERL%%/String
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 379bee1369b5..68f101eee193 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -15,7 +15,4 @@ USE_PERL5=	configure
 CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 
-MAN3=		Text::Iconv.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index d7c708afb917..7d1d9bdc3163 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Text::Iconv.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/Iconv.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index d5fa81e24a68..a70dee288c1a 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -21,10 +21,7 @@ RUN_DEPENDS=	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::IMAPUtf7.3
-
 post-extract:	# breaks non-root build otherwise
 	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} a+rx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-IMAPUtf7/pkg-plist b/converters/p5-Unicode-IMAPUtf7/pkg-plist
index 1119a06959ce..ceb5696e5f45 100644
--- a/converters/p5-Unicode-IMAPUtf7/pkg-plist
+++ b/converters/p5-Unicode-IMAPUtf7/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Unicode::IMAPUtf7.3.gz
 %%SITE_PERL%%/Unicode/IMAPUtf7.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
 @dirrmtry %%SITE_PERL%%/Unicode
diff --git a/converters/p5-Unicode-Map/Makefile b/converters/p5-Unicode-Map/Makefile
index 724630fafe5f..12ba83dc980f 100644
--- a/converters/p5-Unicode-Map/Makefile
+++ b/converters/p5-Unicode-Map/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Perl class that converts strings to/from 2-byte Unicode UCS2 format
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		map.1 mkmapfile.1
-MAN3=		Unicode::Map.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index c7f5470d1620..105ef44f36e2 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -1,7 +1,8 @@
-bin/mirrorMappings
-bin/mkmapfile
 bin/map
+bin/mirrorMappings
 bin/mkCSGB2312
+bin/mkmapfile
+%%PERL5_MAN3%%/Unicode::Map.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
@@ -96,21 +97,23 @@ bin/mkCSGB2312
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map
+man/man1/map.1.gz
+man/man1/mkmapfile.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index 44f8765a263a..dee476276082 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -16,8 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		umap.1
-MAN3=		Unicode::Map8.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index 492a77388df1..9cc1882ca4bb 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -1,4 +1,5 @@
 bin/umap
+%%PERL5_MAN3%%/Unicode::Map8.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ANSI_X3.110-1983.bin
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps/ANSI_X3.4-1968.bin
@@ -184,8 +185,9 @@ bin/umap
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8
+man/man1/umap.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index a434b98f6a99..cc6287b45007 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::MapUTF8.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-MapUTF8/pkg-plist b/converters/p5-Unicode-MapUTF8/pkg-plist
index a97f13bb1132..4f0ad464d598 100644
--- a/converters/p5-Unicode-MapUTF8/pkg-plist
+++ b/converters/p5-Unicode-MapUTF8/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Unicode::MapUTF8.3.gz
 %%SITE_PERL%%/Unicode/MapUTF8.pm
 %%SITE_PERL%%/Unicode/MapUTF8.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index 983ef9421a2a..b107a489c9b2 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -13,7 +13,4 @@ COMMENT=	These are experimental Perl5 modules to handle various Unicode issues
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::CharName.3 Unicode::String.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-String/pkg-plist b/converters/p5-Unicode-String/pkg-plist
index 1e5ed9fe970b..72604c71d407 100644
--- a/converters/p5-Unicode-String/pkg-plist
+++ b/converters/p5-Unicode-String/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Unicode::CharName.3.gz
+%%PERL5_MAN3%%/Unicode::String.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CharName.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/String.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/.packlist
diff --git a/converters/p5-Unicode-Stringprep/Makefile b/converters/p5-Unicode-Stringprep/Makefile
index 896157c2bad8..333d680b08a2 100644
--- a/converters/p5-Unicode-Stringprep/Makefile
+++ b/converters/p5-Unicode-Stringprep/Makefile
@@ -20,12 +20,4 @@ TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::Stringprep.3 \
-		Unicode::Stringprep::BiDi.3 \
-		Unicode::Stringprep::Mapping.3 \
-		Unicode::Stringprep::Prohibited.3 \
-		Unicode::Stringprep::Unassigned.3 \
-		Unicode::Stringprep::_Common.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-Stringprep/pkg-plist b/converters/p5-Unicode-Stringprep/pkg-plist
index 4ddbe551e1bd..89e1e5575624 100644
--- a/converters/p5-Unicode-Stringprep/pkg-plist
+++ b/converters/p5-Unicode-Stringprep/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/Unicode::Stringprep.3.gz
+%%PERL5_MAN3%%/Unicode::Stringprep::BiDi.3.gz
+%%PERL5_MAN3%%/Unicode::Stringprep::Mapping.3.gz
+%%PERL5_MAN3%%/Unicode::Stringprep::Prohibited.3.gz
+%%PERL5_MAN3%%/Unicode::Stringprep::Unassigned.3.gz
+%%PERL5_MAN3%%/Unicode::Stringprep::_Common.3.gz
 %%SITE_PERL%%/Unicode/Stringprep.pm
 %%SITE_PERL%%/Unicode/Stringprep/BiDi.pm
 %%SITE_PERL%%/Unicode/Stringprep/Mapping.pm
diff --git a/converters/p5-Unicode-UTF8simple/Makefile b/converters/p5-Unicode-UTF8simple/Makefile
index 208a0d6d1ae7..1e6fd55356c9 100644
--- a/converters/p5-Unicode-UTF8simple/Makefile
+++ b/converters/p5-Unicode-UTF8simple/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Conversions to/from UTF-8 from/to charactersets
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Unicode::UTF8simple.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-UTF8simple/pkg-plist b/converters/p5-Unicode-UTF8simple/pkg-plist
index 776d994d4f26..17a55fa411d3 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-plist
+++ b/converters/p5-Unicode-UTF8simple/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Unicode::UTF8simple.3.gz
 %%SITE_PERL%%/Unicode/UTF8simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index b2390754b6f4..38a72b1aea81 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -12,12 +12,9 @@ COMMENT=	Convert between XML and WBXML using libwbxml2
 
 LIB_DEPENDS=	wbxml2:${PORTSDIR}/textproc/wbxml2
 
-MAN3=	XML::WBXML.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,-I.,-I. -I${LOCALBASE}/include,' ${WRKSRC}/Makefile.PL
 
diff --git a/converters/p5-XML-WBXML/pkg-plist b/converters/p5-XML-WBXML/pkg-plist
index ad34c982539f..68be2a3ab3ec 100644
--- a/converters/p5-XML-WBXML/pkg-plist
+++ b/converters/p5-XML-WBXML/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/XML::WBXML.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/WBXML.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/WBXML/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/WBXML/WBXML.bs