29 files changed, 97 insertions, 97 deletions

diff --git a/net-mgmt/argus-monitor/Makefile b/net-mgmt/argus-monitor/Makefile
index 9a74f07de190..f1d9adedbaf1 100644
--- a/net-mgmt/argus-monitor/Makefile
+++ b/net-mgmt/argus-monitor/Makefile
@@ -50,8 +50,8 @@ BUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif
 
 .if !defined(WITHOUT_GD)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 .endif
 
 post-install:
diff --git a/net-mgmt/aspathtree/Makefile b/net-mgmt/aspathtree/Makefile
index f83d502e7e6d..df406734f5d5 100644
--- a/net-mgmt/aspathtree/Makefile
+++ b/net-mgmt/aspathtree/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	ASpath-tree-v${PORTVERSION}
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Checks IPv6 routes' stability and correctness on IPv6 internet
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
 		whois3:${PORTSDIR}/net/ripe-whois
 
 WRKSRC=			${WRKDIR}/ASpath-tree-v${PORTVERSION}/
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index e9b9a271b679..021f66acda22 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -15,12 +15,12 @@ DISTNAME=		big-sister-${PORTVERSION}
 MAINTAINER=	freebsd@troback.com
 COMMENT=	SNMP-based network and system monitor with web interface
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp \
+RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 		rrdtool:${PORTSDIR}/databases/rrdtool \
-		${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile
index e0006d97f2b7..55c7f8fe68fa 100644
--- a/net-mgmt/check_mysql_health/Makefile
+++ b/net-mgmt/check_mysql_health/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://labs.consol.de/wp-content/uploads/2011/04/
 MAINTAINER=	ssanders@taximagic.com
 COMMENT=	Nagios plugin to check various parameters of a MySQL database
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
 LICENSE=	GPLv2
 
diff --git a/net-mgmt/circe/Makefile b/net-mgmt/circe/Makefile
index 07b1608c0ef8..823db1643f99 100644
--- a/net-mgmt/circe/Makefile
+++ b/net-mgmt/circe/Makefile
@@ -15,18 +15,18 @@ COMMENT=	A captive portal-based network access control solution in perl
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	${SITE_PERL}/mach/Net/IP/Match/XS.pm:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO \
-		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/${PERL_ARCH}/Sys/Syslog.pm:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		${SITE_PERL}/${PERL_ARCH}/TryCatch.pm:${PORTSDIR}/lang/p5-TryCatch \
-		${SITE_PERL}/Data/Validate/IP.pm:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP \
-		${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
-		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
-		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
-		${SITE_PERL}/Proc/PID/File.pm:${PORTSDIR}/devel/p5-Proc-PID-File
+RUN_DEPENDS=	p5-Net-IP-Match-XS>=0:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-IO>=0:${PORTSDIR}/devel/p5-IO \
+		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+		p5-Sys-Syslog>=0:${PORTSDIR}/sysutils/p5-Sys-Syslog \
+		p5-TryCatch>=0:${PORTSDIR}/lang/p5-TryCatch \
+		p5-Data-Validate-IP>=0:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP \
+		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
+		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
+		p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
+		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
+		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
 
 USE_PERL5=	yes
 
@@ -38,8 +38,8 @@ OPTIONS=	ENCRYPT "Encrypt the destination URL in redirection" Off
 .include <bsd.port.options.mk>
 
 .if defined(WITH_ENCRYPT)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/AES.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES
+RUN_DEPENDS+=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
+		p5-Crypt-OpenSSL-AES>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES
 .endif
 
 MANCOMPRESSED=	no
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index d315931560d2..88ef019f88d8 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -137,10 +137,10 @@ CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if defined(WITH_CGI)
-RUN_DEPENDS+=	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
-		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
+		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 PLIST_SUB+=	CGI=""
 WITH_RRDTOOL=	YES
 .else
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 7f220939eb3c..39a806ecfa0a 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -143,10 +143,10 @@ CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if defined(WITH_CGI)
-RUN_DEPENDS+=	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
-		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
+		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 PLIST_SUB+=	CGI=""
 WITH_RRDTOOL=	YES
 .else
diff --git a/net-mgmt/fetchconfig/Makefile b/net-mgmt/fetchconfig/Makefile
index fc725121b490..899b9570d2ef 100644
--- a/net-mgmt/fetchconfig/Makefile
+++ b/net-mgmt/fetchconfig/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	salexanov@gmail.com
 COMMENT=	Perl script for retrieving configuration of various network devices
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
diff --git a/net-mgmt/glpi-plugins-tracker-agent/Makefile b/net-mgmt/glpi-plugins-tracker-agent/Makefile
index c7d5aaf3b509..bcda7f106505 100644
--- a/net-mgmt/glpi-plugins-tracker-agent/Makefile
+++ b/net-mgmt/glpi-plugins-tracker-agent/Makefile
@@ -17,11 +17,11 @@ DISTNAME=	glpi-tracker_agent-1.5.3
 MAINTAINER=	d.durieux@siprossii.com
 COMMENT=	Agent get informations of networking devices by SNMP for GLPI
 
-RUN_DEPENDS=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Parallel/ForkManager.pm:${PORTSDIR}/devel/p5-Parallel-ForkManager
+RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
+		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/agent_tracker
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 54a8b58cf98f..5d5a78d4c452 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	ports@subnets.ru
 COMMENT=	The multi-router traffic grapher
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
+RUN_DEPENDS=	p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session
 
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
@@ -78,11 +78,11 @@ PORTEXAMPLES=	*
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
-RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 .endif
 
 .if defined(WITH_SNMP)
-RUN_DEPENDS+=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 .endif
 
 post-extract:
diff --git a/net-mgmt/nagios-certexp-plugin/Makefile b/net-mgmt/nagios-certexp-plugin/Makefile
index 12096d9746c8..a51135a38f88 100644
--- a/net-mgmt/nagios-certexp-plugin/Makefile
+++ b/net-mgmt/nagios-certexp-plugin/Makefile
@@ -14,9 +14,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ecronin@gizmolabs.org
 COMMENT=	Nagios plugin for checking SSL server certificate expiration
 
-RUN_DEPENDS+=	${SITE_PERL}/mach/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS+=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
 
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 3e61ea946827..c775eac3321c 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -87,9 +87,9 @@ PLIST_SUB+=	SUB_FPING="@comment "
 
 .if defined(WITH_NETSNMP)
 BUILD_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
-		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 CONFIGURE_ARGS+=	--enable-snmp
 PLIST_SUB+=	SUB_SNMP=""
 .else
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index ab2e0ef2ced0..44473d748a1e 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hizel@vyborg.ru
 COMMENT=	Generate rrdtool\'s graphs by performance data from nagios plugins
 
 RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios \
-		${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool
+		rrdtool>=0:${PORTSDIR}/databases/rrdtool
 
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
diff --git a/net-mgmt/nagiosgrapher/Makefile b/net-mgmt/nagiosgrapher/Makefile
index 58166a74907a..9e7f046f5b70 100644
--- a/net-mgmt/nagiosgrapher/Makefile
+++ b/net-mgmt/nagiosgrapher/Makefile
@@ -17,11 +17,11 @@ MAINTAINER=	cristianorolim@hotmail.com
 COMMENT=	Collects the output from Nagios and generates graphs
 
 BUILD_DEPENDS=	\
-	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
-	${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
-	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-	${SITE_PERL}/Calendar/Simple.pm:${PORTSDIR}/devel/p5-Calendar-Simple \
+	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
+	ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \
+	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+	p5-Calendar-Simple>=0:${PORTSDIR}/devel/p5-Calendar-Simple \
 	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 11314aca9bd4..26a335902250 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Web based frontend to nfdump netflow collector
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/BSD-license.txt
 
-RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
-		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
 		nfdump:${PORTSDIR}/net-mgmt/nfdump
 
 USE_ICONV=	yes
diff --git a/net-mgmt/nrpep/Makefile b/net-mgmt/nrpep/Makefile
index 94cc23a99565..a5a9ecc678c7 100644
--- a/net-mgmt/nrpep/Makefile
+++ b/net-mgmt/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=  	${SITE_PERL}/Crypt/TripleDES.pm:${PORTSDIR}/security/p5-Crypt-TripleDES
+RUN_DEPENDS=  	p5-Crypt-TripleDES>=0:${PORTSDIR}/security/p5-Crypt-TripleDES
 
 USE_PERL5_RUN=	yes
 
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index b220943fd3c4..e624180e2a9b 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -73,7 +73,7 @@ USE_MYSQL=	client
 .endif
 
 .if defined(WITH_JAIL)
-RUN_DEPENDS+=	${SITE_PERL}/Net/Ping.pm:${PORTSDIR}/net/p5-Net-Ping
+RUN_DEPENDS+=	p5-Net-Ping>=0:${PORTSDIR}/net/p5-Net-Ping
 DISTFILES+=	fping
 SUB_LIST+=	FPING="${LOCALBASE}/bin/fping-perl"
 PLIST_FILES+=	bin/fping-perl
diff --git a/net-mgmt/p5-GRNOC-TL1/Makefile b/net-mgmt/p5-GRNOC-TL1/Makefile
index e423b2080175..4e182ed5240e 100644
--- a/net-mgmt/p5-GRNOC-TL1/Makefile
+++ b/net-mgmt/p5-GRNOC-TL1/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Module supports retrieval of data from different models of TL1 devices
 
 PERL_CONFIGURE=	yes
 
-BUILD_DEPENDS+=	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
-		${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS+=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
+		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
index 0a1061b0d4dd..a39a5ceedf84 100644
--- a/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin-LDAP/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Nagios plugin to observe LDAP
 
 PERL_CONFIGURE=	yes
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
-		${SITE_PERL}/Nagios/Plugin.pm:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
+		p5-Nagios-Plugin>=0:${PORTSDIR}/net-mgmt/p5-Nagios-Plugin \
+		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
+		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/p5-Nagios-Plugin/Makefile b/net-mgmt/p5-Nagios-Plugin/Makefile
index 92cf2b870bef..76e3d5279fd7 100644
--- a/net-mgmt/p5-Nagios-Plugin/Makefile
+++ b/net-mgmt/p5-Nagios-Plugin/Makefile
@@ -17,10 +17,10 @@ COMMENT=	Modules to streamline writing Nagios plugins
 
 PERL_CONFIGURE=	yes
 
-BUILD_DEPENDS+=	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
+BUILD_DEPENDS+=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		${SITE_PERL}/Math/Calc/Units.pm:${PORTSDIR}/math/p5-Math-Calc-Units \
-		${SITE_PERL}/Config/Tiny.pm:${PORTSDIR}/devel/p5-Config-Tiny
+		p5-Math-Calc-Units>=0:${PORTSDIR}/math/p5-Math-Calc-Units \
+		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 MAN3=		Nagios::Plugin.3 \
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index 35c401250dfe..ea0063aa1abb 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	A Perl MIB compiler supporting both SMIv1 and SMIv2
 
-BUILD_DEPENDS=	${SITE_PERL}/Data/Compare.pm:${PORTSDIR}/devel/p5-Data-Compare
+BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare
 
 PERL_CONFIGURE=	yes
 
diff --git a/net-mgmt/pancho/Makefile b/net-mgmt/pancho/Makefile
index 802ebe949fd0..48892f9f0203 100644
--- a/net-mgmt/pancho/Makefile
+++ b/net-mgmt/pancho/Makefile
@@ -15,9 +15,9 @@ DISTNAME=	pancho-v${PORTVERSION}
 MAINTAINER=	ecu@ipv42.net
 COMMENT=	Network devices management tool using TFTP and SNMP
 
-RUN_DEPENDS=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
-		${SITE_PERL}/Parallel/ForkManager.pm:${PORTSDIR}/devel/p5-Parallel-ForkManager
+RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
+		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
+		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
 WRKSRC=		${WRKDIR}/Pancho-${PORTVERSION}
 PERL_CONFIGURE=	YES
diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile
index 5eda00996fc4..cad9c4b26fc2 100644
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
 		p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp \
+		net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
@@ -28,7 +28,7 @@ RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
 		p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp \
+		net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index ff8fc7ea4e45..6fe35cd518e2 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Really Awesome New Cisco confIg Differ
 
 BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel
 RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel \
-		${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
+		p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
 
 USE_PERL5=	yes
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 19aba430933e..e9f76966e498 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Really Awesome New Cisco confIg Differ
 
 BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel
 RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel \
-		${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple
+		p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
 
 USE_PERL5=	yes
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile
index ee2be96522b4..08b5a6a2b7f3 100644
--- a/net-mgmt/routers2/Makefile
+++ b/net-mgmt/routers2/Makefile
@@ -16,14 +16,14 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Frontend for the MRTG system monitoring software
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS=	${SITE_PERL}/Convert/ASN1/IO.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		${SITE_PERL}/Crypt/UnixCrypt.pm:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
-		${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-		${SITE_PERL}/Crypt/UnixCrypt.pm:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
-		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
+BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \
+		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
+		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
+		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
+		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
+		p5-CGI-SpeedyCGI>=0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 95851c6cb14e..01b6382d0b19 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -132,23 +132,23 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
 .if defined(WITH_LDAP) || defined(WITH_LDAPSSL)
-RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef(WITH_RADIUS)
-RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
 .ifdef(WITH_LDAPSSL)
-RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
 .ifdef(WITH_TELNET)
-RUN_DEPENDS+=	${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
+RUN_DEPENDS+=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
 .endif
 
 .ifdef(WITH_DNS)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index d3fde0a70ea5..3d618877d3b2 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=	nistor@snickers.org
 COMMENT=	SNMP trap handler/translator/swiss-army-knife
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp \
-		${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
+RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
+		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 9383182eb200..9587bd05c2bf 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -16,16 +16,16 @@ COMMENT=	The Data Series Processing Framework - think mrtg with xml configs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Proc/Daemon.pm:${PORTSDIR}/devel/p5-Proc-Daemon \
-		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
-		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI \
+BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
+		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
+		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
+		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session \
+		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
 		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}