- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

65 files changed, 217 insertions, 217 deletions

diff --git a/graphics/cuttlefish/Makefile b/graphics/cuttlefish/Makefile
index 8cbdb3ae343d..41fbd2a34f90 100644
--- a/graphics/cuttlefish/Makefile
+++ b/graphics/cuttlefish/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.caida.org/tools/visualization/cuttlefish/code/
 MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	Plots diurnal and geographical patterns of supplied data
 
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
+RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		gifsicle:${PORTSDIR}/graphics/gifsicle
 
diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile
index 6683f02f23f6..94d9647158a4 100644
--- a/graphics/gimp-save-for-web/Makefile
+++ b/graphics/gimp-save-for-web/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	magik@roorback.net
 COMMENT=	GIMP Save For Web plugin
 
 LIB_DEPENDS=	gimp-2.0:${PORTSDIR}/graphics/gimp-app
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index 0ba9b2192baf..8753ade92189 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	\
 	${LOCALBASE}/bin/Magick-config:${PORTSDIR}/graphics/ImageMagick \
 	${LOCALBASE}/bin/wrjpgcom:${PORTSDIR}/graphics/jpeg \
 	${LOCALBASE}/bin/mplayer:${PORTSDIR}/multimedia/mplayer \
-	${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info
+	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
 
 USE_PERL5_RUN=	yes
 MAKE_ARGS+=	PERLPATH=${PERL}
diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index 60adecf94966..7f77a5241cf7 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://www.pulia.nu/code/projects/npretty/ \
 MAINTAINER=	peter@pean.org
 COMMENT=	A simple web-gallery generator written in perl
 
-RUN_DEPENDS=	${SITE_PERL}/Image/ExifTool.pm:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		${SITE_PERL}/mach/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
-		${SITE_PERL}/mach/forks.pm:${PORTSDIR}/devel/p5-forks
+RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
+		ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \
+		p5-forks>=0:${PORTSDIR}/devel/p5-forks
 
 LIB_DEPENDS+=	Magick.*:${PORTSDIR}/graphics/ImageMagick
 
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index ff7c4280f6f4..41ecfdefc9c5 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Hide data (badly) in Png images
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Imager.pm:${PORTSDIR}/graphics/p5-Imager \
-		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
+		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 717dfe23b5bb..88514a8461aa 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tolid@plab.ku.dk
 COMMENT=	Perl extension for Grabbing images off the Internet
 
-BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile
index c465e1b33b7e..7c8987e7eada 100644
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl utility for various processing tasks on the image files
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	${SITE_PERL}/Image/ExifTool.pm:${PORTSDIR}/graphics/p5-Image-ExifTool
+BUILD_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -28,7 +28,7 @@ PORTDOCS=	AUTHORS README ChangeLog NEWS TODO
 .include <bsd.port.options.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 post-install:
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 7b130b998bbf..f8b2a599b180 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Free image processing system
 OPTIONS+=	LIBOIL	"Use liboil for CPU-optimized primitives" on
 OPTIONS+=	PYTHON	"Create Python bindings" ${PYPRESENT}
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		exif:${PORTSDIR}/graphics/libexif	\
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}
 
diff --git a/security/afterglow/Makefile b/security/afterglow/Makefile
index 05e6b41d5729..9cb71127c951 100644
--- a/security/afterglow/Makefile
+++ b/security/afterglow/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	pauls@utdallas.edu
 COMMENT=	A collection of graph-generating scripts
 
 RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		${SITE_PERL}/Text/CSV.pm:${PORTSDIR}/textproc/p5-Text-CSV \
+		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
 		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
 		p5-IP-Anonymous>=0:${PORTSDIR}/net/p5-IP-Anonymous
 
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index f44d46e48d5f..fd9554a06fa2 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -19,11 +19,11 @@ COMMENT=	Performance-enhanced daemonized version of amavis-perl
 
 LICENCE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
+RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+		p5-Convert-TNEF>=0:${PORTSDIR}/converters/p5-Convert-TNEF \
 		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \
 		p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM
 
@@ -86,40 +86,40 @@ PLIST_SUB+=	AMAVIS_NOP0F=${AMAVIS_NOP0F}
 USE_RC_SUBR+=	amavisd.sh
 
 .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) && defined(WITH_BDB)
 USE_RC_SUBR+=	amavisd-snmp.sh
-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
 
 .if defined(WITH_BDB)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
+RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
 .endif
 
 .if defined(WITH_SQLITE)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
 .if defined(WITH_MYSQL)
-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
 .endif
 
 .if defined(WITH_PGSQL)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITH_LDAP)
-RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .if defined(WITH_SASL)
-RUN_DEPENDS+=	${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
 .endif
 
 .if defined(WITH_SPAMASSASSIN)
-RUN_DEPENDS+=	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+=	p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
 .if defined(WITH_P0F)
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index 2e011445d920..7e57ea139f63 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	SF/${PORTNAME}/1.%20ClusterSSH%20Series%203/${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Controls multiple hosts simultaneously via xterms and ssh
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
-		${SITE_PERL}/X11/Protocol.pm:${PORTSDIR}/x11/p5-X11-Protocol
+RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
+		p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 36232c127db2..2d1f2e4802eb 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -31,7 +31,7 @@ OPTIONS=		DIG_TOOLS "install dig tools" on \
 
 .if defined(WITH_DIG_TOOLS) || defined(WITH_MAP_TOOLS)
 . if ${PERL_LEVEL} < 500703
-RUN_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+=		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5
 . endif
 .endif
 
@@ -39,7 +39,7 @@ RUN_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
 PLIST_SUB+=		DIG_TOOLS=""
 CONFIGURE_ARGS+=	--with-dig-tools
 MAN1+=			ftimes-crv2dbi.1 ftimes-crv2raw.1 ftimes-dig2ctx.1 ftimes-dig2dbi.1 hipdig.1
-RUN_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 .else
 PLIST_SUB+=		DIG_TOOLS="@comment "
 .endif
diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index 184e16e40d09..a18ba5dc4850 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -15,18 +15,18 @@ MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/
 MAINTAINER=	sean.greven@gmail.com
 COMMENT=	An SPA implimentation for Linux and FreeBSD
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/IPv4Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv4Addr \
-		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/Net/Pcap.pm:${PORTSDIR}/net/p5-Net-Pcap \
-		${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP \
-		${SITE_PERL}/GnuPG/Key.pm:${PORTSDIR}/security/p5-GnuPG-Interface \
-		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
-		${SITE_PERL}/NetPacket.pm:${PORTSDIR}/net/p5-NetPacket \
-		${SITE_PERL}/Net/Ping/External.pm:${PORTSDIR}/net/p5-Net-Ping-External
+BUILD_DEPENDS=	p5-Net-IPv4Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv4Addr \
+		p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
+		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
+		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
+		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
+		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
+		p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
+		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
+		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
+		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
+		p5-Net-Ping-External>=0:${PORTSDIR}/net/p5-Net-Ping-External
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN8=		fwknop.8 fwknopd.8 knopmd.8 knopwatchd.8
diff --git a/security/hunch/Makefile b/security/hunch/Makefile
index 1b3a163de494..5cf59bdbae9c 100644
--- a/security/hunch/Makefile
+++ b/security/hunch/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://s89813419.onlinehome.us/ \
 MAINTAINER=	daniel+hunch@pelleg.org
 COMMENT=	Scan httpd log files for vulnerability probes, mail admins
 
-RUN_DEPENDS=	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 USE_PERL5=	yes
 
diff --git a/security/ipfilter2dshield/Makefile b/security/ipfilter2dshield/Makefile
index 76d4dff4a0ca..0d1363edcd5e 100644
--- a/security/ipfilter2dshield/Makefile
+++ b/security/ipfilter2dshield/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.txt
 MAINTAINER=	fbsd_user@a1poweruser.com
 COMMENT=	Official DShield client for ipfilter firewall logs
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
 USE_PERL5=	yes
 
diff --git a/security/isnprober/Makefile b/security/isnprober/Makefile
index ebf461462353..82d592f33be6 100644
--- a/security/isnprober/Makefile
+++ b/security/isnprober/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	onatan@gmail.com
 COMMENT=	PenTest tool for TCP Initial Sequence Numbers research
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
+RUN_DEPENDS=	p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
diff --git a/security/log2timeline/Makefile b/security/log2timeline/Makefile
index b4cb7967e297..91eaac997922 100644
--- a/security/log2timeline/Makefile
+++ b/security/log2timeline/Makefile
@@ -19,29 +19,29 @@ COMMENT=	A log file parser for computer forensic investigations
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
-		${SITE_PERL}/${PERL_ARCH}/DBI/DBD.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \
-		${SITE_PERL}/Data/Hexify.pm:${PORTSDIR}/devel/p5-Data-Hexify \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
-		${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		${SITE_PERL}/DateTime/TimeZone.pm:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
-		${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
-		${SITE_PERL}/Mac/PropertyList.pm:${PORTSDIR}/devel/p5-Mac-PropertyList \
-		${SITE_PERL}/Parse/Win32Registry.pm:${PORTSDIR}/devel/p5-Parse-Win32Registry \
-		${SITE_PERL}/Image/ExifTool.pm:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		${SITE_PERL}/${PERL_ARCH}/Net/Pcap.pm:${PORTSDIR}/net/p5-Net-Pcap \
-		${SITE_PERL}/NetPacket.pm:${PORTSDIR}/net/p5-NetPacket \
-		${SITE_PERL}/${PERL_ARCH}/Digest/CRC.pm:${PORTSDIR}/security/p5-Digest-CRC \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/File/Mork.pm:${PORTSDIR}/www/p5-File-Mork \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/HTML/Scrubber.pm:${PORTSDIR}/www/p5-HTML-Scrubber \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
+		p5-Data-Hexify>=0:${PORTSDIR}/devel/p5-Data-Hexify \
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
+		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
+		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
+		p5-Mac-PropertyList>=0:${PORTSDIR}/devel/p5-Mac-PropertyList \
+		p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry \
+		p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
+		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
+		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
+		p5-Digest-CRC>=0:${PORTSDIR}/security/p5-Digest-CRC \
+		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-File-Mork>=0:${PORTSDIR}/www/p5-File-Mork \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile
index 48655e64634a..925da105e577 100644
--- a/security/makepasswd/Makefile
+++ b/security/makepasswd/Makefile
@@ -25,8 +25,8 @@ LICENSE=	GPLv1
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
-RUN_DEPENDS+=	${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/Random.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+RUN_DEPENDS+=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
+		p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index 0b7382d698e2..4108ee14d41f 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Use the OpenPGP web of trust to verify ssh connections
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
 		lockfile:${PORTSDIR}/mail/procmail \
 		bash:${PORTSDIR}/shells/bash \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 MAN1=		monkeysphere.1 openpgp2ssh.1 pem2openpgp.1
 MAN7=		monkeysphere.7
diff --git a/security/p5-CSP/Makefile b/security/p5-CSP/Makefile
index a2d410857e12..3dc676e8c2bd 100644
--- a/security/p5-CSP/Makefile
+++ b/security/p5-CSP/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A Perl tool for managing Certificate Authorities
 
-BUILD_DEPENDS=	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
-		${SITE_PERL}/Term/Prompt.pm:${PORTSDIR}/devel/p5-Term-Prompt \
-		${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
+		p5-Term-Prompt>=0:${PORTSDIR}/devel/p5-Term-Prompt \
+		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/p5-Crypt-Simple/Makefile b/security/p5-Crypt-Simple/Makefile
index 9b1a7186ef39..b5f4d7b052de 100644
--- a/security/p5-Crypt-Simple/Makefile
+++ b/security/p5-Crypt-Simple/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	avk@vl.ru
 COMMENT=	Perl encrypt stuff simply
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw
+RUN_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
+		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index 6240ae18d921..d947e9deb13a 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Perl5 extension for portable daemons
 
 PERL_CONFIGURE=	yes
 
-BUILD_DEPENDS+=	${SITE_PERL}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+=	${SITE_PERL}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 
 MAN3=		Net::Daemon::SSL.3
 
diff --git a/security/p5-Net-OpenID-Server/Makefile b/security/p5-Net-OpenID-Server/Makefile
index 3eb89d0715ca..c389873187c5 100644
--- a/security/p5-Net-OpenID-Server/Makefile
+++ b/security/p5-Net-OpenID-Server/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kappa@rambler-co.ru
 COMMENT=	Reference implementation of OpenID server
 
-BUILD_DEPENDS=	${SITE_PERL}/Crypt/DH.pm:${PORTSDIR}/security/p5-Crypt-DH \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Crypt-DH>=0:${PORTSDIR}/security/p5-Crypt-DH \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/p5-POE-Filter-SSL/Makefile b/security/p5-POE-Filter-SSL/Makefile
index ff97bd803940..500a5a3f71a2 100644
--- a/security/p5-POE-Filter-SSL/Makefile
+++ b/security/p5-POE-Filter-SSL/Makefile
@@ -18,13 +18,13 @@ COMMENT=	The easiest and flexiblest way to SSL in POEIntegrate SSL into POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/POE/Filter/Stackable.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/POE/Filter/Stackable.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
+		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-POE>=0:${PORTSDIR}/devel/p5-POE
 
 WRKSRC=	${WRKDIR}
 
diff --git a/security/ppars/Makefile b/security/ppars/Makefile
index a3505d597177..dd0054124bf1 100644
--- a/security/ppars/Makefile
+++ b/security/ppars/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	fbsd_user@a1poweruser.com
 COMMENT=	Proactive Probing Abuse Reporting System
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
 USE_PERL5=	yes
 
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 0b86a75e9251..3e01e97fd10d 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -15,10 +15,10 @@ MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	The Simple WATCHer and filter
 
 BUILD_DEPENDS=	\
-	${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
-	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
-	${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
+	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
+	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index dd0a0c028803..54496e23220e 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -16,10 +16,10 @@ DISTNAME=	${PORTNAME}2-${PORTVERSION}
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Simple graphical interface to manage a small Certification Authority
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
+RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		zip:${PORTSDIR}/archivers/zip \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index 3bb281f625f8..4e2abf0499ed 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vasek@ti.cz
 COMMENT=	Perl module to automate reads from CSV formatted text files
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Text-Report/Makefile b/textproc/p5-Text-Report/Makefile
index fdaad8067603..bbb724e7d104 100644
--- a/textproc/p5-Text-Report/Makefile
+++ b/textproc/p5-Text-Report/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	For generating mixed columnar formatted reports and report templates
 
-RUN_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index 960939b52673..0bd0eec8d77c 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -15,11 +15,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Slide Shows in Vim
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/All.pm:${PORTSDIR}/devel/p5-IO-All \
-		${SITE_PERL}/${PERL_ARCH}/YAML/XS.pm:${PORTSDIR}/textproc/p5-YAML-LibYAML \
-		${SITE_PERL}/Class/Field.pm:${PORTSDIR}/devel/p5-Class-Field \
-		${SITE_PERL}/File/HomeDir.pm:${PORTSDIR}/devel/p5-File-HomeDir \
-		${SITE_PERL}/Template/Toolkit/Simple.pm:${PORTSDIR}/www/p5-Template-Toolkit-Simple
+BUILD_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
+		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
+		p5-Class-Field>=0:${PORTSDIR}/devel/p5-Class-Field \
+		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
+		p5-Template-Toolkit-Simple>=0:${PORTSDIR}/www/p5-Template-Toolkit-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
index 5304e5e9fcf4..e1b1af66ec9f 100644
--- a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
+++ b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	XML::Atom extension for OpenSearch data
 
-BUILD_DEPENDS=	${SITE_PERL}/XML/Atom.pm:${PORTSDIR}/textproc/p5-XML-Atom
+BUILD_DEPENDS=	p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-Descent/Makefile b/textproc/p5-XML-Descent/Makefile
index c0c433ff85a5..58fb4263bd76 100644
--- a/textproc/p5-XML-Descent/Makefile
+++ b/textproc/p5-XML-Descent/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mike@urgle.com
 COMMENT=	Recursive descent XML parsing
 
-BUILD_DEPENDS=	${SITE_PERL}/XML/TokeParser.pm:${PORTSDIR}/textproc/p5-XML-TokeParser \
-		${SITE_PERL}/Test/Differences.pm:${PORTSDIR}/devel/p5-Test-Differences
-RUN_DEPENDS=	${SITE_PERL}/XML/TokeParser.pm:${PORTSDIR}/textproc/p5-XML-TokeParser
+BUILD_DEPENDS=	p5-XML-TokeParser>=0:${PORTSDIR}/textproc/p5-XML-TokeParser \
+		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+RUN_DEPENDS=	p5-XML-TokeParser>=0:${PORTSDIR}/textproc/p5-XML-TokeParser
 
 PERL_CONFIGURE=	yes
 
diff --git a/textproc/p5-XML-Entities/Makefile b/textproc/p5-XML-Entities/Makefile
index 1948a4b8bd43..497d06c6db2b 100644
--- a/textproc/p5-XML-Entities/Makefile
+++ b/textproc/p5-XML-Entities/Makefile
@@ -13,8 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Generic classes for simplistic and perlish handling of XML data
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
index f26ec323d5af..078a02d1624a 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ahumphrey@realestate.com.au
 COMMENT=	Perl SAX Filter allowing DOM processing of selected subtrees
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-TokeParser/Makefile b/textproc/p5-XML-TokeParser/Makefile
index a7193523801d..e35607cc8af0 100644
--- a/textproc/p5-XML-TokeParser/Makefile
+++ b/textproc/p5-XML-TokeParser/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mike@urgle.com
 COMMENT=	Simplified interface to XML::Parser
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index a765c48cf9a3..6f69e2d7c108 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Simple implementation of XUpdate format based on and XML::LibXML
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/XML/LibXML/Iterator.pm:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator
+BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-XML-LibXML-Iterator>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes