10 files changed, 18 insertions, 22 deletions

diff --git a/dns/dnssecwalker/Makefile b/dns/dnssecwalker/Makefile
index e4fd227514ae..2017409905ff 100644
--- a/dns/dnssecwalker/Makefile
+++ b/dns/dnssecwalker/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	walker-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DNSSEC Walker
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index b33999023f1a..788e3d10bb59 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.visi.com/~barr/dnswalk/
 MAINTAINER=	mph@freebsd.org
 COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
diff --git a/dns/p5-BIND-Conf_Parser/Makefile b/dns/p5-BIND-Conf_Parser/Makefile
index 78071d4f3be8..9d0f1c715d78 100644
--- a/dns/p5-BIND-Conf_Parser/Makefile
+++ b/dns/p5-BIND-Conf_Parser/Makefile
@@ -18,6 +18,5 @@ COMMENT=	Perl5 module to parse BIND 8 configuration files
 PERL_CONFIGURE=	yes
 
 MAN3=	BIND::Conf_Parser.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/dns/p5-BIND-Conf_Parser/pkg-plist b/dns/p5-BIND-Conf_Parser/pkg-plist
index f543b76718f7..3738883e119e 100644
--- a/dns/p5-BIND-Conf_Parser/pkg-plist
+++ b/dns/p5-BIND-Conf_Parser/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/BIND/Conf_Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/BIND
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BIND-Conf_Parser
+%%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
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index a2c859789380..92b0edfae44b 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+SITE_PERL=	${SITE_PERL}
 MAN3=		Net::DNS::ZoneFile.3
 
 post-patch:
diff --git a/dns/p5-Net-DNS-ZoneFile/pkg-plist b/dns/p5-Net-DNS-ZoneFile/pkg-plist
index d70a2acbae76..543e3047902f 100644
--- a/dns/p5-Net-DNS-ZoneFile/pkg-plist
+++ b/dns/p5-Net-DNS-ZoneFile/pkg-plist
@@ -1,4 +1,4 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/DNS/ZoneFile.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/DNS 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile/.packlist
+%%SITE_PERL%%/Net/DNS/ZoneFile.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/ZoneFile
+@unexec rmdir %D/%%SITE_PERL%%/Net/DNS 2>/dev/null || true
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index e5f3e28817a9..68b8e60ad629 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=--pm
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
 		Net::DNS::Question.3 Net::DNS::RR.3 Net::DNS::RR::A.3 \
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index e18f5de0aac3..09365a36b341 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -18,12 +18,11 @@ COMMENT=	Tie interface to p5-Net-DNS
 BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL=	${SITE_PERL}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PERL_CONFIGURE=	yes
 
 MAN3=		Tie::DNS.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist
index 73a186a3ba63..fab71504d04d 100644
--- a/dns/p5-Tie-DNS/pkg-plist
+++ b/dns/p5-Tie-DNS/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Tie/DNS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS/.packlist
+%%SITE_PERL%%/Tie/DNS.pm
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example1.pl
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example2.pl
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example3.pl
@@ -7,7 +7,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Tie/DNS.pm
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example5.pl
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example6.pl
 %%PORTDOCS%%share/examples/p5-Tie-DNS/example7.pl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/DNS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
 %%PORTDOCS%%@unexec rmdir %D/share/examples/p5-Tie-DNS 2>/dev/null || true
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index c885360af6ac..6d3162e734a6 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A tool for checking DNS zones
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes