3 files changed, 50 insertions, 47 deletions

diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 57556b7d4b4a..650f43a76f30 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -135,4 +135,9 @@ post-install:
 
 .endif # BUILD_PYLDNS || BUILD_P5PERL
 
+.if defined(BUILD_P5PERL)
+post-stage::
+	${SED} -i '' 's|^${STAGEDIR}||' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/DNS/LDNS/.packlist
+.endif
+
 .include <bsd.port.mk>
diff --git a/dns/p5-DNS-Ldns/Makefile b/dns/p5-DNS-Ldns/Makefile
index fcd481c45805..0ebd594c8ea9 100644
--- a/dns/p5-DNS-Ldns/Makefile
+++ b/dns/p5-DNS-Ldns/Makefile
@@ -7,5 +7,4 @@ BUILD_P5PERL=yes
 
 PLIST=	${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/dns/p5-DNS-Ldns/pkg-plist b/dns/p5-DNS-Ldns/pkg-plist
index 7391d15bbd49..365aa847306c 100644
--- a/dns/p5-DNS-Ldns/pkg-plist
+++ b/dns/p5-DNS-Ldns/pkg-plist
@@ -1,46 +1,45 @@
-@comment Generated by sysutils/genplist
-lib/perl5/5.16/mach/perllocal.pod
-%%PERL5_MAN3%%/DNS::LDNS.3
-%%PERL5_MAN3%%/DNS::LDNS::DNSSecDataChain.3
-%%PERL5_MAN3%%/DNS::LDNS::DNSSecName.3
-%%PERL5_MAN3%%/DNS::LDNS::DNSSecRRSets.3
-%%PERL5_MAN3%%//DNS::LDNS::DNSSecRRs.3
-%%PERL5_MAN3%%//DNS::LDNS::DNSSecTrustTree.3
-%%PERL5_MAN3%%//DNS::LDNS::DNSSecZone.3
-%%PERL5_MAN3%%//DNS::LDNS::GC.3
-%%PERL5_MAN3%%//DNS::LDNS::Key.3
-%%PERL5_MAN3%%//DNS::LDNS::KeyList.3
-%%PERL5_MAN3%%//DNS::LDNS::Packet.3
-%%PERL5_MAN3%%//DNS::LDNS::RBNode.3
-%%PERL5_MAN3%%//DNS::LDNS::RBTree.3
-%%PERL5_MAN3%%//DNS::LDNS::RData.3
-%%PERL5_MAN3%%//DNS::LDNS::RR.3
-%%PERL5_MAN3%%//DNS::LDNS::RRList.3
-%%PERL5_MAN3%%//DNS::LDNS::Resolver.3
-%%PERL5_MAN3%%//DNS::LDNS::Zone.3
-%%SITE_PERL%%/mach/DNS/LDNS.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecDataChain.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecName.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecRRSets.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecRRs.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecTrustTree.pm
-%%SITE_PERL%%/mach/DNS/LDNS/DNSSecZone.pm
-%%SITE_PERL%%/mach/DNS/LDNS/GC.pm
-%%SITE_PERL%%/mach/DNS/LDNS/Key.pm
-%%SITE_PERL%%/mach/DNS/LDNS/KeyList.pm
-%%SITE_PERL%%/mach/DNS/LDNS/Packet.pm
-%%SITE_PERL%%/mach/DNS/LDNS/RBNode.pm
-%%SITE_PERL%%/mach/DNS/LDNS/RBTree.pm
-%%SITE_PERL%%/mach/DNS/LDNS/RData.pm
-%%SITE_PERL%%/mach/DNS/LDNS/RR.pm
-%%SITE_PERL%%/mach/DNS/LDNS/RRList.pm
-%%SITE_PERL%%/mach/DNS/LDNS/Resolver.pm
-%%SITE_PERL%%/mach/DNS/LDNS/Zone.pm
-%%SITE_PERL%%/mach/auto/DNS/LDNS/.packlist
-%%SITE_PERL%%/mach/auto/DNS/LDNS/LDNS.bs
-%%SITE_PERL%%/mach/auto/DNS/LDNS/LDNS.so
-%%SITE_PERL%%/mach/auto/DNS/LDNS/autosplit.ix
-@dirrm %%SITE_PERL%%/mach/auto/DNS/LDNS
-@dirrm %%SITE_PERL%%/mach/auto/DNS
-@dirrm %%SITE_PERL%%/mach/DNS/LDNS
-@dirrm %%SITE_PERL%%/mach/DNS
+@comment lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod.gz
+%%PERL5_MAN3%%/DNS::LDNS.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecDataChain.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecName.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecRRSets.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecRRs.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecTrustTree.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::DNSSecZone.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::GC.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::Key.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::KeyList.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::Packet.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::RBNode.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::RBTree.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::RData.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::RR.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::RRList.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::Resolver.3.gz
+%%PERL5_MAN3%%/DNS::LDNS::Zone.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecDataChain.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecName.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecRRSets.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecRRs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecTrustTree.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/DNSSecZone.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/GC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Key.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/KeyList.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Packet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RBNode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RBTree.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RData.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/RRList.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Resolver.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS/Zone.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/LDNS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/LDNS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS/autosplit.ix
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DNS/LDNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS/LDNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS