14 files changed, 37 insertions, 38 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index dd4ab1a70776..65dc076306d0 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	APACHE			"USE_APACHE"		off \
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 RUN_DEPENDS+=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
+		ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \
 		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA \
 		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index fab5bb306ea0..6b8841646de0 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
-RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
+RUN_DEPENDS=	p5-Net-XWhois>=0:${PORTSDIR}/net/p5-Net-XWhois
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
@@ -42,12 +42,12 @@ OPTIONS=	IPV6 "Enable IPV6 for use with IPv6 Plugin" Off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
-RUN_DEPENDS+=	${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP
-RUN_DEPENDS+=	${SITE_PERL}/mach/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS+=	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP
+RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 .endif
 
 .if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
 .endif
 
 post-patch:
diff --git a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
index 0fe2d6701868..a5360e254db4 100644
--- a/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-OpenID/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	OpenID Authentication
 
-RUN_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		${SITE_PERL}/LWPx/ParanoidAgent.pm:${PORTSDIR}/www/p5-LWPx-ParanoidAgent \
-		${SITE_PERL}/Net/OpenID/Consumer.pm:${PORTSDIR}/net/p5-Net-OpenID-Consumer
+RUN_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-LWPx-ParanoidAgent>=0:${PORTSDIR}/www/p5-LWPx-ParanoidAgent \
+		p5-Net-OpenID-Consumer>=0:${PORTSDIR}/net/p5-Net-OpenID-Consumer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-Adsense/Makefile b/www/p5-HTML-Adsense/Makefile
index 65dc30710ced..cbf120c0db0b 100644
--- a/www/p5-HTML-Adsense/Makefile
+++ b/www/p5-HTML-Adsense/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Create adsense widgets easily
 
-RUN_DEPENDS=	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index 18d73dd40816..7a6102892325 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Generate nice HTML files from HTML syntax trees
 
-BUILD_DEPENDS=	${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-RSSAutodiscovery/Makefile b/www/p5-HTML-RSSAutodiscovery/Makefile
index 35bd253ddf35..59450f6ca612 100644
--- a/www/p5-HTML-RSSAutodiscovery/Makefile
+++ b/www/p5-HTML-RSSAutodiscovery/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Methods for retreiving RSS-ish information from an HTML document
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/www/p5-RT-Client-REST/Makefile b/www/p5-RT-Client-REST/Makefile
index 2f603f47c20b..a2fe92286bea 100644
--- a/www/p5-RT-Client-REST/Makefile
+++ b/www/p5-RT-Client-REST/Makefile
@@ -15,11 +15,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svysh@pn.sinp.msu.ru
 COMMENT=	Perl modules designed to talk to RT installation using REST protocol
 
-BUILD_DEPENDS=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
-		${SITE_PERL}/HTTP/Cookies.pm:${PORTSDIR}/www/p5-libwww \
+BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Template-Multilingual/Makefile b/www/p5-Template-Multilingual/Makefile
index 717f73b1c917..5aceb3a09bde 100644
--- a/www/p5-Template-Multilingual/Makefile
+++ b/www/p5-Template-Multilingual/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kaoru@kaisei.org
 COMMENT=	Multilingual templates for Template Toolkit
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Template-Plugin-Monta/Makefile b/www/p5-Template-Plugin-Monta/Makefile
index e7963175174d..80c3e58a8cfa 100644
--- a/www/p5-Template-Plugin-Monta/Makefile
+++ b/www/p5-Template-Plugin-Monta/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kaoru@kaisei.org
 COMMENT=	Template-Toolkit plugin to Monta Method
 
-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} \
-		${SITE_PERL}/Acme/Monta.pm:${PORTSDIR}/www/p5-Acme-Monta
+		p5-Acme-Monta>=0:${PORTSDIR}/www/p5-Acme-Monta
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Template-Provider-Encoding/Makefile b/www/p5-Template-Provider-Encoding/Makefile
index 6e43b85f001e..297bb5989a27 100644
--- a/www/p5-Template-Provider-Encoding/Makefile
+++ b/www/p5-Template-Provider-Encoding/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kaoru@kaisei.org
 COMMENT=	Template plugin to specify encoding
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-NicoVideo-Download/Makefile b/www/p5-WWW-NicoVideo-Download/Makefile
index 3167dba711ae..400db0916185 100644
--- a/www/p5-WWW-NicoVideo-Download/Makefile
+++ b/www/p5-WWW-NicoVideo-Download/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kaoru@kaisei.org
 COMMENT=	Perl module of download FLV/MP4/SWF files from nicovideo.jp
 
-BUILD_DEPENDS=	${SITE_PERL}/Any/Moose.pm:${PORTSDIR}/devel/p5-Any-Moose \
-		${SITE_PERL}/CGI/Simple.pm:${PORTSDIR}/www/p5-CGI-Simple \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
+		p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \
+		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-WWW-WebArchive/Makefile b/www/p5-WWW-WebArchive/Makefile
index 31283e738d08..3b75436277bf 100644
--- a/www/p5-WWW-WebArchive/Makefile
+++ b/www/p5-WWW-WebArchive/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Retrieve old versions of public web pages from various web archives
 
-RUN_DEPENDS=	${SITE_PERL}/App/Options.pm:${PORTSDIR}/devel/p5-App-Options \
-		${SITE_PERL}/App/Trace.pm:${PORTSDIR}/devel/p5-App-Trace \
-		${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
+		p5-App-Trace>=0:${PORTSDIR}/devel/p5-App-Trace \
+		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index b1f600631f5c..ae8942035515 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	A pastebin web application to upload snippets of text
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/All.pm:${PORTSDIR}/devel/p5-IO-All \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Spiffy.pm:${PORTSDIR}/devel/p5-Spiffy
+BUILD_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -28,7 +28,7 @@ OPTIONS=	X11	"Enable X11 Clipboard support"	off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_X11)
-BUILD_DEPENDS+=	${SITE_PERL}/Clipboard.pm:${PORTSDIR}/x11/p5-Clipboard
+BUILD_DEPENDS+=	p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-lib-WebService-NoPaste.pm
 .endif
diff --git a/www/p5-Xango/Makefile b/www/p5-Xango/Makefile
index fe59de22e5dd..8bd17f6a9617 100644
--- a/www/p5-Xango/Makefile
+++ b/www/p5-Xango/Makefile
@@ -18,14 +18,13 @@ COMMENT=	Event Based High Performance Web Crawler Framework
 DEPRECATED=	Removed from CPAN
 EXPIRATION_DATE=	2012-05-11
 
-BUILD_DEPENDS=	${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
-		${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/HTTP/Response.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
-		${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/POE/Component/Client/DNS.pm:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		${SITE_PERL}/POE/Component/Client/HTTP.pm:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
+		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
+		p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes