aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/aspathtree/Makefile2
-rw-r--r--net/cricket/Makefile4
-rw-r--r--net/ctrace/Makefile6
-rw-r--r--net/edonkey-gui-gtk-urlslave/Makefile2
-rw-r--r--net/flowscan/Makefile10
-rw-r--r--net/hawk/Makefile2
-rw-r--r--net/jarl/Makefile2
-rw-r--r--net/junipoll/Makefile2
-rw-r--r--net/junipoll/pkg-plist4
-rw-r--r--net/lla/Makefile4
-rw-r--r--net/mldonkey-perlreactor/Makefile2
-rw-r--r--net/mldonkey-serverspy/Makefile8
-rw-r--r--net/mldonkey-urlslave/Makefile2
-rw-r--r--net/mrtg/pkg-plist16
-rw-r--r--net/net-snmp-tkmib/Makefile2
-rw-r--r--net/nrpep/Makefile2
-rw-r--r--net/nsc/Makefile2
-rw-r--r--net/openreg/Makefile2
-rw-r--r--net/openreg/pkg-plist74
-rw-r--r--net/p5-Altoids/Makefile2
-rw-r--r--net/p5-Altoids/pkg-plist4
-rw-r--r--net/p5-Archie/pkg-plist2
-rw-r--r--net/p5-Cflow/pkg-plist12
-rw-r--r--net/p5-Frontier-RPC/Makefile4
-rw-r--r--net/p5-Frontier-RPC/pkg-plist14
-rw-r--r--net/p5-IO-INET6/Makefile3
-rw-r--r--net/p5-IO-INET6/pkg-plist4
-rw-r--r--net/p5-IO-Interface/Makefile1
-rw-r--r--net/p5-IO-Interface/pkg-plist16
-rw-r--r--net/p5-IO-Socket-INET6/Makefile3
-rw-r--r--net/p5-IO-Socket-INET6/pkg-plist4
-rw-r--r--net/p5-IO-Socket-Multicast/Makefile3
-rw-r--r--net/p5-IO-Socket-Multicast/pkg-plist18
-rw-r--r--net/p5-JUNOScript/Makefile3
-rw-r--r--net/p5-JUNOScript/pkg-plist42
-rw-r--r--net/p5-Jabber-Connection/Makefile1
-rw-r--r--net/p5-Mon/Makefile1
-rw-r--r--net/p5-Mon/pkg-plist12
-rw-r--r--net/p5-Net-AIM/pkg-plist16
-rw-r--r--net/p5-Net-AOLIM/Makefile1
-rw-r--r--net/p5-Net-AOLIM/pkg-plist12
-rw-r--r--net/p5-Net-CIDR/Makefile1
-rw-r--r--net/p5-Net-CIDR/pkg-plist10
-rw-r--r--net/p5-Net-DLookup/Makefile1
-rw-r--r--net/p5-Net-DLookup/pkg-plist10
-rw-r--r--net/p5-Net-Daemon/Makefile1
-rw-r--r--net/p5-Net-Divert/Makefile1
-rw-r--r--net/p5-Net-Divert/pkg-plist12
-rw-r--r--net/p5-Net-ICQ2000/Makefile1
-rw-r--r--net/p5-Net-ICQ2000/pkg-plist10
-rw-r--r--net/p5-Net-IPv4Addr/pkg-plist16
-rw-r--r--net/p5-Net-IPv6Addr/Makefile4
-rw-r--r--net/p5-Net-IPv6Addr/pkg-plist10
-rw-r--r--net/p5-Net-Jabber/Makefile9
-rw-r--r--net/p5-Net-Jabber/pkg-plist52
-rw-r--r--net/p5-Net-Netmask/Makefile1
-rw-r--r--net/p5-Net-Netmask/pkg-plist12
-rw-r--r--net/p5-Net-ParseWhois/Makefile1
-rw-r--r--net/p5-Net-ParseWhois/pkg-plist44
-rw-r--r--net/p5-Net-Patricia/pkg-plist14
-rw-r--r--net/p5-Net-Pcap/Makefile1
-rw-r--r--net/p5-Net-Pcap/pkg-plist14
-rw-r--r--net/p5-Net-Radius/Makefile3
-rw-r--r--net/p5-Net-Radius/pkg-plist14
-rw-r--r--net/p5-Net-RawIP/Makefile1
-rw-r--r--net/p5-Net-RawIP/pkg-plist20
-rw-r--r--net/p5-Net-RawSock/Makefile1
-rw-r--r--net/p5-Net-RawSock/pkg-plist10
-rw-r--r--net/p5-Net-SCP/Makefile5
-rw-r--r--net/p5-Net-SCP/pkg-plist10
-rw-r--r--net/p5-Net-SMPP/Makefile1
-rw-r--r--net/p5-Net-SMPP/pkg-plist22
-rw-r--r--net/p5-Net-SNPP/Makefile2
-rw-r--r--net/p5-Net-SNPP/pkg-plist16
-rw-r--r--net/p5-Net-SSH-Perl/Makefile3
-rw-r--r--net/p5-Net-SSH-Perl/pkg-plist110
-rw-r--r--net/p5-Net-SSH/Makefile1
-rw-r--r--net/p5-Net-SSH/pkg-plist10
-rw-r--r--net/p5-Net-Server/Makefile1
-rw-r--r--net/p5-Net-Server/pkg-plist42
-rw-r--r--net/p5-Net-Services/Makefile1
-rw-r--r--net/p5-Net-Services/pkg-plist10
-rw-r--r--net/p5-Net-Telnet/Makefile1
-rw-r--r--net/p5-Net-Telnet/pkg-plist10
-rw-r--r--net/p5-Net-Traceroute/Makefile1
-rw-r--r--net/p5-Net-Traceroute/pkg-plist10
-rw-r--r--net/p5-Net-Traceroute6/Makefile1
-rw-r--r--net/p5-Net-Traceroute6/pkg-plist10
-rw-r--r--net/p5-Net-Wake/Makefile1
-rw-r--r--net/p5-Net-Wake/pkg-plist10
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile3
-rw-r--r--net/p5-Net-Whois-RIPE/pkg-plist30
-rw-r--r--net/p5-Net-Whois-Raw/pkg-plist14
-rw-r--r--net/p5-Net-Whois/Makefile3
-rw-r--r--net/p5-Net-Whois/pkg-plist10
-rw-r--r--net/p5-Net-XWhois/Makefile1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/Makefile1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/pkg-plist24
-rw-r--r--net/p5-Net-Z3950/Makefile7
-rw-r--r--net/p5-Net-Z3950/pkg-plist30
-rw-r--r--net/p5-Net-ext/Makefile1
-rw-r--r--net/p5-Net-ext/pkg-plist146
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile3
-rw-r--r--net/p5-NetAddr-IP-Count/pkg-plist10
-rw-r--r--net/p5-NetAddr-IP/Makefile2
-rw-r--r--net/p5-NetAddr-IP/pkg-plist10
-rw-r--r--net/p5-NetPacket/Makefile1
-rw-r--r--net/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--net/p5-POE-Component-RRDTool/pkg-plist14
-rw-r--r--net/p5-PlRPC/Makefile4
-rw-r--r--net/p5-PlRPC/pkg-plist22
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/Makefile5
-rw-r--r--net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist24
-rw-r--r--net/p5-ResourcePool-Resource-SOAP-Lite/Makefile5
-rw-r--r--net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist30
-rw-r--r--net/p5-SNMP-MIB-Compiler/Makefile2
-rw-r--r--net/p5-SNMP-MIB-Compiler/pkg-plist22
-rw-r--r--net/p5-SNMP-Util/Makefile3
-rw-r--r--net/p5-SNMP-Util/pkg-plist10
-rw-r--r--net/p5-SNMP/pkg-plist12
-rw-r--r--net/p5-SNMP_Session/pkg-plist10
-rw-r--r--net/p5-SOAP-Lite/Makefile12
-rw-r--r--net/p5-SOAP-Lite/pkg-plist70
-rw-r--r--net/p5-SOAP/Makefile3
-rw-r--r--net/p5-SOAP/pkg-plist54
-rw-r--r--net/p5-Socket6/pkg-plist10
-rw-r--r--net/p5-Socks/Makefile1
-rw-r--r--net/p5-Socks/pkg-plist50
-rw-r--r--net/p5-Spread-Session/Makefile3
-rw-r--r--net/p5-Spread-Session/pkg-plist10
-rw-r--r--net/p5-Telnet-Cisco/Makefile7
-rw-r--r--net/p5-Telnet-Cisco/pkg-plist22
-rw-r--r--net/p5-URI/Makefile1
-rw-r--r--net/p5-XPC/Makefile7
-rw-r--r--net/p5-XPC/pkg-plist14
-rw-r--r--net/perldap/Makefile1
-rw-r--r--net/perldap/pkg-plist28
-rw-r--r--net/radiator/pkg-plist262
-rw-r--r--net/rancid/Makefile3
-rw-r--r--net/remarp/pkg-plist6
-rw-r--r--net/rrdtool/pkg-plist18
-rw-r--r--net/rrdtool10/pkg-plist18
-rw-r--r--net/spread/pkg-plist12
-rw-r--r--net/spread4/pkg-plist12
-rw-r--r--net/v6eval/pkg-plist6
-rw-r--r--net/vicq/Makefile3
-rw-r--r--net/vicq/pkg-plist10
-rw-r--r--net/wakeonlan/pkg-plist4
-rw-r--r--net/wping/Makefile4
-rw-r--r--net/xmlrpc-c-devel/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
151 files changed, 972 insertions, 1022 deletions
diff --git a/net/aspathtree/Makefile b/net/aspathtree/Makefile
index 6bad5d98f372..90081e8341bc 100644
--- a/net/aspathtree/Makefile
+++ b/net/aspathtree/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ASpath-tree-v${PORTVERSION}
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Checks IPv6 routes' stability and correctness on IPv6 internet
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
ripewhois:${PORTSDIR}/net/ripetools
WRKSRC= ${WRKDIR}/ASpath-tree-v${PORTVERSION}/
diff --git a/net/cricket/Makefile b/net/cricket/Makefile
index 488fa0239f8a..2ed994b0c80b 100644
--- a/net/cricket/Makefile
+++ b/net/cricket/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_PERL_ARCH= ${SITE_PERL}/${PERL_ARCH}
HAS_CONFIGURE= yes
USE_PERL5= yes
diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile
index f8f4b6ffc80b..0c95f1f7f53b 100644
--- a/net/ctrace/Makefile
+++ b/net/ctrace/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES= http://www.pratyeka.org/ctrace/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiprotocol traceroute tool
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
NO_BUILD= yes
USE_BZIP2= yes
diff --git a/net/edonkey-gui-gtk-urlslave/Makefile b/net/edonkey-gui-gtk-urlslave/Makefile
index f1950c59bc03..21326a1d9f89 100644
--- a/net/edonkey-gui-gtk-urlslave/Makefile
+++ b/net/edonkey-gui-gtk-urlslave/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ed2k_urlslave-v2
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to ed2k GTK+ GUI
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ed2k_gui:${PORTSDIR}/net/edonkey-gui-gtk
USE_PERL5= yes
diff --git a/net/flowscan/Makefile b/net/flowscan/Makefile
index d3a8084b8ac0..700951d2bb4d 100644
--- a/net/flowscan/Makefile
+++ b/net/flowscan/Makefile
@@ -18,11 +18,11 @@ COMMENT= Processes IP flows recorded in cflowd-format raw flow files
BUILD_DEPENDS= ksh:${PORTSDIR}/shells/pdksh \
rrdtool:${PORTSDIR}/net/rrdtool \
${LOCALBASE}/sbin/cflowd:${PORTSDIR}/net/cflowd \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
+ ${SITE_PERL}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
+ ${SITE_PERL}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
+ ${SITE_PERL}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
+ ${SITE_PERL}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net/p5-Cflow \
+ ${SITE_PERL}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
CFLOWD_FLOWSCAN_PATCH= yes
diff --git a/net/hawk/Makefile b/net/hawk/Makefile
index 74c0974a54b2..6563d0643d03 100644
--- a/net/hawk/Makefile
+++ b/net/hawk/Makefile
@@ -16,7 +16,7 @@ COMMENT= Track uptime and DNS status for machines on your networks
RUN_DEPENDS= php-config:${PORTSDIR}/www/mod_php4 \
safe_mysqld:${PORTSDIR}/databases/mysql323-server \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
+ ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
do-patch:
@${SED} -e 's#dirname.*"/hawk#"${PREFIX}/etc/hawk/daemon#' \
diff --git a/net/jarl/Makefile b/net/jarl/Makefile
index b107cbc7f607..6a2da5959b1e 100644
--- a/net/jarl/Makefile
+++ b/net/jarl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl/Tk Jabber client
RUN_DEPENDS= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
+ ${SITE_PERL}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber
NO_BUILD= yes
diff --git a/net/junipoll/Makefile b/net/junipoll/Makefile
index b0675b4d157c..2fc2c20d73c5 100644
--- a/net/junipoll/Makefile
+++ b/net/junipoll/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org
COMMENT= JUNIper router snmp POLLer for firewall filter counters
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
+ ${SITE_PERL}/Altoids.pm:${PORTSDIR}/net/p5-Altoids
PERL_CONFIGURE= yes
diff --git a/net/junipoll/pkg-plist b/net/junipoll/pkg-plist
index 83ccc1238da3..b2014994c599 100644
--- a/net/junipoll/pkg-plist
+++ b/net/junipoll/pkg-plist
@@ -1,3 +1,3 @@
bin/junipoll
-lib/perl5/site_perl/%%PERL_VER%%/HCInterfaceTemplate.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/junipoll/.packlist
+%%SITE_PERL%%/HCInterfaceTemplate.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/junipoll/.packlist
diff --git a/net/lla/Makefile b/net/lla/Makefile
index 549add94f9c4..ac24ef3ad4a0 100644
--- a/net/lla/Makefile
+++ b/net/lla/Makefile
@@ -27,8 +27,8 @@ EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= ./${PORTNAME}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-SITE_ARCH_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}
+SITE_ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
diff --git a/net/mldonkey-perlreactor/Makefile b/net/mldonkey-perlreactor/Makefile
index 979d961acf26..c50b60fecc77 100644
--- a/net/mldonkey-perlreactor/Makefile
+++ b/net/mldonkey-perlreactor/Makefile
@@ -16,7 +16,7 @@ DISTNAME= perlreactor_${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Automatically add links found in web pages to MLDonkey queue
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mldonkey-serverspy/Makefile b/net/mldonkey-serverspy/Makefile
index 3cd340789f14..bb6905a89395 100644
--- a/net/mldonkey-serverspy/Makefile
+++ b/net/mldonkey-serverspy/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= MLDonkey Server Spy broadcasts your whereabouts on the eDonkey network
RUN_DEPENDS= \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+ ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
+ ${SITE_PERL}/${PERL_ARCH}/auto/TimeDate:${PORTSDIR}/devel/p5-TimeDate \
+ ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
+ ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mldonkey-urlslave/Makefile b/net/mldonkey-urlslave/Makefile
index 839cf78539c0..d6a0371d9cb8 100644
--- a/net/mldonkey-urlslave/Makefile
+++ b/net/mldonkey-urlslave/Makefile
@@ -16,7 +16,7 @@ DISTNAME= mlurlslave-v${PORTVERSION:S/^0.0.//}
MAINTAINER= lioux@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to MLDonkey
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/mrtg/pkg-plist b/net/mrtg/pkg-plist
index 259b0b713149..949875428795 100644
--- a/net/mrtg/pkg-plist
+++ b/net/mrtg/pkg-plist
@@ -3,13 +3,13 @@ bin/indexmaker
bin/mrtg
bin/rateup
etc/mrtg/mrtg.cfg.sample
-lib/perl5/site_perl/%%PERL_VER%%/MRTG_lib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/InputObjects.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/PlainText.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/Pod/Usage.pm
-lib/perl5/site_perl/%%PERL_VER%%/locales_mrtg.pm
+%%SITE_PERL%%/MRTG_lib.pm
+%%SITE_PERL%%/Pod/InputObjects.pm
+%%SITE_PERL%%/Pod/Parser.pm
+%%SITE_PERL%%/Pod/PlainText.pm
+%%SITE_PERL%%/Pod/Select.pm
+%%SITE_PERL%%/Pod/Usage.pm
+%%SITE_PERL%%/locales_mrtg.pm
%%PORTDOCS%%share/doc/mrtg/ANNOUNCE
%%PORTDOCS%%share/doc/mrtg/CHANGES
%%PORTDOCS%%share/doc/mrtg/COPYRIGHT
@@ -80,6 +80,6 @@ share/mrtg/mrtg-r.png
share/mrtg/mrtg-ti.gif
share/mrtg/mrtg-ti.png
@dirrm etc/mrtg
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod
+@dirrm %%SITE_PERL%%/Pod
%%PORTDOCS%%@dirrm share/doc/mrtg
@dirrm share/mrtg
diff --git a/net/net-snmp-tkmib/Makefile b/net/net-snmp-tkmib/Makefile
index 11fbf73acba1..c7716fb32ab1 100644
--- a/net/net-snmp-tkmib/Makefile
+++ b/net/net-snmp-tkmib/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${SITE_PERL}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
WRKSRC= ${WRKDIR}/ucd-snmp-${PORTVERSION}
NO_BUILD= yes
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
+SITE_PERL= ${SITE_PERL}/${PERL_ARCH}
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/local/tkmib ${PREFIX}/bin
diff --git a/net/nrpep/Makefile b/net/nrpep/Makefile
index 1e28d35e33bf..c6f65fab0575 100644
--- a/net/nrpep/Makefile
+++ b/net/nrpep/Makefile
@@ -14,7 +14,7 @@ COMMENT= A netsaint addon for running plugins on remote hosts
# Note that this port depends on neither netsaint-plugins OR netsaint, because it
# installs both a client and a server, and so could need EITHER. Bummer.
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
+RUN_DEPENDS= ${SITE_PERL}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
USE_PERL5_RUN= yes
diff --git a/net/nsc/Makefile b/net/nsc/Makefile
index 597411d2f587..5284c92a46de 100644
--- a/net/nsc/Makefile
+++ b/net/nsc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= dirk
MAINTAINER= dirk@FreeBSD.org
COMMENT= Netsaint Console monitor
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net/openreg/Makefile b/net/openreg/Makefile
index f0b89f157c8f..da9f6730f520 100644
--- a/net/openreg/Makefile
+++ b/net/openreg/Makefile
@@ -17,7 +17,7 @@ COMMENT= Domain Registry software
RUN_DEPENDS= ${LOCALBASE}/sbin/stunnel:${PORTSDIR}/security/stunnel \
${LOCALBASE}/sbin/named:${PORTSDIR}/dns/bind9 \
${LOCALBASE}/bin/postgres:${PORTSDIR}/${POSTGRESQL_PORT} \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
BUILD_DEPENDS= ${LOCALBASE}/include/isc/buffer.h:${PORTSDIR}/dns/bind9
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
diff --git a/net/openreg/pkg-plist b/net/openreg/pkg-plist
index f053b5cbea11..08182756780e 100644
--- a/net/openreg/pkg-plist
+++ b/net/openreg/pkg-plist
@@ -9,43 +9,43 @@ lib/perl5/%%PERL_VER%%/man/man3/ISC::Random.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::SRS::DB.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::SRS::Version.3
lib/perl5/%%PERL_VER%%/man/man3/ISC::Stats::Report.3
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct/Listen.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DB/ReplicationMaster.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DB/ReplicationSlave.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Date.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/NameVerify.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/CRLF.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/Connect.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/LengthPrefix.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Net/Listen.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Random.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/DB.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPConnection.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPRegistrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPResultCode.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/EPPWriter.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/SAX/EPPHandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/ISC/Stats/Report.pm
-lib/perl5/site_perl/%%PERL_VER%%/mach/auto/ISC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/ISC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Direct
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC/Group
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/CC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/DB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS/SAX
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/SRS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC/Stats
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ISC
+%%SITE_PERL%%/ISC/CC/Direct.pm
+%%SITE_PERL%%/ISC/CC/Direct/Connect.pm
+%%SITE_PERL%%/ISC/CC/Direct/Listen.pm
+%%SITE_PERL%%/ISC/CC/Group.pm
+%%SITE_PERL%%/ISC/CC/Group/Connect.pm
+%%SITE_PERL%%/ISC/CC/Message.pm
+%%SITE_PERL%%/ISC/DB/ReplicationMaster.pm
+%%SITE_PERL%%/ISC/DB/ReplicationSlave.pm
+%%SITE_PERL%%/ISC/DBI.pm
+%%SITE_PERL%%/ISC/Date.pm
+%%SITE_PERL%%/ISC/Log.pm
+%%SITE_PERL%%/ISC/NameVerify.pm
+%%SITE_PERL%%/ISC/Net/CRLF.pm
+%%SITE_PERL%%/ISC/Net/Connect.pm
+%%SITE_PERL%%/ISC/Net/LengthPrefix.pm
+%%SITE_PERL%%/ISC/Net/Listen.pm
+%%SITE_PERL%%/ISC/Random.pm
+%%SITE_PERL%%/ISC/SRS/DB.pm
+%%SITE_PERL%%/ISC/SRS/EPPConnection.pm
+%%SITE_PERL%%/ISC/SRS/EPPParser.pm
+%%SITE_PERL%%/ISC/SRS/EPPRegistrar.pm
+%%SITE_PERL%%/ISC/SRS/EPPResultCode.pm
+%%SITE_PERL%%/ISC/SRS/EPPWriter.pm
+%%SITE_PERL%%/ISC/SRS/SAX/EPPHandler.pm
+%%SITE_PERL%%/ISC/SRS/Version.pm
+%%SITE_PERL%%/ISC/Stats/Report.pm
+%%SITE_PERL%%/mach/auto/ISC/.packlist
+@dirrm %%SITE_PERL%%/mach/auto/ISC
+@dirrm %%SITE_PERL%%/ISC/CC/Direct
+@dirrm %%SITE_PERL%%/ISC/CC/Group
+@dirrm %%SITE_PERL%%/ISC/CC
+@dirrm %%SITE_PERL%%/ISC/DB
+@dirrm %%SITE_PERL%%/ISC/Net
+@dirrm %%SITE_PERL%%/ISC/SRS/SAX
+@dirrm %%SITE_PERL%%/ISC/SRS
+@dirrm %%SITE_PERL%%/ISC/Stats
+@dirrm %%SITE_PERL%%/ISC
bin/group-sniff
bin/epp-from-file
sbin/msgq
diff --git a/net/p5-Altoids/Makefile b/net/p5-Altoids/Makefile
index 4278a53e9e95..942bba982e66 100644
--- a/net/p5-Altoids/Makefile
+++ b/net/p5-Altoids/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
COMMENT= SNMP get/walk functionality with built-in name to OID translation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
+RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
GNU_CONFIGURE= yes
diff --git a/net/p5-Altoids/pkg-plist b/net/p5-Altoids/pkg-plist
index a0872517cd92..940269ace681 100644
--- a/net/p5-Altoids/pkg-plist
+++ b/net/p5-Altoids/pkg-plist
@@ -1,7 +1,7 @@
bin/altget
bin/altwalk
-lib/perl5/site_perl/%%PERL_VER%%/Altoids.pm
-lib/perl5/site_perl/%%PERL_VER%%/altoids.pl
+%%SITE_PERL%%/Altoids.pm
+%%SITE_PERL%%/altoids.pl
share/altoids/CISCO-ATM-IF-MIB.oid
share/altoids/CISCO-LECS-MIB.oid
share/altoids/CISCO-LES-MIB.oid
diff --git a/net/p5-Archie/pkg-plist b/net/p5-Archie/pkg-plist
index 942fec8f2776..16ef7bed1ddb 100644
--- a/net/p5-Archie/pkg-plist
+++ b/net/p5-Archie/pkg-plist
@@ -1,2 +1,2 @@
-lib/perl5/site_perl/%%PERL_VER%%/Archie.pm
+%%SITE_PERL%%/Archie.pm
bin/archie_gateway
diff --git a/net/p5-Cflow/pkg-plist b/net/p5-Cflow/pkg-plist
index b6979f86cd3e..57c85d3587fc 100644
--- a/net/p5-Cflow/pkg-plist
+++ b/net/p5-Cflow/pkg-plist
@@ -1,7 +1,7 @@
bin/flowdumper
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cflow.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cflow
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index bc541c6169b8..d47e78a82277 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -17,8 +17,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Frontier::RPC implements UserLand Software's XML RPC
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
PERL_CONFIGURE= yes
diff --git a/net/p5-Frontier-RPC/pkg-plist b/net/p5-Frontier-RPC/pkg-plist
index d802816a7fc9..cd7f59f2e05a 100644
--- a/net/p5-Frontier-RPC/pkg-plist
+++ b/net/p5-Frontier-RPC/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/Daemon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Frontier/RPC2.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Frontier
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier/RPC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier/RPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Frontier
+%%SITE_PERL%%/Frontier/Client.pm
+%%SITE_PERL%%/Frontier/Daemon.pm
+%%SITE_PERL%%/Frontier/RPC2.pm
+@dirrm %%SITE_PERL%%/Frontier
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier/RPC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Frontier
diff --git a/net/p5-IO-INET6/Makefile b/net/p5-IO-INET6/Makefile
index b2bad846c7af..fa80567e33a9 100644
--- a/net/p5-IO-INET6/Makefile
+++ b/net/p5-IO-INET6/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-IO-
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Perl module with object interface to AF_INET6 domain sockets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::INET6.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-INET6/pkg-plist b/net/p5-IO-INET6/pkg-plist
index 5fd1608e1a71..c55dad737f54 100644
--- a/net/p5-IO-INET6/pkg-plist
+++ b/net/p5-IO-INET6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/INET6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
+%%SITE_PERL%%/IO/Socket/INET6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
diff --git a/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index 981b4f427ead..de827b579665 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl extension for access to network card configuration information
PERL_CONFIGURE= yes
MAN3= IO::Interface.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-IO-Interface/pkg-plist b/net/p5-IO-Interface/pkg-plist
index 57a092cf7714..26670440e552 100644
--- a/net/p5-IO-Interface/pkg-plist
+++ b/net/p5-IO-Interface/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Interface.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Interface
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Interface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index b2bad846c7af..fa80567e33a9 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-IO-
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Perl module with object interface to AF_INET6 domain sockets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::INET6.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist
index 5fd1608e1a71..c55dad737f54 100644
--- a/net/p5-IO-Socket-INET6/pkg-plist
+++ b/net/p5-IO-Socket-INET6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/INET6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
+%%SITE_PERL%%/IO/Socket/INET6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index f4d096ea8db4..37fb1ed4f15e 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= janos.mohacsi@dante.org.uk
COMMENT= Perl module to send and receive multicast messages
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/Interface.pm:${PORTSDIR}/net/p5-IO-Interface
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Interface.pm:${PORTSDIR}/net/p5-IO-Interface
RUN_DEPENDS= ${BUILD_DEPENDS}
MAN3= IO::Socket::Multicast.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-Socket-Multicast/pkg-plist b/net/p5-IO-Socket-Multicast/pkg-plist
index 3fb905b3f4dd..af311518a705 100644
--- a/net/p5-IO-Socket-Multicast/pkg-plist
+++ b/net/p5-IO-Socket-Multicast/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/Multicast.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket/Multicast.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/net/p5-JUNOScript/Makefile b/net/p5-JUNOScript/Makefile
index e25502cd08d2..ba2f8c24f81f 100644
--- a/net/p5-JUNOScript/Makefile
+++ b/net/p5-JUNOScript/Makefile
@@ -18,7 +18,7 @@ DISTNAME= junoscript-perl-${PORTVERSION}-domestic
MAINTAINER= jesper@FreeBSD.org
COMMENT= API to exchange information with Juniper Networks routers
-PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE= ${SITE_PERL}
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
xml2:${PORTSDIR}/textproc/libxml2 \
xslt:${PORTSDIR}/textproc/libxslt
@@ -69,7 +69,6 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/junoscript-perl-${PORTVERSION}
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= JUNOS::Access.3 \
JUNOS::Access::stubs.3 \
JUNOS::Access::ssl.3 \
diff --git a/net/p5-JUNOScript/pkg-plist b/net/p5-JUNOScript/pkg-plist
index 4dd8d09e06a4..0bdc37ffe4cc 100644
--- a/net/p5-JUNOScript/pkg-plist
+++ b/net/p5-JUNOScript/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/stubs.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssl.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/xnm.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/clear_text.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/rsh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access/ssh.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jroute_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jcrypto_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2/jkernel_methods.pl
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Methods.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/version.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Trace.pm
-lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Device.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/5.3R2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/Access
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS/DOM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/JUNOS
+%%SITE_PERL%%/JUNOS/Access/stubs.pm
+%%SITE_PERL%%/JUNOS/Access/ssl.pm
+%%SITE_PERL%%/JUNOS/Access/xnm.pm
+%%SITE_PERL%%/JUNOS/Access/clear_text.pm
+%%SITE_PERL%%/JUNOS/Access/telnet.pm
+%%SITE_PERL%%/JUNOS/Access/rsh.pm
+%%SITE_PERL%%/JUNOS/Access/ssh.pm
+%%SITE_PERL%%/JUNOS/Access.pm
+%%SITE_PERL%%/JUNOS/5.3R2/jroute_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jcrypto_methods.pl
+%%SITE_PERL%%/JUNOS/5.3R2/jkernel_methods.pl
+%%SITE_PERL%%/JUNOS/Methods.pm
+%%SITE_PERL%%/JUNOS/DOM/Parser.pm
+%%SITE_PERL%%/JUNOS/version.pm
+%%SITE_PERL%%/JUNOS/Response.pm
+%%SITE_PERL%%/JUNOS/Trace.pm
+%%SITE_PERL%%/JUNOS/Device.pm
+@dirrm %%SITE_PERL%%/JUNOS/5.3R2
+@dirrm %%SITE_PERL%%/JUNOS/Access
+@dirrm %%SITE_PERL%%/JUNOS/DOM
+@dirrm %%SITE_PERL%%/JUNOS
diff --git a/net/p5-Jabber-Connection/Makefile b/net/p5-Jabber-Connection/Makefile
index 46bbb62aee01..9ec50086bc62 100644
--- a/net/p5-Jabber-Connection/Makefile
+++ b/net/p5-Jabber-Connection/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Jabber::Connection.3 Jabber::NS.3 Jabber::NodeFactory.3
.include <bsd.port.mk>
diff --git a/net/p5-Mon/Makefile b/net/p5-Mon/Makefile
index 6c894c62f4ee..08fd4f743ca2 100644
--- a/net/p5-Mon/Makefile
+++ b/net/p5-Mon/Makefile
@@ -18,7 +18,6 @@ COMMENT= A perl module that supports mon, a network and system monitoring daemon
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mon::SNMP.3 \
Mon::Client.3 \
Mon::Protocol.3
diff --git a/net/p5-Mon/pkg-plist b/net/p5-Mon/pkg-plist
index 2ecd0782ab22..1e891925646e 100644
--- a/net/p5-Mon/pkg-plist
+++ b/net/p5-Mon/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mon/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mon/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mon
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mon
+%%SITE_PERL%%/Mon/SNMP.pm
+%%SITE_PERL%%/Mon/Client.pm
+%%SITE_PERL%%/Mon/Protocol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
+@dirrm %%SITE_PERL%%/Mon
diff --git a/net/p5-Net-AIM/pkg-plist b/net/p5-Net-AIM/pkg-plist
index 056829109de0..3bb9b194db29 100644
--- a/net/p5-Net-AIM/pkg-plist
+++ b/net/p5-Net-AIM/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Event.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/AIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AIM.pm
+%%SITE_PERL%%/Net/AIM/Connection.pm
+%%SITE_PERL%%/Net/AIM/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/AIM
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-AOLIM/Makefile b/net/p5-Net-AOLIM/Makefile
index 8717d920b9c0..23d7033dd28c 100644
--- a/net/p5-Net-AOLIM/Makefile
+++ b/net/p5-Net-AOLIM/Makefile
@@ -19,6 +19,5 @@ PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN3= Net::AOLIM.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-AOLIM/pkg-plist b/net/p5-Net-AOLIM/pkg-plist
index 0fa005304ffe..a77414bb513f 100644
--- a/net/p5-Net-AOLIM/pkg-plist
+++ b/net/p5-Net-AOLIM/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/AOLIM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/example.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/AOLIM.pm
+%%SITE_PERL%%/Net/example.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-CIDR/Makefile b/net/p5-Net-CIDR/Makefile
index 0b15ece4220a..343b90023a03 100644
--- a/net/p5-Net-CIDR/Makefile
+++ b/net/p5-Net-CIDR/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to manipulate IPv4/IPv6 netblocks in CIDR notation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::CIDR.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-CIDR/pkg-plist b/net/p5-Net-CIDR/pkg-plist
index 63df1a085536..cb70ad77e5a0 100644
--- a/net/p5-Net-CIDR/pkg-plist
+++ b/net/p5-Net-CIDR/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/CIDR.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/CIDR
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/CIDR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-DLookup/Makefile b/net/p5-Net-DLookup/Makefile
index 98b948a27787..9e1ba19d305f 100644
--- a/net/p5-Net-DLookup/Makefile
+++ b/net/p5-Net-DLookup/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perform domain lookups on 2-letter and 3-letter TLDs
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::DLookup.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-DLookup/pkg-plist b/net/p5-Net-DLookup/pkg-plist
index b405599834c4..b8c7bbff12c2 100644
--- a/net/p5-Net-DLookup/pkg-plist
+++ b/net/p5-Net-DLookup/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/DLookup.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/DLookup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 1cce82651fa8..3d1bdcbfdbac 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 extension for portable daemons
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Daemon.3 \
Net::Daemon::Log.3 \
Net::Daemon::Test.3
diff --git a/net/p5-Net-Divert/Makefile b/net/p5-Net-Divert/Makefile
index 19a9d4c30bdd..61c433b28660 100644
--- a/net/p5-Net-Divert/Makefile
+++ b/net/p5-Net-Divert/Makefile
@@ -17,7 +17,6 @@ COMMENT= A module to deal with divert(4) sockets
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Divert.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Divert/pkg-plist b/net/p5-Net-Divert/pkg-plist
index 59b8ffc44dec..2c12b2593ad8 100644
--- a/net/p5-Net-Divert/pkg-plist
+++ b/net/p5-Net-Divert/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Divert.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Divert/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Divert/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Divert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Divert
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Divert.pm
+%%SITE_PERL%%/auto/Net/Divert/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert
+@dirrm %%SITE_PERL%%/auto/Net/Divert
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-ICQ2000/Makefile b/net/p5-Net-ICQ2000/Makefile
index 880b7cffddd6..04d0e030febc 100644
--- a/net/p5-Net-ICQ2000/Makefile
+++ b/net/p5-Net-ICQ2000/Makefile
@@ -16,7 +16,6 @@ COMMENT= A perl5 module for ICQv7 protocol realisation
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::ICQ2000.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-ICQ2000/pkg-plist b/net/p5-Net-ICQ2000/pkg-plist
index ee89d17f1a35..c12fde127c95 100644
--- a/net/p5-Net-ICQ2000/pkg-plist
+++ b/net/p5-Net-ICQ2000/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/ICQ2000.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+%%SITE_PERL%%/Net/ICQ2000.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net/p5-Net-IPv4Addr/pkg-plist b/net/p5-Net-IPv4Addr/pkg-plist
index 0a3f254d4f64..44e353284e09 100644
--- a/net/p5-Net-IPv4Addr/pkg-plist
+++ b/net/p5-Net-IPv4Addr/pkg-plist
@@ -1,9 +1,9 @@
bin/ipv4calc
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv4Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv4Addr.pm
+%%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
+@dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-IPv6Addr/Makefile b/net/p5-Net-IPv6Addr/Makefile
index 4fcf1c77ddce..5e3d57a5d4f3 100644
--- a/net/p5-Net-IPv6Addr/Makefile
+++ b/net/p5-Net-IPv6Addr/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= jj@nttmcl.com
COMMENT= Perl extension for manipulating IPv6 addresses
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
+BUILD_DEPENDS= ${SITE_PERL}/Net/IPv4Addr.pm:${PORTSDIR}/net/p5-Net-IPv4Addr \
+ ${SITE_PERL}/Math/Base85.pm:${PORTSDIR}/math/p5-Math-Base85
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-IPv6Addr/pkg-plist b/net/p5-Net-IPv6Addr/pkg-plist
index 43f6d919b7a7..a572beffdd37 100644
--- a/net/p5-Net-IPv6Addr/pkg-plist
+++ b/net/p5-Net-IPv6Addr/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/IPv6Addr.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/IPv6Addr.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Jabber/Makefile b/net/p5-Net-Jabber/Makefile
index 2bd47716063e..456a5b8ece8a 100644
--- a/net/p5-Net-Jabber/Makefile
+++ b/net/p5-Net-Jabber/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Net::Jabber provide a Perl Developer access to the Jabber protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS= ${SITE_PERL}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+ ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+ ${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
Net::Jabber::Data.3 Net::Jabber::Debug.3 \
Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \
diff --git a/net/p5-Net-Jabber/pkg-plist b/net/p5-Net-Jabber/pkg-plist
index 3c91235f8800..4ceae39c3b94 100644
--- a/net/p5-Net-Jabber/pkg-plist
+++ b/net/p5-Net-Jabber/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Verify.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/IQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Jabber.pm
+%%SITE_PERL%%/Net/Jabber/Client.pm
+%%SITE_PERL%%/Net/Jabber/Component.pm
+%%SITE_PERL%%/Net/Jabber/Data.pm
+%%SITE_PERL%%/Net/Jabber/Debug.pm
+%%SITE_PERL%%/Net/Jabber/Dialback.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Result.pm
+%%SITE_PERL%%/Net/Jabber/Dialback/Verify.pm
+%%SITE_PERL%%/Net/Jabber/IQ.pm
+%%SITE_PERL%%/Net/Jabber/JID.pm
+%%SITE_PERL%%/Net/Jabber/Key.pm
+%%SITE_PERL%%/Net/Jabber/Log.pm
+%%SITE_PERL%%/Net/Jabber/Message.pm
+%%SITE_PERL%%/Net/Jabber/Namespaces.pm
+%%SITE_PERL%%/Net/Jabber/Presence.pm
+%%SITE_PERL%%/Net/Jabber/Protocol.pm
+%%SITE_PERL%%/Net/Jabber/Query.pm
+%%SITE_PERL%%/Net/Jabber/Server.pm
+%%SITE_PERL%%/Net/Jabber/X.pm
+%%SITE_PERL%%/Net/Jabber/XDB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
+@dirrm %%SITE_PERL%%/Net/Jabber/Dialback
+@dirrm %%SITE_PERL%%/Net/Jabber
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Netmask/Makefile b/net/p5-Net-Netmask/Makefile
index ca105125cdcb..e3d4b16f9414 100644
--- a/net/p5-Net-Netmask/Makefile
+++ b/net/p5-Net-Netmask/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse, manipulate and lookup IP network blocks
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Netmask.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Netmask/pkg-plist b/net/p5-Net-Netmask/pkg-plist
index 6a04e9c5fa62..99bfc80a6892 100644
--- a/net/p5-Net-Netmask/pkg-plist
+++ b/net/p5-Net-Netmask/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Netmask.pod
+%%SITE_PERL%%/Net/Netmask.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-ParseWhois/Makefile b/net/p5-Net-ParseWhois/Makefile
index b7e023b9cec4..8b1a755f67e2 100644
--- a/net/p5-Net-ParseWhois/Makefile
+++ b/net/p5-Net-ParseWhois/Makefile
@@ -17,7 +17,6 @@ COMMENT= Extendable perl5 module for parsing whois information
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::ParseWhois.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-ParseWhois/pkg-plist b/net/p5-Net-ParseWhois/pkg-plist
index 043b973fbf7a..263a943d2e11 100644
--- a/net/p5-Net-ParseWhois/pkg-plist
+++ b/net/p5-Net-ParseWhois/pkg-plist
@@ -1,22 +1,22 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/BulkRegister.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/CoreNic.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/DomainBank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/DomainDiscover.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Dotster.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Easyspace.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/INameWW.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Netsol.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/OpenSRS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Register.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Registrars.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ParseWhois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain/Registrar
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois/Domain
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/ParseWhois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/ParseWhois.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/BulkRegister.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/CoreNic.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/DomainBank.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/DomainDiscover.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Dotster.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Easyspace.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/INameWW.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Netsol.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/OpenSRS.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Register.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Registrars.pm
+%%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar
+@dirrm %%SITE_PERL%%/Net/ParseWhois/Domain
+@dirrm %%SITE_PERL%%/Net/ParseWhois
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist
index 890c195a76a6..2b97bb53b1a8 100644
--- a/net/p5-Net-Patricia/pkg-plist
+++ b/net/p5-Net-Patricia/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Patricia.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Patricia.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 7f94a4fc1344..f26a7fa63362 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -17,7 +17,6 @@ COMMENT= Interface to pcap(3) LBL packet capture library
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Pcap.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist
index b3783c3972d6..42a04751efcf 100644
--- a/net/p5-Net-Pcap/pkg-plist
+++ b/net/p5-Net-Pcap/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Pcap.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Pcap
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Pcap.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 16688a073f2a..65d4405c655d 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kbyanc@FreeBSD.org
COMMENT= A perl module to manipulate RADIUS packets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::Radius::Dictionary.3 Net::Radius::Packet.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
find ${WRKDIR} -type f | xargs perl -pi -e "s:\r::g"
diff --git a/net/p5-Net-Radius/pkg-plist b/net/p5-Net-Radius/pkg-plist
index 3ffb5da26ba6..0312e0a35440 100644
--- a/net/p5-Net-Radius/pkg-plist
+++ b/net/p5-Net-Radius/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Radius/Dictionary.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Radius/Packet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Radius
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Radius
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Radius/Dictionary.pm
+%%SITE_PERL%%/Net/Radius/Packet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
+@dirrm %%SITE_PERL%%/Net/Radius
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index 044b86844b25..45103526c433 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -19,6 +19,5 @@ COMMENT= A perl module to manipulate raw IP packets
PERL_CONFIGURE= yes
MAN3= Net::RawIP.3 Net::RawIP::libpcap.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-RawIP/pkg-plist b/net/p5-Net-RawIP/pkg-plist
index 788fc61c2d50..4e9ecf499d10 100644
--- a/net/p5-Net-RawIP/pkg-plist
+++ b/net/p5-Net-RawIP/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP/libpcap.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawIP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawIP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/RawIP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP/libpcap.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-RawSock/Makefile b/net/p5-Net-RawSock/Makefile
index c844d2c50804..12da0db3c598 100644
--- a/net/p5-Net-RawSock/Makefile
+++ b/net/p5-Net-RawSock/Makefile
@@ -15,7 +15,6 @@ COMMENT= Net::RawSock provides a base function to send raw IP packets from Perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::RawSock.3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net/p5-Net-RawSock/pkg-plist b/net/p5-Net-RawSock/pkg-plist
index 1ef91ba6d77e..a3aec16ca2f4 100644
--- a/net/p5-Net-RawSock/pkg-plist
+++ b/net/p5-Net-RawSock/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/RawSock.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RawSock.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
%%PORTDOCS%%share/doc/p5-Net-RawSock/README
diff --git a/net/p5-Net-SCP/Makefile b/net/p5-Net-SCP/Makefile
index 4f5915d4c65c..677136898bba 100644
--- a/net/p5-Net-SCP/Makefile
+++ b/net/p5-Net-SCP/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erich@tacni.net
COMMENT= Perl5 module to access and use scp protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SSH.pm:${PORTSDIR}/net/p5-Net-SSH \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS= ${SITE_PERL}/Net/SSH.pm:${PORTSDIR}/net/p5-Net-SSH \
+ ${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::SCP.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-SCP/pkg-plist b/net/p5-Net-SCP/pkg-plist
index a51250e56234..2b1aeb85092a 100644
--- a/net/p5-Net-SCP/pkg-plist
+++ b/net/p5-Net-SCP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SCP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index 0acf83217e0d..5b3c9498d7e8 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -17,7 +17,6 @@ COMMENT= Net::SMPP - pure Perl implementation of SMPP 3.4 over TCP
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::SMPP.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-SMPP/pkg-plist b/net/p5-Net-SMPP/pkg-plist
index 31e26f6e6cad..e58ebb46e4c1 100644
--- a/net/p5-Net-SMPP/pkg-plist
+++ b/net/p5-Net-SMPP/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMPP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/smsc.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/sendmessage.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme-rec.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme-hammer.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/SMPP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/esme.pl
-lib/perl5/site_perl/%%PERL_VER%%/Net/bind-hammer.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SMPP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP/.packlist
+%%SITE_PERL%%/Net/smsc.pl
+%%SITE_PERL%%/Net/sendmessage.pl
+%%SITE_PERL%%/Net/esme-rec.pl
+%%SITE_PERL%%/Net/esme-hammer.pl
+%%SITE_PERL%%/Net/SMPP.pm
+%%SITE_PERL%%/Net/esme.pl
+%%SITE_PERL%%/Net/bind-hammer.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index 31cd5e1decbe..44caffa5cbd4 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -29,7 +29,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
diff --git a/net/p5-Net-SNPP/pkg-plist b/net/p5-Net-SNPP/pkg-plist
index 88a726efca91..1895e2aa4057 100644
--- a/net/p5-Net-SNPP/pkg-plist
+++ b/net/p5-Net-SNPP/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNPP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP/HylaFAX.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNPP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP/.packlist
+%%SITE_PERL%%/Net/SNPP.pm
+%%SITE_PERL%%/Net/SNPP/Server.pm
+%%SITE_PERL%%/Net/SNPP/HylaFAX.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP
+@dirrm %%SITE_PERL%%/Net/SNPP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index cf1ea6564333..fe184e1bc43a 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -17,7 +17,7 @@ COMMENT= Perl5 module implements both the SSH1 and SSH2 protocols
NO_PACKAGE= "Runaway package build"
-PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERL_BASE= ${SITE_PERL}
BUILD_DEPENDS= ${PERL_BASE}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
${PERL_BASE}/Crypt/DH.pm:${PORTSDIR}/security/p5-Crypt-DH \
${PERL_BASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
@@ -38,7 +38,6 @@ FETCH_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::SSH::Perl::Constants.3 \
Net::SSH::Perl::Util.3 \
Net::SSH::Perl::ChannelMgr.3 \
diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 3425a9e3cf1a..4191f1c6cdd2 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -1,55 +1,55 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Constants.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Hosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Authfile.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/Term.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH2MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1Misc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/SSH1MP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/ChannelMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/KeyboardInt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/PublicKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth/Password.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/RC4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/IDEA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/Blowfish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/CFB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher/DES3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/DSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key/RSA.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex/DH1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Buffer.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/SSH2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp/Zlib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/AuthMgr.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Packet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Channel.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Handle
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Auth
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Cipher
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Key
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Kex
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl/Comp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH/Perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/SSH
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Handle/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Constants.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Hosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Authfile.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH2MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1Misc.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/SSH1MP.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Util.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/ChannelMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/KeyboardInt.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/PublicKey.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Rhosts_RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/ChallengeResponse.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth/Password.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CBC.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/RC4.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/IDEA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/Blowfish.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/CFB.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher/DES3.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/DSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key/RSA.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp.pm
+%%SITE_PERL%%/Net/SSH/Perl/Mac.pm
+%%SITE_PERL%%/Net/SSH/Perl/Auth.pm
+%%SITE_PERL%%/Net/SSH/Perl/Kex/DH1.pm
+%%SITE_PERL%%/Net/SSH/Perl/Buffer.pm
+%%SITE_PERL%%/Net/SSH/Perl/Cipher.pm
+%%SITE_PERL%%/Net/SSH/Perl/SSH2.pm
+%%SITE_PERL%%/Net/SSH/Perl/Key.pm
+%%SITE_PERL%%/Net/SSH/Perl/Comp/Zlib.pm
+%%SITE_PERL%%/Net/SSH/Perl/Agent.pm
+%%SITE_PERL%%/Net/SSH/Perl/Config.pm
+%%SITE_PERL%%/Net/SSH/Perl/AuthMgr.pm
+%%SITE_PERL%%/Net/SSH/Perl/Packet.pm
+%%SITE_PERL%%/Net/SSH/Perl/Channel.pm
+%%SITE_PERL%%/Net/SSH/Perl.pm
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Handle
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Util
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Cipher
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Key
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Kex
+@dirrm %%SITE_PERL%%/Net/SSH/Perl/Comp
+@dirrm %%SITE_PERL%%/Net/SSH/Perl
+@dirrm %%SITE_PERL%%/Net/SSH
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index 179967b31e8e..a7de46ae9cdd 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to access and use ssh protocol
PERL_CONFIGURE= yes
MAN3= Net::SSH.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-SSH/pkg-plist b/net/p5-Net-SSH/pkg-plist
index c5ada57b9b57..c7494f0c65e6 100644
--- a/net/p5-Net-SSH/pkg-plist
+++ b/net/p5-Net-SSH/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SSH
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/SSH.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 7de5dce499ce..1667c5aab7cd 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -18,7 +18,6 @@ COMMENT= A configurable base class for writing internet servers in Perl
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Server.3 \
Net::Server::Daemonize.3\
Net::Server::Fork.3 \
diff --git a/net/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist
index 3c8ed0c280a4..222e9f284fdd 100644
--- a/net/p5-Net-Server/pkg-plist
+++ b/net/p5-Net-Server/pkg-plist
@@ -1,21 +1,21 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Daemonize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Fork.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/INET.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/MultiType.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Multiplex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/PreFork.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/PreForkSimple.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/SSL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/UDP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto/UNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/SIG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Single.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Server/Proto
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Server
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Server.pm
+%%SITE_PERL%%/Net/Server/Daemonize.pm
+%%SITE_PERL%%/Net/Server/Fork.pm
+%%SITE_PERL%%/Net/Server/INET.pm
+%%SITE_PERL%%/Net/Server/MultiType.pm
+%%SITE_PERL%%/Net/Server/Multiplex.pm
+%%SITE_PERL%%/Net/Server/PreFork.pm
+%%SITE_PERL%%/Net/Server/PreForkSimple.pm
+%%SITE_PERL%%/Net/Server/Proto.pm
+%%SITE_PERL%%/Net/Server/Proto/SSL.pm
+%%SITE_PERL%%/Net/Server/Proto/TCP.pm
+%%SITE_PERL%%/Net/Server/Proto/UDP.pm
+%%SITE_PERL%%/Net/Server/Proto/UNIX.pm
+%%SITE_PERL%%/Net/Server/SIG.pm
+%%SITE_PERL%%/Net/Server/Single.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/Server/Proto
+@dirrm %%SITE_PERL%%/Net/Server
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Services/Makefile b/net/p5-Net-Services/Makefile
index 0e7e32310d89..4425e08b80e4 100644
--- a/net/p5-Net-Services/Makefile
+++ b/net/p5-Net-Services/Makefile
@@ -17,7 +17,6 @@ COMMENT= Provides a tied interface to the /etc/services file
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Services.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Services/pkg-plist b/net/p5-Net-Services/pkg-plist
index c2f7c61b1957..f868261143b3 100644
--- a/net/p5-Net-Services/pkg-plist
+++ b/net/p5-Net-Services/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Services.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Services/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Services
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Services.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index e691e26fbd3c..3682df84807b 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to access and use telnet protocol
PERL_CONFIGURE= yes
MAN3= Net::Telnet.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Telnet/pkg-plist b/net/p5-Net-Telnet/pkg-plist
index 2d2c8b096731..6dd1cfd55f80 100644
--- a/net/p5-Net-Telnet/pkg-plist
+++ b/net/p5-Net-Telnet/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Telnet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index feff71b27fec..42f658cfdd5b 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse traceroute(8)
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Traceroute.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Traceroute/pkg-plist b/net/p5-Net-Traceroute/pkg-plist
index 39a27befc5f5..16b451b78c4e 100644
--- a/net/p5-Net-Traceroute/pkg-plist
+++ b/net/p5-Net-Traceroute/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Traceroute.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Traceroute.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index d309c18bac09..7c590eaf47ab 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl module to parse traceroute6(8) output
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Traceroute6.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Traceroute6/pkg-plist b/net/p5-Net-Traceroute6/pkg-plist
index 3b71151261df..2c1eac3fcbe4 100644
--- a/net/p5-Net-Traceroute6/pkg-plist
+++ b/net/p5-Net-Traceroute6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Traceroute6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Traceroute6
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Traceroute6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index f5ba7f5812e5..8f095f0b8959 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -17,7 +17,6 @@ COMMENT= Send Wake On Lan (WOL) packets to power on computers
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Wake.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Wake/pkg-plist b/net/p5-Net-Wake/pkg-plist
index f7a2486892f7..16b211c5a758 100644
--- a/net/p5-Net-Wake/pkg-plist
+++ b/net/p5-Net-Wake/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Wake.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Wake
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Wake.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 278409923eb3..214f7854567c 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -16,11 +16,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mich@FreeBSD.org
COMMENT= Implementation of RIPE Whois
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Whois::RIPE::Iterator.3 \
Net::Whois::RIPE::Object.3 \
Net::Whois::RIPE.3
diff --git a/net/p5-Net-Whois-RIPE/pkg-plist b/net/p5-Net-Whois-RIPE/pkg-plist
index 76fc74303a2c..75ebfdd6d44e 100644
--- a/net/p5-Net-Whois-RIPE/pkg-plist
+++ b/net/p5-Net-Whois-RIPE/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Iterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Iterator.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object.pod
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object/Template.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE/Object
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/RIPE
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois/RIPE.pm
+%%SITE_PERL%%/Net/Whois/RIPE.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Iterator.pm
+%%SITE_PERL%%/Net/Whois/RIPE/Iterator.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Object.pm
+%%SITE_PERL%%/Net/Whois/RIPE/Object.pod
+%%SITE_PERL%%/Net/Whois/RIPE/Object/Template.pm
+@dirrm %%SITE_PERL%%/Net/Whois/RIPE/Object
+@dirrm %%SITE_PERL%%/Net/Whois/RIPE
+@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist
index 18bd79350b4d..91c8e0b802c5 100644
--- a/net/p5-Net-Whois-Raw/pkg-plist
+++ b/net/p5-Net-Whois-Raw/pkg-plist
@@ -1,8 +1,8 @@
bin/pwhois
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois/Raw.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois/Raw.pm
+@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index f751423b5966..4c7f7f0567ae 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A perl5 module to get information using the Whois protocol
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
+RUN_DEPENDS= ${SITE_PERL}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Whois.3
.include <bsd.port.mk>
diff --git a/net/p5-Net-Whois/pkg-plist b/net/p5-Net-Whois/pkg-plist
index c2ce7c9d5ef3..508cac6a217a 100644
--- a/net/p5-Net-Whois/pkg-plist
+++ b/net/p5-Net-Whois/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Whois.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Whois
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Whois.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index bdb32f30e981..23870ceca27e 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -18,7 +18,6 @@ COMMENT= Whois Client Interface for Perl5
PERL_CONFIGURE= YES
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::XWhois.3
post-patch:
diff --git a/net/p5-Net-Z3950-SimpleServer/Makefile b/net/p5-Net-Z3950-SimpleServer/Makefile
index d29b3087f59a..7131e55328f3 100644
--- a/net/p5-Net-Z3950-SimpleServer/Makefile
+++ b/net/p5-Net-Z3950-SimpleServer/Makefile
@@ -20,6 +20,5 @@ PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
MAN3= Net::Z3950::GRS1.3 Net::Z3950::SimpleServer.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-plist b/net/p5-Net-Z3950-SimpleServer/pkg-plist
index c1e2b7b9f1c1..863b7f202857 100644
--- a/net/p5-Net-Z3950-SimpleServer/pkg-plist
+++ b/net/p5-Net-Z3950-SimpleServer/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/GRS1.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/OID.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/SimpleServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/grs_test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/ztest.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/SimpleServer.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/GRS1.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/OID.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/SimpleServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/grs_test.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ztest.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
diff --git a/net/p5-Net-Z3950/Makefile b/net/p5-Net-Z3950/Makefile
index f1225e619f7f..e345c3aa3722 100644
--- a/net/p5-Net-Z3950/Makefile
+++ b/net/p5-Net-Z3950/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= A perl interface to the Z39.50 information retrieval protocol
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MARC.pm:${PORTSDIR}/textproc/p5-MARC \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
+RUN_DEPENDS= ${SITE_PERL}/MARC.pm:${PORTSDIR}/textproc/p5-MARC \
+ ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
@@ -25,6 +25,5 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
MAN3= Net::Z3950::ResultSet.3 Net::Z3950::Manager.3 \
Net::Z3950::Tutorial.3 Net::Z3950::Record.3 \
Net::Z3950::Connection.3 Net::Z3950::APDU.3 Net::Z3950.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Net-Z3950/pkg-plist b/net/p5-Net-Z3950/pkg-plist
index 121608361bf5..c3adeb614121 100644
--- a/net/p5-Net-Z3950/pkg-plist
+++ b/net/p5-Net-Z3950/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/APDU.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Record.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/ResultSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950/Tutorial.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Z3950
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/Z3950.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/APDU.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Connection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Manager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Record.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/ResultSet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950/Tutorial.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index 770beb57f01b..2925f99f48c5 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl modules for using sockets
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Net::Gen.3 \
Net::Inet.3 \
Net::TCP.3 \
diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist
index 83e157f66b21..a39dcbafd6f9 100644
--- a/net/p5-Net-ext/pkg-plist
+++ b/net/p5-Net-ext/pkg-plist
@@ -1,73 +1,73 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Gen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Inet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UDP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Gen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Inet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UDP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index d8006e19dbc1..26d7f52f378b 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= NetAddr::IP::Count - Count hosts in named subnets
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
+BUILD_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= NetAddr::IP::Count.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-NetAddr-IP-Count/pkg-plist b/net/p5-NetAddr-IP-Count/pkg-plist
index 2fad3dc4890f..22e5c2b9bb50 100644
--- a/net/p5-NetAddr-IP-Count/pkg-plist
+++ b/net/p5-NetAddr-IP-Count/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/sample.pl
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP/Count.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count/.packlist
+%%SITE_PERL%%/NetAddr/IP/sample.pl
+%%SITE_PERL%%/NetAddr/IP/Count.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
+@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile
index a9f654cf2744..bd2fae0e00e8 100644
--- a/net/p5-NetAddr-IP/Makefile
+++ b/net/p5-NetAddr-IP/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= Perl module for working with IP addresses and blocks thereof
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-NetAddr-IP/pkg-plist b/net/p5-NetAddr-IP/pkg-plist
index 06ce8b14fa22..3b5b565fb485 100644
--- a/net/p5-NetAddr-IP/pkg-plist
+++ b/net/p5-NetAddr-IP/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/NetAddr/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/NetAddr
+%%SITE_PERL%%/NetAddr/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
+@dirrm %%SITE_PERL%%/NetAddr
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index c79b7a95e892..5ef3bcad5b57 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -17,7 +17,6 @@ COMMENT= Modules to assemble/disassemble network packets at the protocol level
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= NetPacket::LACP.3 NetPacket::IGMP.3 NetPacket::IP.3 \
NetPacket::SpanningTree.3 NetPacket::LLC.3 NetPacket::ARP.3 \
NetPacket.3 NetPacket::UDP.3 NetPacket::Ethernet.3 \
diff --git a/net/p5-POE-Component-RRDTool/Makefile b/net/p5-POE-Component-RRDTool/Makefile
index 837deba5e469..a2f593ccdeb9 100644
--- a/net/p5-POE-Component-RRDTool/Makefile
+++ b/net/p5-POE-Component-RRDTool/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= POE interface to Round Robin Database Tools
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
+BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-POE-Component-RRDTool/pkg-plist b/net/p5-POE-Component-RRDTool/pkg-plist
index 975c5b42eda6..ae6853c7d35f 100644
--- a/net/p5-POE-Component-RRDTool/pkg-plist
+++ b/net/p5-POE-Component-RRDTool/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/RRDTool.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
+%%SITE_PERL%%/POE/Component/RRDTool.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 0bbf0e053f3d..a8e5f46ad5cf 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
COMMENT= Perl module for writing RPC servers and clients
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon
+BUILD_DEPENDS= ${SITE_PERL}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -28,7 +28,7 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif
.include <bsd.port.post.mk>
diff --git a/net/p5-PlRPC/pkg-plist b/net/p5-PlRPC/pkg-plist
index 6dc4af700582..8dc629cd2e0d 100644
--- a/net/p5-PlRPC/pkg-plist
+++ b/net/p5-PlRPC/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/PlRPC.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer/Comm.pm
-lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC/PlServer/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RPC/PlServer
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC/PlServer
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
+%%SITE_PERL%%/Bundle/PlRPC.pm
+%%SITE_PERL%%/RPC/PlClient.pm
+%%SITE_PERL%%/RPC/PlServer.pm
+%%SITE_PERL%%/RPC/PlServer/Comm.pm
+%%SITE_PERL%%/RPC/PlServer/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer/.packlist
+@dirrm %%SITE_PERL%%/RPC/PlServer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index bf53ac830809..ade5849823a7 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= A ResourcePool wrapper for Net::LDAP
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS= ${SITE_PERL}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
+ ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ResourcePool::Resource::Net::LDAP.3 ResourcePool::Factory::Net::LDAP.3
.include <bsd.port.mk>
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
index c3b684b760b8..ea041a51d096 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
@@ -1,12 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP/.packlist
+%%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pm
+%%SITE_PERL%%/ResourcePool/Resource/Net/LDAP.pod
+%%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pm
+%%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Resource/Net
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Factory/Net
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index ad9d5171e4a1..ea6c3f18473f 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -16,13 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= A ResourcePool wrapper for SOAP::Lite
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS= ${SITE_PERL}/ResourcePool.pm:${PORTSDIR}/devel/p5-ResourcePool \
+ ${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= ResourcePool::Factory::SOAP::Lite.3 \
ResourcePool::Command::SOAP::Lite::Call.3
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
index de451c096ce2..9f8f9dda7819 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
@@ -1,15 +1,15 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite/Call.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite/Call.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP/Lite.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP/Lite
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Command/SOAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/SOAP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite/.packlist
+%%SITE_PERL%%/ResourcePool/Command/SOAP/Lite/Call.pod
+%%SITE_PERL%%/ResourcePool/Command/SOAP/Lite/Call.pm
+%%SITE_PERL%%/ResourcePool/Resource/SOAP/Lite.pm
+%%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pm
+%%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP/Lite
+@dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP
+@dirrm %%SITE_PERL%%/ResourcePool/Resource/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrm %%SITE_PERL%%/ResourcePool/Factory/SOAP
+@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
diff --git a/net/p5-SNMP-MIB-Compiler/Makefile b/net/p5-SNMP-MIB-Compiler/Makefile
index f5a01f0cb517..8999b8efdd50 100644
--- a/net/p5-SNMP-MIB-Compiler/Makefile
+++ b/net/p5-SNMP-MIB-Compiler/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= marcus@FreeBSD.org
COMMENT= A Perl MIB compiler supporting both SMIv1 and SMIv2
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
+BUILD_DEPENDS= ${SITE_PERL}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
PERL_CONFIGURE= yes
diff --git a/net/p5-SNMP-MIB-Compiler/pkg-plist b/net/p5-SNMP-MIB-Compiler/pkg-plist
index 1dc69ce8baba..d5743b0f21f8 100644
--- a/net/p5-SNMP-MIB-Compiler/pkg-plist
+++ b/net/p5-SNMP-MIB-Compiler/pkg-plist
@@ -1,13 +1,13 @@
bin/mibbrowser
bin/mibcompiler
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB/Compiler.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP/MIB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/SNMP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%SITE_PERL%%/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/Bundle/SNMP/MIB/Compiler.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
+@dirrm %%SITE_PERL%%/SNMP/MIB
+@dirrm %%SITE_PERL%%/SNMP
+@dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
+@dirrm %%SITE_PERL%%/Bundle/SNMP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index 4072c6530360..bfe7997ff7a3 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
COMMENT= Perl modules to perform SNMP set,get,walk,next,walk_hash etc
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
PERL_CONFIGURE= yes
MAN3= SNMP::Util.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-SNMP-Util/pkg-plist b/net/p5-SNMP-Util/pkg-plist
index 8d1bb8e92c43..45bd43f00781 100644
--- a/net/p5-SNMP-Util/pkg-plist
+++ b/net/p5-SNMP-Util/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP/Util_env.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SNMP
+%%SITE_PERL%%/SNMP/Util.pm
+%%SITE_PERL%%/SNMP/Util_env.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util
+@dirrm %%SITE_PERL%%/SNMP
diff --git a/net/p5-SNMP/pkg-plist b/net/p5-SNMP/pkg-plist
index ab35e7ecaf97..44aead515a4d 100644
--- a/net/p5-SNMP/pkg-plist
+++ b/net/p5-SNMP/pkg-plist
@@ -1,7 +1,7 @@
lib/perl5/site_perl/README.SNMP
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP
+%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
diff --git a/net/p5-SNMP_Session/pkg-plist b/net/p5-SNMP_Session/pkg-plist
index 427fdd615c02..f2271d1b39be 100644
--- a/net/p5-SNMP_Session/pkg-plist
+++ b/net/p5-SNMP_Session/pkg-plist
@@ -1,9 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/BER.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/SNMP_util.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
+%%SITE_PERL%%/BER.pm
+%%SITE_PERL%%/SNMP_Session.pm
+%%SITE_PERL%%/SNMP_util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
%%PORTDOCS%%share/doc/SNMP_Session/README
%%PORTDOCS%%share/doc/SNMP_Session/README.SNMP_util
%%PORTDOCS%%share/doc/SNMP_Session/index.html
%%PORTDOCS%%@dirrm share/doc/SNMP_Session
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SNMP_Session
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index b49ce9229f28..6b05a8418973 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
COMMENT= SOAP::Lite - Client and server side SOAP implementation
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= ${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+ ${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+ ${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist
index 20c83c82ab28..d537be594310 100644
--- a/net/p5-SOAP-Lite/pkg-plist
+++ b/net/p5-SOAP-Lite/pkg-plist
@@ -1,38 +1,38 @@
bin/SOAPsh.pl
bin/XMLRPCsh.pl
bin/stubmaker.pl
-lib/perl5/site_perl/%%PERL_VER%%/Apache/SOAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Apache/XMLRPC/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/SessionData.pm
-lib/perl5/site_perl/%%PERL_VER%%/IO/SessionSet.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/FTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/IO.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/JABBER.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/LOCAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/MAILTO.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/MQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/POP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/UDDI/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/Parser/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/POP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/Lite
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/XMLRPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/UDDI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLRPC/Transport
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLRPC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/Apache/SOAP.pm
+%%SITE_PERL%%/Apache/XMLRPC/Lite.pm
+%%SITE_PERL%%/IO/SessionData.pm
+%%SITE_PERL%%/IO/SessionSet.pm
+%%SITE_PERL%%/SOAP/Lite.pm
+%%SITE_PERL%%/SOAP/Test.pm
+%%SITE_PERL%%/SOAP/Transport/FTP.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP.pm
+%%SITE_PERL%%/SOAP/Transport/IO.pm
+%%SITE_PERL%%/SOAP/Transport/JABBER.pm
+%%SITE_PERL%%/SOAP/Transport/LOCAL.pm
+%%SITE_PERL%%/SOAP/Transport/MAILTO.pm
+%%SITE_PERL%%/SOAP/Transport/MQ.pm
+%%SITE_PERL%%/SOAP/Transport/POP3.pm
+%%SITE_PERL%%/SOAP/Transport/TCP.pm
+%%SITE_PERL%%/UDDI/Lite.pm
+%%SITE_PERL%%/XML/Parser/Lite.pm
+%%SITE_PERL%%/XMLRPC/Lite.pm
+%%SITE_PERL%%/XMLRPC/Test.pm
+%%SITE_PERL%%/XMLRPC/Transport/HTTP.pm
+%%SITE_PERL%%/XMLRPC/Transport/POP3.pm
+%%SITE_PERL%%/XMLRPC/Transport/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Apache/XMLRPC
+@dirrm %%SITE_PERL%%/SOAP/Transport
+@dirrm %%SITE_PERL%%/UDDI
+@dirrm %%SITE_PERL%%/XMLRPC/Transport
+@dirrm %%SITE_PERL%%/XMLRPC
+@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 478b4ab968f8..998d6aeefcc9 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SOAP.3 SOAP::SimpleTypeWrapper.3 SOAP::Parser.3 \
SOAP::EnvelopeMaker.3 SOAP::GenericScalarSerializer.3 \
SOAP::Transport::HTTP::Apache.3 SOAP::TypedPrimitiveSerializer.3 \
diff --git a/net/p5-SOAP/pkg-plist b/net/p5-SOAP/pkg-plist
index c6abac241524..65422beedb8b 100644
--- a/net/p5-SOAP/pkg-plist
+++ b/net/p5-SOAP/pkg-plist
@@ -1,27 +1,27 @@
-lib/perl5/site_perl/%%PERL_VER%%/SOAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Defs.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Envelope.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/EnvelopeMaker.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericHashSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericInputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/GenericScalarSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/OutputStream.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Packager.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Serializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/SimpleTypeWrapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Struct.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/StructSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/CGI.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypeMapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypedPrimitive.pm
-lib/perl5/site_perl/%%PERL_VER%%/SOAP/TypedPrimitiveSerializer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport/HTTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/SOAP/Transport
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+%%SITE_PERL%%/SOAP.pm
+%%SITE_PERL%%/SOAP/Defs.pm
+%%SITE_PERL%%/SOAP/Envelope.pm
+%%SITE_PERL%%/SOAP/EnvelopeMaker.pm
+%%SITE_PERL%%/SOAP/GenericHashSerializer.pm
+%%SITE_PERL%%/SOAP/GenericInputStream.pm
+%%SITE_PERL%%/SOAP/GenericScalarSerializer.pm
+%%SITE_PERL%%/SOAP/OutputStream.pm
+%%SITE_PERL%%/SOAP/Packager.pm
+%%SITE_PERL%%/SOAP/Parser.pm
+%%SITE_PERL%%/SOAP/Serializer.pm
+%%SITE_PERL%%/SOAP/SimpleTypeWrapper.pm
+%%SITE_PERL%%/SOAP/Struct.pm
+%%SITE_PERL%%/SOAP/StructSerializer.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Apache.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/CGI.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Client.pm
+%%SITE_PERL%%/SOAP/Transport/HTTP/Server.pm
+%%SITE_PERL%%/SOAP/TypeMapper.pm
+%%SITE_PERL%%/SOAP/TypedPrimitive.pm
+%%SITE_PERL%%/SOAP/TypedPrimitiveSerializer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
+@dirrm %%SITE_PERL%%/SOAP/Transport/HTTP
+@dirrm %%SITE_PERL%%/SOAP/Transport
+@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
diff --git a/net/p5-Socket6/pkg-plist b/net/p5-Socket6/pkg-plist
index 51cd5e3f22d9..01f8440ef22d 100644
--- a/net/p5-Socket6/pkg-plist
+++ b/net/p5-Socket6/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Socket6.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/Socket6.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6/Socket6.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket6
+%%SITE_PERL%%/%%PERL_ARCH%%/Socket6.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/Socket6.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6/Socket6.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Socket6
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 3b4162bb6076..6f5915aedc6b 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -18,6 +18,5 @@ COMMENT= Perl5 module to communicate with socks v4 and v5 servers
PERL_CONFIGURE= yes
MAN3= Net::SOCKS.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist
index 9989db8a57c4..b1c97b391aba 100644
--- a/net/p5-Socks/pkg-plist
+++ b/net/p5-Socks/pkg-plist
@@ -1,25 +1,25 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SOCKS/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/SOCKS.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/accept.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/close.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/connect.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/param.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_connect.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_get_resp5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_get_response.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_import_args.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_method_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_method_response5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_request.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_user_request5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_user_response5.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_validate.al
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SOCKS
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS/.packlist
+%%SITE_PERL%%/Net/SOCKS.pm
+%%SITE_PERL%%/auto/Net/SOCKS/accept.al
+%%SITE_PERL%%/auto/Net/SOCKS/autosplit.ix
+%%SITE_PERL%%/auto/Net/SOCKS/bind.al
+%%SITE_PERL%%/auto/Net/SOCKS/close.al
+%%SITE_PERL%%/auto/Net/SOCKS/connect.al
+%%SITE_PERL%%/auto/Net/SOCKS/new.al
+%%SITE_PERL%%/auto/Net/SOCKS/param.al
+%%SITE_PERL%%/auto/Net/SOCKS/_connect.al
+%%SITE_PERL%%/auto/Net/SOCKS/_get_resp5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_get_response.al
+%%SITE_PERL%%/auto/Net/SOCKS/_import_args.al
+%%SITE_PERL%%/auto/Net/SOCKS/_method_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_method_response5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_request.al
+%%SITE_PERL%%/auto/Net/SOCKS/_user_request5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_user_response5.al
+%%SITE_PERL%%/auto/Net/SOCKS/_validate.al
+@dirrm %%SITE_PERL%%/auto/Net/SOCKS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Spread-Session/Makefile b/net/p5-Spread-Session/Makefile
index 6a94d347b693..18206d151d1a 100644
--- a/net/p5-Spread-Session/Makefile
+++ b/net/p5-Spread-Session/Makefile
@@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= joshua@roughtrade.net
COMMENT= Perl OO wrapper for Spread messaging toolkit
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Spread.pm:${PORTSDIR}/net/spread
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Spread::Session.3
.include <bsd.port.mk>
diff --git a/net/p5-Spread-Session/pkg-plist b/net/p5-Spread-Session/pkg-plist
index 6fd057a70d8f..acb5bc782b78 100644
--- a/net/p5-Spread-Session/pkg-plist
+++ b/net/p5-Spread-Session/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Spread/Session.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Session
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Spread 2>/dev/null || true
+%%SITE_PERL%%/Spread/Session.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Spread 2>/dev/null || true
diff --git a/net/p5-Telnet-Cisco/Makefile b/net/p5-Telnet-Cisco/Makefile
index 8d939273774e..b085d858b2b6 100644
--- a/net/p5-Telnet-Cisco/Makefile
+++ b/net/p5-Telnet-Cisco/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lyngbol@wheel.dk
COMMENT= Perl5 module to telnet to Cisco routers
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+ ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Net::Telnet::Cisco.3
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff --git a/net/p5-Telnet-Cisco/pkg-plist b/net/p5-Telnet-Cisco/pkg-plist
index 9c5819955ccc..a47cbba36307 100644
--- a/net/p5-Telnet-Cisco/pkg-plist
+++ b/net/p5-Telnet-Cisco/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet/Cisco.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet/Cisco 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/Net/Telnet/Cisco.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
+%%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index a85640a0254d..3b4f264932ca 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -17,7 +17,6 @@ COMMENT= Perl5 interface to Uniform Resource Identifier (URI) references
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= URI.3 \
URI::Escape.3 \
URI::Heuristic.3 \
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index f85d54a4a1e6..d7c908f69424 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -15,14 +15,13 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= XML Procedure Call (XPC)
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ ${SITE_PERL}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww \
+ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= XPC.3 XPC::Agent.3 XPC::Daemon.3
.include <bsd.port.mk>
diff --git a/net/p5-XPC/pkg-plist b/net/p5-XPC/pkg-plist
index 1e69c4622f03..0a33a152cb82 100644
--- a/net/p5-XPC/pkg-plist
+++ b/net/p5-XPC/pkg-plist
@@ -1,9 +1,9 @@
bin/xpcc
bin/xpcd
-lib/perl5/site_perl/%%PERL_VER%%/XPC.pm
-lib/perl5/site_perl/%%PERL_VER%%/XPC/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/XPC/Daemon.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XPC
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XPC/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XPC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+%%SITE_PERL%%/XPC.pm
+%%SITE_PERL%%/XPC/Agent.pm
+%%SITE_PERL%%/XPC/Daemon.pm
+@dirrm %%SITE_PERL%%/XPC
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XPC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/net/perldap/Makefile b/net/perldap/Makefile
index 91c458430f19..7c31fb0afd82 100644
--- a/net/perldap/Makefile
+++ b/net/perldap/Makefile
@@ -18,7 +18,6 @@ COMMENT= Perl interface to LDAP
LIB_DEPENDS= mozldap.1:${PORTSDIR}/net/ldapsdk
WRKSRC= ${WRKDIR}/$(PORTNAME)-$(PORTVERSION)
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mozilla::LDAP::Conn.3 \
Mozilla::LDAP::LDIF.3 \
Mozilla::LDAP::Utils.3 \
diff --git a/net/perldap/pkg-plist b/net/perldap/pkg-plist
index 978b2fe5206c..4e9177b93c09 100644
--- a/net/perldap/pkg-plist
+++ b/net/perldap/pkg-plist
@@ -1,14 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Conn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/LDIF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Utils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/API.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP/Entry.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mozilla
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla/LDAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mozilla
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/API.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Conn.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/LDIF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/API.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP/Entry.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP/API
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mozilla
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mozilla/LDAP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mozilla
diff --git a/net/radiator/pkg-plist b/net/radiator/pkg-plist
index 7c333e63203c..80e9e14dacd9 100644
--- a/net/radiator/pkg-plist
+++ b/net/radiator/pkg-plist
@@ -2,134 +2,134 @@ bin/builddbm
bin/buildsql
bin/radiusd
bin/radpwtst
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorDHCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AddressAllocatorSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AttrVal.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthACE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthADSI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthCDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthDBFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthDYNADDRESS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEMERALD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEMERALD4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthEXTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthGROUP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthHTGROUP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthIMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthINTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthIPASS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAP2.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLDAPSDK.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLOADBALANCE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthLogSYSLOG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthMOBILEIP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthNISPLUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthNT.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthOPIE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPAM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPLATYPUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPOP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthPORTLIMITCHECK.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADIUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADKEY.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRADMIN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthRODOPI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthROUNDROBIN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSQLRADIUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthSYSTEM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthTACACSPLUS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthTEST.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthUNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthURL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/AuthVOLUMEBALANCE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/ClientListSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Configurable.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Context.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/DES.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/DHCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_13.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_21.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_25.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_26.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/EAP_5.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Finger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Handler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Log.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogEMERALD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/LogSYSLOG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/MSCHAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Mib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Monitor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Ascend.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/AscendSNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay4000SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay5399SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Bay8000SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/BayFinger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Cisco.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/CiscoVPDN.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Computone.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Cyclades.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Hiper.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Livingston.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/NortelCVX1800.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Patton.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Ping.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portmaster3.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portmaster4.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Portslave.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/PortslaveLinux.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/PortslaveMoxa.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Shiva.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Tigris.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TigrisNew.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TigrisOld.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TotalControl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/TotalControlSNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/Xyplex.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/ignore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas/unknown.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/RDict.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Radius.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/RadpwtstGui.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Rcrypt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Realm.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SNMPAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Select.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/ServerConfig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessDBM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessINTERNAL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessNULL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SessSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SimpleClient.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/SqlDb.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogFILE.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogGeneric.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/StatsLogSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/TLS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/User.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Radius/Win32Service.pm
-lib/perl5/site_perl/%%PERL_VER%%/radhostname.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Radius/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Radius/Nas
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Radius
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Radius
+%%SITE_PERL%%/Radius/AddressAllocatorDHCP.pm
+%%SITE_PERL%%/Radius/AddressAllocatorGeneric.pm
+%%SITE_PERL%%/Radius/AddressAllocatorSQL.pm
+%%SITE_PERL%%/Radius/AttrVal.pm
+%%SITE_PERL%%/Radius/AuthACE.pm
+%%SITE_PERL%%/Radius/AuthADSI.pm
+%%SITE_PERL%%/Radius/AuthCDB.pm
+%%SITE_PERL%%/Radius/AuthDBFILE.pm
+%%SITE_PERL%%/Radius/AuthDYNADDRESS.pm
+%%SITE_PERL%%/Radius/AuthEMERALD.pm
+%%SITE_PERL%%/Radius/AuthEMERALD4.pm
+%%SITE_PERL%%/Radius/AuthEXTERNAL.pm
+%%SITE_PERL%%/Radius/AuthFILE.pm
+%%SITE_PERL%%/Radius/AuthGROUP.pm
+%%SITE_PERL%%/Radius/AuthGeneric.pm
+%%SITE_PERL%%/Radius/AuthHTGROUP.pm
+%%SITE_PERL%%/Radius/AuthIMAP.pm
+%%SITE_PERL%%/Radius/AuthINTERNAL.pm
+%%SITE_PERL%%/Radius/AuthIPASS.pm
+%%SITE_PERL%%/Radius/AuthLDAP.pm
+%%SITE_PERL%%/Radius/AuthLDAP2.pm
+%%SITE_PERL%%/Radius/AuthLDAPSDK.pm
+%%SITE_PERL%%/Radius/AuthLOADBALANCE.pm
+%%SITE_PERL%%/Radius/AuthLogFILE.pm
+%%SITE_PERL%%/Radius/AuthLogGeneric.pm
+%%SITE_PERL%%/Radius/AuthLogSQL.pm
+%%SITE_PERL%%/Radius/AuthLogSYSLOG.pm
+%%SITE_PERL%%/Radius/AuthMOBILEIP.pm
+%%SITE_PERL%%/Radius/AuthNISPLUS.pm
+%%SITE_PERL%%/Radius/AuthNT.pm
+%%SITE_PERL%%/Radius/AuthOPIE.pm
+%%SITE_PERL%%/Radius/AuthPAM.pm
+%%SITE_PERL%%/Radius/AuthPLATYPUS.pm
+%%SITE_PERL%%/Radius/AuthPOP3.pm
+%%SITE_PERL%%/Radius/AuthPORTLIMITCHECK.pm
+%%SITE_PERL%%/Radius/AuthRADIUS.pm
+%%SITE_PERL%%/Radius/AuthRADKEY.pm
+%%SITE_PERL%%/Radius/AuthRADMIN.pm
+%%SITE_PERL%%/Radius/AuthRODOPI.pm
+%%SITE_PERL%%/Radius/AuthROUNDROBIN.pm
+%%SITE_PERL%%/Radius/AuthSQL.pm
+%%SITE_PERL%%/Radius/AuthSQLRADIUS.pm
+%%SITE_PERL%%/Radius/AuthSYSTEM.pm
+%%SITE_PERL%%/Radius/AuthTACACSPLUS.pm
+%%SITE_PERL%%/Radius/AuthTEST.pm
+%%SITE_PERL%%/Radius/AuthUNIX.pm
+%%SITE_PERL%%/Radius/AuthURL.pm
+%%SITE_PERL%%/Radius/AuthVOLUMEBALANCE.pm
+%%SITE_PERL%%/Radius/Client.pm
+%%SITE_PERL%%/Radius/ClientListSQL.pm
+%%SITE_PERL%%/Radius/Configurable.pm
+%%SITE_PERL%%/Radius/Context.pm
+%%SITE_PERL%%/Radius/DES.pm
+%%SITE_PERL%%/Radius/DHCP.pm
+%%SITE_PERL%%/Radius/EAP.pm
+%%SITE_PERL%%/Radius/EAP_13.pm
+%%SITE_PERL%%/Radius/EAP_21.pm
+%%SITE_PERL%%/Radius/EAP_25.pm
+%%SITE_PERL%%/Radius/EAP_26.pm
+%%SITE_PERL%%/Radius/EAP_4.pm
+%%SITE_PERL%%/Radius/EAP_5.pm
+%%SITE_PERL%%/Radius/Finger.pm
+%%SITE_PERL%%/Radius/Handler.pm
+%%SITE_PERL%%/Radius/Log.pm
+%%SITE_PERL%%/Radius/LogEMERALD.pm
+%%SITE_PERL%%/Radius/LogFILE.pm
+%%SITE_PERL%%/Radius/LogGeneric.pm
+%%SITE_PERL%%/Radius/LogSQL.pm
+%%SITE_PERL%%/Radius/LogSYSLOG.pm
+%%SITE_PERL%%/Radius/MSCHAP.pm
+%%SITE_PERL%%/Radius/Mib.pm
+%%SITE_PERL%%/Radius/Monitor.pm
+%%SITE_PERL%%/Radius/Nas.pm
+%%SITE_PERL%%/Radius/Nas/Ascend.pm
+%%SITE_PERL%%/Radius/Nas/AscendSNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay.pm
+%%SITE_PERL%%/Radius/Nas/Bay4000SNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay5399SNMP.pm
+%%SITE_PERL%%/Radius/Nas/Bay8000SNMP.pm
+%%SITE_PERL%%/Radius/Nas/BayFinger.pm
+%%SITE_PERL%%/Radius/Nas/Cisco.pm
+%%SITE_PERL%%/Radius/Nas/CiscoVPDN.pm
+%%SITE_PERL%%/Radius/Nas/Computone.pm
+%%SITE_PERL%%/Radius/Nas/Cyclades.pm
+%%SITE_PERL%%/Radius/Nas/Hiper.pm
+%%SITE_PERL%%/Radius/Nas/Livingston.pm
+%%SITE_PERL%%/Radius/Nas/NortelCVX1800.pm
+%%SITE_PERL%%/Radius/Nas/Patton.pm
+%%SITE_PERL%%/Radius/Nas/Ping.pm
+%%SITE_PERL%%/Radius/Nas/Portmaster3.pm
+%%SITE_PERL%%/Radius/Nas/Portmaster4.pm
+%%SITE_PERL%%/Radius/Nas/Portslave.pm
+%%SITE_PERL%%/Radius/Nas/PortslaveLinux.pm
+%%SITE_PERL%%/Radius/Nas/PortslaveMoxa.pm
+%%SITE_PERL%%/Radius/Nas/Shiva.pm
+%%SITE_PERL%%/Radius/Nas/Tigris.pm
+%%SITE_PERL%%/Radius/Nas/TigrisNew.pm
+%%SITE_PERL%%/Radius/Nas/TigrisOld.pm
+%%SITE_PERL%%/Radius/Nas/TotalControl.pm
+%%SITE_PERL%%/Radius/Nas/TotalControlSNMP.pm
+%%SITE_PERL%%/Radius/Nas/Xyplex.pm
+%%SITE_PERL%%/Radius/Nas/ignore.pm
+%%SITE_PERL%%/Radius/Nas/unknown.pm
+%%SITE_PERL%%/Radius/RDict.pm
+%%SITE_PERL%%/Radius/Radius.pm
+%%SITE_PERL%%/Radius/RadpwtstGui.pm
+%%SITE_PERL%%/Radius/Rcrypt.pm
+%%SITE_PERL%%/Radius/Realm.pm
+%%SITE_PERL%%/Radius/SNMP.pm
+%%SITE_PERL%%/Radius/SNMPAgent.pm
+%%SITE_PERL%%/Radius/Select.pm
+%%SITE_PERL%%/Radius/ServerConfig.pm
+%%SITE_PERL%%/Radius/SessDBM.pm
+%%SITE_PERL%%/Radius/SessGeneric.pm
+%%SITE_PERL%%/Radius/SessINTERNAL.pm
+%%SITE_PERL%%/Radius/SessNULL.pm
+%%SITE_PERL%%/Radius/SessSQL.pm
+%%SITE_PERL%%/Radius/SimpleClient.pm
+%%SITE_PERL%%/Radius/SqlDb.pm
+%%SITE_PERL%%/Radius/StatsLogFILE.pm
+%%SITE_PERL%%/Radius/StatsLogGeneric.pm
+%%SITE_PERL%%/Radius/StatsLogSQL.pm
+%%SITE_PERL%%/Radius/TLS.pm
+%%SITE_PERL%%/Radius/User.pm
+%%SITE_PERL%%/Radius/Util.pm
+%%SITE_PERL%%/Radius/Win32Service.pm
+%%SITE_PERL%%/radhostname.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius/.packlist
+@dirrm %%SITE_PERL%%/Radius/Nas
+@dirrm %%SITE_PERL%%/Radius
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Radius
diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index ec6d4faf7a67..4b0bd395c706 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
-SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL= ${SITE_PERL}
USE_PERL5= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
@@ -27,7 +27,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX}/rancid
-MANPREFIX= ${PREFIX}/rancid
MAN1= lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
diff --git a/net/remarp/pkg-plist b/net/remarp/pkg-plist
index 7b1cdbf0912a..ca539473cd5d 100644
--- a/net/remarp/pkg-plist
+++ b/net/remarp/pkg-plist
@@ -1,5 +1,5 @@
sbin/remarp
etc/remarp.conf.sample
-lib/perl5/site_perl/%%PERL_VER%%/remarp/config.pm
-lib/perl5/site_perl/%%PERL_VER%%/remarp/configure.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/remarp
+%%SITE_PERL%%/remarp/config.pm
+%%SITE_PERL%%/remarp/configure.pm
+@dirrm %%SITE_PERL%%/remarp
diff --git a/net/rrdtool/pkg-plist b/net/rrdtool/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/net/rrdtool/pkg-plist
+++ b/net/rrdtool/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
index 579be8a0753f..a84a6d29e72e 100644
--- a/net/rrdtool10/pkg-plist
+++ b/net/rrdtool10/pkg-plist
@@ -73,16 +73,16 @@ share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/RRDs.html
share/doc/rrdtool/html/RRDp.html
share/doc/rrdtool/html/rrdxport.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%SITE_PERL%%/RRDp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
@dirrm share/examples/rrdtool/trytime
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html
@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index b7ea631d841f..9401c691bfc1 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -15,17 +15,17 @@ lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%share/doc/spread/perl/README
%%PORTDOCS%%share/doc/spread/perl/test.pl
%%PORTDOCS%%share/doc/spread/LICENSE
%%PORTDOCS%%share/doc/spread/Readme.txt
@unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@dirrm share/doc/spread/perl
%%PORTDOCS%%@dirrm share/doc/spread
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
index b7ea631d841f..9401c691bfc1 100644
--- a/net/spread4/pkg-plist
+++ b/net/spread4/pkg-plist
@@ -15,17 +15,17 @@ lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%share/doc/spread/perl/README
%%PORTDOCS%%share/doc/spread/perl/test.pl
%%PORTDOCS%%share/doc/spread/LICENSE
%%PORTDOCS%%share/doc/spread/Readme.txt
@unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@dirrm share/doc/spread/perl
%%PORTDOCS%%@dirrm share/doc/spread
diff --git a/net/v6eval/pkg-plist b/net/v6eval/pkg-plist
index e99edb6c1262..a33543afe0bb 100644
--- a/net/v6eval/pkg-plist
+++ b/net/v6eval/pkg-plist
@@ -499,6 +499,6 @@ v6eval/man/man1/pktsend.1.gz
@unexec rmdir %D/v6eval/etc 2>/dev/null || true
@dirrm v6eval/include
@dirrm v6eval
-lib/perl5/site_perl/%%PERL_VER%%/V6evalTool.pm
-lib/perl5/site_perl/%%PERL_VER%%/V6evalCommon.pm
-lib/perl5/site_perl/%%PERL_VER%%/V6evalRemote.pm
+%%SITE_PERL%%/V6evalTool.pm
+%%SITE_PERL%%/V6evalCommon.pm
+%%SITE_PERL%%/V6evalRemote.pm
diff --git a/net/vicq/Makefile b/net/vicq/Makefile
index 5ef7fcfac345..6ba820996d4a 100644
--- a/net/vicq/Makefile
+++ b/net/vicq/Makefile
@@ -14,13 +14,12 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= A text-based ICQ implementation
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
WRKSRC= ${WRKDIR}/${PORTNAME}
PERL_CONFIGURE= yes
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-extract:
${MV} ${WRKSRC}/Net/vICQ/* ${WRKSRC}
diff --git a/net/vicq/pkg-plist b/net/vicq/pkg-plist
index bd1bf6a93db3..b8b31b16b64b 100644
--- a/net/vicq/pkg-plist
+++ b/net/vicq/pkg-plist
@@ -1,8 +1,8 @@
bin/vicq
-lib/perl5/site_perl/%%PERL_VER%%/Net/vICQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
+%%SITE_PERL%%/Net/vICQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist
share/examples/vicq/vicqrc.example
@dirrm share/examples/vicq
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true
diff --git a/net/wakeonlan/pkg-plist b/net/wakeonlan/pkg-plist
index 0ea3783ed223..54f74c5e4dc9 100644
--- a/net/wakeonlan/pkg-plist
+++ b/net/wakeonlan/pkg-plist
@@ -1,5 +1,5 @@
bin/wakeonlan
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
share/examples/wakeonlan/lab001.wol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/wakeonlan
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan
@dirrm share/examples/wakeonlan
diff --git a/net/wping/Makefile b/net/wping/Makefile
index 48b42c0e7a59..91c4f350adb3 100644
--- a/net/wping/Makefile
+++ b/net/wping/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://www.x-router.com/files/
MAINTAINER= mich@FreeBSD.org
COMMENT= A Web-based graphical ping log
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index afb44306fdc2..672d3067400f 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML-RPC library for C and C++
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
+RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_REINPLACE= yes
USE_LIBTOOL= yes
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index afb44306fdc2..672d3067400f 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML-RPC library for C and C++
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
+RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_REINPLACE= yes
USE_LIBTOOL= yes