- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

29 files changed, 88 insertions, 88 deletions

diff --git a/audio/crip/Makefile b/audio/crip/Makefile
index c3d633b900a6..13528a131280 100644
--- a/audio/crip/Makefile
+++ b/audio/crip/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://bach.dynet.com/crip/src/
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Terminal-based ripper/encoder/tagger
 
-RUN_DEPENDS=	${SITE_PERL}/CDDB_get.pm:${PORTSDIR}/audio/p5-CDDB_get \
+RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		vorbisgain:${PORTSDIR}/audio/vorbisgain
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index dc0f0e538b10..d5cb7b5e5041 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	An alternative for replaygain
 
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		wavegain:${PORTSDIR}/audio/wavegain
 
 USE_PERL5_RUN=	yes
@@ -39,7 +39,7 @@ OPTIONS=	\
 
 .if defined(WITH_GNORMALIZE_MP3)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
-	${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info
+	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
 .endif
 
 .if defined(WITH_GNORMALIZE_OGG)
@@ -64,7 +64,7 @@ RUN_DEPENDS+=	cddb.pl:${PORTSDIR}/audio/p5-CDDB_get
 .endif
 
 .if defined(WITH_GNORMALIZE_CDPLAY)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Audio/CD.pm:${PORTSDIR}/audio/p5-Audio-CD
+RUN_DEPENDS+=	p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD
 .endif
 
 .if defined(WITH_GNORMALIZE_FLAC)
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 1c71f8a6a334..14b75a822c18 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Convert MP3 files to Ogg Vorbis files
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
+		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
diff --git a/audio/ogg2mp3/Makefile b/audio/ogg2mp3/Makefile
index 59e860adcd21..a5c6b05844f3 100644
--- a/audio/ogg2mp3/Makefile
+++ b/audio/ogg2mp3/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Perl script that converts Ogg Vorbis files to MP3 format
 
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote \
+		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
 		ogginfo:${PORTSDIR}/audio/vorbis-tools
 
 NO_BUILD=	yes
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index ea097a87bdb7..be9368f0fa09 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	A command line audio CD ripper
 
 # See pkg-message about other dependencies.
-RUN_DEPENDS=	${SITE_PERL}/CDDB_get.pm:${PORTSDIR}/audio/p5-CDDB_get \
-	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
-	${SITE_PERL}/WebService/MusicBrainz.pm:${PORTSDIR}/www/p5-WebService-MusicBrainz \
+RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
+	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+	p5-WebService-MusicBrainz>=0:${PORTSDIR}/www/p5-WebService-MusicBrainz \
 	p5-MusicBrainz-DiscID>=0:${PORTSDIR}/audio/p5-MusicBrainz-DiscID \
 	lame:${PORTSDIR}/audio/lame \
 	cdparanoia:${PORTSDIR}/audio/cdparanoia \
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index 9826d790855e..77430355b235 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -16,12 +16,12 @@ MAINTAINER=	miks.mikelsons@gmail.com
 COMMENT=	Airtunes emulator
 
 LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-HTTP-Message \
+RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
+		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
+		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
 		avahi-publish-service:${PORTSDIR}/net/avahi-app
 
 USE_GMAKE=	yes
diff --git a/sysutils/backupme/Makefile b/sysutils/backupme/Makefile
index fb3047d87291..17c09ff4f259 100644
--- a/sysutils/backupme/Makefile
+++ b/sysutils/backupme/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	http://backupme.org.ua/
 MAINTAINER=	yaroslav@berezhinskiy.org.ua
 COMMENT=	Flexible and easy backup utility
 
-RUN_DEPENDS=	${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		${SITE_PERL}/mach/Filesys/Df.pm:${PORTSDIR}/sysutils/p5-Filesys-Df \
-		${SITE_PERL}/Filesys/DiskUsage.pm:${PORTSDIR}/sysutils/p5-Filesys-DiskUsage \
-		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
-		${SITE_PERL}/Net/SCP/Expect.pm:${PORTSDIR}/net/p5-Net-SCP-Expect \
-		${SITE_PERL}/Net/IPv6Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
-		${SITE_PERL}/Net/Jabber.pm:${PORTSDIR}/net-im/p5-Net-Jabber \
-		${SITE_PERL}/Net/SSH.pm:${PORTSDIR}/net/p5-Net-SSH
+RUN_DEPENDS=	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
+		p5-Filesys-Df>=0:${PORTSDIR}/sysutils/p5-Filesys-Df \
+		p5-Filesys-DiskUsage>=0:${PORTSDIR}/sysutils/p5-Filesys-DiskUsage \
+		p5-Net>=0:${PORTSDIR}/net/p5-Net \
+		p5-Net-SCP-Expect>=0:${PORTSDIR}/net/p5-Net-SCP-Expect \
+		p5-Net-IPv6Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
+		p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber \
+		p5-Net-SSH>=0:${PORTSDIR}/net/p5-Net-SSH
 
 USE_PERL5=	yes
 
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 6d47da939c20..b5bb2c90dd65 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -47,10 +47,10 @@ OPTIONS=	COMPRESS_ZLIB "Perl5 interface to zlib compression library"	on \
 RUN_DEPENDS+=	p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
 .endif
 .if defined(WITH_ARCHIVE_ZIP)
-RUN_DEPENDS+=	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
+RUN_DEPENDS+=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip
 .endif
 .if defined(WITH_FILE_RSYNCP)
-RUN_DEPENDS+=	${SITE_PERL}/mach/File/RsyncP.pm:${PORTSDIR}/net/p5-File-RsyncP
+RUN_DEPENDS+=	p5-File-RsyncP>=0:${PORTSDIR}/net/p5-File-RsyncP
 .endif
 .if defined(WITH_SMBCLIENT)
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
@@ -59,7 +59,7 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
 RUN_DEPENDS+=	nmblookup:${PORTSDIR}/net/samba-nmblookup
 .endif
 .if defined(WITH_XML_RSS)
-RUN_DEPENDS+=	${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS
+RUN_DEPENDS+=	p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
 .endif
 
 post-patch:
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index fa57dfe66a50..3ea83f26d52f 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	admin@lissyara.su
 COMMENT=	A robust log colorizer
 
-RUN_DEPENDS=	${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
diff --git a/sysutils/cvsweb-converters/Makefile b/sysutils/cvsweb-converters/Makefile
index b4b1b485ef2b..6c9aa9b20aed 100644
--- a/sysutils/cvsweb-converters/Makefile
+++ b/sysutils/cvsweb-converters/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://mitglied.multimania.de/mkamm/distfiles/ \
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Create hyperlinks to cvsweb from cvs[up] output or FreeBSD commitlogs
 
-RUN_DEPENDS=	${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
-		${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
+		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/sysutils/dirvish/Makefile b/sysutils/dirvish/Makefile
index d5ba19bb7950..b622df42edd0 100644
--- a/sysutils/dirvish/Makefile
+++ b/sysutils/dirvish/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	tarkhil@over.ru
 COMMENT=	Network backup system based off of rsync
 
-RUN_DEPENDS=	${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \
-		${SITE_PERL}/Time/Period.pm:${PORTSDIR}/devel/p5-Time-Period \
+RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
+		p5-Time-Period>=0:${PORTSDIR}/devel/p5-Time-Period \
 		rsync:${PORTSDIR}/net/rsync
 
 MAN5=		dirvish.conf.5
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index e25971140291..e4d5e98cadb9 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	delphus@gmail.com
 COMMENT=	Graphical disk map Utility
 
-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_GNOME=	gnomeprefix gnomehack gtk20
 USE_GMAKE=	yes
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 18606cec9107..413254a730d9 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -83,8 +83,8 @@ PLIST_SUB+=		MGMT="@comment "
 .endif
 
 .if defined(WITH_LDIRECTORD)
-RUN_DEPENDS+=		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-			${SITE_PERL}/Mail/Send.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS+=		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+			p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
 USE_PERL5_RUN=		yes
 PLIST_SUB+=		LDIRECTORD=""
 MAN8+=			ldirectord.8
diff --git a/sysutils/ispman/Makefile b/sysutils/ispman/Makefile
index 0ab52c49be55..1174d79ca00e 100644
--- a/sysutils/ispman/Makefile
+++ b/sysutils/ispman/Makefile
@@ -15,26 +15,26 @@ DISTNAME=	${PORTNAME}-1.3rc2
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	ISP management software
 
-RUN_DEPENDS=	${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced\
-		${SITE_PERL}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		${SITE_PERL}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
-		${SITE_PERL}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \
-		${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \
-		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
-		${SITE_PERL}/DNS/ZoneParse.pm:${PORTSDIR}/dns/p5-DNS-ZoneParse \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
-		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
-		${SITE_PERL}/Mail/RFC822/Address.pm:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-		${SITE_PERL}/Locale/Maketext/Lexicon.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags \
-		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS=	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced\
+		p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \
+		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
+		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \
+		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
+		p5-IMAP-Admin>=0:${PORTSDIR}/mail/p5-IMAP-Admin \
+		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
+		p5-DNS-ZoneParse>=0:${PORTSDIR}/dns/p5-DNS-ZoneParse \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String \
+		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
+		p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
+		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
+		p5-I18N-LangTags>=0:${PORTSDIR}/misc/p5-I18N-LangTags \
+		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/sysutils/jps/Makefile b/sysutils/jps/Makefile
index e3eae515546b..ef2778fe57d5 100644
--- a/sysutils/jps/Makefile
+++ b/sysutils/jps/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ext.by/jps/
 MAINTAINER=	pavel@ext.by
 COMMENT=	Wrapper to ps(1) that maps pids to jails
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN1=		jps.1
diff --git a/sysutils/jtop/Makefile b/sysutils/jtop/Makefile
index 363f6d1efef7..ab063c1272b2 100644
--- a/sysutils/jtop/Makefile
+++ b/sysutils/jtop/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ext.by/jtop/
 MAINTAINER=	pavel@ext.by
 COMMENT=	Wrapper to top(1) that maps pids to jails
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN1=		jtop.1
diff --git a/sysutils/jx/Makefile b/sysutils/jx/Makefile
index 69cd7c139ef9..1a013dc487b2 100644
--- a/sysutils/jx/Makefile
+++ b/sysutils/jx/Makefile
@@ -26,7 +26,7 @@ OPTIONS=	CONFIG  "Enable custom config (recuire Config::General)" Off
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_CONFIG)
-RUN_DEPENDS=	${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General
+RUN_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General
 PLIST_FILES+=	etc/${PORTNAME}.cfg.sample
 .endif
 
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 45cab7e7f1d0..c6318e3feb5b 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Webfrontend for managing accounts stored in an OpenLDAP server
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota \
-		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota \
+		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
 NO_BUILD=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index 35b9824e8227..288d892c3875 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -23,13 +23,13 @@ COMMENT=	Logfile analyse toolkit for multiple applications
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		lambda:${PORTSDIR}/math/lambda \
-		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules \
-		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
-		${SITE_PERL}/Curses/UI.pm:${PORTSDIR}/devel/p5-Curses-UI \
-		${SITE_PERL}/Locale/TextDomain.pm:${PORTSDIR}/devel/p5-Locale-libintl
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
+		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
+		p5-Curses-UI>=0:${PORTSDIR}/devel/p5-Curses-UI \
+		p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
 
 OPTIONS=	CHARTS "Have Charts output format" On \
 		HTML "Have HTML or DocBook output format" On \
@@ -264,7 +264,7 @@ MAN7=		lire.7
 
 .ifdef(WITH_CHARTS)
 RUN_DEPENDS+=	ploticus:${PORTSDIR}/math/ploticus-nox11
-BUILD_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS+=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
 .endif
 .ifdef(WITH_HTML)
 RUN_DEPENDS+=	lynx:${PORTSDIR}/www/lynx
@@ -278,7 +278,7 @@ RUN_DEPENDS+=	epsffit:${PORTSDIR}/print/psutils-a4 \
 
 .endif
 .ifdef(WITH_EXCEL95)
-BUILD_DEPENDS+=	${SITE_PERL}/Spreadsheet/WriteExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
+BUILD_DEPENDS+=	p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
 .endif
 
 RUN_DEPENDS+=	${BUILD_DEPENDS}
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index fb90b6a5801f..72bbd48644f4 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A log file analysis program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${SITE_PERL}/mach/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
 USE_PERL5_RUN=	yes
 
diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index 5725d1e15cc1..6337e4362ece 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX=	-common
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Common components between a munin node and server
 
-BUILD_DEPENDS=	${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \
-		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
+		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index 0786276fb2dc..22aee6262218 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mahlon@martini.nu
 COMMENT=	An object oriented perl interface to jail(2)
 
 BUILD_DEPENDS=\
-	${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline
+	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/sysutils/p5-Unix-Lsof/Makefile b/sysutils/p5-Unix-Lsof/Makefile
index 60c917a6462e..d1831f42b9eb 100644
--- a/sysutils/p5-Unix-Lsof/Makefile
+++ b/sysutils/p5-Unix-Lsof/Makefile
@@ -16,8 +16,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gjvc@gjvc.com
 COMMENT=	Unix::Lsof -- a wrapper to the Unix lsof utility
 
-BUILD_DEPENDS=	${SITE_PERL}/IPC/Run3.pm:${PORTSDIR}/devel/p5-IPC-Run3
-RUN_DEPENDS=	${SITE_PERL}/IPC/Run3.pm:${PORTSDIR}/devel/p5-IPC-Run3
+BUILD_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
+RUN_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
 
 PERL_CONFIGURE=	yes
 
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index c450501076a8..c322d7227763 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Filesystem snapshot utility based on rsync(1)
 
 BUILD_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		${SITE_PERL}/${PERL_ARCH}/Lchown.pm:${PORTSDIR}/sysutils/p5-Lchown
+		p5-Lchown>=0:${PORTSDIR}/sysutils/p5-Lchown
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index b350c5268cea..9597392f2476 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -18,8 +18,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Web-based interface for performing some user tasks
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
 
 FETCH_CMD?=	/usr/bin/fetch -pRr
 NO_BUILD=	yes
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index e42d00f4bd83..f2c5667e994b 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -18,8 +18,8 @@ MAINTAINER=	fehlner@gmx.de
 COMMENT=	Account management and creation tool
 
 RUN_DEPENDS=	\
-    ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-    ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd
+    p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
+    p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
 
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
diff --git a/sysutils/vlogger/Makefile b/sysutils/vlogger/Makefile
index ff6bfa94c223..7724b26fca76 100644
--- a/sysutils/vlogger/Makefile
+++ b/sysutils/vlogger/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Logging utility for Apache servers with many virtual hosts
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Bundle/DBI.pm:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index d09f07b3d636..e3b66b0858e8 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -19,8 +19,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Web-based interface for system administration for Unix
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
 
 USE_PERL5=	yes
 USE_PYTHON=	yes
diff --git a/sysutils/whatpix/Makefile b/sysutils/whatpix/Makefile
index 7b947719f026..9082426c5772 100644
--- a/sysutils/whatpix/Makefile
+++ b/sysutils/whatpix/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://whatpix.sourceforge.net/download/
 MAINTAINER=	pcasidy@casidy.com
 COMMENT=	Perl console application which finds, moves or deletes duplicate files
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/whatpix