- Convert to new perl framework

per port extra changes:
devel/p5-Perl-Version remove outage PERL_LEVEL check
devel/p5-Devel-LeakTrace-Fast remove perl version requiment 5.12.0- (no need in current version)

Approved by:	lth@ (maintainer)

155 files changed, 311 insertions, 162 deletions

diff --git a/archivers/p5-Archive-Peek/Makefile b/archivers/p5-Archive-Peek/Makefile
index 37155c8a171e..96fc5295ddcd 100644
--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -22,7 +22,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Archive::Peek.3
 
diff --git a/audio/p5-Filesys-Virtual-DAAP/Makefile b/audio/p5-Filesys-Virtual-DAAP/Makefile
index c8a24403fc5f..3f8dc2a4856b 100644
--- a/audio/p5-Filesys-Virtual-DAAP/Makefile
+++ b/audio/p5-Filesys-Virtual-DAAP/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Net-DAAP-Client>=0:${PORTSDIR}/audio/p5-Net-DAAP-Client
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Filesys::Virtual::DAAP.3
 
diff --git a/audio/p5-Net-DAAP-Client/Makefile b/audio/p5-Net-DAAP-Client/Makefile
index 814346dd9d4a..fe2b68c8afa6 100644
--- a/audio/p5-Net-DAAP-Client/Makefile
+++ b/audio/p5-Net-DAAP-Client/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-Digest-MD5-M4p>=0:${PORTSDIR}/security/p5-Digest-MD5-M4p \
 		p5-Net-DAAP-DMAP>=0:${PORTSDIR}/audio/p5-Net-DAAP-DMAP
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Net::DAAP::Client.3
 
diff --git a/audio/p5-Net-DAAP-DMAP/Makefile b/audio/p5-Net-DAAP-DMAP/Makefile
index 7c7989c060a8..eeb83d1ffbf1 100644
--- a/audio/p5-Net-DAAP-DMAP/Makefile
+++ b/audio/p5-Net-DAAP-DMAP/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Data-HexDump>0:${PORTSDIR}/devel/p5-Data-HexDump \
 		p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::DAAP::DMAP.3
 
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 47929c6ba7a0..911d2cd3cc82 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
 		p5-Class-DBI-Plugin-Type>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::DBI::AsForm.3
 
diff --git a/databases/p5-Class-DBI-DATA-Schema/Makefile b/databases/p5-Class-DBI-DATA-Schema/Makefile
index 1882a68cb9aa..b0f704ac6306 100644
--- a/databases/p5-Class-DBI-DATA-Schema/Makefile
+++ b/databases/p5-Class-DBI-DATA-Schema/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Class::DBI::DATA::Schema.3
 
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index 7edd87002744..9aec3a72011d 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Data-Lazy>=0:${PORTSDIR}/devel/p5-Data-Lazy \
 		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Class::DBI::LazyInflate.3
 
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index ae75da839b9e..9386cc598b5e 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Class-DBI-Loader>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader
 		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::DBI::Loader::Relationship.3
 
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index 4eb184ac3d3d..13526b443f65 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-Class-DBI-Plugin>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Plug
 		p5-SQL-Abstract>=1.50:${PORTSDIR}/databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Class::DBI::Plugin::AbstractCount.3
 
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index 27989b2055a0..5b39433c36d2 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::DBI::Plugin::RetrieveAll.3
 
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index d9ef6247a3ae..001fd47aa602 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::DBI::Plugin::Type.3
 
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index a28513d009d7..43280eb6bb4b 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Abstract base class for Class::DBI plugins
 BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Class::DBI::Plugin.3
 
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index f8bf1efac7d0..f9e2f45d41fd 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::DBI::Untaint.3
 
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index 5df2def9b180..ef04c17dc546 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:${PORTSDIR}/databases/p5-DBIx-Cl
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	DBIx::Class::TimeStamp.3
 
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index e9e4557ef3d8..ef767bbce1d8 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql \
 		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
 		p5-Params-Util>=0.26:${PORTSDIR}/devel/p5-Params-Util
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	DBIx::MySQLSequence.3
 
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index 7eaa6a85c8a0..0cefa94b886d 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -14,7 +14,8 @@ RUN_DEPENDS=	p5-Clone>=0.30:${PORTSDIR}/devel/p5-Clone \
 		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		SQL::Dialects::ANSI.3 \
 		SQL::Dialects::AnyData.3 \
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index c29b55c95acb..7fa801f09395 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-AppConfig-Std>=1.05:${PORTSDIR}/devel/p5-AppConfig-Std \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	cpan-upload.1
 
diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile
index d657bc964e01..cf9284773cc2 100644
--- a/devel/easygit/Makefile
+++ b/devel/easygit/Makefile
@@ -19,7 +19,8 @@ COMMENT=	Easy wrapper for git
 RUN_DEPENDS=	git:${PORTSDIR}/devel/git
 
 DIST_SUBDIR=	eg/${PORTVERSION}_${PORTREVISION}
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/eg bin/easygit
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 8f00c2d5b457..323938205d33 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -15,7 +15,8 @@ COMMENT=	Generate prefixes from intervals
 
 TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Algorithm::Interval2Prefix.3
 
diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index b52da844103a..dfc401816e48 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	A Perl module for reading configuration files
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		AppConfig.3 \
 		AppConfig::Args.3 \
diff --git a/devel/p5-CPAN-DistnameInfo/Makefile b/devel/p5-CPAN-DistnameInfo/Makefile
index ecc429d2fb25..84ca9a189894 100644
--- a/devel/p5-CPAN-DistnameInfo/Makefile
+++ b/devel/p5-CPAN-DistnameInfo/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Extract distribution name and version from a CPAN filename
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CPAN::DistnameInfo.3
 
diff --git a/devel/p5-CPAN-Recent-Uploads/Makefile b/devel/p5-CPAN-Recent-Uploads/Makefile
index b659a3fa9ede..f6a26ae51e08 100644
--- a/devel/p5-CPAN-Recent-Uploads/Makefile
+++ b/devel/p5-CPAN-Recent-Uploads/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww \
 		p5-YAML-Syck>=1.15:${PORTSDIR}/textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CPAN::Recent::Uploads.3 \
 		CPAN::Recent::Uploads::Retriever.3
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 1a80b1dc4276..fe6fa4d2be63 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Digest-SHA1>=2.01:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-IO-String>=1.02:${PORTSDIR}/devel/p5-IO-String \
 		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Cache.3 \
 		Cache::Entry.3 \
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index 8533a98d3eca..2a6cc9cc78e2 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Class::Accessor::Lvalue.3 \
 		Class::Accessor::Lvalue::Fast.3
diff --git a/devel/p5-Class-Base/Makefile b/devel/p5-Class-Base/Makefile
index 590f355ac76a..59b435e1f92c 100644
--- a/devel/p5-Class-Base/Makefile
+++ b/devel/p5-Class-Base/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Useful base class for deriving other modules
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::Base.3
 
diff --git a/devel/p5-Class-ErrorHandler/Makefile b/devel/p5-Class-ErrorHandler/Makefile
index c5908dc13abe..617ab83cb8ce 100644
--- a/devel/p5-Class-ErrorHandler/Makefile
+++ b/devel/p5-Class-ErrorHandler/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Base class for error handling
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Class::ErrorHandler.3
 
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index 5070604bb145..0ad5ccf6adbb 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 OPTIONS_DEFINE=	XMLSIMPLE
 XMLSIMPLE_DESC=	Support for XML config files
diff --git a/devel/p5-Date-Easter/Makefile b/devel/p5-Date-Easter/Makefile
index ae44b1b6e500..42e3d39829c5 100644
--- a/devel/p5-Date-Easter/Makefile
+++ b/devel/p5-Date-Easter/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Calculates Easter for any given year
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Date::Easter.3
 
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index 4c0d10db914e..94060ad6c25b 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Date-Simple>=0:${PORTSDIR}/devel/p5-Date-Simple \
 		p5-Date-Easter>=0:${PORTSDIR}/devel/p5-Date-Easter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Date::Holidays::DK.3
 
diff --git a/devel/p5-Devel-LeakTrace-Fast/Makefile b/devel/p5-Devel-LeakTrace-Fast/Makefile
index bc9fc0bf1f3f..3ce58a15bdad 100644
--- a/devel/p5-Devel-LeakTrace-Fast/Makefile
+++ b/devel/p5-Devel-LeakTrace-Fast/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Indicate where leaked variables are coming from
 
-PERL_CONFIGURE=	5.12.0-
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Devel::LeakTrace::Fast.3
 
diff --git a/devel/p5-Devel-TraceCalls/Makefile b/devel/p5-Devel-TraceCalls/Makefile
index ed260616e97b..8afade5bb649 100644
--- a/devel/p5-Devel-TraceCalls/Makefile
+++ b/devel/p5-Devel-TraceCalls/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Track calls to subs, classes, and object instances
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Devel::TraceCalls.3
 
diff --git a/devel/p5-Directory-Scratch-Structured/Makefile b/devel/p5-Directory-Scratch-Structured/Makefile
index 505a9578bf7d..1595c62e3167 100644
--- a/devel/p5-Directory-Scratch-Structured/Makefile
+++ b/devel/p5-Directory-Scratch-Structured/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Creates temporary files and directories from a structured description
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 RUN_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
 		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 4d0c0cda4f09..37c3c67a95c9 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -58,7 +58,8 @@ BUILD_DEPENDS=	p5-App-Cmd>=0.309:${PORTSDIR}/devel/p5-App-Cmd \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	dzil.1
 MAN3=	Dist::Zilla.3 \
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index e69b77fe653a..03371c447425 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:${PORTSDIR}/devel/p5-File-Find-Rule \
 		p5-Params-Util>=0.38:${PORTSDIR}/devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	File::Find::Rule::Perl.3
 
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index 67a3c0fa8c92..634326c8c6f9 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -22,6 +22,7 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 MAN3=		File::Finder.3 \
 		File::Finder::Steps.3
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Path-Expand/Makefile b/devel/p5-File-Path-Expand/Makefile
index 9f7244561a79..91d2bbaa49b2 100644
--- a/devel/p5-File-Path-Expand/Makefile
+++ b/devel/p5-File-Path-Expand/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Expand filenames
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Path::Expand.3
 
diff --git a/devel/p5-Filesys-Virtual-Plain/Makefile b/devel/p5-Filesys-Virtual-Plain/Makefile
index 0228911cad56..98be91d59f65 100644
--- a/devel/p5-Filesys-Virtual-Plain/Makefile
+++ b/devel/p5-Filesys-Virtual-Plain/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A Plain virtual filesystem
 BUILD_DEPENDS=	p5-Filesys-Virtual>=0.05:${PORTSDIR}/devel/p5-Filesys-Virtual
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Filesys::Virtual::Plain.3
 
diff --git a/devel/p5-Filesys-Virtual/Makefile b/devel/p5-Filesys-Virtual/Makefile
index 03991e6e05bc..68874f662f4b 100644
--- a/devel/p5-Filesys-Virtual/Makefile
+++ b/devel/p5-Filesys-Virtual/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl extension to provide a framework for a virtual filesystem
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Filesys::Virtual.3
 
diff --git a/devel/p5-IO-Capture/Makefile b/devel/p5-IO-Capture/Makefile
index dc766237bd4f..007ee86cecbd 100644
--- a/devel/p5-IO-Capture/Makefile
+++ b/devel/p5-IO-Capture/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Abstract Base Class to build modules to capture output
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	IO::Capture.3 \
 	IO::Capture::Overview.3 \
diff --git a/devel/p5-IO-CaptureOutput/Makefile b/devel/p5-IO-CaptureOutput/Makefile
index 1f1d0130f9fe..c5a5e3f15bfb 100644
--- a/devel/p5-IO-CaptureOutput/Makefile
+++ b/devel/p5-IO-CaptureOutput/Makefile
@@ -15,7 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Capture STDOUT/STDERR from subprocesses and XS/C modules
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	IO::CaptureOutput.3
 
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 0d98d890c133..c8e9ccb03e56 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-version>0:${PORTSDIR}/devel/p5-version \
 		p5-Want>0:${PORTSDIR}/devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	IO::Prompt.3
 
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index cf030e46f529..7105af721e8c 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Log::Dispatch::FileRotate.3
 
diff --git a/devel/p5-Log-Log4perl/Makefile b/devel/p5-Log-Log4perl/Makefile
index a3cbbde7f88f..41852242167b 100644
--- a/devel/p5-Log-Log4perl/Makefile
+++ b/devel/p5-Log-Log4perl/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Log4j implementation for Perl
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		l4p-tmpl.1
 MAN3=		Log::Log4perl.3 \
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index 509f2e498da4..361afbf71ba9 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Report a problem, pluggable handlers and language support
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Log::Report.3 \
 	Log::Report::Die.3 \
diff --git a/devel/p5-Log-Trace/Makefile b/devel/p5-Log-Trace/Makefile
index 64f6005f9448..fe1a7981097f 100644
--- a/devel/p5-Log-Trace/Makefile
+++ b/devel/p5-Log-Trace/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Provides a unified approach to tracing
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Log::Trace.3 \
 	Log::Trace::Manual.3
diff --git a/devel/p5-Module-CPANfile/Makefile b/devel/p5-Module-CPANfile/Makefile
index f305686aa14c..50686c43067d 100644
--- a/devel/p5-Module-CPANfile/Makefile
+++ b/devel/p5-Module-CPANfile/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Parse cpanfile
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	mymeta-cpanfile.1
 MAN3=	Module::CPANfile.3 \
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index eb6f8b5e04ff..a4dccaee8e8f 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Retrieves module information from a file or script
 RUN_DEPENDS=	p5-Module-Info>0.20:${PORTSDIR}/devel/p5-Module-Info
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	YES
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		version.pl.1
 MAN3=		Module::Info::File.3
diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile
index ad139c92f773..dfcfeff365b9 100644
--- a/devel/p5-Module-Pluggable/Makefile
+++ b/devel/p5-Module-Pluggable/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Automatically give your module the ability to have plugins
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5	configure
 
 MAN3=		Devel::InnerPackage.3 \
 		Module::Pluggable.3 \
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index 46e2b7898538..61d782f47ea5 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-Module-Starter>=0:${PORTSDIR}/devel/p5-Module-Starter \
 		p5-version>=0:${PORTSDIR}/devel/p5-version
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Module::Starter::PBP.3
 
diff --git a/devel/p5-Moose-Test/Makefile b/devel/p5-Moose-Test/Makefile
index b2415230c5c3..21a2f4447ac2 100644
--- a/devel/p5-Moose-Test/Makefile
+++ b/devel/p5-Moose-Test/Makefile
@@ -14,7 +14,8 @@ BUILD_DEPENDS=	p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Moose::Test.3 \
 	Moose::Test::Case.3
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index db4ab902051e..e5ee1834cb7e 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	MooseX::AttributeShortcuts.3
 
diff --git a/devel/p5-MooseX-SimpleConfig/Makefile b/devel/p5-MooseX-SimpleConfig/Makefile
index 3c0a30c038ff..37a4da8d5cec 100644
--- a/devel/p5-MooseX-SimpleConfig/Makefile
+++ b/devel/p5-MooseX-SimpleConfig/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS=	p5-Moose>=0.35:${PORTSDIR}/devel/p5-Moose \
 		p5-Config-Any>=0.13:${PORTSDIR}/devel/p5-Config-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		MooseX::SimpleConfig.3
 
diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile
index 5cc17300b05a..0cee7d9a2b58 100644
--- a/devel/p5-Parse-CPAN-Meta/Makefile
+++ b/devel/p5-Parse-CPAN-Meta/Makefile
@@ -19,7 +19,8 @@ COMMENT=	Parse META.yml and other similar CPAN metadata files
 BUILD_DEPENDS=	p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
 RUN_DEPENDS=	p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Parse::CPAN::Meta.3
 
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index 542970f6e55c..8f4f0616ae73 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -24,7 +24,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-InDistDir>0:${PORTSDIR}/devel/p5-Test-InDistDir \
 		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Parse::CPAN::Packages.3 \
 	Parse::CPAN::Packages::Distribution.3 \
diff --git a/devel/p5-Perl-Version/Makefile b/devel/p5-Perl-Version/Makefile
index 71fc521544e7..d7c34ddb6156 100644
--- a/devel/p5-Perl-Version/Makefile
+++ b/devel/p5-Perl-Version/Makefile
@@ -18,16 +18,10 @@ RUN_DEPENDS=	p5-File-Slurp>=9999.12:${PORTSDIR}/devel/p5-File-Slurp \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		perl-reversion.1
 MAN3=		Perl::Version.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 5.008007
-RUN_DEPENDS+=	p5-Pod-Parser>=1.3:${PORTSDIR}/textproc/p5-Pod-Parser
-BUILD_DEPENDS+=	p5-Pod-Parser>=1.3:${PORTSDIR}/textproc/p5-Pod-Parser
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index 9ebc99b819e2..b44d9ae243be 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl module that provides a method to daemonify a Perl script
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Proc::Daemon.3
 
diff --git a/devel/p5-Proc-PID-File/Makefile b/devel/p5-Proc-PID-File/Makefile
index 70cf9dd9a87b..31c1e5ad261a 100644
--- a/devel/p5-Proc-PID-File/Makefile
+++ b/devel/p5-Proc-PID-File/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	A module to manage process id files
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Proc::PID::File.3
 
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 63cccd38eafa..e703eb10d030 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Simple closure-driven TAP generator
 BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	TAP::SimpleOutput.3
 
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index bf3d1e64e1fc..ae6c1966ae24 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -18,7 +18,8 @@ COMMENT=	A simple set of building blocks for both unit and runtime testing
 RUN_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::Assertions.3 \
 	Test::Assertions::Manual.3 \
diff --git a/devel/p5-Test-Block/Makefile b/devel/p5-Test-Block/Makefile
index 9b9008c537a1..43a3087e1141 100644
--- a/devel/p5-Test-Block/Makefile
+++ b/devel/p5-Test-Block/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-Simple>=0.47:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::Block.3
 
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index d02c2d1aa4f5..507d672c17e5 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-Class-Inspector>=1.12:${PORTSDIR}/devel/p5-Class-Inspector \
 		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::ClassAPI.3
 
diff --git a/devel/p5-Test-Data/Makefile b/devel/p5-Test-Data/Makefile
index 98f868d263c2..0de34103e53d 100644
--- a/devel/p5-Test-Data/Makefile
+++ b/devel/p5-Test-Data/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Test functions for particular variable types
 RUN_DEPENDS=	p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::Data.3 \
 		Test::Data::Array.3 \
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 2365b9befb77..1374679445ae 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Test::File::ShareDir.3 \
 	Test::File::ShareDir::TempDirObject.3
diff --git a/devel/p5-Test-Group/Makefile b/devel/p5-Test-Group/Makefile
index 2232db628dba..8f52b8a911c8 100644
--- a/devel/p5-Test-Group/Makefile
+++ b/devel/p5-Test-Group/Makefile
@@ -13,7 +13,8 @@ BUILD_DEPENDS=	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
 		p5-Test-Cmd>=0:${PORTSDIR}/devel/p5-Test-Cmd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Test::Group.3 \
 		Test::Group::Extending.3 \
diff --git a/devel/p5-Test-InDistDir/Makefile b/devel/p5-Test-InDistDir/Makefile
index 66d7f7461d7e..7d961f006bdb 100644
--- a/devel/p5-Test-InDistDir/Makefile
+++ b/devel/p5-Test-InDistDir/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test environment setup for development with IDE
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::InDistDir.3
 
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index d02191e6ba2f..536032b70b84 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences \
 		p5-JSON-Any>=1.20:${PORTSDIR}/converters/p5-JSON-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::JSON.3
 
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index d7824e20bec9..947b5c9fbd64 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Override subroutines in a module for unit testing
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::MockModule.3
 
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index f82f26ab9224..91afe891ddd1 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::Moose::More.3
 
diff --git a/devel/p5-Test-Object/Makefile b/devel/p5-Test-Object/Makefile
index 153221fc83cf..68a6e28e843c 100644
--- a/devel/p5-Test-Object/Makefile
+++ b/devel/p5-Test-Object/Makefile
@@ -16,7 +16,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Thoroughly testing objects via registered handlers
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::Object.3
 
diff --git a/devel/p5-Test-POE-Client-TCP/Makefile b/devel/p5-Test-POE-Client-TCP/Makefile
index 36035d0e8afe..04fc5dfe1549 100644
--- a/devel/p5-Test-POE-Client-TCP/Makefile
+++ b/devel/p5-Test-POE-Client-TCP/Makefile
@@ -12,7 +12,8 @@ COMMENT=	A POE Component providing TCP client services for test cases
 BUILD_DEPENDS=	p5-POE>=1.28:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::POE::Client::TCP.3
 
diff --git a/devel/p5-Test-POE-Server-TCP/Makefile b/devel/p5-Test-POE-Server-TCP/Makefile
index 96d1fcdd7d4c..c23e2e4c934e 100644
--- a/devel/p5-Test-POE-Server-TCP/Makefile
+++ b/devel/p5-Test-POE-Server-TCP/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A POE Component providing TCP server services for test cases
 BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::POE::Server::TCP.3
 
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index fd3eca0642aa..0bc0e840b8cc 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-Pod-Coverage>0:${PORTSDIR}/devel/p5-Pod-Coverage \
 		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::Pod::Coverage.3
 
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 90b308b78e55..bbd52551ddfb 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Sends test results to cpan-testers@perl.org
 RUN_DEPENDS=	p5-Net>0:${PORTSDIR}/net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 MAKE_JOBS_UNSAFE=	yes
 
 MAN3=		Test::Reporter.3 \
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index 65be1cab815b..bfd03084461d 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-IPC-Run3>=0.034:${PORTSDIR}/devel/p5-IPC-Run3 \
 		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::Script.3
 
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index ee8e6a2d08af..60c7ae267077 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
 		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::SubCalls.3
 
diff --git a/devel/p5-Test-WWW-Mechanize-CGI/Makefile b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
index 804eedd43bdf..110826aecccf 100644
--- a/devel/p5-Test-WWW-Mechanize-CGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-WWW-Mechanize-CGI>=0.2:${PORTSDIR}/www/p5-WWW-Mechanize-CGI \
 		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::WWW::Mechanize::CGI.3
 
diff --git a/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index 03bc9af7010e..3f3623fcf46d 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML \
 		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Test::XML::Valid.3
 
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index fe6206896bed..32763a363f64 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-XML-SemanticDiff>=0:${PORTSDIR}/textproc/p5-XML-SemanticDiff \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::XML.3 \
 	Test::XML::SAX.3 \
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 38e26c38f7d0..0f631ca65d3b 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Test for valid YAML
 RUN_DEPENDS=	p5-YAML>=0.60:${PORTSDIR}/textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::YAML::Valid.3
 
diff --git a/devel/p5-Time-Warp/Makefile b/devel/p5-Time-Warp/Makefile
index 78cac89fd620..b57e7da31a92 100644
--- a/devel/p5-Time-Warp/Makefile
+++ b/devel/p5-Time-Warp/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Control over the flow of time
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Time::Warp.3
 
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index e007ec431d34..6262302fce3d 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	mocked.3 \
 	unmocked.3
diff --git a/games/p5-Games-Bingo-Bot/Makefile b/games/p5-Games-Bingo-Bot/Makefile
index 0b7bbc1f68fc..494ea00e056d 100644
--- a/games/p5-Games-Bingo-Bot/Makefile
+++ b/games/p5-Games-Bingo-Bot/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A simple class holding IRC related methods for bingo
 BUILD_DEPENDS=	p5-Games-Bingo>=0:${PORTSDIR}/games/p5-Games-Bingo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Games::Bingo::Bot.3
 
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index 8d5c56d41359..d5fb47275eff 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS=	p5-Games-Bingo>=0:${PORTSDIR}/games/p5-Games-Bingo \
 		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		bingo_print.pl.1
 MAN3=		Games::Bingo::Print.3
diff --git a/games/p5-Games-Bingo/Makefile b/games/p5-Games-Bingo/Makefile
index 8d4347c33413..60a4021d450e 100644
--- a/games/p5-Games-Bingo/Makefile
+++ b/games/p5-Games-Bingo/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	A bingo game Perl implementation
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		bingo.pl.1
 MAN3=		Games::Bingo.3 \
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index 8eb3ca7f446f..c9671ec3ff55 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Provide the stuff missing in List::Util
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	List::MoreUtils.3
 
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index b4c66dbdf767..08a99a2af29e 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -14,7 +14,8 @@ RUN_DEPENDS=	p5-Email-Simple>=1.91:${PORTSDIR}/mail/p5-Email-Simple \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::Abstract.3 \
 		Email::Abstract::EmailMIME.3 \
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index d048954623f8..b7b43106a5fe 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	p5-Email-Folder>=0.84:${PORTSDIR}/mail/p5-Email-Folder \
 		p5-File-Find-Rule>=0.28:${PORTSDIR}/devel/p5-File-Find-Rule
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Email::Delete.3 \
 	Email::Delete::Maildir.3 \
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index ab7c89302201..cb7c808651d7 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Email-FolderType-Net>=0:${PORTSDIR}/mail/p5-Email-FolderType-Net
 		p5-URI-imap>=0:${PORTSDIR}/mail/p5-URI-imap
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Email::Folder::IMAP.3
 
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index 95695189b435..a14f9d2e1a6c 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Email-FolderType-Net>=0:${PORTSDIR}/mail/p5-Email-FolderType-Net
 		p5-URI-imaps>=0:${PORTSDIR}/mail/p5-URI-imaps
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Email::Folder::IMAPS.3
 
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 5e89409c094f..043504db206d 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
 		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Email::Folder::POP3.3
 
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index 3bc75d089609..9879daa47058 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-Email-Simple>0:${PORTSDIR}/mail/p5-Email-Simple \
 		p5-Email-FolderType>=0.6:${PORTSDIR}/mail/p5-Email-FolderType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::Folder.3 \
 		Email::Folder::MH.3 \
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 21f32744a0e7..3d11bab2b711 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI \
 		p5-Email-FolderType>=0.8:${PORTSDIR}/mail/p5-Email-FolderType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Email::FolderType::Net.3
 
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 98fb5fb9ef9e..23f9ebfd02ca 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	${PORTNAME}-0.813
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Determine the type of a mail folder
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::FolderType.3 \
 		Email::FolderType::Ezmlm.3 \
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 9425e92f9edf..eccaa0c86ccd 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -14,7 +14,8 @@ BUILD_DEPENDS=	p5-Email-LocalDelivery>=0:${PORTSDIR}/mail/p5-Email-LocalDelivery
 		p5-Email-FolderType>=0:${PORTSDIR}/mail/p5-Email-FolderType
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::LocalDelivery::Ezmlm.3
 
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index 98b2948d547f..fb3179a5e297 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-Email-MIME>=1.861:${PORTSDIR}/mail/p5-Email-MIME \
 		p5-Email-MIME-ContentType>=1.0:${PORTSDIR}/mail/p5-Email-MIME-ContentType
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::MIME::Attachment::Stripper.3
 
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index 6f0df5d2aa9a..ed6849f60232 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Parse a MIME Content-Type Header
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::MIME::ContentType.3
 
diff --git a/mail/p5-Email-MIME-Encodings/Makefile b/mail/p5-Email-MIME-Encodings/Makefile
index 8185ec4aff34..378700056950 100644
--- a/mail/p5-Email-MIME-Encodings/Makefile
+++ b/mail/p5-Email-MIME-Encodings/Makefile
@@ -12,7 +12,8 @@ COMMENT=	A unified interface to MIME encoding and decoding
 RUN_DEPENDS=	p5-MIME-Base64>3.05:${PORTSDIR}/converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::MIME::Encodings.3
 
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index 5841646dcdf8..55640cf43147 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	p5-Email-Simple>=2.102:${PORTSDIR}/mail/p5-Email-Simple \
 		p5-MIME-Types>=1.13:${PORTSDIR}/mail/p5-MIME-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Email::MIME.3 \
 		Email::MIME::Creator.3 \
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index de671f26568f..412df4de6b4d 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		p5-Net-IMAP-Simple>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Net::IMAP::Simple::SSL.3
 
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index ec854be2cfe6..ebc1a89f9211 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -17,7 +17,8 @@ COMMENT=	URI::imap - Support IMAP URI
 BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	URI::imap.3
 
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index efc40482fccd..da526a931ec8 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Support IMAPS URI
 BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	URI::imaps.3
 
diff --git a/misc/p5-File-CounterFile/Makefile b/misc/p5-File-CounterFile/Makefile
index 8079151c891b..1a297d15d717 100644
--- a/misc/p5-File-CounterFile/Makefile
+++ b/misc/p5-File-CounterFile/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl module for persistent counter class
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::CounterFile.3
 
diff --git a/net-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index 0eaac1cea01c..069fdc3733c8 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl module to parse, manipulate, and lookup IP network blocks
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::Netmask.3
 
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 7feb9297b642..867477ccbc81 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
 		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 CONFLICTS=	p5-Net-SNMP3-[0-9]*
 
 MAN1=		snmpkey.1
diff --git a/net/p5-File-RsyncP/Makefile b/net/p5-File-RsyncP/Makefile
index 726ec0ad4db0..fca52d20c66e 100644
--- a/net/p5-File-RsyncP/Makefile
+++ b/net/p5-File-RsyncP/Makefile
@@ -16,7 +16,8 @@ COMMENT=	Perl Rsync client
 
 MAKE_JOBS_UNSAFE=	yes
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::RsyncP.3 \
 		File::RsyncP::Digest.3 \
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index 6cd826d65706..f509d664f4b9 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl interface to a variant of the MD5 algorithm
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Digest::MD5::M4p.3
 
diff --git a/sysutils/p5-Filesys-DfPortable/Makefile b/sysutils/p5-Filesys-DfPortable/Makefile
index b6fff581d650..b0a16502e6e1 100644
--- a/sysutils/p5-Filesys-DfPortable/Makefile
+++ b/sysutils/p5-Filesys-DfPortable/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Filesys::DfPortable - Perl extension for filesystem disk space information.
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Filesys::DfPortable.3
 
diff --git a/sysutils/p5-Sys-CpuLoad/Makefile b/sysutils/p5-Sys-CpuLoad/Makefile
index 7a01c57da551..cc3c66dd6269 100644
--- a/sysutils/p5-Sys-CpuLoad/Makefile
+++ b/sysutils/p5-Sys-CpuLoad/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl5 module to retrieve CPU load averages
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Sys::CpuLoad.3
 
diff --git a/sysutils/p5-Sys-Syslog/Makefile b/sysutils/p5-Sys-Syslog/Makefile
index dd555df0ecdd..9ec364d1f70e 100644
--- a/sysutils/p5-Sys-Syslog/Makefile
+++ b/sysutils/p5-Sys-Syslog/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl interface to the UNIX syslog(3) calls
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 MAKE_JOBS_UNSAFE=	yes
 
 MAN3=	Sys::Syslog.3
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index 39f758233891..ac1816d54062 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Devel-TraceCalls>=0.03:${PORTSDIR}/devel/p5-Devel-TraceCalls \
 		p5-XML-SAX-Machines>=0:${PORTSDIR}/textproc/p5-XML-SAX-Machines
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Devel::TraceSAX.3
 
diff --git a/textproc/p5-HTML-Quoted/Makefile b/textproc/p5-HTML-Quoted/Makefile
index 9997df28b805..b640dad60ffc 100644
--- a/textproc/p5-HTML-Quoted/Makefile
+++ b/textproc/p5-HTML-Quoted/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Extract structure of quoted HTML mail message
 BUILD_DEPENDS=	p5-HTML-Parser>=3.0:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		HTML::Quoted.3
 
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
index 8e5ecd16c212..a4ef264d8e44 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
@@ -16,7 +16,8 @@ COMMENT=	Force number of words to singular or plural
 BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Lingua::EN::Inflect::Number.3
 
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index a2967a9320bc..9e1cc7e0adcc 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	p5-PPI>=0.990:${PORTSDIR}/textproc/p5-PPI \
 		p5-Params-Util>=0.05:${PORTSDIR}/devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	PPI::HTML.3
 
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 2d6880f959a0..6329e3347c87 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -13,7 +13,8 @@ COMMENT=	XS acceleration for the PPI perl parser
 RUN_DEPENDS=	p5-PPI>=1.000:${PORTSDIR}/textproc/p5-PPI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	PPI::XS.3
 
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index da389b7191ea..02295b9f15b1 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -25,7 +25,8 @@ TEST_DEPENDS=	p5-Test-NoWarnings>=0.084:${PORTSDIR}/devel/p5-Test-NoWarnings \
 		p5-Test-Object>=0.07:${PORTSDIR}/devel/p5-Test-Object \
 		p5-Test-SubCalls>=1.07:${PORTSDIR}/devel/p5-Test-SubCalls
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	PPI.3 \
 	PPI::Cache.3 \
diff --git a/textproc/p5-Perl-MinimumVersion/Makefile b/textproc/p5-Perl-MinimumVersion/Makefile
index 56127fad3fc4..c3986adda55b 100644
--- a/textproc/p5-Perl-MinimumVersion/Makefile
+++ b/textproc/p5-Perl-MinimumVersion/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-File-Find-Rule>=0.32:${PORTSDIR}/devel/p5-File-Find-Rule \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	perlver.1
 MAN3=	Perl::MinimumVersion.3
diff --git a/textproc/p5-Pod-Spell/Makefile b/textproc/p5-Pod-Spell/Makefile
index e1e61609f373..b7bdd657ca5d 100644
--- a/textproc/p5-Pod-Spell/Makefile
+++ b/textproc/p5-Pod-Spell/Makefile
@@ -12,7 +12,8 @@ COMMENT=	A formatter for spellchecking Pod
 BUILD_DEPENDS=	p5-Pod-Escapes>=1.01:${PORTSDIR}/textproc/p5-Pod-Escapes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	podspell.1
 MAN3=	Pod::Spell.3 \
diff --git a/textproc/p5-Regexp-Common-net-CIDR/Makefile b/textproc/p5-Regexp-Common-net-CIDR/Makefile
index e2603179b220..4409731feb57 100644
--- a/textproc/p5-Regexp-Common-net-CIDR/Makefile
+++ b/textproc/p5-Regexp-Common-net-CIDR/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Provide patterns for CIDR blocks
 BUILD_DEPENDS=	p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Regexp::Common::net::CIDR.3
 
diff --git a/textproc/p5-Regexp-IPv6/Makefile b/textproc/p5-Regexp-IPv6/Makefile
index 9042eab86297..edf9df3a1e52 100644
--- a/textproc/p5-Regexp-IPv6/Makefile
+++ b/textproc/p5-Regexp-IPv6/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Regular expression for IPv6 addresses
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Regexp::IPv6.3
 
diff --git a/textproc/p5-String-Truncate/Makefile b/textproc/p5-String-Truncate/Makefile
index 1334eaf341d3..c751804bae86 100644
--- a/textproc/p5-String-Truncate/Makefile
+++ b/textproc/p5-String-Truncate/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-Sub-Exporter>=0.953:${PORTSDIR}/devel/p5-Sub-Exporter \
 		p5-Sub-Install>=0.03:${PORTSDIR}/devel/p5-Sub-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		String::Truncate.3
 
diff --git a/textproc/p5-Text-ASCIITable/Makefile b/textproc/p5-Text-ASCIITable/Makefile
index a9cf486b4d7d..c6b0db20b75a 100644
--- a/textproc/p5-Text-ASCIITable/Makefile
+++ b/textproc/p5-Text-ASCIITable/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create a nice formatted table using ASCII characters
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Text::ASCIITable.3 \
 	Text::ASCIITable::Wrap.3
diff --git a/textproc/p5-Text-FixEOL/Makefile b/textproc/p5-Text-FixEOL/Makefile
index f92246303c09..3b97e99d7632 100644
--- a/textproc/p5-Text-FixEOL/Makefile
+++ b/textproc/p5-Text-FixEOL/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Canonicalizes text to a specified EOL/EOF convention
 
 MAN3=		Text::FixEOL.3
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index 9382851b3e22..cfa8198ad873 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		tablify.1 tabmerge.1 tab2graph.1
 MAN3=		Text::RecordParser.3 \
diff --git a/textproc/p5-Text-TabularDisplay/Makefile b/textproc/p5-Text-TabularDisplay/Makefile
index fef503ca2a66..e1dc08f9dfda 100644
--- a/textproc/p5-Text-TabularDisplay/Makefile
+++ b/textproc/p5-Text-TabularDisplay/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Display text in formatted table output
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Text::TabularDisplay.3
 
diff --git a/textproc/p5-Text-Truncate/Makefile b/textproc/p5-Text-Truncate/Makefile
index e5c827bd2168..9ae2437affe5 100644
--- a/textproc/p5-Text-Truncate/Makefile
+++ b/textproc/p5-Text-Truncate/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl module with simple string truncating routine
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Text::Truncate.3
 
diff --git a/textproc/p5-Version-Next/Makefile b/textproc/p5-Version-Next/Makefile
index 24f713eee3db..c5dc43a4437c 100644
--- a/textproc/p5-Version-Next/Makefile
+++ b/textproc/p5-Version-Next/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Increment module version numbers simply and correctly
 BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Version::Next.3
 
diff --git a/textproc/p5-XML-Rules/Makefile b/textproc/p5-XML-Rules/Makefile
index 7f4817ecd1a2..7bf03dd679a3 100644
--- a/textproc/p5-XML-Rules/Makefile
+++ b/textproc/p5-XML-Rules/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Parse XML and specify rules for individual tags
 RUN_DEPENDS=	p5-XML-Parser>=2.00:${PORTSDIR}/textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	XML::Rules.3
 
diff --git a/textproc/p5-XML-SAX-Expat-Incremental/Makefile b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
index 90e0362c2096..c315837b6bc4 100644
--- a/textproc/p5-XML-SAX-Expat-Incremental/Makefile
+++ b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	XML::SAX::Expat::Incremental.3
 
diff --git a/textproc/p5-XML-SemanticDiff/Makefile b/textproc/p5-XML-SemanticDiff/Makefile
index 22fbdadc5d9a..f43bb9cf6ef5 100644
--- a/textproc/p5-XML-SemanticDiff/Makefile
+++ b/textproc/p5-XML-SemanticDiff/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Perl extension for comparing XML documents
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	XML::SemanticDiff.3 \
 	XML::SemanticDiff::BasicHandler.3
diff --git a/textproc/p5-pod2pdf/Makefile b/textproc/p5-pod2pdf/Makefile
index 48dc56bc7af6..31535ed91194 100644
--- a/textproc/p5-pod2pdf/Makefile
+++ b/textproc/p5-pod2pdf/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-PDF-API2>=0.60:${PORTSDIR}/textproc/p5-PDF-API2 \
 		p5-Getopt-ArgvFile>0:${PORTSDIR}/devel/p5-Getopt-ArgvFile
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		pod2pdf.1
 
diff --git a/www/p5-CGI-Ajax/Makefile b/www/p5-CGI-Ajax/Makefile
index 04c8e6cc360e..9943e50ec1d7 100644
--- a/www/p5-CGI-Ajax/Makefile
+++ b/www/p5-CGI-Ajax/Makefile
@@ -18,7 +18,8 @@ COMMENT=	A module for writing AJAX/DHTML-based web apps
 BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	CGI::Ajax.3
 
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 50202c6b0a43..8c529e3854e9 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -18,6 +18,8 @@ COMMENT=	A simple totally OO CGI interface that is CGI.pm compliant
 TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
 
 PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CGI::Simple.3 \
 		CGI::Simple::Cookie.3 \
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index a0c6f1e21f05..23b088fd9d7f 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Process and decode WWW forms and cookies
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		CGI::Lite.3
 
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index f20369f29527..e7e20e7bc386 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>0:${PORTSDIR}/www/p5-Catalyst-Runtime \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Catalyst::Component::ACCEPT_CONTEXT.3
 
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index 61279a08aa3c..0dadc3c6c362 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -24,7 +24,8 @@ BUILD_DEPENDS=	p5-Cache-FastMmap>0:${PORTSDIR}/devel/p5-Cache-FastMmap \
 		p5-URI>0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Catalyst::Plugin::Session::FastMmap.3
 
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index c79f1d3d781a..39891457c41a 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=2.99:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Catalyst::Plugin::Static.3
 
diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile
index 694c787fbe61..da6c9dc05c09 100644
--- a/www/p5-Catalyst-View-Jemplate/Makefile
+++ b/www/p5-Catalyst-View-Jemplate/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
 		p5-Jemplate>=0.19:${PORTSDIR}/www/p5-Jemplate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Catalyst::Helper::View::Jemplate.3 \
 	Catalyst::View::Jemplate.3
diff --git a/www/p5-Feed-Find/Makefile b/www/p5-Feed-Find/Makefile
index f56f26f78d9e..cb3ecd7c63c2 100644
--- a/www/p5-Feed-Find/Makefile
+++ b/www/p5-Feed-Find/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Feed::Find.3
 
diff --git a/www/p5-HTML-Mason-PSGIHandler/Makefile b/www/p5-HTML-Mason-PSGIHandler/Makefile
index 7cbaca1a7388..7bad885e038a 100644
--- a/www/p5-HTML-Mason-PSGIHandler/Makefile
+++ b/www/p5-HTML-Mason-PSGIHandler/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Plack>=0:${PORTSDIR}/www/p5-Plack
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		HTML::Mason::PSGIHandler.3
 
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index 8bf7fe50c6e2..484734f2b5e9 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
 		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	HTTP::Server::Simple::Static.3
 
diff --git a/www/p5-HTTP-Server-Simple/Makefile b/www/p5-HTTP-Server-Simple/Makefile
index 4f742b5c6be4..42345b9b737c 100644
--- a/www/p5-HTTP-Server-Simple/Makefile
+++ b/www/p5-HTTP-Server-Simple/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	A very simple standalone HTTP daemon
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	HTTP::Server::Simple.3 \
 	HTTP::Server::Simple::CGI.3 \
diff --git a/www/p5-Jemplate/Makefile b/www/p5-Jemplate/Makefile
index c504aed13353..b135bfb508e3 100644
--- a/www/p5-Jemplate/Makefile
+++ b/www/p5-Jemplate/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
 		p5-Template-Toolkit>=2.19:${PORTSDIR}/www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	jemplate.1
 MAN3=	Jemplate.3 \
diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile
index 7aab93f4f3fc..750574883bff 100644
--- a/www/p5-LWP-UserAgent-POE/Makefile
+++ b/www/p5-LWP-UserAgent-POE/Makefile
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	p5-POE>=0.9999:${PORTSDIR}/devel/p5-POE \
 		p5-Log-Log4perl>=1:${PORTSDIR}/devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		LWP::UserAgent::POE.3
 
diff --git a/www/p5-POE-Component-Server-SOAP/Makefile b/www/p5-POE-Component-Server-SOAP/Makefile
index 324689cc2a2b..03d927587c34 100644
--- a/www/p5-POE-Component-Server-SOAP/Makefile
+++ b/www/p5-POE-Component-Server-SOAP/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-SOAP-Lite>=0.55:${PORTSDIR}/net/p5-SOAP-Lite \
 		p5-POE>=0:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	POE::Component::Server::SOAP.3 \
 	POE::Component::Server::SOAP::Response.3
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
index 2539882d4005..fe142b5adffb 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/Makefile
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-POE-Filter-HTTP-Parser>=1.06:${PORTSDIR}/www/p5-POE-Filter-HTTP-Parser \
 		p5-Test-POE-Client-TCP>0:${PORTSDIR}/devel/p5-Test-POE-Client-TCP
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::Server::SimpleHTTP.3 \
 		POE::Component::Server::SimpleHTTP::Connection.3 \
diff --git a/www/p5-POE-Filter-HTTP-Parser/Makefile b/www/p5-POE-Filter-HTTP-Parser/Makefile
index 62fcb7e23f3b..f431c5c7ac7d 100644
--- a/www/p5-POE-Filter-HTTP-Parser/Makefile
+++ b/www/p5-POE-Filter-HTTP-Parser/Makefile
@@ -17,7 +17,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-POE-Client-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Client-TCP \
 		p5-Test-POE-Server-TCP>=0:${PORTSDIR}/devel/p5-Test-POE-Server-TCP
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Filter::HTTP::Parser.3
 
diff --git a/www/p5-Template-Plugin-Class/Makefile b/www/p5-Template-Plugin-Class/Makefile
index c5c9b646acb6..21ac26096135 100644
--- a/www/p5-Template-Plugin-Class/Makefile
+++ b/www/p5-Template-Plugin-Class/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Allow calling of class methods on arbitrary classes
 BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Template::Plugin::Class.3
 
diff --git a/www/p5-Template-Plugin-Clickable-Email/Makefile b/www/p5-Template-Plugin-Clickable-Email/Makefile
index 81adde9a8583..2d71e68a5795 100644
--- a/www/p5-Template-Plugin-Clickable-Email/Makefile
+++ b/www/p5-Template-Plugin-Clickable-Email/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Email-Find>=0:${PORTSDIR}/mail/p5-Email-Find \
 		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Template::Plugin::Clickable::Email.3
 
diff --git a/www/p5-Template-Plugin-Clickable/Makefile b/www/p5-Template-Plugin-Clickable/Makefile
index 1952deaa29ef..0eedef0c9ecf 100644
--- a/www/p5-Template-Plugin-Clickable/Makefile
+++ b/www/p5-Template-Plugin-Clickable/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-URI-Find>=0.13:${PORTSDIR}/textproc/p5-URI-Find \
 		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Template::Plugin::Clickable.3
 
diff --git a/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile
index fe1b78ff99c3..efd7dbd7d7e8 100644
--- a/www/p5-Template-Plugin-FillInForm/Makefile
+++ b/www/p5-Template-Plugin-FillInForm/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-HTML-FillInForm>=0:${PORTSDIR}/www/p5-HTML-FillInForm \
 		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Template::Plugin::FillInForm.3
 
diff --git a/www/p5-Template-Plugin-Number-Format/Makefile b/www/p5-Template-Plugin-Number-Format/Makefile
index b6c618891bd8..9ddd499f893e 100644
--- a/www/p5-Template-Plugin-Number-Format/Makefile
+++ b/www/p5-Template-Plugin-Number-Format/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-Number-Format>0:${PORTSDIR}/textproc/p5-Number-Format \
 		p5-Template-Toolkit>=2.07:${PORTSDIR}/www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Template::Plugin::Number::Format.3
 
diff --git a/www/p5-Template-Plugin-Subst/Makefile b/www/p5-Template-Plugin-Subst/Makefile
index 20dc26fd69e1..445ccaa79b25 100644
--- a/www/p5-Template-Plugin-Subst/Makefile
+++ b/www/p5-Template-Plugin-Subst/Makefile
@@ -17,7 +17,8 @@ COMMENT=	TT plugin for s/// functionality in templates
 BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Template::Plugin::Subst.3
 
diff --git a/www/p5-Template-Timer/Makefile b/www/p5-Template-Timer/Makefile
index 7cd78df1e8bd..386f6ca8d893 100644
--- a/www/p5-Template-Timer/Makefile
+++ b/www/p5-Template-Timer/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Rudimentary profiling for Template Toolkit
 BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Template::Timer.3
 
diff --git a/www/p5-WWW-Mechanize-CGI/Makefile b/www/p5-WWW-Mechanize-CGI/Makefile
index dc0aa306ccd5..f33da93e59bd 100644
--- a/www/p5-WWW-Mechanize-CGI/Makefile
+++ b/www/p5-WWW-Mechanize-CGI/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-HTTP-Request-AsCGI>=0.2:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
 		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	WWW::Mechanize::CGI.3
 
diff --git a/www/p5-WWW-Shorten/Makefile b/www/p5-WWW-Shorten/Makefile
index 8fc0c666febb..015abeceb025 100644
--- a/www/p5-WWW-Shorten/Makefile
+++ b/www/p5-WWW-Shorten/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-libwww>=5.75:${PORTSDIR}/www/p5-libwww \
 		p5-URI>=1.27:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		shorten.1
 MAN3=		WWW::Shorten.3 \