diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 61174028dfc4..21423bf29f6b 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements an FTP client POE Component
 
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Algorithm-RabinKarp/Makefile b/textproc/p5-Algorithm-RabinKarp/Makefile
index 010c8042cc07..43aa75e20494 100644
--- a/textproc/p5-Algorithm-RabinKarp/Makefile
+++ b/textproc/p5-Algorithm-RabinKarp/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_1
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Rabin-Karp streaming hash
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+BUILD_DEPENDS=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=	Algorithm::RabinKarp.3 Algorithm::RabinKarp::Util.3
diff --git a/textproc/p5-HTML-Tidy/Makefile b/textproc/p5-HTML-Tidy/Makefile
index 7f467bc8bd36..5a5bae411009 100644
--- a/textproc/p5-HTML-Tidy/Makefile
+++ b/textproc/p5-HTML-Tidy/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web validation in a Perl object using tidy
 
-BUILD_DEPENDS=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 LIB_DEPENDS=	tidyp:${PORTSDIR}/textproc/tidyp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index f7c0c043fa4f..affa2f878c4d 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=		p5-
 MAINTAINER=		perl@FreeBSD.org
 COMMENT=		Provides word stemming algorithms localized by language
 
-BUILD_DEPENDS=		${SITE_PERL}/Lingua/PT/Stemmer.pm:${PORTSDIR}/textproc/p5-Lingua-PT-Stemmer \
-			${SITE_PERL}/Lingua/Stem/Fr.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Fr \
-			${SITE_PERL}/Lingua/Stem/It.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-It \
-			${SITE_PERL}/Lingua/Stem/Ru.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Ru \
-			${SITE_PERL}/Lingua/Stem/Snowball/Da.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Da \
-			${SITE_PERL}/Lingua/Stem/Snowball/No.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-No \
-			${SITE_PERL}/Lingua/Stem/Snowball/Se.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Se \
-			${SITE_PERL}/Text/German.pm:${PORTSDIR}/textproc/p5-Text-German
+BUILD_DEPENDS=		p5-Lingua-PT-Stemmer>=0:${PORTSDIR}/textproc/p5-Lingua-PT-Stemmer \
+			p5-Lingua-Stem-Fr>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Fr \
+			p5-Lingua-Stem-It>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-It \
+			p5-Lingua-Stem-Ru>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Ru \
+			p5-Lingua-Stem-Snowball-Da>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Da \
+			p5-Lingua-Stem-Snowball-No>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-No \
+			p5-Lingua-Stem-Snowball-Se>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Se \
+			p5-Text-German>=0:${PORTSDIR}/textproc/p5-Text-German
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 PERL_CONFIGURE=		yes
diff --git a/textproc/p5-Net-YASA/Makefile b/textproc/p5-Net-YASA/Makefile
index 92f3df0b2573..41f44d931436 100644
--- a/textproc/p5-Net-YASA/Makefile
+++ b/textproc/p5-Net-YASA/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to YASA (Yet Another Suffix Array)
 
-RUN_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 660a1a817b20..b5f4fc1c01ed 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 routines that present a simple interface to parse syslog files
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
 
 PERL_CONFIGURE=	yes
 
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index ea4b4f94de8c..82339b6f5980 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert PerlPoint docs into various formats
 
-BUILD_DEPENDS=	${SITE_PERL}/PerlPoint/Parser.pm:${PORTSDIR}/textproc/p5-PerlPoint-Package \
-		${SITE_PERL}/Getopt/ArgvFile.pm:${PORTSDIR}/devel/p5-Getopt-ArgvFile
+BUILD_DEPENDS=	p5-PerlPoint-Package>=0:${PORTSDIR}/textproc/p5-PerlPoint-Package \
+		p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/textproc/p5-Petal-CodePerl/Makefile b/textproc/p5-Petal-CodePerl/Makefile
index 66a96a7a2546..7e2fd9d34c09 100644
--- a/textproc/p5-Petal-CodePerl/Makefile
+++ b/textproc/p5-Petal-CodePerl/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make Petal go faster by compiling the expressions
 
-BUILD_DEPENDS=	${SITE_PERL}/Petal.pm:${PORTSDIR}/textproc/p5-Petal \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		${SITE_PERL}/Code/Perl.pm:${PORTSDIR}/devel/p5-Code-Perl
+BUILD_DEPENDS=	p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
+		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		p5-Code-Perl>=0:${PORTSDIR}/devel/p5-Code-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=	Petal::CodePerl.3 Petal::CodePerl::Expr.3 \
diff --git a/textproc/p5-Petal/Makefile b/textproc/p5-Petal/Makefile
index 0941da084ca8..51bbb23d9ddc 100644
--- a/textproc/p5-Petal/Makefile
+++ b/textproc/p5-Petal/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Template Attribute Language - TAL for Perl!
 
-BUILD_DEPENDS=	${SITE_PERL}/MKDoc/XML.pm:${PORTSDIR}/textproc/p5-MKDoc-XML
+BUILD_DEPENDS=	p5-MKDoc-XML>=0:${PORTSDIR}/textproc/p5-MKDoc-XML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=	Petal.3 \
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index e78c2f2ad919..ec60f7d5d5fe 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	An object oriented Perl modules for handling tasks related to RDF
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/${PERL_ARCH}/Bundle/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index a9edf3a02dc3..207600d4b7c8 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	RDF Notation3 parser
 
-BUILD_DEPENDS=	${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
-		${SITE_PERL}/${PERL_ARCH}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore
+BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
+		p5-RDF-Core>=0:${PORTSDIR}/textproc/p5-RDF-Core \
+		p5-RDFStore>=0:${PORTSDIR}/textproc/p5-RDFStore
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Text-MultiMarkdown/Makefile b/textproc/p5-Text-MultiMarkdown/Makefile
index aecefbd69b94..f5e8d5b2bc6b 100644
--- a/textproc/p5-Text-MultiMarkdown/Makefile
+++ b/textproc/p5-Text-MultiMarkdown/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert MultiMarkdown syntax to (X)HTML
 
 BUILD_DEPENDS=	\
-	${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \
-	${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils \
-	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
+	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
+	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 	p5-Text-Markdown>=1.0.26:${PORTSDIR}/textproc/p5-Text-Markdown
 RUN_DEPENDS=	\
 	p5-Text-Markdown>=1.0.26:${PORTSDIR}/textproc/p5-Text-Markdown
diff --git a/textproc/p5-XML-RSS-Feed/Makefile b/textproc/p5-XML-RSS-Feed/Makefile
index 33ea0295232c..0e7059069fa1 100644
--- a/textproc/p5-XML-RSS-Feed/Makefile
+++ b/textproc/p5-XML-RSS-Feed/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Persistant XML RSS Encapsulation
 
-BUILD_DEPENDS=	${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index d772f4d582e2..93fcd019eecb 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Some collection of Tk Widgets
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 7103cc6026e7..941c043ca6f6 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	User configuration window for Tk with interface to Getopt::Long
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes