- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

50 files changed, 133 insertions, 133 deletions

diff --git a/astro/p5-Weather-Underground/Makefile b/astro/p5-Weather-Underground/Makefile
index 641320c..119c196 100644
--- a/astro/p5-Weather-Underground/Makefile
+++ b/astro/p5-Weather-Underground/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	simon@olofsson.de
 COMMENT=	Retrieve weather information from wunderground.com
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/astro/weatherspect/Makefile b/astro/weatherspect/Makefile
index 921a9ab..525a801 100644
--- a/astro/weatherspect/Makefile
+++ b/astro/weatherspect/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Weather simulation in ASCII art
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${SITE_PERL}/Term/Animation.pm:${PORTSDIR}/devel/p5-Term-Animation \
-		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	p5-Term-Animation>=0:${PORTSDIR}/devel/p5-Term-Animation \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 
 PORTSCOUT=	skipv:1.31	# Wrong versioning upstream
 
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index 5414a95..b2becf7 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -18,8 +18,8 @@ MAINTAINER=	mauricio@arareko.net
 COMMENT=	Wrapper modules for common bioinformatics tools
 
 BUILD_DEPENDS=	p5-bioperl>=1.6.0:${PORTSDIR}/biology/p5-bioperl \
-		${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
-		${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
+		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
+		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-bioperl-run-1.[13579]*
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 2d8310b..a1cc3fc 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Tools to talk to GSM cellular phones
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-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
 
 GROUPS=		${PORTNAME}
 USE_BZIP2=	yes
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index 282fe90..89b905a 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES=	SF
 MAINTAINER=	svmohr@rm6.net
 COMMENT=	A graphical frontend for scmxx
 
-RUN_DEPENDS=	${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
-		${SITE_PERL}/mach/Gtk:${PORTSDIR}/x11-toolkits/p5-Gtk
-BUILD_DEPENDS=	${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
-		${SITE_PERL}/mach/Gtk:${PORTSDIR}/x11-toolkits/p5-Gtk \
+RUN_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
+		p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk
+BUILD_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
+		p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk \
 		scmxx:${PORTSDIR}/comms/scmxx \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
diff --git a/comms/p5-SMS-SMS77/Makefile b/comms/p5-SMS-SMS77/Makefile
index 435ca58..84fb8c7 100644
--- a/comms/p5-SMS-SMS77/Makefile
+++ b/comms/p5-SMS-SMS77/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	steinex@nognu.de
 COMMENT=	Perl interface and script to send SMS via SMS77.de
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 MAN1=		sms77send.1
 MAN3=		SMS::SMS77::Message.3 \
diff --git a/comms/p5-SMS-Send-TW-PChome/Makefile b/comms/p5-SMS-Send-TW-PChome/Makefile
index b8f870d..c42f6584 100644
--- a/comms/p5-SMS-Send-TW-PChome/Makefile
+++ b/comms/p5-SMS-Send-TW-PChome/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	 p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for sms.pchome.com.tw
 
-RUN_DEPENDS=	${SITE_PERL}/SMS/Send.pm:${PORTSDIR}/comms/p5-SMS-Send \
+RUN_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
   		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay
+		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
+		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
index babcb720..20489f3 100644
--- a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
+++ b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	catone@cpan.org
 COMMENT=	Support versions 1 and 2 of JSON::XS
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/JSON/XS.pm:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/converters/p5-MIME-Base64-URLSafe/Makefile b/converters/p5-MIME-Base64-URLSafe/Makefile
index 0837367..ba1eeaa 100644
--- a/converters/p5-MIME-Base64-URLSafe/Makefile
+++ b/converters/p5-MIME-Base64-URLSafe/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Perl version of Python's URL-safe base64 codec
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/00//}
diff --git a/converters/ytnef/Makefile b/converters/ytnef/Makefile
index 0632de6..31f9b51 100644
--- a/converters/ytnef/Makefile
+++ b/converters/ytnef/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	delphus@gmail.com
 COMMENT=	Unpack data in MS Outlook TNEF format
 
 LIB_DEPENDS=	ytnef.0:${PORTSDIR}/devel/libytnef
-RUN_DEPENDS=	${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools
+RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
 
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index 0d0d938..ec6cc43 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 MAINTAINER=	tut@nhamon.com.ua
 COMMENT=	MySQL Monitoring Tool
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
-		${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
+		p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 PERL_CONFIGURE=	yes
 
diff --git a/databases/mysqlidxchk/Makefile b/databases/mysqlidxchk/Makefile
index ebb2e4d..53cb9a2 100644
--- a/databases/mysqlidxchk/Makefile
+++ b/databases/mysqlidxchk/Makefile
@@ -15,9 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rdna@rdna.ru
 COMMENT=	Checks MySQL databases/tables for unused indexes
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index b7f8379..7a04098 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	andrew@scoop.co.nz
 COMMENT=	Extensions to Class::DBI for MySQL
 
-BUILD_DEPENDS=	${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/databases/p5-DBD-FrontBase/Makefile b/databases/p5-DBD-FrontBase/Makefile
index bc7890e..00e7f40 100644
--- a/databases/p5-DBD-FrontBase/Makefile
+++ b/databases/p5-DBD-FrontBase/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	mjs@bur.st
 COMMENT=	DBI driver for FrontBase RDBMS server
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		${LOCALBASE}/lib/libFBCAccess.a:${PORTSDIR}/databases/frontbase
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index c6b7af3..a626222a 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -31,7 +31,7 @@ MAN3=	DBIx::Simple.3 \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SQL_INTERP)
-RUN_DEPENDS+=	${SITE_PERL}/SQL/Interp.pm:${PORTSDIR}/databases/p5-SQL-Interp
+RUN_DEPENDS+=	p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp
 .endif
 
 .if defined(WITH_SQL_ABSTRACT)
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 3c928cd..2d0f1c2 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	C library to read various Paradox files
 
-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_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index e561a2e..9416303 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -68,11 +68,11 @@ PLIST_SUB+=	WITH_OFX="@comment "
 
 .if defined(WITH_QUOTES)
 USE_PERL5_RUN=	yes
-RUN_DEPENDS+=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/Finance/Quote.pm:${PORTSDIR}/finance/p5-Finance-Quote \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS+=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 .endif
 
 .if !defined(PACKAGE_BUILDING) && defined(WITH_KBANKING) && !exists(${LOCALBASE}/lib/libgwengui-qt4.so)
diff --git a/finance/ledgersmb/Makefile b/finance/ledgersmb/Makefile
index 7f2ad64..5100fd0 100644
--- a/finance/ledgersmb/Makefile
+++ b/finance/ledgersmb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/ledgersmb/${PORTVERSION}
 MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	A double entry accounting system
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile
index aacb47e..6ed4fa7 100644
--- a/finance/ledgersmb12/Makefile
+++ b/finance/ledgersmb12/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	SF/ledger-smb/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	A double entry accounting system
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
-			${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
-			${SITE_PERL}/Config/Std.pm:${PORTSDIR}/devel/p5-Config-Std
+BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
+			p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
+			p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	ledgersmb12
diff --git a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
index 7ecabac..c3482c2 100644
--- a/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
+++ b/finance/p5-Business-OnlinePayment-PayflowPro/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	never@nevermind.kiev.ua
 COMMENT=	A Business::OnlinePayment backend module for PayflowPro
 
-BUILD_DEPENDS=	${SITE_PERL}/Business/OnlinePayment.pm:${PORTSDIR}/finance/p5-Business-OnlinePayment \
-		${SITE_PERL}/mach/PFProAPI.pm:${PORTSDIR}/finance/p5-PFProAPI
+BUILD_DEPENDS=	p5-Business-OnlinePayment>=0:${PORTSDIR}/finance/p5-Business-OnlinePayment \
+		p5-PFProAPI>=0:${PORTSDIR}/finance/p5-PFProAPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/finance/sql-ledger/Makefile b/finance/sql-ledger/Makefile
index 7cce274..92ce781 100644
--- a/finance/sql-ledger/Makefile
+++ b/finance/sql-ledger/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.sql-ledger.com/source/ \
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	A double entry accounting system
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/games/asciiquarium/Makefile b/games/asciiquarium/Makefile
index a69e1c9..7780806 100644
--- a/games/asciiquarium/Makefile
+++ b/games/asciiquarium/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	aquarium/sea animation in ASCII art
 
-RUN_DEPENDS=	${SITE_PERL}/Term/Animation.pm:${PORTSDIR}/devel/p5-Term-Animation
+RUN_DEPENDS=	p5-Term-Animation>=0:${PORTSDIR}/devel/p5-Term-Animation
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 8d62368..46fb293 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -15,8 +15,8 @@ DISTNAME=	frozen-bubble-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Throw colourful bubbles to build groups and destroy the groups
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
+BUILD_DEPENDS=	p5-SDL>=0:${PORTSDIR}/devel/p5-SDL
+RUN_DEPENDS=	p5-SDL>=0:${PORTSDIR}/devel/p5-SDL
 
 USE_SDL=	mixer sdl pango
 USE_GMAKE=	yes
@@ -31,7 +31,7 @@ MAN6=		frozen-bubble-editor.6 frozen-bubble.6
 LEXECDIR=	${PREFIX}/libexec/${PORTNAME}
 
 .if !defined(WITHOUT_NLS)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS+=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 463e7bd..ae49a30 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -14,9 +14,9 @@ MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	slaven@rezic.de
 COMMENT=	A route-finder for cyclists in Berlin and Brandenburg
 
-BUILD_DEPENDS=	${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline \
-		${SITE_PERL}/${PERL_ARCH}/CDB_File.pm:${PORTSDIR}/databases/p5-CDB_File
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
+BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
+		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
+RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
 		${BUILD_DEPENDS}
 
 USE_PERL5=	YES
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index 8659ee1..79ddc0e 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	ftp://ftp.nog.net/pub/tony/nethirc/
 MAINTAINER=	matt_mills@btopenworld.com
 COMMENT=	Perl-based IRC client that uses Net::IRC
 
-BUILD_DEPENDS=	${SITE_PERL}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC \
-		${SITE_PERL}/String/Format.pm:${PORTSDIR}/textproc/p5-String-Format \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-POE-Component-IRC>=0:${PORTSDIR}/irc/p5-POE-Component-IRC \
+		p5-String-Format>=0:${PORTSDIR}/textproc/p5-String-Format \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile
index a4bd909..1e12fab 100644
--- a/math/algotutor/Makefile
+++ b/math/algotutor/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	An interactive tutorial for algorithms and data structures
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5_BUILD=yes
diff --git a/math/polymake/Makefile b/math/polymake/Makefile
index 987ee16..c361a5a 100644
--- a/math/polymake/Makefile
+++ b/math/polymake/Makefile
@@ -13,14 +13,14 @@ MASTER_SITES=	http://wwwopt.mathematik.tu-darmstadt.de/polymake/lib/exe/fetch.ph
 MAINTAINER=	gawrilow@math.tu-berlin.de
 COMMENT=	A framework for experimental discrete geometry
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
+BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml-lat1.ent:${PORTSDIR}/textproc/xhtml
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
+RUN_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml-lat1.ent:${PORTSDIR}/textproc/xhtml \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
+		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT \
 		${LOCALBASE}/bin/c++filt:${PORTSDIR}/devel/binutils
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		readline.[56]:${PORTSDIR}/devel/readline
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index 81fd68f..f5fa7eb 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Convert CHORD input files to HTML
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/misc/gcstar/Makefile b/misc/gcstar/Makefile
index 69779f2..5397040 100644
--- a/misc/gcstar/Makefile
+++ b/misc/gcstar/Makefile
@@ -15,26 +15,26 @@ MAINTAINER=	dominique.goncalves@gmail.com
 COMMENT=	Open source application for managing your collections
 
 USE_GNOME=	desktopfileutils
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/MP3/Tag.pm:${PORTSDIR}/audio/p5-MP3-Tag \
-		${SITE_PERL}/Ogg/Vorbis/Header/PurePerl.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/${PERL_ARCH}/Time/Piece.pm:${PORTSDIR}/devel/p5-Time-Piece \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2/Spell.pm:${PORTSDIR}/devel/p5-Gtk2-Spell \
-		${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
+RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
+		p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
+		p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
+		p5-Gtk2-Spell>=0:${PORTSDIR}/devel/p5-Gtk2-Spell \
+		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
+		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
 		p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
-		${SITE_PERL}/${PERL_ARCH}/Gnome2/VFS.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		${SITE_PERL}/${PERL_ARCH}/Net/FreeDB.pm:${PORTSDIR}/audio/p5-Net-FreeDB \
-		${SITE_PERL}/Sort/Naturally.pm:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
-		${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+		p5-Gnome2-VFS>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
+		p5-Net-FreeDB>=0:${PORTSDIR}/audio/p5-Net-FreeDB \
+		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
+		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
 
 MAN1=		gcstar.1
 MANCOMPRESSED=	yes
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile
index 6d3ce550..d58847b 100644
--- a/net-im/jarl/Makefile
+++ b/net-im/jarl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A Perl/Tk Jabber client
 
 RUN_DEPENDS=	ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
-		${SITE_PERL}/Net/Jabber/IQ.pm:${PORTSDIR}/net-im/p5-Net-Jabber
+		p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber
 
 NO_BUILD=	yes
 
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 70275d6..2686f2f 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Jabber Perl library for client/component connectivity
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 PERL_CONFIGURE=	yes
 
diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile
index 7f7383b..1433d0c 100644
--- a/net-im/vicq/Makefile
+++ b/net-im/vicq/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	A text-based ICQ implementation
 
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
+RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net-p2p/bitflu/Makefile b/net-p2p/bitflu/Makefile
index 87fbd4f..2dc8341 100644
--- a/net-p2p/bitflu/Makefile
+++ b/net-p2p/bitflu/Makefile
@@ -35,7 +35,7 @@ OPTIONS=	IPV6 "Enable functionality over IPv6 transport" on
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_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
 
 post-patch:
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index 03792de..d7d2692 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Search and Download .torrent(s) files from BitTorrents boards
 
-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/news/inn/Makefile b/news/inn/Makefile
index 3e9fbb4..485c39a 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -43,7 +43,7 @@ VARBASE?=	/var
 
 BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
-#		${SITE_PERL}/MIME/parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
+#		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/news/nzbperl/Makefile b/news/nzbperl/Makefile
index 7d69dd4..7432448 100644
--- a/news/nzbperl/Makefile
+++ b/news/nzbperl/Makefile
@@ -18,8 +18,8 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@thepentagon.org
 COMMENT=	A perl script for downloading nzb files
 
-RUN_DEPENDS=	${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
+		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${LOCALBASE}/bin/uudeview:${PORTSDIR}/converters/uudeview
 
 PLIST_FILES=	bin/nzbperl
@@ -27,7 +27,7 @@ NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
 .if defined(WITH_SSL)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS+=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
 .endif
 
 do-extract:
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index dbdb615..7042887 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -15,11 +15,11 @@ MAINTAINER=	john@zoner.org
 COMMENT=	Perl script to download and decode binaries posted to Usenet
 
 RUN_DEPENDS=	\
-	${SITE_PERL}/News/Newsrc.pm:${PORTSDIR}/news/p5-News-Newsrc \
-	${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
-	${SITE_PERL}/MIME/Decoder.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32
+	p5-News-Newsrc>=0:${PORTSDIR}/news/p5-News-Newsrc \
+	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+	p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32
 
 NO_BUILD=	YES
 USE_PERL5=	YES
diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
index 4fa4b66..37a16e2 100644
--- a/ports-mgmt/portscout/Makefile
+++ b/ports-mgmt/portscout/Makefile
@@ -24,22 +24,22 @@ PORTDOCS=	UPDATING portscout-portconfig.txt xml-datasrc-example.xml
 
 MAN1=		portscout.1
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI	\
-		${SITE_PERL}/Proc/Queue.pm:${PORTSDIR}/devel/p5-Proc-Queue	\
-		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net			\
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI			\
-		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath	\
-		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite		\
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI	\
+		p5-Proc-Queue>=0:${PORTSDIR}/devel/p5-Proc-Queue	\
+		p5-Net>=0:${PORTSDIR}/net/p5-Net			\
+		p5-URI>=0:${PORTSDIR}/net/p5-URI			\
+		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath	\
+		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite		\
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_SQLITE3)
 USE_SQLITE=	3
-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
 .elif !defined(WITHOUT_PGSQL)
 USE_PGSQL=	yes
-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
 
 pre-everything::
diff --git a/print/easylatex/Makefile b/print/easylatex/Makefile
index 0f75f86..f5c7b99 100644
--- a/print/easylatex/Makefile
+++ b/print/easylatex/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Perl script which transforms "pseudo-LaTeX" into proper LaTeX
 
-RUN_DEPENDS=	${SITE_PERL}/${SITE_ARCH}/Getopt/Declare.pm:${PORTSDIR}/devel/p5-Getopt-Declare
+RUN_DEPENDS=	p5-Getopt-Declare>=0:${PORTSDIR}/devel/p5-Getopt-Declare
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 31c5c3e..49c1074 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Access Apache FOP from Perl to create PDF files using XSL-FO
 
-BUILD_DEPENDS=	${SITE_PERL}/Java.pm:${PORTSDIR}/devel/p5-Java \
+BUILD_DEPENDS=	p5-Java>=0:${PORTSDIR}/devel/p5-Java \
 		${LOCALBASE}/share/java/fop/build/fop.jar:${PORTSDIR}/textproc/fop
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/science/mcstas/Makefile b/science/mcstas/Makefile
index ddad64a..e7176da 100644
--- a/science/mcstas/Makefile
+++ b/science/mcstas/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A neutron ray-trace simulation package
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	pgxwin_server:${PORTSDIR}/graphics/pgplot
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/PDL.pm:${PORTSDIR}/math/PDL \
-		${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	PDL>=0:${PORTSDIR}/math/PDL \
+		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 
 STRIP=
 USE_PERL5=	yes
diff --git a/shells/p5-Shell-Perl/Makefile b/shells/p5-Shell-Perl/Makefile
index 3814cbe..fda048f 100644
--- a/shells/p5-Shell-Perl/Makefile
+++ b/shells/p5-Shell-Perl/Makefile
@@ -15,16 +15,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	A read-eval-print loop in Perl
 
-RUN_DEPENDS=	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
-		${SITE_PERL}/Data/Dump.pm:${PORTSDIR}/devel/p5-Data-Dump \
-		${SITE_PERL}/${PERL_ARCH}/Data/Dump/Streamer.pm:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		${SITE_PERL}/Path/Class.pm:${PORTSDIR}/devel/p5-Path-Class \
-		${SITE_PERL}/File/HomeDir.pm:${PORTSDIR}/devel/p5-File-HomeDir
-BUILD_DEPENDS=	${SITE_PERL}/Test/Script.pm:${PORTSDIR}/devel/p5-Test-Script \
-		${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
-		${SITE_PERL}/Test/Pod/Coverage.pm:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		${SITE_PERL}/Test/Expect.pm:${PORTSDIR}/devel/p5-Test-Expect
+RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
+		p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
+		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
+		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir
+BUILD_DEPENDS=	p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script \
+		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
+		p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect
 
 PERL_CONFIGURE=	YES
 
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index 5955261..be2e316 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	yuri.pankov@gmail.com
 COMMENT=	Utilities of the Tango project
 
-BUILD_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
-RUN_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 34bae5b..f5c9aee 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -18,12 +18,12 @@ DISTNAME=	Gtk2-GladeXML-${PORTVERSION}
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Gtk2-Perl bindings to libglade2
 
-EXTRACT_DEPENDS=${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends
-BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/ExtUtils/PkgConfig.pm:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
+EXTRACT_DEPENDS=p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
+		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
+RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libglade2
 PERL_CONFIGURE=	yes
diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
index fe047e5..67b69de 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
 		p5-ExtUtils-Depends>=0.3:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 		p5-ExtUtils-PkgConfig>=1.1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
 		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
 RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/Makefile b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
index 9ff973c..3a6a2d3 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/Makefile
+++ b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
 		p5-ExtUtils-Depends>=0.3:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 		p5-ExtUtils-PkgConfig>=1.1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
 		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
 RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index cecabd2..ad4d3cd 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	CPAN
 MAINTAINER=	minter@lunenburg.org
 COMMENT=	Tk::FileDialog - A file selector dialog for perl/Tk
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 
 PERL_CONFIGURE=	yes
 MAN3=		Tk::FileDialog.3
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index b04328a..54458d6 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -16,8 +16,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Application library for the Xfce desktop environment
 
-BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/lib//}
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index b63ada9..30e0926 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -59,8 +59,8 @@ PORTDOCS1=	Changes README.FAQ README.configure
 PORTDOCS=	README.xvt ${PORTDOCS1}
 
 .if !defined(WITHOUT_IMLOCALE_FIX)
-PATCH_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/p5-Encode-HanExtra \
-		${SITE_PERL}/${PERL_ARCH}/Encode/JIS2K.pm:${PORTSDIR}/converters/p5-Encode-JIS2K
+PATCH_DEPENDS+=	p5-Encode-HanExtra>=0:${PORTSDIR}/chinese/p5-Encode-HanExtra \
+		p5-Encode-JIS2K>=0:${PORTSDIR}/converters/p5-Encode-JIS2K
 .endif
 
 # disable the embedded perl interpreter
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index d6514c9..8ada516 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -27,7 +27,7 @@ OPTIONS=	GUI "Install Tk GUI" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GUI)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 PLIST_SUB=	GUI=""
 MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 .else