- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

55 files changed, 121 insertions, 121 deletions

diff --git a/audio/mp3burn/Makefile b/audio/mp3burn/Makefile
index 3ca4b9cf4532..b87abeb33c5c 100644
--- a/audio/mp3burn/Makefile
+++ b/audio/mp3burn/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Command line tool to burn audio CDs from MP3, Ogg, Vorbis, FLAC files
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
-		${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis/Header.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
+		p5-Ogg-Vorbis-Header>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
+		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index c17c4f5988f8..d04127dd8fb2 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	An audio manipulation routines for perl
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Math/GSL.pm:${PORTSDIR}/math/p5-Math-GSL
+BUILD_DEPENDS=	p5-Math-GSL>=0:${PORTSDIR}/math/p5-Math-GSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 493dd6d9b7b3..05615789aef8 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 		rawplay:${PORTSDIR}/audio/rawrec \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		flac:${PORTSDIR}/audio/flac \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
 
 LICENSE=	GPLv2
 
diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile
index 14e4927e4079..5aa5f2a5849b 100644
--- a/comms/atslog/Makefile
+++ b/comms/atslog/Makefile
@@ -55,14 +55,14 @@ PLIST_SUB+=	WWW="@comment "
 
 .if !defined(WITHOUT_MYSQL)
 USE_MYSQL=	yes
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
-RUN_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+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITHOUT_LIBWRAP)
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index fc2e7968a459..e75f8fdf3a1b 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=	WWW/MACKERS
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Send SMS messages via the websites of Irish mobile operators
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/Lingua/EN/Squeeze.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Squeeze \
-		${SITE_PERL}/TestGen4Web/Runner.pm:${PORTSDIR}/www/p5-TestGen4Web-Runner
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-Lingua-EN-Squeeze>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Squeeze \
+		p5-TestGen4Web-Runner>=0:${PORTSDIR}/www/p5-TestGen4Web-Runner
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/colorgcc/Makefile b/devel/colorgcc/Makefile
index bce295a42816..a081fa5e7fe3 100644
--- a/devel/colorgcc/Makefile
+++ b/devel/colorgcc/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Perl script to colorize the terminal ouput of GCC
 
-RUN_DEPENDS=	${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PLIST_FILES=	bin/${PORTNAME} \
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 74f21189c452..d587839dd256 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -236,9 +236,9 @@ PLIST_SUB+=	PYTHON="@comment "
 .ifdef (WITH_PERL)
 USE_PERL5=	yes
 MAKE_ENV+=	PERL_PATH=${PERL}
-BUILD_DEPENDS+=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
-RUN_DEPENDS+=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/Net/SMTP/SSL.pm:${PORTSDIR}/mail/p5-Net-SMTP-SSL
+BUILD_DEPENDS+=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+RUN_DEPENDS+=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+		p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL
 MAN3=		Git.3 \
 		Git::I18N.3
 PLIST_SUB+=	PERLSUB=""
@@ -299,8 +299,8 @@ MAKE_ARGS+=	NO_TCLTK=yes
 # devel/p5-subversion if you set WITH_SUBVERSION_VER=16. Otherwise
 # devel/subversion will be brought in.
 .ifdef (WITH_SVN)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
+RUN_DEPENDS+=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
 PLIST_SUB+=	SVN=""
 MAN1+=		git-svn.1
 .else
diff --git a/devel/p5-Goo-Canvas/Makefile b/devel/p5-Goo-Canvas/Makefile
index 6153f9432782..580451206b4f 100644
--- a/devel/p5-Goo-Canvas/Makefile
+++ b/devel/p5-Goo-Canvas/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Perl interface to the GooCanvas
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
-		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
+		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
+		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 LIB_DEPENDS=	goocanvas.3:${PORTSDIR}/graphics/goocanvas \
 		gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
-		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
+		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
+		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/p5-Locale-PO/Makefile b/devel/p5-Locale-PO/Makefile
index b8e96d33d9b8..7522133ffe03 100644
--- a/devel/p5-Locale-PO/Makefile
+++ b/devel/p5-Locale-PO/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Perl module for manipulating .po entries from GNU gettext
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=		Locale::PO.3
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 844b1d75ba65..35d07163e144 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -124,7 +124,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		gpatch:${PORTSDIR}/devel/patch \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${PORTSDIR}/devel/imake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
@@ -138,7 +138,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
 		epm:${PORTSDIR}/devel/epm \
 		dmake:${PORTSDIR}/devel/dmake \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_AUTOTOOLS=	autoconf
 USE_BISON=	build
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index f216bfd43607..efb2e9208004 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -125,7 +125,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		gpatch:${PORTSDIR}/devel/patch \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${PORTSDIR}/devel/imake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
@@ -139,7 +139,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
 		epm:${PORTSDIR}/devel/epm \
 		dmake:${PORTSDIR}/devel/dmake \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_AUTOTOOLS=	autoconf
 USE_BISON=	build
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 11007803dcea..7fd7300ce5b4 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -78,7 +78,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${PORTSDIR}/devel/imake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 8364b92f4783..61ce3fa19a3b 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.sai.msu.su/pub/unix/FTP/mirror/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	An utility to mirror directory hierarchy with FTP
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+RUN_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 65c0fe7b4212..c5356fa1544c 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -16,19 +16,19 @@ COMMENT=	Produce PDF from scanned documents
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Perl/Critic.pm:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		${SITE_PERL}/Set/IntSpan.pm:${PORTSDIR}/math/p5-Set-IntSpan \
-		${SITE_PERL}/XML/LibXML/Simple.pm:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
-		${SITE_PERL}/Sys/SigAction.pm:${PORTSDIR}/devel/p5-Sys-SigAction \
-		${SITE_PERL}/${PERL_ARCH}/forks.pm:${PORTSDIR}/devel/p5-forks \
-		${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
-		${SITE_PERL}/${PERL_ARCH}/Goo/Canvas.pm:${PORTSDIR}/devel/p5-Goo-Canvas \
-		${SITE_PERL}/${PERL_ARCH}/Pango.pm:${PORTSDIR}/x11-toolkits/p5-Pango \
-		${SITE_PERL}/${PERL_ARCH}/Acme/Damn.pm:${PORTSDIR}/devel/p5-Acme-Damn \
-		${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
-		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
-		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+BUILD_DEPENDS=	p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
+		p5-Set-IntSpan>=0:${PORTSDIR}/math/p5-Set-IntSpan \
+		p5-XML-LibXML-Simple>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
+		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
+		p5-forks>=0:${PORTSDIR}/devel/p5-forks \
+		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
+		ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \
+		p5-Goo-Canvas>=0:${PORTSDIR}/devel/p5-Goo-Canvas \
+		p5-Pango>=0:${PORTSDIR}/x11-toolkits/p5-Pango \
+		p5-Acme-Damn>=0:${PORTSDIR}/devel/p5-Acme-Damn \
+		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
+		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
+		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
 		cjb2:${PORTSDIR}/graphics/djvulibre \
@@ -47,7 +47,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Test/Perl/Critic.pm:${PORTSDIR}/textproc/p5-Test-Per
 		p5-Gtk2-ImageView>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+RUN_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
 		cjb2:${PORTSDIR}/graphics/djvulibre \
diff --git a/japanese/tiarra/Makefile b/japanese/tiarra/Makefile
index 695eaa4f13ad..3e19e6d0b5a7 100644
--- a/japanese/tiarra/Makefile
+++ b/japanese/tiarra/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.clovery.jp/tiarra/archive/2010/02/
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	IRC Proxy software
 
-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
 
 USE_PERL5_RUN=	yes
 USE_BZIP2=	yes
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index d5510693c28e..9be3124f8f37 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -25,7 +25,7 @@ USE_RUBY=	yes
 USE_PERL5_BUILD=yes
 
 BUILD_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 # We cannot use ${ARCH} nor ${UNAME} which are defined in bsd.port.mk, here.
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index abda88f32bd5..94927a18cbca 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		pcre.1:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
 
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index 3900b3c08d5f..3355239db03c 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Converts mbox mailboxes to Maildir
 
-RUN_DEPENDS=	${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
 EXTRACT_CMD=	${GZIP_CMD} -cd
 EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${PORTNAME}
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 7439092c9ec3..805c6181cc9e 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Greylist Policy Service for postfix
 
 LIB_DEPENDS=	dbi.1:${PORTSDIR}/databases/libdbi
 RUN_DEPENDS=	${LOCALBASE}/lib/dbd:${PORTSDIR}/databases/libdbi-drivers \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
 SCRIPT_FILES=	gps-maintain.pl gps-db-update.pl
 PLIST_FILES=	etc/gps.conf-dist libexec/gps libexec/gps-maintain.pl libexec/gps-db-update.pl
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 830de26a94d7..cfc2216078f2 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	SF/razor/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A distributed, collaborative, spam detection and filtering network
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/multimedia/mp3cd/Makefile b/multimedia/mp3cd/Makefile
index 233d0809963c..0e3bfa4907e9 100644
--- a/multimedia/mp3cd/Makefile
+++ b/multimedia/mp3cd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://outflux.net/software/pkgs/mp3cd/download/
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Perl script that burns MP3 to audio CDs
 
-BUILD_DEPENDS=	${SITE_PERL}/Config/Simple.pm:${PORTSDIR}/devel/p5-Config-Simple
+BUILD_DEPENDS=	p5-Config-Simple>=0:${PORTSDIR}/devel/p5-Config-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
diff --git a/multimedia/youtube-viewer/Makefile b/multimedia/youtube-viewer/Makefile
index 86bc9b673b6e..a18acc55fd67 100644
--- a/multimedia/youtube-viewer/Makefile
+++ b/multimedia/youtube-viewer/Makefile
@@ -18,9 +18,9 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Search and play YouTube videos streaming in MPlayer
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Fast.pm:${PORTSDIR}/net/p5-XML-Fast \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor \
+RUN_DEPENDS=	p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
 		mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_PERL5_RUN=	yes
diff --git a/net-im/twirssi/Makefile b/net-im/twirssi/Makefile
index 2d700b0561e1..848e762ecdc9 100644
--- a/net-im/twirssi/Makefile
+++ b/net-im/twirssi/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Twitter script to irssi
 
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi \
-		${SITE_PERL}/Net/Twitter.pm:${PORTSDIR}/net/p5-Net-Twitter \
-		${SITE_PERL}/WWW/Shorten.pm:${PORTSDIR}/www/p5-WWW-Shorten \
-		${SITE_PERL}/WWW/Shorten/Bitly.pm:${PORTSDIR}/www/p5-WWW-Shorten-Bitly
+		p5-Net-Twitter>=0:${PORTSDIR}/net/p5-Net-Twitter \
+		p5-WWW-Shorten>=0:${PORTSDIR}/www/p5-WWW-Shorten \
+		p5-WWW-Shorten-Bitly>=0:${PORTSDIR}/www/p5-WWW-Shorten-Bitly
 
 SUB_FILES=	pkg-message
 
diff --git a/net-mgmt/nagios-silfreed-plugins/Makefile b/net-mgmt/nagios-silfreed-plugins/Makefile
index 267dbde9bc55..605287c6bcf3 100644
--- a/net-mgmt/nagios-silfreed-plugins/Makefile
+++ b/net-mgmt/nagios-silfreed-plugins/Makefile
@@ -26,8 +26,8 @@ COMMENT=	Additional SNMP plugins for Nagios from silfreed.net
 
 # Also uses traceroute, dig at runtime (in base system with hardcoded paths).
 RUN_DEPENDS+=	\
-	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
+	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 .if defined(WITH_EXPECT_TOOLS)
 RUN_DEPENDS+=	\
 	${LOCALBASE}/bin/expect:${PORTSDIR}/lang/expect
diff --git a/net-mgmt/weathermap/Makefile b/net-mgmt/weathermap/Makefile
index 4136602d0db2..4b084a1d1088 100644
--- a/net-mgmt/weathermap/Makefile
+++ b/net-mgmt/weathermap/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	This tool displays the utilization of the network links
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD/Image.pm:${PORTSDIR}/graphics/p5-GD \
+RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		mrtg:${PORTSDIR}/net-mgmt/mrtg
 
 NO_BUILD=	yes
diff --git a/net/httpry/Makefile b/net/httpry/Makefile
index f0c2c9f7d11f..d3a8be438157 100644
--- a/net/httpry/Makefile
+++ b/net/httpry/Makefile
@@ -25,7 +25,7 @@ OPTIONS=	EXTRASCRIPTS "Install additional scripts" Off
 .if defined(WITH_EXTRASCRIPTS)
 PLIST_SUB=	EXTRASCRIPTS=""
 USE_PERL5_RUN=	yes
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 . if ${PERL_LEVEL} < 500903
 RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
 . endif
diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile
index 0d3a6eb69b73..b7cab29ba7cf 100644
--- a/net/p5-Net-INET6Glue/Makefile
+++ b/net/p5-Net-INET6Glue/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Make common modules IPv6 ready by hotpatching
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
+BUILD_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/net/scnc/Makefile b/net/scnc/Makefile
index 12d1e6dabce5..c07cf85b4cc1 100644
--- a/net/scnc/Makefile
+++ b/net/scnc/Makefile
@@ -15,8 +15,8 @@ COMMENT=	SSL Capable Netcat
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index af6c28905542..bb7986696e6a 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/files/LICENSE
 OPTIONS=	LSOF "Use LSOF" on \
 		NMAP "Use NMAP" off
 
-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 \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 USE_PERL5=	yes
diff --git a/sysutils/p5-Probe-Perl/Makefile b/sysutils/p5-Probe-Perl/Makefile
index 3a89081b7248..d4d990783aef 100644
--- a/sysutils/p5-Probe-Perl/Makefile
+++ b/sysutils/p5-Probe-Perl/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Information about the currently running perl
 
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS+=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS+=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
 
 PERL_CONFIGURE=	yes
 
diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index 77ae699aa94a..c222dbb76147 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -14,11 +14,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Perl module for templating Excel files
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
+BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/Spreadsheet/WriteExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		${SITE_PERL}/Test/Deep.pm:${PORTSDIR}/devel/p5-Test-Deep
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
+		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -59,7 +59,7 @@ MAN3=		Excel::Template.3 \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
+RUN_DEPENDS+=	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
 CONFIGURE_ARGS+=	USE_UNICODE=1
 .endif
 
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index abd1cb17bec6..2254554fd168 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Tk::XMLViewer - Tk widget to display XML
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index dac728ec7b30..0ef29adff096 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -34,7 +34,7 @@ SUB_LIST+=	NOTEWORK=""
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GDSUPPORT)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 .endif
 
 post-patch:
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index 8cda56557559..445b9849bbce 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Easy DBI access from CGI::Application
 
-BUILD_DEPENDS=	${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI-modules \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/DBD/Mock.pm:${PORTSDIR}/databases/p5-DBD-Mock
+BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
+		p5-CGI-modules>=0:${PORTSDIR}/www/p5-CGI-modules \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-Mock>=0:${PORTSDIR}/databases/p5-DBD-Mock
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/p5-CGI-Application-Plugin-HTDot/Makefile b/www/p5-CGI-Application-Plugin-HTDot/Makefile
index 5770931747d8..d757370af077 100644
--- a/www/p5-CGI-Application-Plugin-HTDot/Makefile
+++ b/www/p5-CGI-Application-Plugin-HTDot/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Enable "magic dot" notation in CGI::Application-derived applications
 
 BUILD_DEPENDS=	p5-CGI-Application>=4.0:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
-		${SITE_PERL}/HTML/Template/Plugin/Dot.pm:${PORTSDIR}/www/p5-HTML-Template-Pluggable \
-		${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application \
+		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
+		p5-HTML-Template-Pluggable>=0:${PORTSDIR}/www/p5-HTML-Template-Pluggable \
+		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
 		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index 9536ad5600b5..a882fe41d202 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -13,10 +13,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Help validate forms with the CGI::Application framework
 
-BUILD_DEPENDS=	${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
-		${SITE_PERL}/Data/FormValidator.pm:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		${SITE_PERL}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI-modules \
-		${SITE_PERL}/CGI/Application.pm:${PORTSDIR}/www/p5-CGI-Application
+BUILD_DEPENDS=	p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
+		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator \
+		p5-CGI-modules>=0:${PORTSDIR}/www/p5-CGI-modules \
+		p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-HTML-Template-Associate/Makefile b/www/p5-HTML-Template-Associate/Makefile
index d0bcec8afb84..b6eee6ef088c 100644
--- a/www/p5-HTML-Template-Associate/Makefile
+++ b/www/p5-HTML-Template-Associate/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Bridges gap between HTML::Template and other modules
 
-RUN_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-		${SITE_PERL}/Data/FormValidator.pm:${PORTSDIR}/textproc/p5-Data-FormValidator
+RUN_DEPENDS=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
+		p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-Template-Pluggable/Makefile b/www/p5-HTML-Template-Pluggable/Makefile
index 1d10bced6722..93ff90289b18 100644
--- a/www/p5-HTML-Template-Pluggable/Makefile
+++ b/www/p5-HTML-Template-Pluggable/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Extends HTML::Template with plugin support
 
 BUILD_DEPENDS=	p5-HTML-Template>=2.7:${PORTSDIR}/www/p5-HTML-Template \
 		p5-Test-MockObject>=1:${PORTSDIR}/devel/p5-Test-MockObject \
-		${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
-		${SITE_PERL}/Class/Trigger.pm:${PORTSDIR}/devel/p5-Class-Trigger
+		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
+		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Sledge-Plugin-CacheContent/Makefile b/www/p5-Sledge-Plugin-CacheContent/Makefile
index 64af5533a74d..bfbafe025f54 100644
--- a/www/p5-Sledge-Plugin-CacheContent/Makefile
+++ b/www/p5-Sledge-Plugin-CacheContent/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that generates and serves cached content
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-Download/Makefile b/www/p5-Sledge-Plugin-Download/Makefile
index 99ff05361adc..5a9250835b64 100644
--- a/www/p5-Sledge-Plugin-Download/Makefile
+++ b/www/p5-Sledge-Plugin-Download/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that works around browser bugs with file downloading
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-Dumper/Makefile b/www/p5-Sledge-Plugin-Dumper/Makefile
index cc5cf769118b..80020b621da7 100644
--- a/www/p5-Sledge-Plugin-Dumper/Makefile
+++ b/www/p5-Sledge-Plugin-Dumper/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that automatically calls Data::Dumper
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/Makefile b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
index 72f178f97596..d17fe764f567 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/Makefile
+++ b/www/p5-Sledge-Plugin-HTML2HDML/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS} \
 		html2hdml:${PORTSDIR}/www/html2hdml
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-PM_DEPENDS+=	${SITE_PERL}/HTTP/MobileAgent.pm:${PORTSDIR}/www/p5-HTTP-MobileAgent
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS+=	p5-HTTP-MobileAgent>=0:${PORTSDIR}/www/p5-HTTP-MobileAgent
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-Log/Makefile b/www/p5-Sledge-Plugin-Log/Makefile
index e70f2ae946af..be807b01fda3 100644
--- a/www/p5-Sledge-Plugin-Log/Makefile
+++ b/www/p5-Sledge-Plugin-Log/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A Sledge plug-in that adds Log::Dispatch::Config on
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-PM_DEPENDS+=	${SITE_PERL}/Log/Dispatch/Config.pm:${PORTSDIR}/devel/p5-Log-Dispatch-Config
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS+=	p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-NoCache/Makefile b/www/p5-Sledge-Plugin-NoCache/Makefile
index dee5b9a9c201..d7a01af0ed61 100644
--- a/www/p5-Sledge-Plugin-NoCache/Makefile
+++ b/www/p5-Sledge-Plugin-NoCache/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that outputs HTTP no-cache headers
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-SaveUpload/Makefile b/www/p5-Sledge-Plugin-SaveUpload/Makefile
index 75776da516d2..4031eb650d2c 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/Makefile
+++ b/www/p5-Sledge-Plugin-SaveUpload/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that copes with cross-device link errors in uploading
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-ScratchPad/Makefile b/www/p5-Sledge-Plugin-ScratchPad/Makefile
index 5ee1e18523e0..844cdb19a53d 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/Makefile
+++ b/www/p5-Sledge-Plugin-ScratchPad/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that provides temporary data buffers
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
index 45a6e63541b0..60493d33a255 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Sledge plug-in that automatically cleans up old sessions
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Plugin-XSLT/Makefile b/www/p5-Sledge-Plugin-XSLT/Makefile
index 316821f914c6..b5c50001ab8d 100644
--- a/www/p5-Sledge-Plugin-XSLT/Makefile
+++ b/www/p5-Sledge-Plugin-XSLT/Makefile
@@ -18,9 +18,9 @@ COMMENT=	A Sledge plug-in that adds XSLT::Dispatch::Config on
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
-PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS+=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+PM_DEPENDS+=	p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-SessionManager-CookieStore/Makefile b/www/p5-Sledge-SessionManager-CookieStore/Makefile
index f47a983d06ef..efeb6e7ac5cf 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/Makefile
+++ b/www/p5-Sledge-SessionManager-CookieStore/Makefile
@@ -18,10 +18,10 @@ COMMENT=	A Sledge extension that stores session data to HTTP cookies
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish
-PM_DEPENDS+=	${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
-PM_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS+=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish
+PM_DEPENDS+=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+PM_DEPENDS+=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge-Template-Expr/Makefile b/www/p5-Sledge-Template-Expr/Makefile
index 8b959cf50b8b..55daac1077b9 100644
--- a/www/p5-Sledge-Template-Expr/Makefile
+++ b/www/p5-Sledge-Template-Expr/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A Sledge extension that uses HTML::Template::Expr as template engine
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Sledge.pm:${PORTSDIR}/www/p5-Sledge
-PM_DEPENDS+=	${SITE_PERL}/HTML/Template/Expr.pm:${PORTSDIR}/www/p5-HTML-Template-Expr
+PM_DEPENDS=	p5-Sledge>=0:${PORTSDIR}/www/p5-Sledge
+PM_DEPENDS+=	p5-HTML-Template-Expr>=0:${PORTSDIR}/www/p5-HTML-Template-Expr
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Sledge/Makefile b/www/p5-Sledge/Makefile
index 1d0b925d4a76..df86dc9bfb45 100644
--- a/www/p5-Sledge/Makefile
+++ b/www/p5-Sledge/Makefile
@@ -21,7 +21,7 @@ DEPRECATED=	depends on mod_perl 1 which is gone
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
-PM_DEPENDS=	${SITE_PERL}/Bundle/Sledge.pm:${PORTSDIR}/www/p5-Bundle-Sledge
+PM_DEPENDS=	p5-Bundle-Sledge>=0:${PORTSDIR}/www/p5-Bundle-Sledge
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-WWW-FreeProxy/Makefile b/www/p5-WWW-FreeProxy/Makefile
index fc59f4fc367b..b1739f4bbcd6 100644
--- a/www/p5-WWW-FreeProxy/Makefile
+++ b/www/p5-WWW-FreeProxy/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Fetch proxies from free proxy lists
 
-BUILD_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/www/rejik/Makefile b/www/rejik/Makefile
index 7b5a960630d6..b3ce260cc6d8 100644
--- a/www/rejik/Makefile
+++ b/www/rejik/Makefile
@@ -55,8 +55,8 @@ PLIST_SUB+=	WWW="@comment "
 .if defined(WITH_DBL)
 DISTFILES+=	dbl-2.0.tgz
 USE_PERL5_RUN=	yes
-RUN_DEPENDS+=	${SITE_PERL}/mach/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
-		${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+RUN_DEPENDS+=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		wget:${PORTSDIR}/ftp/wget
 PLIST_SUB+=	DBL=""
 .else
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index ad9c71ab300c..0418318c153a 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -33,7 +33,7 @@ PLIST_SUB+=	NLS="@comment "
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 PLIST_SUB+=	OPML="@comment "
 .else
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 PLIST_SUB+=	OPML=""
 # opml2snow only have "" manpage
 _MANPAGES+=	${PREFIX}/man/man1/opml2snow.1
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 01741f4b6743..702e84bfa5f9 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
 		xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
 		ev.4:${PORTSDIR}/devel/libev \
 		yajl.2:${PORTSDIR}/devel/yajl
-RUN_DEPENDS=	${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
+RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3