19 files changed, 52 insertions, 93 deletions

diff --git a/devel/p5-AutoLoader/Makefile b/devel/p5-AutoLoader/Makefile
index ecb03ca9b475..ed0f3dd24120 100644
--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-AutoLoader
-# Date created:				Jan 18 2007
-# Whom:					Rong-En Fan <rafan@FreeBSD.org>
-#
+# Created by: Rong-En Fan <rafan@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	AutoLoader
 PORTVERSION=	5.73
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Load subroutines only on demand
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		AutoLoader.3 AutoSplit.3
 
diff --git a/devel/p5-Class-Mix/Makefile b/devel/p5-Class-Mix/Makefile
index 2e8887633e18..02e95460715c 100644
--- a/devel/p5-Class-Mix/Makefile
+++ b/devel/p5-Class-Mix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Class-Mix
-# Date created:				21 May 2009
-# Whom:					brix@FreeBSD.org
-#
+# Created by: brix@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	Class-Mix
 PORTVERSION=	0.005
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
 RUN_DEPENDS=	p5-parent>=0:${PORTSDIR}/devel/p5-parent \
 		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Class::Mix.3
 
diff --git a/devel/p5-Clone-More/Makefile b/devel/p5-Clone-More/Makefile
index fe945ec2f93a..cee96ef0a2b5 100644
--- a/devel/p5-Clone-More/Makefile
+++ b/devel/p5-Clone-More/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Clone-More
-# Date created:		2006-07-14
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Clone-More
 PORTVERSION=	0.90.2
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Perl module for natively copying Perl data structures
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 38eab747aec8..0efac6fcd39b 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Config::IniFiles.3
 
diff --git a/devel/p5-Data-ClearSilver-HDF/Makefile b/devel/p5-Data-ClearSilver-HDF/Makefile
index bc19a75b82af..c45e66db6422 100644
--- a/devel/p5-Data-ClearSilver-HDF/Makefile
+++ b/devel/p5-Data-ClearSilver-HDF/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Data-ClearSilver-HDF
-# Date created:	   14 Aug 2008
-# Whom:		   Denis Pokataev <catone@cpan.org>
-#
+# Created by: Denis Pokataev <catone@cpan.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Data-ClearSilver-HDF
 PORTVERSION=	0.04
@@ -21,7 +17,8 @@ BUILD_DEPENDS=	p5-ClearSilver>=0:${PORTSDIR}/www/p5-ClearSilver \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	cspage.1
 
diff --git a/devel/p5-Dir-Self/Makefile b/devel/p5-Dir-Self/Makefile
index cfeb245a933c..60b723928c39 100644
--- a/devel/p5-Dir-Self/Makefile
+++ b/devel/p5-Dir-Self/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Dir-Self
-# Date created:		2011-05-19
-# Whom:			Steve Wills <swills@FreeBSD.org>
-#
+# Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Dir-Self
 PORTVERSION=	0.10
@@ -15,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	A __DIR__ constant for the directory your source file is in
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Dir::Self.3
 
diff --git a/devel/p5-File-Grep/Makefile b/devel/p5-File-Grep/Makefile
index 66fd55730048..56d140c9e8ae 100644
--- a/devel/p5-File-Grep/Makefile
+++ b/devel/p5-File-Grep/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	File-Grep
-# Date created:			08 May 2004
-# Whom:				Xavier Beaudouin <kiwi@oav.net>
-#
+# Created by: Xavier Beaudouin <kiwi@oav.net>
 # $FreeBSD$
 
 PORTNAME=	File-Grep
@@ -13,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Perl Module that Find matches to a pattern in files or function
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Grep.3
 
diff --git a/devel/p5-Gearman-XS/Makefile b/devel/p5-Gearman-XS/Makefile
index e516c51ed5a6..bc8d1c9f23ef 100644
--- a/devel/p5-Gearman-XS/Makefile
+++ b/devel/p5-Gearman-XS/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Gearman-XS
-# Date created:				July 3rd 2009
-# Whom:	      				Alex Kapranoff <ka@nadoby.ru>
-#
+# Created by: Alex Kapranoff <ka@nadoby.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	Gearman-XS
 PORTVERSION=	0.12
@@ -20,7 +16,8 @@ LIB_DEPENDS=	gearman:${PORTSDIR}/devel/gearmand
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 INSTALL_TARGET=	pure_install
 
diff --git a/devel/p5-List-AllUtils/Makefile b/devel/p5-List-AllUtils/Makefile
index 2cc4f3b53c24..81cf791591ba 100644
--- a/devel/p5-List-AllUtils/Makefile
+++ b/devel/p5-List-AllUtils/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-List-AllUtils
-# Date created:		2011-02-16
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	List-AllUtils
 PORTVERSION=	0.03
@@ -17,7 +13,8 @@ COMMENT=	Combines List::Util and List::MoreUtils in one bite-sized package
 BUILD_DEPENDS=	p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS=	p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		List::AllUtils.3
 
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index 9b756445a354..a7e085de97b3 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Log::Dispatch::Colorful
-# Date created:		22 Jan 2009
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Log-Dispatch-Colorful
 PORTVERSION=	0.03
@@ -21,7 +16,8 @@ BUILD_DEPENDS=	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
 		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Log::Dispatch::Colorful.3
 
diff --git a/devel/p5-Module-List/Makefile b/devel/p5-Module-List/Makefile
index fd5e9d52a2f7..6d7d7bbebb60 100644
--- a/devel/p5-Module-List/Makefile
+++ b/devel/p5-Module-List/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Module-List
-# Date created:				2008-06-09
-# Whom:					Oleg A. Mamontov <oleg@mamontov.net>
-#
+# Created by: Oleg A. Mamontov <oleg@mamontov.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Module-List
 PORTVERSION=	0.003
@@ -16,7 +12,8 @@ COMMENT=	Module 'directory' listing
 
 RUN_DEPENDS=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Module::List.3
 
diff --git a/devel/p5-POE-Component-Hailo/Makefile b/devel/p5-POE-Component-Hailo/Makefile
index d8382d1ff24a..90d8b30a70b8 100644
--- a/devel/p5-POE-Component-Hailo/Makefile
+++ b/devel/p5-POE-Component-Hailo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	POE-Componenet-Hailo
-# Date created:	   2011-07-19
-# Whom:		   milki <milki@rescomp.berkeley.edu>
-#
+# Created by: milki <milki@rescomp.berkeley.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-Hailo
 PORTVERSION=	0.10
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 		p5-Hailo>=0:${PORTSDIR}/textproc/p5-Hailo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	POE::Component::Hailo.3
 
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index 32275fc5fda5..df967f4edcf3 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devel/p5-POE-Component-Syndicator
-# Date created:	   2011-05-03
-# Whom:		   Jase Thew <freebsd@beardz.net>
-#
+# Created by: Jase Thew <freebsd@beardz.net>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-Syndicator
 PORTVERSION=	0.06
@@ -23,7 +19,8 @@ BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
 		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::Syndicator.3
 
diff --git a/devel/p5-Range-String/Makefile b/devel/p5-Range-String/Makefile
index 3dda42430393..77308b8c01ec 100644
--- a/devel/p5-Range-String/Makefile
+++ b/devel/p5-Range-String/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Range-String
-# Date created:				21 March 2011
-# Whom:					Andrey Ignatov <rdna@rdna.ru>
-#
+# Created by: Andrey Ignatov <rdna@rdna.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	Range-String
 PORTVERSION=	v0.01
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rdna@rdna.ru
 COMMENT=	Perl5 module which provides interface to string ranges
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Range::Integer.3 Range::String.3 Range::String::Parse.3 \
 		Range::Interface::Object.3 Range::Interface::Parse.3 \
diff --git a/devel/p5-Test-LectroTest/Makefile b/devel/p5-Test-LectroTest/Makefile
index 68623440103d..88da0b027a5f 100644
--- a/devel/p5-Test-LectroTest/Makefile
+++ b/devel/p5-Test-LectroTest/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Easy, automatic, specification-based tests
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Test::LectroTest.3 \
 		Test::LectroTest::Compat.3 \
diff --git a/devel/p5-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index 8230825fe500..f33c23bca738 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Perl extension for fork test
 
 TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Test::SharedFork.3
 
diff --git a/devel/p5-Tie-CPHash/Makefile b/devel/p5-Tie-CPHash/Makefile
index 864ea24d7b0f..94da8940e8b8 100644
--- a/devel/p5-Tie-CPHash/Makefile
+++ b/devel/p5-Tie-CPHash/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Tie-CPHash
-# Date created:			09 October 2006
-# Whom:				David Chaplin-Loebell <direct@klatha.com>
-#
+# Created by: David Chaplin-Loebell <direct@klatha.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Tie-CPHash
 PORTVERSION=	1.04
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	direct@klatha.com
 COMMENT=	Perl module implementing a case preserving hash table
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Tie::CPHash.3
 
diff --git a/devel/p5-Unix-Uptime/Makefile b/devel/p5-Unix-Uptime/Makefile
index e2419da9cc35..c603b6315376 100644
--- a/devel/p5-Unix-Uptime/Makefile
+++ b/devel/p5-Unix-Uptime/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Unix-Uptime
-# Date created:		2009-01-19
-# Whom:			Murilo Opsfelder <mopsfelder@gmail.com>
-#
+# Created by: Murilo Opsfelder <mopsfelder@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Unix-Uptime
 PORTVERSION=	0.3701
@@ -15,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Determine the current uptime in seconds
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Unix::Uptime.3 \
 		Unix::Uptime::BSD.3 \
diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
index 3e70eb5d7fde..4fdb1cd6d326 100644
--- a/devel/p5-syntax/Makefile
+++ b/devel/p5-syntax/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Data-OptList>=0.104:${PORTSDIR}/devel/p5-Data-OptList \
 		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	syntax.3