- Remove SITE_PERL from *_DEPENDS

Approved by: maintainer (tobez@ via IM)

47 files changed, 90 insertions, 90 deletions

diff --git a/astro/p5-Astro-Sunrise/Makefile b/astro/p5-Astro-Sunrise/Makefile
index 654b99b14da0..9e641b534de3 100644
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for computing the sunrise/sunset on a given day
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
 
 PERL_CONFIGURE=	yes
 
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 23947d1183f8..b2e87c794a49 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	An API for hierarchical tag/value structures
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index 49d7e7bc1d8d..8e578816b3fb 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Compatibility interfaces for Encode.pm on Perl < 5.7.1
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv
+BUILD_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index 2d3472074b83..da3f8323d9ee 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Database-independent create and drop functions
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 
 PERL_CONFIGURE=	yes
 
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 0eede5d6e4dd..a0a2dd047725 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Template::Plugin::DBI - Template interface to the DBI module
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-SQL-Statement>=1.28:${PORTSDIR}/databases/p5-SQL-Statement \
 		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index b68705ca769d..79e938e3654a 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text-Query-SQL provides query builders for SQL databases
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/Query.pm:${PORTSDIR}/textproc/p5-Text-Query
+BUILD_DEPENDS=	p5-Text-Query>=0:${PORTSDIR}/textproc/p5-Text-Query
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index 5875c7f51305..224a57fc997e 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Build and evaluate include/exclude lists
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index e9705b1e5a14..09597924bf3c 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fallbackable module loader
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index c17f96cae61d..c06b2d6baa34 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Encapsulated, declarative classes in Perl
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/PadWalker.pm:${PORTSDIR}/devel/p5-PadWalker \
-		${SITE_PERL}/${PERL_ARCH}/Devel/Caller.pm:${PORTSDIR}/devel/p5-Devel-Caller
+BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
+		p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 001b497350fb..0d90b9810a27 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A return-value object that can be treated as a boolean,array or object
 
-BUILD_DEPENDS=	${SITE_PERL}/Devel/StackTrace.pm:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	5.8.0+
diff --git a/devel/p5-Class-Spiffy/Makefile b/devel/p5-Class-Spiffy/Makefile
index feabb04c09bc..9e97a05fd4e9 100644
--- a/devel/p5-Class-Spiffy/Makefile
+++ b/devel/p5-Class-Spiffy/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Class::Spiffy - Spiffy Perl Interface Framework For You
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 6eb4ffc39406..7dbbc482be06 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -16,8 +16,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A perl module to transport objects from one system to another
 
-BUILD_DEPENDS=	${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
-RUN_DEPENDS=	${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
+RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
 
 PERL_CONFIGURE=	yes
 
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 8f33af74e45e..5a21a8974f7e 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::ACL - Perl extension for simple ACL lists
 
-BUILD_DEPENDS=	${SITE_PERL}/Set/NestedGroups.pm:${PORTSDIR}/devel/p5-Set-NestedGroups
+BUILD_DEPENDS=	p5-Set-NestedGroups>=0:${PORTSDIR}/devel/p5-Set-NestedGroups
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index f9f8b7b12478..f071f6bce5e0 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Compare - compare perl data structures
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Find/Rule.pm:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index f2b70f38a518..4fbbdc537c01 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Determine the day of the week for any date
 
-BUILD_DEPENDS=	${SITE_PERL}/Date/Leapyear.pm:${PORTSDIR}/devel/p5-Date-Leapyear \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Date-Leapyear>=0:${PORTSDIR}/devel/p5-Date-Leapyear \
+		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 3079d420f134..1d55b52779d7 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Inherit file attributes from parent directories
 
-BUILD_DEPENDS=	${SITE_PERL}/Directory/Scratch.pm:${PORTSDIR}/devel/p5-Directory-Scratch \
-		${SITE_PERL}/Path/Class.pm:${PORTSDIR}/devel/p5-Path-Class \
-		${SITE_PERL}/File/Attributes.pm:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
+		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
+		p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index 91acb5de019d..d3ccf1aa336b 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	File::Attributes - Manipulate file metadata
 
-BUILD_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
-		${SITE_PERL}/Directory/Scratch.pm:${PORTSDIR}/devel/p5-Directory-Scratch \
-		${SITE_PERL}/Best.pm:${PORTSDIR}/devel/p5-Best \
+BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
+		p5-Best>=0:${PORTSDIR}/devel/p5-Best \
 		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 94ba35d94430..de1b53b8a314 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Keeps track of file creation times
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Attributes.pm:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 2dc32a841df2..3b878a48eea3 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Transparently speed up perl functions by caching return values
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 45b9f146c8a0..b8a32392be74 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for prompting a user for information
 
-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}
 
 PERL_CONFIGURE=	yes
diff --git a/dns/p5-Data-Validate-Domain/Makefile b/dns/p5-Data-Validate-Domain/Makefile
index e69163f4592f..ffd235e45bbe 100644
--- a/dns/p5-Data-Validate-Domain/Makefile
+++ b/dns/p5-Data-Validate-Domain/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Validate::Domain - domain validation methods
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/Domain/TLD.pm:${PORTSDIR}/dns/p5-Net-Domain-TLD
+BUILD_DEPENDS=	p5-Net-Domain-TLD>=0:${PORTSDIR}/dns/p5-Net-Domain-TLD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/dns/p5-Net-DNS-ZoneCheck/Makefile b/dns/p5-Net-DNS-ZoneCheck/Makefile
index 6a0b86274fe5..9d96443f190e 100644
--- a/dns/p5-Net-DNS-ZoneCheck/Makefile
+++ b/dns/p5-Net-DNS-ZoneCheck/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Validate a DNS zone composed of Net::DNS::RR records
 
-BUILD_DEPENDS=	${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index f8d5c4204e2e..388fca3b1851 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension to convert a zone file to a collection of RRs
 
-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 \
 		p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index 6a8720051474..9c9db50499b9 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl6::Subs - Define your subroutines in the Perl 6 style
 
-BUILD_DEPENDS=	${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index c62d3e6eae8d..76ecdabff1c8 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Find RFC 822 email addresses in plain text
 
-BUILD_DEPENDS=	${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
+BUILD_DEPENDS=	p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index a8514a582730..b356fe6807ba 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Email-Address>=1.80:${PORTSDIR}/mail/p5-Email-Address \
 		p5-Email-Simple>=1.92:${PORTSDIR}/mail/p5-Email-Simple \
 		p5-Return-Value>=1.28:${PORTSDIR}/devel/p5-Return-Value \
-		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require
+		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 334fbefdfbb7..546a0bba5085 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module implementing a modern mail folder management
 
 COMMON_DEPENDS=	\
-	${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
-	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+	p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
+	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
 	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
 	p5-File-Remove>=0.20:${PORTSDIR}/devel/p5-File-Remove \
 	p5-HTML-Format>=2.01:${PORTSDIR}/textproc/p5-HTML-Format \
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index d7c7648affc1..492ecf98518b 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Parse log messages generated by various MTAs
 
-BUILD_DEPENDS=	${SITE_PERL}/Parse/Syslog.pm:${PORTSDIR}/textproc/p5-Parse-Syslog
+BUILD_DEPENDS=	p5-Parse-Syslog>=0:${PORTSDIR}/textproc/p5-Parse-Syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index 458f719e6751..9916adb716bf 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Library of advanced math functions that includes a Perl OO module
 
-RUN_DEPENDS=	${SITE_PERL}/Carp/Clan.pm:${PORTSDIR}/devel/p5-Carp-Clan
+RUN_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index fc1293a68e22..d6946a82ef9a 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Graph, the Perl module for graph operations
 
-BUILD_DEPENDS=	${SITE_PERL}/Heap.pm:${PORTSDIR}/devel/p5-Heap \
-		${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap \
+		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index 9de97ebea14e..d37e12ef85a5 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fast handling of sets containing integer spans
 
-BUILD_DEPENDS=	${SITE_PERL}/Data/Types.pm:${PORTSDIR}/devel/p5-Data-Types
+BUILD_DEPENDS=	p5-Data-Types>=0:${PORTSDIR}/devel/p5-Data-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index bc2dc51179c7..acf0c65225e6 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -15,10 +15,10 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Authen::Htpasswd - interface to read and modify Apache .htpasswd files
 TAGS=		apache authentication pass password md5 sha1 crypto
 
-COMMON_DEPENDS=	${SITE_PERL}/IO/LockedFile.pm:${PORTSDIR}/devel/p5-IO-LockedFile \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor
+COMMON_DEPENDS=	p5-IO-LockedFile>=0:${PORTSDIR}/devel/p5-IO-LockedFile \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
+		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 7c9f16b20bf3..2828c54acf9d 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -15,20 +15,20 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Pure-Perl OpenPGP-compatible PGP implementation
 
 RUN_DEPENDS= \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		${SITE_PERL}/Crypt/CAST5_PP.pm:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
-		${SITE_PERL}/Crypt/DES_EDE3.pm:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
-		${SITE_PERL}/Crypt/DSA.pm:${PORTSDIR}/security/p5-Crypt-DSA \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/IDEA.pm:${PORTSDIR}/security/p5-Crypt-IDEA \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/RIPEMD160.pm:${PORTSDIR}/security/p5-Crypt-RIPEMD160 \
-		${SITE_PERL}/Crypt/RSA.pm:${PORTSDIR}/security/p5-Crypt-RSA \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Twofish.pm:${PORTSDIR}/security/p5-Crypt-Twofish \
-		${SITE_PERL}/Data/Buffer.pm:${PORTSDIR}/misc/p5-Data-Buffer \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/File/HomeDir.pm:${PORTSDIR}/devel/p5-File-HomeDir \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
+		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
+		p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
+		p5-Crypt-DES_EDE3>=0:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
+		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA \
+		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA \
+		p5-Crypt-RIPEMD160>=0:${PORTSDIR}/security/p5-Crypt-RIPEMD160 \
+		p5-Crypt-RSA>=0:${PORTSDIR}/security/p5-Crypt-RSA \
+		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
+		p5-Crypt-Twofish>=0:${PORTSDIR}/security/p5-Crypt-Twofish \
+		p5-Data-Buffer>=0:${PORTSDIR}/misc/p5-Data-Buffer \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI
 
 PERL_CONFIGURE=	yes
 
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index 5b16b0aead57..04bb1e45454f 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Crypt::PassGen - Generate a random password that looks like a real word
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index a1707f66cdd2..75b6a588d8be 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple blog code to valid XHTML
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 867768882e4a..1df33099eacb 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -16,9 +16,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Stemmed analyzer plugin for p5-Plucene search engine
 
-BUILD_DEPENDS=	${SITE_PERL}/Lingua/StopWords.pm:${PORTSDIR}/textproc/p5-Lingua-StopWords \
-		${SITE_PERL}/${PERL_ARCH}/Lingua/Stem/Snowball.pm:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball \
-		${SITE_PERL}/Plucene/Analysis/TokenFilter.pm:${PORTSDIR}/textproc/p5-Plucene
+BUILD_DEPENDS=	p5-Lingua-StopWords>=0:${PORTSDIR}/textproc/p5-Lingua-StopWords \
+		p5-Lingua-Stem-Snowball>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball \
+		p5-Plucene>=0:${PORTSDIR}/textproc/p5-Plucene
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index eb738acacad4..6a0fe2b27379 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -16,14 +16,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl port of the Java Lucene search engine
 
-BUILD_DEPENDS=	${SITE_PERL}/Tie/Array/Sorted.pm:${PORTSDIR}/devel/p5-Tie-Array-Sorted \
-		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \
-		${SITE_PERL}/Class/Virtual.pm:${PORTSDIR}/devel/p5-Class-Virtual \
-		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/${PERL_ARCH}/Time/Piece.pm:${PORTSDIR}/devel/p5-Time-Piece \
-		${SITE_PERL}/Lingua/Stem/En.pm:${PORTSDIR}/textproc/p5-Lingua-Stem \
-		${SITE_PERL}/Bit/Vector/Minimal.pm:${PORTSDIR}/math/p5-Bit-Vector-Minimal \
-		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-Tie-Array-Sorted>=0:${PORTSDIR}/devel/p5-Tie-Array-Sorted \
+		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+		p5-Class-Virtual>=0:${PORTSDIR}/devel/p5-Class-Virtual \
+		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
+		p5-Lingua-Stem>=0:${PORTSDIR}/textproc/p5-Lingua-Stem \
+		p5-Bit-Vector-Minimal>=0:${PORTSDIR}/math/p5-Bit-Vector-Minimal \
+		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index 0a4967ea5d06..10e0a6dab210 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Convert to/from Koremutake Memorable Random Strings
 
-BUILD_DEPENDS=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index 29f19623377c..0972abd8d0f4 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Interface Template Toolkit to Lingua::EN::Inflect module
 
-BUILD_DEPENDS=	${SITE_PERL}/Lingua/EN/Inflect.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
+		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index 875c0b528326..477858b2ae74 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text::Diff::HTML - XHTML format for Text::Diff::Unified
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 2597bff40861..810396d3e0ad 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Chains multiple Text::Filter objects and runs them in sequence
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
+BUILD_DEPENDS=	p5-Text-Filter>=0:${PORTSDIR}/textproc/p5-Text-Filter
 
 PERL_CONFIGURE=	yes
 
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 7358a7638398..0424d8cced2b 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Various niceties for p5-Text-FixedLength lovers
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
+BUILD_DEPENDS=	p5-Text-FixedLength>=0:${PORTSDIR}/textproc/p5-Text-FixedLength
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 16ee237a01a8..f1e9c540ef2d 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A text graphics rendering toolkit
 
-BUILD_DEPENDS=	${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
+BUILD_DEPENDS=	p5-Text-Wrapper>=0:${PORTSDIR}/textproc/p5-Text-Wrapper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTTP-Server-Simple-Recorder/Makefile b/www/p5-HTTP-Server-Simple-Recorder/Makefile
index 08f3a24e6a47..464b96620ea8 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/Makefile
+++ b/www/p5-HTTP-Server-Simple-Recorder/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Mixin to record HTTP::Server::Simple's sockets
 
-BUILD_DEPENDS=	${SITE_PERL}/HTTP/Server/Simple.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		${SITE_PERL}/Test/HTTP/Server/Simple.pm:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
-		${SITE_PERL}/IO/Tee.pm:${PORTSDIR}/devel/p5-IO-Tee
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
+		p5-Test-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \
+		p5-IO-Tee>=0:${PORTSDIR}/devel/p5-IO-Tee
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Test-HTTP-Server-Simple/Makefile b/www/p5-Test-HTTP-Server-Simple/Makefile
index b23df7e175c5..d1596ba1f436 100644
--- a/www/p5-Test-HTTP-Server-Simple/Makefile
+++ b/www/p5-Test-HTTP-Server-Simple/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Test::More functions for HTTP::Server::Simple
 
-BUILD_DEPENDS=	${SITE_PERL}/HTTP/Server/Simple.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple \
+BUILD_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
 		p5-URI>0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 3821346a988c..48f005620d65 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Tk::Splashscreen, display a Splashscreen during program initialization
 
-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/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index f41a181e5226..0c549d4ea77e 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Access to X11 clipboard from Perl
 
-BUILD_DEPENDS=	${SITE_PERL}/Spiffy.pm:${PORTSDIR}/devel/p5-Spiffy
+BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		xclip:${PORTSDIR}/x11/xclip