Support STAGEDIR.

48 files changed, 203 insertions, 193 deletions

diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index fca98a31d68c..7d77052a0ed5 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl5 module to parse BIND 8 configuration files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	BIND::Conf_Parser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-BIND-Conf_Parser/pkg-plist b/dns/p5-BIND-Conf_Parser/pkg-plist
index 3738883e119e..140003a00565 100644
--- a/dns/p5-BIND-Conf_Parser/pkg-plist
+++ b/dns/p5-BIND-Conf_Parser/pkg-plist
@@ -1,4 +1,5 @@
+%%PERL5_MAN3%%/BIND::Conf_Parser.3.gz
 %%SITE_PERL%%/BIND/Conf_Parser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser/.packlist
-@dirrm %%SITE_PERL%%/BIND
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser
+@dirrmtry %%SITE_PERL%%/BIND
diff --git a/dns/p5-BIND-Config-Parser/Makefile b/dns/p5-BIND-Config-Parser/Makefile
index f27436f11ca4..68a1216481b5 100644
--- a/dns/p5-BIND-Config-Parser/Makefile
+++ b/dns/p5-BIND-Config-Parser/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	BIND::Config::Parser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-BIND-Config-Parser/pkg-plist b/dns/p5-BIND-Config-Parser/pkg-plist
index 5d6407a29666..46bb48e6640d 100644
--- a/dns/p5-BIND-Config-Parser/pkg-plist
+++ b/dns/p5-BIND-Config-Parser/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/BIND::Config::Parser.3.gz
 %%SITE_PERL%%/BIND/Config/Parser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND/Config/Parser/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BIND/Config/Parser
diff --git a/dns/p5-DNS-Config/Makefile b/dns/p5-DNS-Config/Makefile
index 91aab7b3ff06..acde5d4aec7a 100644
--- a/dns/p5-DNS-Config/Makefile
+++ b/dns/p5-DNS-Config/Makefile
@@ -14,7 +14,6 @@ COMMENT=	DNS::Config is set of perl modules for name service configurations
 USES=		perl5
 USE_PERL5=	configure patch
 
-NO_STAGE=	yes
 post-patch:
 	${FIND} ${WRKSRC} -name '*.pm' -o -name '*.t' -o -name '*.PL' | \
 	${XARGS} ${PERL} -pi -e '$$_="" if /^use 5/;' \
@@ -22,8 +21,8 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/p5-DNS-Config/pkg-plist b/dns/p5-DNS-Config/pkg-plist
index 45abd59d304f..1a34c8e0f272 100644
--- a/dns/p5-DNS-Config/pkg-plist
+++ b/dns/p5-DNS-Config/pkg-plist
@@ -10,8 +10,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Config/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Config
-@dirrm %%SITE_PERL%%/DNS/Config/Statement
-@dirrm %%SITE_PERL%%/DNS/Config/File
-@dirrm %%SITE_PERL%%/DNS/Config
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Config
+@dirrmtry %%SITE_PERL%%/DNS/Config/Statement
+@dirrmtry %%SITE_PERL%%/DNS/Config/File
+@dirrmtry %%SITE_PERL%%/DNS/Config
 @dirrmtry %%SITE_PERL%%/DNS
diff --git a/dns/p5-DNS-EasyDNS/Makefile b/dns/p5-DNS-EasyDNS/Makefile
index e7b858b5f74e..57bfaf437fca 100644
--- a/dns/p5-DNS-EasyDNS/Makefile
+++ b/dns/p5-DNS-EasyDNS/Makefile
@@ -10,20 +10,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Update your EasyDNS dynamic DNS entries
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	DNS::EasyDNS.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/p5-DNS-EasyDNS/pkg-plist b/dns/p5-DNS-EasyDNS/pkg-plist
index e4ce7de8e1f2..b1959ba0f5f4 100644
--- a/dns/p5-DNS-EasyDNS/pkg-plist
+++ b/dns/p5-DNS-EasyDNS/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/DNS::EasyDNS.3.gz
 %%SITE_PERL%%/DNS/EasyDNS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/EasyDNS/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/easydns-by-interface
 %%PORTDOCS%%%%EXAMPLESDIR%%/easydns-from-router
 %%PORTDOCS%%%%EXAMPLESDIR%%/easydns-simple
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/EasyDNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/EasyDNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS
 @dirrmtry %%SITE_PERL%%/DNS
diff --git a/dns/p5-DNS-Zone/Makefile b/dns/p5-DNS-Zone/Makefile
index 78bb88caeb44..4248ad468d31 100644
--- a/dns/p5-DNS-Zone/Makefile
+++ b/dns/p5-DNS-Zone/Makefile
@@ -14,7 +14,6 @@ COMMENT=	DNS::Zone is set of perl modules for name service zone files
 USES=		perl5
 USE_PERL5=	configure patch
 
-NO_STAGE=	yes
 post-patch:
 	${FIND} ${WRKSRC} -name '*.pm' -o -name '*.t' -o -name '*.PL' | \
 	${XARGS} ${PERL} -pi -e '$$_="" if /^use 5/;' \
@@ -22,8 +21,8 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/p5-DNS-Zone/pkg-plist b/dns/p5-DNS-Zone/pkg-plist
index 781d1a1ce93f..573f28e8c623 100644
--- a/dns/p5-DNS-Zone/pkg-plist
+++ b/dns/p5-DNS-Zone/pkg-plist
@@ -6,7 +6,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Zone/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Zone
-@dirrm %%SITE_PERL%%/DNS/Zone/File
-@dirrm %%SITE_PERL%%/DNS/Zone
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Zone
+@dirrmtry %%SITE_PERL%%/DNS/Zone/File
+@dirrmtry %%SITE_PERL%%/DNS/Zone
 @dirrmtry %%SITE_PERL%%/DNS
diff --git a/dns/p5-DNS-ZoneParse/Makefile b/dns/p5-DNS-ZoneParse/Makefile
index 0e7461016dfd..a31ba4a74f4b 100644
--- a/dns/p5-DNS-ZoneParse/Makefile
+++ b/dns/p5-DNS-ZoneParse/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Parse and manipulate DNS Zone Files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		DNS::ZoneParse.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-DNS-ZoneParse/pkg-plist b/dns/p5-DNS-ZoneParse/pkg-plist
index 94ecec46dabe..e0fb2400e4ac 100644
--- a/dns/p5-DNS-ZoneParse/pkg-plist
+++ b/dns/p5-DNS-ZoneParse/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/DNS::ZoneParse.3.gz
 %%SITE_PERL%%/DNS/ZoneParse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/ZoneParse/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/ZoneParse
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/ZoneParse
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS
 @dirrmtry %%SITE_PERL%%/DNS
diff --git a/dns/p5-Net-Bonjour/Makefile b/dns/p5-Net-Bonjour/Makefile
index 24fa625e5c08..e90b5a8fb749 100644
--- a/dns/p5-Net-Bonjour/Makefile
+++ b/dns/p5-Net-Bonjour/Makefile
@@ -13,19 +13,12 @@ COMMENT=	Module for DNS service discovery
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-USES=		perl5
-USE_PERL5=	configure
-
 BUILD_DEPENDS=	p5-Net-DNS>=0.5:${PORTSDIR}/dns/p5-Net-DNS
-
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Net::Rendezvous.3        \
-	Net::Bonjour::Entry.3    \
-	Net::Rendezvous::Entry.3 \
-	Net::Bonjour.3
+USES=		perl5
+USE_PERL5=	configure
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's/my $$ans = .*/my $$ans = "n";/g' ${WRKSRC}/Makefile.PL
 
diff --git a/dns/p5-Net-Bonjour/pkg-plist b/dns/p5-Net-Bonjour/pkg-plist
index f2b9d5f34864..5dbfcaa0a707 100644
--- a/dns/p5-Net-Bonjour/pkg-plist
+++ b/dns/p5-Net-Bonjour/pkg-plist
@@ -1,9 +1,14 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Bonjour/.packlist
+%%PERL5_MAN3%%/Net::Bonjour.3.gz
+%%PERL5_MAN3%%/Net::Bonjour::Entry.3.gz
+%%PERL5_MAN3%%/Net::Rendezvous.3.gz
+%%PERL5_MAN3%%/Net::Rendezvous::Entry.3.gz
 %%SITE_PERL%%/Net/Bonjour.pm
 %%SITE_PERL%%/Net/Bonjour/Entry.pm
-%%SITE_PERL%%/Net/Rendezvous/Entry.pm
 %%SITE_PERL%%/Net/Rendezvous.pm
+%%SITE_PERL%%/Net/Rendezvous/Entry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Bonjour/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Bonjour
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrmtry %%SITE_PERL%%/Net/Rendezvous
 @dirrmtry %%SITE_PERL%%/Net/Bonjour
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-DNS-Codes/Makefile b/dns/p5-Net-DNS-Codes/Makefile
index 6852b7853fb6..1220059c1121 100644
--- a/dns/p5-Net-DNS-Codes/Makefile
+++ b/dns/p5-Net-DNS-Codes/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Collection of C library DNS codes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::DNS::Codes.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-Codes/pkg-plist b/dns/p5-Net-DNS-Codes/pkg-plist
index ebf6f0962cfb..c3ce52ced179 100644
--- a/dns/p5-Net-DNS-Codes/pkg-plist
+++ b/dns/p5-Net-DNS-Codes/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Codes/.packlist
+%%PERL5_MAN3%%/Net::DNS::Codes.3.gz
 %%SITE_PERL%%/Net/DNS/Codes.pm
-@dirrmtry %%SITE_PERL%%/Net/DNS
-@dirrmtry %%SITE_PERL%%/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Codes/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Codes
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/DNS
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-DNS-Lite/Makefile b/dns/p5-Net-DNS-Lite/Makefile
index 38a0471ba736..32f0261653ed 100644
--- a/dns/p5-Net-DNS-Lite/Makefile
+++ b/dns/p5-Net-DNS-Lite/Makefile
@@ -21,7 +21,4 @@ TEST_DEPENDS=	p5-Cache-LRU>=0:${PORTSDIR}/devel/p5-Cache-LRU \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::DNS::Lite.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-Lite/pkg-plist b/dns/p5-Net-DNS-Lite/pkg-plist
index 03b442737ce2..9c53bbb3b081 100644
--- a/dns/p5-Net-DNS-Lite/pkg-plist
+++ b/dns/p5-Net-DNS-Lite/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Lite/.packlist
+%%PERL5_MAN3%%/Net::DNS::Lite.3.gz
 %%SITE_PERL%%/Net/DNS/Lite.pm
-@dirrmtry %%SITE_PERL%%/Net/DNS
-@dirrmtry %%SITE_PERL%%/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Lite/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/Lite
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/DNS
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index 8b210f23cf05..fa2878d168dd 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -23,12 +23,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::DNS::Keyset.3 Net::DNS::RR::DS.3 Net::DNS::RR::KEY.3 \
-		Net::DNS::RR::NXT.3 Net::DNS::RR::SIG.3 \
-		Net::DNS::SEC.3 Net::DNS::RR::DLV.3 \
-		Net::DNS::SEC::Private.3 Net::DNS::RR::RRSIG.3 \
-		Net::DNS::RR::NSEC.3 Net::DNS::RR::DNSKEY.3 \
-		Net::DNS::RR::NSEC3.3 Net::DNS::RR::NSEC3PARAM.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-SEC/pkg-plist b/dns/p5-Net-DNS-SEC/pkg-plist
index 378168d59f51..6f5e9acaf10e 100644
--- a/dns/p5-Net-DNS-SEC/pkg-plist
+++ b/dns/p5-Net-DNS-SEC/pkg-plist
@@ -1,3 +1,16 @@
+%%PERL5_MAN3%%/Net::DNS::Keyset.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::DLV.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::DNSKEY.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::DS.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::KEY.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NSEC.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NSEC3.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NSEC3PARAM.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NXT.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::RRSIG.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::SIG.3.gz
+%%PERL5_MAN3%%/Net::DNS::SEC.3.gz
+%%PERL5_MAN3%%/Net::DNS::SEC::Private.3.gz
 %%SITE_PERL%%/Net/DNS/Keyset.pm
 %%SITE_PERL%%/Net/DNS/RR/DLV.pm
 %%SITE_PERL%%/Net/DNS/RR/DNSKEY.pm
@@ -15,7 +28,7 @@
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/SEC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/DNS/SEC
+@dirrmtry %%SITE_PERL%%/Net/DNS/SEC
 @dirrmtry %%SITE_PERL%%/Net/DNS/RR
 @dirrmtry %%SITE_PERL%%/Net/DNS
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-DNS-ToolKit/Makefile b/dns/p5-Net-DNS-ToolKit/Makefile
index da3992ef3c3e..54fbc4fca22a 100644
--- a/dns/p5-Net-DNS-ToolKit/Makefile
+++ b/dns/p5-Net-DNS-ToolKit/Makefile
@@ -19,35 +19,4 @@ MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::DNS::ToolKit.3 \
-		Net::DNS::ToolKit::Debug.3 \
-		Net::DNS::ToolKit::Question.3 \
-		Net::DNS::ToolKit::RR.3 \
-		Net::DNS::ToolKit::RR::A.3 \
-		Net::DNS::ToolKit::RR::AAAA.3 \
-		Net::DNS::ToolKit::RR::AFSDB.3 \
-		Net::DNS::ToolKit::RR::CNAME.3 \
-		Net::DNS::ToolKit::RR::HINFO.3 \
-		Net::DNS::ToolKit::RR::ISDN.3 \
-		Net::DNS::ToolKit::RR::MB.3 \
-		Net::DNS::ToolKit::RR::MD.3 \
-		Net::DNS::ToolKit::RR::MF.3 \
-		Net::DNS::ToolKit::RR::MG.3 \
-		Net::DNS::ToolKit::RR::MINFO.3 \
-		Net::DNS::ToolKit::RR::MR.3 \
-		Net::DNS::ToolKit::RR::MX.3 \
-		Net::DNS::ToolKit::RR::NS.3 \
-		Net::DNS::ToolKit::RR::NULL.3 \
-		Net::DNS::ToolKit::RR::PTR.3 \
-		Net::DNS::ToolKit::RR::RP.3 \
-		Net::DNS::ToolKit::RR::RT.3 \
-		Net::DNS::ToolKit::RR::SOA.3 \
-		Net::DNS::ToolKit::RR::SRV.3 \
-		Net::DNS::ToolKit::RR::TXT.3 \
-		Net::DNS::ToolKit::RR::TYPE.3 \
-		Net::DNS::ToolKit::RR::Template.3 \
-		Net::DNS::ToolKit::RR::X25.3 \
-		Net::DNS::ToolKit::Utilities.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-ToolKit/pkg-plist b/dns/p5-Net-DNS-ToolKit/pkg-plist
index bdaedf3e893d..76688a730f70 100644
--- a/dns/p5-Net-DNS-ToolKit/pkg-plist
+++ b/dns/p5-Net-DNS-ToolKit/pkg-plist
@@ -1,3 +1,32 @@
+%%PERL5_MAN3%%/Net::DNS::ToolKit.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::Debug.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::Question.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::A.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::AAAA.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::AFSDB.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::CNAME.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::HINFO.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::ISDN.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MB.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MD.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MF.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MG.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MINFO.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MR.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::MX.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::NS.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::NULL.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::PTR.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::RP.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::RT.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::SOA.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::SRV.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::TXT.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::TYPE.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::Template.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::RR::X25.3.gz
+%%PERL5_MAN3%%/Net::DNS::ToolKit::Utilities.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/Debug.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ToolKit/Question.pm
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
index a403ff5b5b5d..e2bcc385cd6c 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Net::DNS::ZoneFile::Fast.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist b/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
index fdfc1d7cb749..8eee8852ef21 100644
--- a/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
+++ b/dns/p5-Net-DNS-ZoneFile-Fast/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/Net::DNS::ZoneFile::Fast.3.gz
 %%SITE_PERL%%/Net/DNS/ZoneFile/Fast.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/Fast/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/Fast
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/Fast
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
-@dirrm %%SITE_PERL%%/Net/DNS/ZoneFile
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/DNS/ZoneFile
 @dirrmtry %%SITE_PERL%%/Net/DNS
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 296fd027507d..a10e8ac6b906 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -22,33 +22,8 @@ USES=		perl5
 USE_PERL5=	configure
 DOCSDIR=	${PREFIX}/share/doc/p5-Net-DNS
 
-MAN3=		Net::DNS.3 Net::DNS::Domain.3 Net::DNS::DomainName.3 \
-		Net::DNS::FAQ.3 Net::DNS::Header.3 Net::DNS::Mailbox.3 \
-		Net::DNS::Nameserver.3 Net::DNS::Packet.3 \
-		Net::DNS::Parameters.3 Net::DNS::Question.3 Net::DNS::RR.3 \
-		Net::DNS::RR::A.3 Net::DNS::RR::AAAA.3 Net::DNS::RR::AFSDB.3 \
-		Net::DNS::RR::APL.3 Net::DNS::RR::CERT.3 Net::DNS::RR::CNAME.3 \
-		Net::DNS::RR::DHCID.3 Net::DNS::RR::DNAME.3 \
-		Net::DNS::RR::EID.3 Net::DNS::RR::HINFO.3 Net::DNS::RR::HIP.3 \
-		Net::DNS::RR::IPSECKEY.3 Net::DNS::RR::ISDN.3 \
-		Net::DNS::RR::KX.3 Net::DNS::RR::L32.3 Net::DNS::RR::L64.3 \
-		Net::DNS::RR::LOC.3 Net::DNS::RR::LP.3 Net::DNS::RR::MB.3 \
-		Net::DNS::RR::MG.3 Net::DNS::RR::MINFO.3 Net::DNS::RR::MR.3 \
-		Net::DNS::RR::MX.3 Net::DNS::RR::NAPTR.3 Net::DNS::RR::NID.3 \
-		Net::DNS::RR::NIMLOC.3 Net::DNS::RR::NS.3 Net::DNS::RR::NSAP.3 \
-		Net::DNS::RR::NULL.3 Net::DNS::RR::OPT.3 Net::DNS::RR::PTR.3 \
-		Net::DNS::RR::PX.3 Net::DNS::RR::RP.3 Net::DNS::RR::RT.3 \
-		Net::DNS::RR::SOA.3 Net::DNS::RR::SPF.3 Net::DNS::RR::SRV.3 \
-		Net::DNS::RR::SSHFP.3 Net::DNS::RR::TKEY.3 \
-		Net::DNS::RR::TLSA.3 Net::DNS::RR::TSIG.3 Net::DNS::RR::TXT.3 \
-		Net::DNS::RR::X25.3 Net::DNS::Resolver.3 \
-		Net::DNS::Resolver::Base.3 Net::DNS::Resolver::MSWin32.3 \
-		Net::DNS::Resolver::Recurse.3 Net::DNS::Resolver::UNIX.3 \
-		Net::DNS::Resolver::cygwin.3 Net::DNS::Resolver::os2.3 \
-		Net::DNS::Text.3 Net::DNS::Update.3 Net::DNS::ZoneFile.3
 PORTDOCS=	Changes README TODO
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDN}
@@ -63,8 +38,8 @@ RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS/pkg-plist b/dns/p5-Net-DNS/pkg-plist
index 4e5104360fbb..47dcd80eb923 100644
--- a/dns/p5-Net-DNS/pkg-plist
+++ b/dns/p5-Net-DNS/pkg-plist
@@ -1,3 +1,67 @@
+%%PERL5_MAN3%%/Net::DNS.3.gz
+%%PERL5_MAN3%%/Net::DNS::Domain.3.gz
+%%PERL5_MAN3%%/Net::DNS::DomainName.3.gz
+%%PERL5_MAN3%%/Net::DNS::FAQ.3.gz
+%%PERL5_MAN3%%/Net::DNS::Header.3.gz
+%%PERL5_MAN3%%/Net::DNS::Mailbox.3.gz
+%%PERL5_MAN3%%/Net::DNS::Nameserver.3.gz
+%%PERL5_MAN3%%/Net::DNS::Packet.3.gz
+%%PERL5_MAN3%%/Net::DNS::Parameters.3.gz
+%%PERL5_MAN3%%/Net::DNS::Question.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::A.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::AAAA.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::AFSDB.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::APL.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::CERT.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::CNAME.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::DHCID.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::DNAME.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::EID.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::HINFO.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::HIP.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::IPSECKEY.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::ISDN.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::KX.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::L32.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::L64.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::LOC.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::LP.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::MB.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::MG.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::MINFO.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::MR.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::MX.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NAPTR.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NID.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NIMLOC.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NS.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NSAP.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::NULL.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::OPT.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::PTR.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::PX.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::RP.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::RT.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::SOA.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::SPF.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::SRV.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::SSHFP.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::TKEY.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::TLSA.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::TSIG.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::TXT.3.gz
+%%PERL5_MAN3%%/Net::DNS::RR::X25.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::Base.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::MSWin32.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::Recurse.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::UNIX.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::cygwin.3.gz
+%%PERL5_MAN3%%/Net::DNS::Resolver::os2.3.gz
+%%PERL5_MAN3%%/Net::DNS::Text.3.gz
+%%PERL5_MAN3%%/Net::DNS::Update.3.gz
+%%PERL5_MAN3%%/Net::DNS::ZoneFile.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Domain.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/DomainName.pm
@@ -67,7 +131,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/DNS.so
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/Makefile b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
index d13f169849c6..ed460083e9a6 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/Makefile
+++ b/dns/p5-Net-DNSBL-MultiDaemon/Makefile
@@ -16,12 +16,9 @@ BUILD_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 		p5-Net-DNS-Codes>=0:${PORTSDIR}/dns/p5-Net-DNS-Codes \
 		p5-Net-DNS-ToolKit>=0:${PORTSDIR}/dns/p5-Net-DNS-ToolKit
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-				p5-File-SafeDO>=0:${PORTSDIR}/devel/p5-File-SafeDO
+		p5-File-SafeDO>=0:${PORTSDIR}/devel/p5-File-SafeDO
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::DNSBL::MultiDaemon.3 Net::DNSBL::Utilities.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist b/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
index 9ce1eb8290d2..1af982f53aee 100644
--- a/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
+++ b/dns/p5-Net-DNSBL-MultiDaemon/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/Net::DNSBL::MultiDaemon.3.gz
+%%PERL5_MAN3%%/Net::DNSBL::Utilities.3.gz
 %%SITE_PERL%%/Net/DNSBL/MultiDaemon.pm
 %%SITE_PERL%%/Net/DNSBL/Utilities.pm
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/A1271.al
@@ -7,8 +9,6 @@
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/A1275.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/A1276.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/A1277.al
-%%SITE_PERL%%/auto/Net/DNSBL/Utilities/setAUTH.al
-%%SITE_PERL%%/auto/Net/DNSBL/Utilities/setRA.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/_loadSocket.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/autosplit.ix
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/bystat.al
@@ -20,12 +20,16 @@
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/not_found.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/open_udpNB.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/s_response.al
+%%SITE_PERL%%/auto/Net/DNSBL/Utilities/setAUTH.al
+%%SITE_PERL%%/auto/Net/DNSBL/Utilities/setRA.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/statinit.al
 %%SITE_PERL%%/auto/Net/DNSBL/Utilities/write_stats.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL/MultiDaemon/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL/MultiDaemon
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL
-@dirrm %%SITE_PERL%%/auto/Net/DNSBL/Utilities
-@dirrm %%SITE_PERL%%/auto/Net/DNSBL
-@dirrm %%SITE_PERL%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/DNSBL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL/MultiDaemon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNSBL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/auto/Net/DNSBL/Utilities
+@dirrmtry %%SITE_PERL%%/auto/Net/DNSBL
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/DNSBL
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-Net-Domain-ExpireDate/Makefile b/dns/p5-Net-Domain-ExpireDate/Makefile
index c9325a0dba41..e0c0570b0cc3 100644
--- a/dns/p5-Net-Domain-ExpireDate/Makefile
+++ b/dns/p5-Net-Domain-ExpireDate/Makefile
@@ -12,12 +12,9 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module obtain expiration date of domain names
 
 BUILD_DEPENDS=	p5-Net-Whois-Raw>=0:${PORTSDIR}/net/p5-Net-Whois-Raw
-RUN_DEPENDS=	p5-Net-Whois-Raw>=0:${PORTSDIR}/net/p5-Net-Whois-Raw
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::Domain::ExpireDate.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-Domain-ExpireDate/pkg-plist b/dns/p5-Net-Domain-ExpireDate/pkg-plist
index db7a0ffdaf9b..bd1954f7bf85 100644
--- a/dns/p5-Net-Domain-ExpireDate/pkg-plist
+++ b/dns/p5-Net-Domain-ExpireDate/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/Net::Domain::ExpireDate.3.gz
 %%SITE_PERL%%/Net/Domain/ExpireDate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain/ExpireDate/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain/ExpireDate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain/ExpireDate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Domain
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrmtry %%SITE_PERL%%/Net/Domain
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index 9294191128cb..f94d22c088c6 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -17,7 +17,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS+=	--with-libidn=${PREFIX}/lib --with-libidn-inc=${PREFIX}/include
 
-MAN3=		Net::LibIDN.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-LibIDN/pkg-plist b/dns/p5-Net-LibIDN/pkg-plist
index 6af29b074a8e..43ca2c4acee2 100644
--- a/dns/p5-Net-LibIDN/pkg-plist
+++ b/dns/p5-Net-LibIDN/pkg-plist
@@ -1,8 +1,9 @@
+%%PERL5_MAN3%%/Net::LibIDN.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/LibIDN.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/LibIDN.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/LibIDN.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/dns/p5-Net-Nslookup/Makefile b/dns/p5-Net-Nslookup/Makefile
index 14cd1fbef34a..56abe3fc6c95 100644
--- a/dns/p5-Net-Nslookup/Makefile
+++ b/dns/p5-Net-Nslookup/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::Nslookup.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-Nslookup/pkg-plist b/dns/p5-Net-Nslookup/pkg-plist
index 195988c11302..1456a5b0cfef 100644
--- a/dns/p5-Net-Nslookup/pkg-plist
+++ b/dns/p5-Net-Nslookup/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Net::Nslookup.3.gz
 %%SITE_PERL%%/Net/Nslookup.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nslookup/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nslookup
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Nslookup
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
index 2f8cace0d392..9f102144732b 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Client::DNS::Recursive.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist b/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
index 3a1d4462f21a..53a4923da369 100644
--- a/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNS-Recursive/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/POE::Component::Client::DNS::Recursive.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNS/Recursive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS/Recursive/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS/Recursive
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index 571aa8916c1e..416cf0da25aa 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -19,7 +19,4 @@ TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Client::DNS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-POE-Component-Client-DNS/pkg-plist b/dns/p5-POE-Component-Client-DNS/pkg-plist
index 3bb3a862cb9e..6af693d4fa3f 100644
--- a/dns/p5-POE-Component-Client-DNS/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNS/pkg-plist
@@ -1,6 +1,7 @@
+%%PERL5_MAN3%%/POE::Component::Client::DNS.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/dns/p5-POE-Component-Client-DNSBL/Makefile b/dns/p5-POE-Component-Client-DNSBL/Makefile
index 80b14f5de497..742455a8c8f3 100644
--- a/dns/p5-POE-Component-Client-DNSBL/Makefile
+++ b/dns/p5-POE-Component-Client-DNSBL/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	POE::Component::Client::DNSBL.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-POE-Component-Client-DNSBL/pkg-plist b/dns/p5-POE-Component-Client-DNSBL/pkg-plist
index 531d1d364af9..527b8373f7cd 100644
--- a/dns/p5-POE-Component-Client-DNSBL/pkg-plist
+++ b/dns/p5-POE-Component-Client-DNSBL/pkg-plist
@@ -1,3 +1,10 @@
+%%PERL5_MAN3%%/POE::Component::Client::DNSBL.3.gz
 %%SITE_PERL%%/POE/Component/Client/DNSBL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNSBL/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/DNSBL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/dns/p5-POE-Component-Server-DNS/Makefile b/dns/p5-POE-Component-Server-DNS/Makefile
index a46460a06031..0bbe9fdd38d2 100644
--- a/dns/p5-POE-Component-Server-DNS/Makefile
+++ b/dns/p5-POE-Component-Server-DNS/Makefile
@@ -21,7 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		POE::Component::Server::DNS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-POE-Component-Server-DNS/pkg-plist b/dns/p5-POE-Component-Server-DNS/pkg-plist
index 6887dd29f31b..d105ed2d8c74 100644
--- a/dns/p5-POE-Component-Server-DNS/pkg-plist
+++ b/dns/p5-POE-Component-Server-DNS/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/DNS/.packlist
+%%PERL5_MAN3%%/POE::Component::Server::DNS.3.gz
 %%SITE_PERL%%/POE/Component/Server/DNS.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/DNS
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/DNS/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/dns/p5-Stanford-DNSserver/Makefile b/dns/p5-Stanford-DNSserver/Makefile
index 7db620d13d69..953f915612f4 100644
--- a/dns/p5-Stanford-DNSserver/Makefile
+++ b/dns/p5-Stanford-DNSserver/Makefile
@@ -13,7 +13,4 @@ COMMENT=	A DNS name server framework with a Perl backend
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Stanford::DNS.3 Stanford::DNSserver.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-Stanford-DNSserver/pkg-plist b/dns/p5-Stanford-DNSserver/pkg-plist
index aa619685ec81..59ef8d968e9d 100644
--- a/dns/p5-Stanford-DNSserver/pkg-plist
+++ b/dns/p5-Stanford-DNSserver/pkg-plist
@@ -1,6 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford/DNSserver/.packlist
+%%PERL5_MAN3%%/Stanford::DNS.3.gz
+%%PERL5_MAN3%%/Stanford::DNSserver.3.gz
 %%SITE_PERL%%/Stanford/DNS.pm
 %%SITE_PERL%%/Stanford/DNSserver.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford/DNSserver
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford
-@dirrm %%SITE_PERL%%/Stanford
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford/DNSserver/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford/DNSserver
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stanford
+@dirrmtry %%SITE_PERL%%/Stanford
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index 05cdfb1ed9e5..1b5ed02ddc15 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -19,16 +19,13 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Tie::DNS.3
-
 .if !defined(NOPORTEXAMPLES)
 
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/eg/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/eg/* ${STAGEDIR}${EXAMPLESDIR}
 
 .endif
 
diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist
index 8e92d2471ceb..5653f4acc3ad 100644
--- a/dns/p5-Tie-DNS/pkg-plist
+++ b/dns/p5-Tie-DNS/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
+%%PERL5_MAN3%%/Tie::DNS.3.gz
 %%SITE_PERL%%/Tie/DNS.pm
-@dirrmtry %%SITE_PERL%%/Tie
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index c9b79e170c83..1a27698aef0c 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -10,16 +10,12 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Geographic NameServer
 
 BUILD_DEPENDS=	p5-Geo-IP>=0:${PORTSDIR}/net/p5-Geo-IP \
-  				p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-				p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+  		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
 
-NO_MANCOMPRESS=	no
-MAN1=	pgeodns.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/dns/p5-pgeodns/pkg-plist b/dns/p5-pgeodns/pkg-plist
index 371d1c18dbbb..38ae58140c63 100644
--- a/dns/p5-pgeodns/pkg-plist
+++ b/dns/p5-pgeodns/pkg-plist
@@ -1,6 +1,7 @@
 bin/pgeodns
 %%SITE_PERL%%/Countries.pm
 %%SITE_PERL%%/GeoDNS.pm
-%%SITE_PERL%%/pgeodns.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/pgeodns/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/pgeodns/
+%%SITE_PERL%%/pgeodns.pl
+man/man1/pgeodns.1.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/pgeodns