- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

57 files changed, 167 insertions, 167 deletions

diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 397ba8f54df5..98e528b18a0a 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -16,13 +16,13 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	RSS client that serves HTTP to your local web browser
 
 RUN_DEPENDS=	\
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
-		${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 
 LICENSE=	EULA
 LICENSE_NAME=	The Clarified Artistic License
diff --git a/www/asql/Makefile b/www/asql/Makefile
index 12b5064402e5..11a5ddb73bc5 100644
--- a/www/asql/Makefile
+++ b/www/asql/Makefile
@@ -14,9 +14,9 @@ MASTER_SITES=	http://www.steve.org.uk/Software/asql/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Query Apache logfiles via SQL
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl
+RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/asql
diff --git a/www/davical/Makefile b/www/davical/Makefile
index df11a937fff7..153d6483db0f 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -15,9 +15,9 @@ DISTNAME=	davical-${PORTVERSION}
 MAINTAINER=	maurice@castro.aus.net
 COMMENT=	A simple CalDAV server using a postgres backend
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
-		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
+RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
 		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
 		php-libawl>=0.51:${PORTSDIR}/devel/php-libawl
 
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 3efbb860d562..98f5d634916d 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://web.taranis.org/drraw/dist/ \
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	A simple web-based presentation front-end for RRDtool
 
-RUN_DEPENDS+=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS+=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
 
 OPTIONS=	ZOOM_PATCH	"Zoom support using jQuery via external patch"	off
 
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index de54a9a4aefd..2dcb8478283e 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -32,11 +32,11 @@ OPTIONS=	MYSQL "Add MySQL support" on \
 USE_RC_SUBR=	interchange.sh
 
 .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
 
 ARCH_PERL=	${SITE_PERL}/${PERL_ARCH}
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index c7e3897e2583..387256b7c378 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -16,7 +16,7 @@ PATCHFILES=	patch-0.6.2b1.diff
 MAINTAINER=	christophe@labouisse.org
 COMMENT=	A IP addresse to hostname program for httpd log files
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile
index 971a398096b4..ea799a173e69 100644
--- a/www/mythplugin-mythweb/Makefile
+++ b/www/mythplugin-mythweb/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	mythplugins-${PORTVERSION}
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	A frontend for scheduling and managing recordings on your MythTV Box
 
-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
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
diff --git a/www/p5-Apache-Singleton/Makefile b/www/p5-Apache-Singleton/Makefile
index ebe5266b8c5d..f107b95e0bca 100644
--- a/www/p5-Apache-Singleton/Makefile
+++ b/www/p5-Apache-Singleton/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Singleton class for mod_perl
 
-RUN_DEPENDS=${SITE_PERL}/Class/Singleton.pm:${PORTSDIR}/devel/p5-Class-Singleton
+RUN_DEPENDS=p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-CGI-Application-Dispatch-Server/Makefile b/www/p5-CGI-Application-Dispatch-Server/Makefile
index 82b44e7f01f1..7e2ab4fea359 100644
--- a/www/p5-CGI-Application-Dispatch-Server/Makefile
+++ b/www/p5-CGI-Application-Dispatch-Server/Makefile
@@ -14,12 +14,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	A simple HTTP server for developing with CGI::Application::Dispatch
 
-BUILD_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/IO/Capture/Stdout.pm:${PORTSDIR}/devel/p5-IO-Capture \
-		${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Application/Dispatch.pm:${PORTSDIR}/www/p5-CGI-Application-Dispatch \
-		${SITE_PERL}/HTTP/Server/Simple/CGI.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		${SITE_PERL}/HTTP/Server/Simple/Static.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple-Static \
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \
+		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Application-Dispatch>=0:${PORTSDIR}/www/p5-CGI-Application-Dispatch \
+		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
+		p5-HTTP-Server-Simple-Static>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple-Static \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile
index 7339bf18870a..249bbf46a998 100644
--- a/www/p5-CGI-Application-Plugin-Authorization/Makefile
+++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Support for authorization of requests in CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
-		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		${SITE_PERL}/CGI/Application/Plugin/Authentication.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-Authentication \
-		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
-		${SITE_PERL}/Test/Warn.pm:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
+		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
+		p5-CGI-Application-Plugin-Authentication>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Authentication \
+		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
+		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
index d5cd5fa16b06..408d2f339033 100644
--- a/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
+++ b/www/p5-CGI-Application-Plugin-AutoRunmode/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	CGI::App plugin to automatically register runmodes
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
index 8cda335bfa45..6ea89e1b8463 100644
--- a/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
+++ b/www/p5-CGI-Application-Plugin-DebugScreen/Makefile
@@ -14,11 +14,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	This plug-in add DebugScreen support to CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-		${SITE_PERL}/CGI/Application/Plugin/ViewCode.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-ViewCode \
-		${SITE_PERL}/Devel/StackTrace.pm:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
+		p5-CGI-Application-Plugin-ViewCode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-ViewCode \
+		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
+		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-CGI-Application-Plugin-Forward/Makefile b/www/p5-CGI-Application-Plugin-Forward/Makefile
index b133d113a8be..dbe44f191718 100644
--- a/www/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/www/p5-CGI-Application-Plugin-Forward/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Support for forwarding requests in CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Application/Plugin/AutoRunmode.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-AutoRunmode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
index 67ab2008adae..1dec60521289 100644
--- a/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTMLPrototype/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Access to the prototype JavaScript library using HTML::Prototype
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/HTML/Prototype.pm:${PORTSDIR}/www/p5-HTML-Prototype
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-HTML-Prototype>=0:${PORTSDIR}/www/p5-HTML-Prototype
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
index 6f900b1cd3da..071aaf1eed7c 100644
--- a/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
+++ b/www/p5-CGI-Application-Plugin-LinkIntegrity/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Make tamper-resisistent links in CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Digest/HMAC.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${SITE_PERL}/CGI/Application/Plugin/AutoRunmode.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
+		p5-CGI-Application-Plugin-AutoRunmode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
index a1312de31669..82a61d9be5f7 100644
--- a/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
+++ b/www/p5-CGI-Application-Plugin-LogDispatch/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Plugin that adds Log::Dispatch support to CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
-		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
+		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-MessageStack/Makefile b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
index 23a18125b65a..cb4f4813cc62 100644
--- a/www/p5-CGI-Application-Plugin-MessageStack/Makefile
+++ b/www/p5-CGI-Application-Plugin-MessageStack/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	A message stack for your CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Application/Plugin/Session.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-Session \
-		${SITE_PERL}/CGI/Application/Plugin/TT.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-TT
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-Session>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Session \
+		p5-CGI-Application-Plugin-TT>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-TT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-Redirect/Makefile b/www/p5-CGI-Application-Plugin-Redirect/Makefile
index 22fe508a13f4..12550f58b246 100644
--- a/www/p5-CGI-Application-Plugin-Redirect/Makefile
+++ b/www/p5-CGI-Application-Plugin-Redirect/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Easy external redirects in CGI::Application
 
-RUN_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application
+RUN_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index c468d7e00fca..864e031344ad 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Plugin that adds session support to CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \
-		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
+		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-Stream/Makefile b/www/p5-CGI-Application-Plugin-Stream/Makefile
index 4d9e87085226..58025e277609 100644
--- a/www/p5-CGI-Application-Plugin-Stream/Makefile
+++ b/www/p5-CGI-Application-Plugin-Stream/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Plugin that adds file streaming support to CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Application/Plugin/AutoRunmode.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode \
-		${SITE_PERL}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-AutoRunmode>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-AutoRunmode \
+		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-TT/Makefile b/www/p5-CGI-Application-Plugin-TT/Makefile
index e7d7c56c5c7c..cbddaaf672ab 100644
--- a/www/p5-CGI-Application-Plugin-TT/Makefile
+++ b/www/p5-CGI-Application-Plugin-TT/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Add Template Toolkit support to CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
-		${SITE_PERL}/CGI/Application/Plugin/DevPopup.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-DevPopup
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
+		p5-CGI-Application-Plugin-DevPopup>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-DevPopup
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-CGI-Application-Plugin-ViewCode/Makefile b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
index b4da3b5d845b..209cda3b43de 100644
--- a/www/p5-CGI-Application-Plugin-ViewCode/Makefile
+++ b/www/p5-CGI-Application-Plugin-ViewCode/Makefile
@@ -14,11 +14,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	View the source of the running application
 
-RUN_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Application/Plugin/Forward.pm:${PORTSDIR}/www/p5-CGI-Application-Plugin-Forward \
-		${SITE_PERL}/Syntax/Highlight/Perl/Improved.pm:${PORTSDIR}/textproc/p5-Syntax-Highlight-Perl-Improved \
-		${SITE_PERL}/Pod/Xhtml.pm:${PORTSDIR}/textproc/p5-Pod-Xhtml \
-		${SITE_PERL}/Test/LongString.pm:${PORTSDIR}/devel/p5-Test-LongString
+RUN_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-Application-Plugin-Forward>=0:${PORTSDIR}/www/p5-CGI-Application-Plugin-Forward \
+		p5-Syntax-Highlight-Perl-Improved>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Perl-Improved \
+		p5-Pod-Xhtml>=0:${PORTSDIR}/textproc/p5-Pod-Xhtml \
+		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
index d0d600037fb9..326f85d1d2bc 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached-Fast/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	Catalyst Plugin for Cache::Memcached::Fast
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Cache/Memcached/Fast.pm:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \
+		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Catalyst-Plugin-CookiedSession/Makefile b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
index eda993a75541..076660f2c1fe 100644
--- a/www/p5-Catalyst-Plugin-CookiedSession/Makefile
+++ b/www/p5-Catalyst-Plugin-CookiedSession/Makefile
@@ -15,11 +15,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	Catalyst Plugin for storing sessions in a browser cookie
 
-BUILD_DEPENDS=	${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		${SITE_PERL}/JSON/XS/VersionOneAndTwo.pm:${PORTSDIR}/converters/p5-JSON-XS-VersionOneAndTwo \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime
+BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
+		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
+		p5-JSON-XS-VersionOneAndTwo>=0:${PORTSDIR}/converters/p5-JSON-XS-VersionOneAndTwo \
+		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile
index 2871b1f8a574..fb6730a0b9de 100644
--- a/www/p5-FCGI-Spawn/Makefile
+++ b/www/p5-FCGI-Spawn/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	FastCGI server for CGI-like applications multiprocessing
 
-RUN_DEPENDS=	${SITE_PERL}/FCGI/ProcManager.pm:${PORTSDIR}/www/p5-FCGI-ProcManager
+RUN_DEPENDS=	p5-FCGI-ProcManager>=0:${PORTSDIR}/www/p5-FCGI-ProcManager
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-HTML-Chunks/Makefile b/www/p5-HTML-Chunks/Makefile
index 09f1690daca3..3e8c6c9c9b58 100644
--- a/www/p5-HTML-Chunks/Makefile
+++ b/www/p5-HTML-Chunks/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fbsd@meersau.de
 COMMENT=	A simple nested template engine for HTML, XML and XHTML
 
-RUN_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index fff563232dfe..425731082065 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	A Perl module for finding changes between two strings of HTML
 
-BUILD_DEPENDS=	${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-LinkExtractor/Makefile b/www/p5-HTML-LinkExtractor/Makefile
index 4d4ede05d879..56eb5d1f9e8b 100644
--- a/www/p5-HTML-LinkExtractor/Makefile
+++ b/www/p5-HTML-LinkExtractor/Makefile
@@ -15,8 +15,8 @@ DISTNAME=	${PORTNAME}-0.13
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	HTML::LinkExtractor is used for extracting links from HTML
 
-BUILD_DEPENDS=	${SITE_PERL}/HTML/TokeParser/Simple.pm:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=0:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index bc13b2e2383a..b08c58bf53aa 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -71,7 +71,7 @@ post-install:
 
 .if ${PORT_OPTIONS:MMOD_PERL}
 USE_APACHE=	20+
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
+RUN_DEPENDS+=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-Cookies-w3m/Makefile b/www/p5-HTTP-Cookies-w3m/Makefile
index 1b5c367fc419..f89434137b08 100644
--- a/www/p5-HTTP-Cookies-w3m/Makefile
+++ b/www/p5-HTTP-Cookies-w3m/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Cookie storage and management for w3m
 
-BUILD_DEPENDS=	${SITE_PERL}/Module/Install.pm:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=		HTTP::Cookies::w3m.3
diff --git a/www/p5-HTTP-Daemon-SSL/Makefile b/www/p5-HTTP-Daemon-SSL/Makefile
index 77ab61037dbd..f519ea6680d9 100644
--- a/www/p5-HTTP-Daemon-SSL/Makefile
+++ b/www/p5-HTTP-Daemon-SSL/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	delgod@portaone.com
 COMMENT=	A simple http server class with SSL support
 
-RUN_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/HTTP/Daemon.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index 5472c5700441..7d639c2ce8b7 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	PSGI handler for HTTP::Server::Simple
 
-RUN_DEPENDS=	${SITE_PERL}/HTTP/Server/Simple.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple
+RUN_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple
 
 USE_PERL5=	YES
 PERL_CONFIGURE=	YES
diff --git a/www/p5-POE-Component-Server-HTTPServer/Makefile b/www/p5-POE-Component-Server-HTTPServer/Makefile
index adbb8fb7aba3..9b32eda376c5 100644
--- a/www/p5-POE-Component-Server-HTTPServer/Makefile
+++ b/www/p5-POE-Component-Server-HTTPServer/Makefile
@@ -14,12 +14,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lin-chi@lastamericanempire.com
 COMMENT=	POE Component to server HTTP requests
 
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/HTTP/Message.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/HTML/Template/HashWrapper.pm:${PORTSDIR}/www/p5-HTML-Template-HashWrapper \
-		${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types
+BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-HTML-Template-HashWrapper>=0:${PORTSDIR}/www/p5-HTML-Template-HashWrapper \
+		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index b9aa4cf0ae68..82b3c3a4fede 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Generating HTML from several files containg POD documentation
 
-BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/HTML/FormatPS.pm:${PORTSDIR}/textproc/p5-HTML-Format
+BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Template-Toolkit-Simple/Makefile b/www/p5-Template-Toolkit-Simple/Makefile
index 1fd793aa787b..143f5790f604 100644
--- a/www/p5-Template-Toolkit-Simple/Makefile
+++ b/www/p5-Template-Toolkit-Simple/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	A Simple Interface to Template Toolkit
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index bc38799feb11..6a8a9846553f 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -17,9 +17,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	A PERL module to replay files recorded with TestGen4Web
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-URI-Escape-XS/Makefile b/www/p5-URI-Escape-XS/Makefile
index 101510d5580c..5edf7123f62f 100644
--- a/www/p5-URI-Escape-XS/Makefile
+++ b/www/p5-URI-Escape-XS/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	Drop-In replacement for URI::Escape in XS
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-VUser-Google-ProvisioningAPI/Makefile b/www/p5-VUser-Google-ProvisioningAPI/Makefile
index e4f8de49a4a9..600c34556d15 100644
--- a/www/p5-VUser-Google-ProvisioningAPI/Makefile
+++ b/www/p5-VUser-Google-ProvisioningAPI/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Perl module that implements the Google Provisioning API
 
-RUN_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Encode>=0:${PORTSDIR}/converters/p5-Encode \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-W3C-LogValidator/Makefile b/www/p5-W3C-LogValidator/Makefile
index 626f40eddfff..dc5ed8499949 100644
--- a/www/p5-W3C-LogValidator/Makefile
+++ b/www/p5-W3C-LogValidator/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	toni.viemero@iki.fi
 COMMENT=	A comprehensive validation tool for webmasters and web developers
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General \
-		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		${SITE_PERL}/WebService/Validator/CSS/W3C.pm:${PORTSDIR}/www/p5-webservice-validator-css-w3c \
-		${SITE_PERL}/WebService/Validator/HTML/W3C.pm:${PORTSDIR}/www/p5-webservice-validator-html-w3c \
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
+		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
+		p5-webservice-validator-css-w3c>=0:${PORTSDIR}/www/p5-webservice-validator-css-w3c \
+		p5-webservice-validator-html-w3c>=0:${PORTSDIR}/www/p5-webservice-validator-html-w3c \
 		${LOCALBASE}/bin/checklink:${PORTSDIR}/www/p5-W3C-LinkChecker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/www/p5-WWW-Google-News-TW/Makefile b/www/p5-WWW-Google-News-TW/Makefile
index 7ca4bdd00225..1cfb0bfa0a4b 100644
--- a/www/p5-WWW-Google-News-TW/Makefile
+++ b/www/p5-WWW-Google-News-TW/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Access to Google's Taiwan News Service (Not Usenet)
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-Google-Notebook/Makefile b/www/p5-WWW-Google-Notebook/Makefile
index 6a851f464c45..28505355e666 100644
--- a/www/p5-WWW-Google-Notebook/Makefile
+++ b/www/p5-WWW-Google-Notebook/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Perl interface for Google Notebook
 
-RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-Google-Video/Makefile b/www/p5-WWW-Google-Video/Makefile
index 6f356bc3a50e..5864b8d618ee 100644
--- a/www/p5-WWW-Google-Video/Makefile
+++ b/www/p5-WWW-Google-Video/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	An interface to fetch the Google Video Information
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-Mechanize-TreeBuilder/Makefile b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
index c22c2b8f0269..ed42d52db8ae 100644
--- a/www/p5-WWW-Mechanize-TreeBuilder/Makefile
+++ b/www/p5-WWW-Mechanize-TreeBuilder/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alex.deiter@gmail.com
 COMMENT=	WWW::Mechanize::TreeBuilder
 
-BUILD_DEPENDS=	${SITE_PERL}/MooseX/Role/Parameterized.pm:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${SITE_PERL}/Test/WWW/Mechanize.pm:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		${SITE_PERL}/${PERL_ARCH}/Moose.pm:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
+		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
+		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
+		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-OpenSVN/Makefile b/www/p5-WWW-OpenSVN/Makefile
index 0abccf0c0415..280bff42c05e 100644
--- a/www/p5-WWW-OpenSVN/Makefile
+++ b/www/p5-WWW-OpenSVN/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	An automated interface for OpenSVN.csie.org
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-WWW-Shorten-KUSO/Makefile b/www/p5-WWW-Shorten-KUSO/Makefile
index 087d7d94fc8d..b40e880b6794 100644
--- a/www/p5-WWW-Shorten-KUSO/Makefile
+++ b/www/p5-WWW-Shorten-KUSO/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Shorten URL using http://KUSO.CC/
 
-BUILD_DEPENDS=	${SITE_PERL}/WWW/Shorten.pm:${PORTSDIR}/www/p5-WWW-Shorten
+BUILD_DEPENDS=	p5-WWW-Shorten>=0:${PORTSDIR}/www/p5-WWW-Shorten
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-SourceForge/Makefile b/www/p5-WWW-SourceForge/Makefile
index 40482ba69f62..75f2622861b4 100644
--- a/www/p5-WWW-SourceForge/Makefile
+++ b/www/p5-WWW-SourceForge/Makefile
@@ -16,9 +16,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Retrieve infromation from SourceForge site
 
-BUILD_DEPENDS=	${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize \
-		${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
+		p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-TV/Makefile b/www/p5-WWW-TV/Makefile
index 312aa8cf62e7..0c973230bcd5 100644
--- a/www/p5-WWW-TV/Makefile
+++ b/www/p5-WWW-TV/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tolid@tolid.eu.org
 COMMENT=	Perl interface to the database of series/episodes at TV.com
 
-RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-WWW-TWSMS/Makefile b/www/p5-WWW-TWSMS/Makefile
index 21c100fb1546..69b1329ac1c5 100644
--- a/www/p5-WWW-TWSMS/Makefile
+++ b/www/p5-WWW-TWSMS/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	A Perl interface for sending sms by TWSMS
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-webservice-validator-css-w3c/Makefile b/www/p5-webservice-validator-css-w3c/Makefile
index ecb6ee2aa6d5..6ebe35b8ac20 100644
--- a/www/p5-webservice-validator-css-w3c/Makefile
+++ b/www/p5-webservice-validator-css-w3c/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	toni.viemero@iki.fi
 COMMENT=	Experimental interface to the W3C CSS Validation online service
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/QueryParam.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
-		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
+		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile
index 805a4e0ab9bc..b3e0c8370d14 100644
--- a/www/photo_gallery/Makefile
+++ b/www/photo_gallery/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=		bob@bomar.us
 COMMENT=		Simple web based photo gallery
 
 RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm\
-		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info\
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info\
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 
 USE_APACHE=	20+
 USE_PERL5=	yes
diff --git a/www/podcastamatic/Makefile b/www/podcastamatic/Makefile
index f4f8236de483..c98e36c3c6c0 100644
--- a/www/podcastamatic/Makefile
+++ b/www/podcastamatic/Makefile
@@ -16,8 +16,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Automates creation of webpage and RSS feed for a podcast
 
-RUN_DEPENDS=	${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/MP4/Info.pm:${PORTSDIR}/multimedia/p5-MP4-Info
+RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
+		p5-MP4-Info>=0:${PORTSDIR}/multimedia/p5-MP4-Info
 
 USE_ZIP=	yes
 USE_PERL5_RUN=	yes
diff --git a/www/twiki-LDAPPasswordChangerPlugin/Makefile b/www/twiki-LDAPPasswordChangerPlugin/Makefile
index a65c31dbc709..eb4c94299d04 100644
--- a/www/twiki-LDAPPasswordChangerPlugin/Makefile
+++ b/www/twiki-LDAPPasswordChangerPlugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Change TWiki password at a pre-configured LDAP server
 
-RUN_DEPENDS=	${SITE_PERL}/Bundle/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
 SVNREV=		18108
 
diff --git a/www/validator/Makefile b/www/validator/Makefile
index b8ef00cc2128..49d6d8ad135b 100644
--- a/www/validator/Makefile
+++ b/www/validator/Makefile
@@ -16,18 +16,18 @@ MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Markup Validation Service from the World Wide Web Consortium (W3C)
 
 RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/opensp \
-		${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General \
-		${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/p5-Encode-HanExtra \
-		${SITE_PERL}/${PERL_ARCH}/Encode/JIS2K.pm:${PORTSDIR}/converters/p5-Encode-JIS2K \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/HTML/Encoding.pm:${PORTSDIR}/www/p5-HTML-Encoding \
-		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
+		p5-Encode-HanExtra>=0:${PORTSDIR}/chinese/p5-Encode-HanExtra \
+		p5-Encode-JIS2K>=0:${PORTSDIR}/converters/p5-Encode-JIS2K \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-HTML-Encoding>=0:${PORTSDIR}/www/p5-HTML-Encoding \
+		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
 		p5-libwww>=5.817:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/JSON.pm:${PORTSDIR}/converters/p5-JSON \
-		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		${SITE_PERL}/${PERL_ARCH}/SGML/Parser/OpenSP.pm:${PORTSDIR}/textproc/p5-SGML-Parser-OpenSP \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		p5-SGML-Parser-OpenSP>=0:${PORTSDIR}/textproc/p5-SGML-Parser-OpenSP \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	5.8.0+
@@ -39,7 +39,7 @@ OPTIONS=	HTML_TIDY "Enable HTML Markup Cleaning" On
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_HTML_TIDY)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/HTML/Tidy.pm:${PORTSDIR}/textproc/p5-HTML-Tidy
+RUN_DEPENDS+=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
 .endif
 
 post-extract:
diff --git a/www/vdradmin-am/Makefile b/www/vdradmin-am/Makefile
index e708a7844260..9079fa323fa6 100644
--- a/www/vdradmin-am/Makefile
+++ b/www/vdradmin-am/Makefile
@@ -14,20 +14,20 @@ MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Video Disk Recorder - webinterface
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
+		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
-		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Compress \
-		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \
+		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
+		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
+		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript \
-		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Compress \
-		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww
+		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
+		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
+		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 DIST_SUBDIR=	vdr
 PATCH_STRIP=	-p1
diff --git a/www/webinject/Makefile b/www/webinject/Makefile
index 6b209b47906f..e75476fb7c5d 100644
--- a/www/webinject/Makefile
+++ b/www/webinject/Makefile
@@ -15,14 +15,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	A tool for automated testing of web applications
 
-RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-	        ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+	        p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
 
 .if !defined(WITHOUT_X11)
 # some work to do here
-#RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+#RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 
 USE_PERL5=	5.8.0+
diff --git a/www/wikicalc/Makefile b/www/wikicalc/Makefile
index dbf45bac4a24..ce5322c9399b 100644
--- a/www/wikicalc/Makefile
+++ b/www/wikicalc/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,-,}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	An Open Source Wiki-Spreadsheet
 
-RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 25e20b581c2a..b5fb829338a7 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	\
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		p5-Bit-Vector>=5.2:${PORTSDIR}/math/p5-Bit-Vector \
 		p5-File-PathConvert>0:${PORTSDIR}/devel/p5-File-PathConvert \
 		p5-Image-Size>=2.6:${PORTSDIR}/graphics/p5-Image-Size \