- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

39 files changed, 128 insertions, 128 deletions

diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index df09cd0..dfd5267 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Applet to edit Claws Mail's hidden preferences
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	claws-mail>=3.8.1:${PORTSDIR}/mail/claws-mail \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
+		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 
 USE_PERL5=	5.8.0+
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 238351d..56092ed 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
 		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
-		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	courier-imap-2.* couriermlm-0.* \
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index dee96be..29ca012 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -15,8 +15,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	A RRDtool frontend for Courier statistics
 
-RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool	\
-		${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
+		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/mail/dkfilter/Makefile b/mail/dkfilter/Makefile
index c43afe2..13f2880 100644
--- a/mail/dkfilter/Makefile
+++ b/mail/dkfilter/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES=	http://jason.long.name/dkfilter/
 MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
 COMMENT=	Domainkeys filter for Postfix
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile
index 20dbb48..35beb4c 100644
--- a/mail/dkimproxy/Makefile
+++ b/mail/dkimproxy/Makefile
@@ -16,9 +16,9 @@ COMMENT=	DKIM filter for Postfix
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM \
-		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
-		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM \
+		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
+		p5-Error>=0:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 657b27b..7aa8141 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -417,10 +417,10 @@ RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 USE_APACHE=	20+
 .	endif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
-RUN_DEPENDS+=	${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d
-RUN_DEPENDS+=	${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS+=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+RUN_DEPENDS+=	p5-GD-Graph3d>=0:${PORTSDIR}/graphics/p5-GD-Graph3d
+RUN_DEPENDS+=	p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5=	yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 918ac36..e888d6f 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -401,10 +401,10 @@ RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 USE_APACHE=	20+
 .	endif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
-RUN_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
-RUN_DEPENDS+=	${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d
-RUN_DEPENDS+=	${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS+=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+RUN_DEPENDS+=	p5-GD-Graph3d>=0:${PORTSDIR}/graphics/p5-GD-Graph3d
+RUN_DEPENDS+=	p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5=	yes
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index 89c62eb..88d7bdd 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Tool to centralize and visualize Exim logs with a web front end
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -27,11 +27,11 @@ WITH_SQL_BACKEND?=	mysql
 
 .if (${WITH_SQL_BACKEND} == "mysql")
 WITH_MYSQL=	yes
-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
 SERVER=		mysql
 .elif (${WITH_SQL_BACKEND} == "postgresql")
 WITH_POSTGRESQL=	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
 SERVER=		postgresql
 .else
 BROKEN=	You should specify sql backend using WITH_SQL_BACKEND
diff --git a/mail/extmail/Makefile b/mail/extmail/Makefile
index 637e482..a5e9b72 100644
--- a/mail/extmail/Makefile
+++ b/mail/extmail/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.chifeng.name/dist/extmail/ \
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	A high performance webmail system
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog
+RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -26,10 +26,10 @@ OPTIONS=	MYSQL "Use MySQL support" On \
 .include <bsd.port.pre.mk>
 
 .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_LDAP)
-RUN_DEPENDS+=	${SITE_PERL}/DBD/LDAP.pm:${PORTSDIR}/databases/p5-DBD-LDAP
+RUN_DEPENDS+=	p5-DBD-LDAP>=0:${PORTSDIR}/databases/p5-DBD-LDAP
 .endif
 
 do-install:
diff --git a/mail/extman/Makefile b/mail/extman/Makefile
index 59f40db..96cd6c3 100644
--- a/mail/extman/Makefile
+++ b/mail/extman/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.chifeng.name/dist/extman/%SUBDIR%/ \
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Web interface to manage Virtual Accounts
 
-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
@@ -26,11 +26,11 @@ OPTIONS=	MySQL "Use MySQL support" On \
 .include <bsd.port.pre.mk>
 
 .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_LDAP)
-RUN_DEPENDS+=	${SITE_PERL}/DBD/LDAP.pm:${PORTSDIR}/databases/p5-DBD-LDAP
+RUN_DEPENDS+=	p5-DBD-LDAP>=0:${PORTSDIR}/databases/p5-DBD-LDAP
 .endif
 
 do-install:
diff --git a/mail/ezmlm-web/Makefile b/mail/ezmlm-web/Makefile
index 964c42b..010930e 100644
--- a/mail/ezmlm-web/Makefile
+++ b/mail/ezmlm-web/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	hans@nordhaug.priv.no
 COMMENT=	Manage ezmlm-idx mailing lists through the web (using CGI)
 
 RUN_DEPENDS=	ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
-		${SITE_PERL}/Mail/Ezmlm.pm:${PORTSDIR}/mail/p5-Mail-Ezmlm \
-		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
+		p5-Mail-Ezmlm>=0:${PORTSDIR}/mail/p5-Mail-Ezmlm \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
 
 EXAMPLES=	apache.conf.dist ezmlmwebrc.dist ezmlmwebrc.minimal-dist \
 		htaccess.dist multidomain.conf.dist webusers.dist
diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index d6e0b63..082fb5b 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -14,14 +14,14 @@ MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Download e-mail from a Yahoo account to a Berkeley mailbox
 
 RUN_DEPENDS=	\
-	${SITE_PERL}/IO/Lines.pm:${PORTSDIR}/devel/p5-IO-stringy \
-	${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-	${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
-	${SITE_PERL}/${PERL_ARCH}/HTML/Filter.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${SITE_PERL}/HTTP/Request/Common.pm:${PORTSDIR}/www/p5-libwww \
-	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 
 MAN1=		fetchyahoo.1
 PLIST_DIRS=	share/examples/fetchyahoo
diff --git a/mail/listadmin/Makefile b/mail/listadmin/Makefile
index 668d845..05cba03 100644
--- a/mail/listadmin/Makefile
+++ b/mail/listadmin/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	http://heim.ifi.uio.no/kjetilho/hacks/
 MAINTAINER=	christer.edwards@gmail.com
 COMMENT=	Command-line alternative to Mailman Web interface
 
-RUN_DEPENDS=	${SITE_PERL}/Text/Reform.pm:${PORTSDIR}/textproc/p5-Text-Reform \
-		${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Text-Reform>=0:${PORTSDIR}/textproc/p5-Text-Reform \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_PERL5_RUN=	5.8.0+
 
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 5ff60c1..0d03f71 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -16,24 +16,24 @@ MAINTAINER=	kkobb@skylinecorp.com
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
 
 BUILD_DEPENDS=	\
-	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
-	${SITE_PERL}/${PERL_ARCH}/Bundle/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
-	${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
-	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
-	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-	${SITE_PERL}/Net/Ident.pm:${PORTSDIR}/net/p5-Net-Ident \
-	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
-	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-	${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
-	${SITE_PERL}/${PERL_ARCH}/Filesys/Df.pm:${PORTSDIR}/sysutils/p5-Filesys-Df \
-	${SITE_PERL}/Sys/Hostname/Long.pm:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-	${SITE_PERL}/Sys/SigAction.pm:${PORTSDIR}/devel/p5-Sys-SigAction
+	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+	p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
+	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+	p5-Convert-TNEF>=0:${PORTSDIR}/converters/p5-Convert-TNEF \
+	p5-Convert-BinHex>=0:${PORTSDIR}/converters/p5-Convert-BinHex \
+	p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+	p5-Net-Ident>=0:${PORTSDIR}/net/p5-Net-Ident \
+	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+	p5-Filesys-Df>=0:${PORTSDIR}/sysutils/p5-Filesys-Df \
+	p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
+	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
+	p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		bash:${PORTSDIR}/shells/bash \
@@ -94,7 +94,7 @@ RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
 .endif
 
 .if defined(WITH_CLAMAVMODULE)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mail/ClamAV.pm:${PORTSDIR}/mail/p5-Mail-ClamAV
+RUN_DEPENDS+=	p5-Mail-ClamAV>=0:${PORTSDIR}/mail/p5-Mail-ClamAV
 .endif
 
 .if defined(WITH_CLAMAV)||defined(WITH_CLAMAVMODULE)
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index aa9ec58..51498a7 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Milter based anti-spam and anti-virus filtering program
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
-	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 	p5-MIME-Tools>=5.417:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 	p5-Mail-SpamAssassin>=3.0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index fd19cee..7b50ef7 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -23,9 +23,9 @@ WANT_PHP_WEB=	yes
 .endif
 
 .if defined(WITH_PERL_WEBINTERFACE)
-RUN_DEPENDS+=	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/CGI/FastTemplate.pm:${PORTSDIR}/www/p5-CGI-FastTemplate
+RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-CGI-FastTemplate>=0:${PORTSDIR}/www/p5-CGI-FastTemplate
 .endif
 
 .if defined(WITH_PERL_WEBINTERFACE)
diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile
index f30949e..0f3c004 100644
--- a/mail/msgconvert/Makefile
+++ b/mail/msgconvert/Makefile
@@ -16,9 +16,9 @@ EXTRACT_SUFX=	.bz2
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	Convert .MSG files to multipart MIME messages (mbox)
 
-RUN_DEPENDS=	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-		${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index 8520e3f..049c9b1 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	ftp://ftp.oav.net/openvisp/stats/
 MAINTAINER=	kiwi@oav.net
 COMMENT=	A RRDtool frontend for mail statistics
 
-RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool	\
-		${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
+		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/mail/p5-Data-Validate-Email/Makefile b/mail/p5-Data-Validate-Email/Makefile
index 1590670..8362857 100644
--- a/mail/p5-Data-Validate-Email/Makefile
+++ b/mail/p5-Data-Validate-Email/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	A common email validation written in Perl
 
-RUN_DEPENDS=	${SITE_PERL}/Data/Validate/Domain.pm:${PORTSDIR}/dns/p5-Data-Validate-Domain \
-		${SITE_PERL}/Email/Address.pm:${PORTSDIR}/mail/p5-Email-Address \
-		${SITE_PERL}/Net/Domain/TLD.pm:${PORTSDIR}/dns/p5-Net-Domain-TLD
+RUN_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain \
+		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
+		p5-Net-Domain-TLD>=0:${PORTSDIR}/dns/p5-Net-Domain-TLD
 
 PERL_CONFIGURE=	yes
 
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 59dc88f..047e006 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm			\
 		ocrad:${PORTSDIR}/graphics/ocrad			\
 		gifasm:${PORTSDIR}/graphics/giflib			\
 		spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin	\
-		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM	\
-		${SITE_PERL}/MLDBM/Sync.pm:${PORTSDIR}/databases/p5-MLDBM-Sync \
-		${SITE_PERL}/${PERL_ARCH}/String/Approx.pm:${PORTSDIR}/devel/p5-String-Approx
+		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM	\
+		p5-MLDBM-Sync>=0:${PORTSDIR}/databases/p5-MLDBM-Sync \
+		p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 21884e4..f77ed8d 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mashtizadeh@gmail.com
 COMMENT=	Perl IMAP4 gateway to Google's webmail service
 
-BUILD_DEPENDS=	${SITE_PERL}/Mail/Webmail/Gmail.pm:${PORTSDIR}/mail/p5-Mail-Webmail-Gmail
+BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:${PORTSDIR}/mail/p5-Mail-Webmail-Gmail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index 9636532..a1a7741 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Perl module to check email addresses for validity
 
-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}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index f28128c..e5c3156 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
 COMMENT=	Perl5 module to process and/or create DKIM email
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 MASTER_SITE_BACKUP+=	http://jason.long.name/dkimproxy/
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index fd5ee0f..7d49eb6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -15,10 +15,10 @@ DISTNAME=	MailFolder-${PORTVERSION}
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Perl module for a folder-independant interface to email folders
 
-BUILD_DEPENDS=	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
-		${SITE_PERL}/MIME/Head.pm:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+		p5-File-Sync>=0:${PORTSDIR}/devel/p5-File-Sync \
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 0ff2f45..223de3c2 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Perl module to detect newer messages in procmail-generated mailboxes
 
-BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
+BUILD_DEPENDS=	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 3304f9b..23a64e5 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Sender Rewriting Scheme
 
-BUILD_DEPENDS=	${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
+		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=	Mail::SRS.3 \
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 76584ad..1cea7ed 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	A "pure perl" implementation of mail spooling, unspooling and sending
 
-BUILD_DEPENDS=	${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
-		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index b924bbe..01bb635 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Perl module to verify email addresses
 
-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}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index eda20cd..51bc5dc 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	james@now.ie
 COMMENT=	Perl module to provide a Quick Mail Transfer Protocol (QMTP) client
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/Netstring.pm:${PORTSDIR}/textproc/p5-Text-Netstring
-RUN_DEPENDS=	${SITE_PERL}/Text/Netstring.pm:${PORTSDIR}/textproc/p5-Text-Netstring
+BUILD_DEPENDS=	p5-Text-Netstring>=0:${PORTSDIR}/textproc/p5-Text-Netstring
+RUN_DEPENDS=	p5-Text-Netstring>=0:${PORTSDIR}/textproc/p5-Text-Netstring
 
 PERL_CONFIGURE=	yes
 
diff --git a/mail/p5-Net-SenderBase/Makefile b/mail/p5-Net-SenderBase/Makefile
index c8b7df0..fcc528e 100644
--- a/mail/p5-Net-SenderBase/Makefile
+++ b/mail/p5-Net-SenderBase/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Query the SenderBase service
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 
 PERL_CONFIGURE=	yes
 
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 5cc7914..542be2e 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	This module simplifies access to gmail
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index d6f249a..fb1c7e9 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -15,11 +15,11 @@ MASTER_SITES=	ftp://ftp.aerasec.de/pub/linux/postfix/pflogsumm/${PORTNAME}/
 MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	Postfix Log Statistics Reporter
 
-RUN_DEPENDS=	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
-		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		${SITE_PERL}/Number/Format.pm:${PORTSDIR}/textproc/p5-Number-Format \
-		${SITE_PERL}/XML/Dumper.pm:${PORTSDIR}/textproc/p5-XML-Dumper
+RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
+		p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
+		p5-XML-Dumper>=0:${PORTSDIR}/textproc/p5-XML-Dumper
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile
index 2d482c3..2a240c6 100644
--- a/mail/pflogsumm/Makefile
+++ b/mail/pflogsumm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://jimsun.LinxNet.com/downloads/ \
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Postfix Log Entry Summarizer
 
-RUN_DEPENDS=	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index 9a8fa2c0..d0cca75 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -15,10 +15,10 @@ DISTNAME=	cluebringer-${PORTVERSION}
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Policyd v2 is a multi-platform policy server for popular MTAs
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
-		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
-		${SITE_PERL}/mach/Cache/FastMmap.pm:${PORTSDIR}/devel/p5-Cache-FastMmap
+RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
+		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
+		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap
 
 USE_PERL5=	yes
 USE_PHP=	yes
@@ -37,13 +37,13 @@ OPTIONS=	MYSQL "Use MySQL support" On \
 .include <bsd.port.pre.mk>
 USE_PHP=	pdo_mysql
 .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_SQLite)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 .if defined(WITH_PostgreSQL)
-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
 
 post-patch:
diff --git a/mail/postfix-policyd-spf-perl/Makefile b/mail/postfix-policyd-spf-perl/Makefile
index 1d7a77d..eb941d3 100644
--- a/mail/postfix-policyd-spf-perl/Makefile
+++ b/mail/postfix-policyd-spf-perl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://www.openspf.org/blobs/
 MAINTAINER=	ports.maintainer@evilphi.com
 COMMENT=	SPF policy service for Postfix written in Perl
 
-RUN_DEPENDS=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF \
+RUN_DEPENDS=	p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF \
 		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version
+		p5-version>=0:${PORTSDIR}/devel/p5-version
 
 USE_PERL5_RUN=	5.6.0+
 NO_BUILD=	yes
diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index 14eef91..2519c67 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	michael@ranner.eu
 COMMENT=	The iXhash plugin for SpamAssassin
 
 RUN_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
 		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
 
 LICENSE=	AL2
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 755decb..98c3d17 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.8%20%28stable%29
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Greylisting policy server for Postfix using an SQL backend
 
-RUN_DEPENDS=	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
-		${SITE_PERL}/IO/Multiplex.pm:${PORTSDIR}/devel/p5-IO-Multiplex \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
+RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
+		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
+		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser
 
 USE_PERL5_RUN=	yes
 USE_RC_SUBR=	sqlgrey
@@ -48,19 +48,19 @@ OPTIONS=	PGSQL "PostgreSQL backend" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITH_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_SQLITE)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
 .if defined(WITH_STATS)
-RUN_DEPENDS+=	${SITE_PERL}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS+=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
 .endif
 
 post-patch:
diff --git a/mail/t-prot/Makefile b/mail/t-prot/Makefile
index 37ea563..0c276f1 100644
--- a/mail/t-prot/Makefile
+++ b/mail/t-prot/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.escape.de/~tolot/mutt/t-prot/downloads/ \
 MAINTAINER=	torres.g.alex@gmail.com
 COMMENT=	TOFU Protection - Display Filter for RFC822 messages
 
-RUN_DEPENDS=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+RUN_DEPENDS=	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
 	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 
 USE_PERL5=	yes
diff --git a/mail/vodmr/Makefile b/mail/vodmr/Makefile
index 016dc1c..7170908 100644
--- a/mail/vodmr/Makefile
+++ b/mail/vodmr/Makefile
@@ -18,10 +18,10 @@ MASTER_SITES=	http://romana.now.ie/software/ \
 MAINTAINER=	james@now.ie
 COMMENT=	An ODMR/ATRN server for vpopmail+qmail
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/CDB_File.pm:${PORTSDIR}/databases/p5-CDB_File \
-		${SITE_PERL}/${PERL_ARCH}/vpopmail.pm:${PORTSDIR}/mail/p5-vpopmail \
-		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
+RUN_DEPENDS=	p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File \
+		p5-vpopmail>=0:${PORTSDIR}/mail/p5-vpopmail \
+		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
 
 .if !defined(WITHOUT_TCPSERVER)
 RUN_DEPENDS+=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp