19 files changed, 51 insertions, 95 deletions

diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index 64620b7ab6eb..27440dccc38c 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvs2html
-# Date created:				Sun 02 Jul 2000
-# Whom:					will
-#
+# Created by: will
 # $FreeBSD$
-#
 
 PORTNAME=	cvs2html
 PORTVERSION=	1.98
@@ -21,7 +17,7 @@ COMMENT=	Perl script to turn ``cvs log'' output into HTML
 LICENSE=	GPLv2
 
 PLIST_FILES=	bin/cvs2html
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 do-extract:
diff --git a/devel/cvschk/Makefile b/devel/cvschk/Makefile
index 0b0925a410dc..41a79151fbae 100644
--- a/devel/cvschk/Makefile
+++ b/devel/cvschk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	cvschk
-# Date created:				2005-04-23
-# Whom:					Matthias Andree <matthias.andree@gmx.de>
-#
+# Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	cvschk
 PORTVERSION=	1.12
@@ -16,7 +12,8 @@ EXTRACT_ONLY=
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Quick offline checker for CVS modifications
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 MAN1=		cvschk.1
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index 594106c3bc89..875bf28885a0 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Carp-Datum
-# Date created:				Aug 5th 2002
-# Whom:	      				kuriyama
-#
+# Created by: kuriyama
 # $FreeBSD$
-#
 
 PORTNAME=	Carp-Datum
 PORTVERSION=	0.1.3
@@ -18,7 +14,8 @@ BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \
 		p5-Getargs-Long>=0:${PORTSDIR}/devel/p5-Getargs-Long
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		datum_strip.1
 MAN3=		Carp::Datum::Assert.3 \
diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index 57cad918cf8b..d97e7c2195fa 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Perl5 module for handling Apache-style configuration files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Config::General::Extended.3 Config::General::Interpolated.3 \
 		Config::General.3
diff --git a/devel/p5-Data-Inherited/Makefile b/devel/p5-Data-Inherited/Makefile
index 628e75bdeea6..ce13fa943d67 100644
--- a/devel/p5-Data-Inherited/Makefile
+++ b/devel/p5-Data-Inherited/Makefile
@@ -9,7 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for hierarchy-wide accumulation of list/hash results
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Data::Inherited.3
 
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 3823e9dfe0e8..be24d122cd82 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Date-Roman
-# Date created:				16 January 2003
-# Whom:	      				Philip Paeps <philip@paeps.cx>
-#
+# Created by: Philip Paeps <philip@paeps.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	Date-Roman
 PORTVERSION=	1.06
@@ -17,7 +13,8 @@ COMMENT=	Perl module to play with Roman dates
 BUILD_DEPENDS=	p5-Roman>=0:${PORTSDIR}/math/p5-Roman
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Date::Roman.3
 
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index 83c8989ded0b..ce5f941604a4 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Event-Join
-# Date created:	   24 Mar 2010
-# Whom:		   Denis Pokataev <catone@cpan.org>
-#
+# Created by: Denis Pokataev <catone@cpan.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Event-Join
 PORTVERSION=	0.06
@@ -23,7 +19,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-use-ok>0:${PORTSDIR}/devel/p5-Test-use-ok
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Event::Join.3
 
diff --git a/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index 60fb2399ed32..af768fbd7426 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Event-Lib
-# Date created:				07 Jun 2006
-# Whom:					Fabian Keil <fk@fabiankeil.de>
-#
+# Created by: Fabian Keil <fk@fabiankeil.de>
 # $FreeBSD$
-#
 
 PORTNAME=	Event-Lib
 PORTVERSION=	1.03
@@ -17,7 +13,8 @@ COMMENT=	Makes libevent(3) accessible with Perl
 
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Event::Lib.3
 
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 7079cac9a0b5..2a4464ba1138 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,6 +1,5 @@
 # Created by: Johann Visagie <johann@egenetics.com>
 # $FreeBSD$
-#
 
 PORTNAME=	File-Temp
 PORTVERSION=	0.23.01
@@ -12,7 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Perl5 module to generate temporary files or directories safely
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Temp.3
 
diff --git a/devel/p5-File-Tempdir/Makefile b/devel/p5-File-Tempdir/Makefile
index 09105bbaf074..ffc6658fc2b0 100644
--- a/devel/p5-File-Tempdir/Makefile
+++ b/devel/p5-File-Tempdir/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-File-Tempdir
-# Date created:		2007-01-02
-# Whom:	      		loader <loader@freebsdmall.com>
-#
+# Created by: loader <loader@freebsdmall.com>
 # $FreeBSD$
-#
 
 PORTNAME=	File-Tempdir
 PORTVERSION=	0.02
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	loader@freebsdmall.com
 COMMENT=	Perl5 module to provide an object interface for File::Temp
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Tempdir.3
 
diff --git a/devel/p5-Gtk2-Notify/Makefile b/devel/p5-Gtk2-Notify/Makefile
index f7af9ea53c5b..6fa487c3c2b8 100644
--- a/devel/p5-Gtk2-Notify/Makefile
+++ b/devel/p5-Gtk2-Notify/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Gtk2-Notify
-# Date created:				2011-10-13
-# Whom:					Roman Bogorodskiy <novel@FreeBSD.org>
-#
+# Created by: Roman Bogorodskiy <novel@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Gtk2-Notify
 PORTVERSION=	0.05
@@ -23,7 +19,8 @@ RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Gtk2::Notify.3 Gtk2::Notify::index.3
 
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index 71e6faa1617e..68cc53bc3f4e 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Gtk2-Spell
-# Date created:		2006-03-21
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	Gtk2-Spell
 PORTVERSION=	1.03
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
 		p5-Gtk2>=1.001:${PORTSDIR}/x11-toolkits/p5-Gtk2
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Gtk2::Spell.3
 
diff --git a/devel/p5-IO-All-LWP/Makefile b/devel/p5-IO-All-LWP/Makefile
index e86a62645298..2459aa828d2e 100644
--- a/devel/p5-IO-All-LWP/Makefile
+++ b/devel/p5-IO-All-LWP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-IO-All-LWP
-# Date created:		2009-04-21
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	IO-All-LWP
 PORTVERSION=	0.14
@@ -18,7 +14,8 @@ COMMENT=	IO::All interface to LWP
 RUN_DEPENDS=	p5-IO-All>=0.30:${PORTSDIR}/devel/p5-IO-All \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		IO::All::FTP.3 \
 		IO::All::HTTP.3 \
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index 19c862e0cfc7..be994d21e353 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devel/p5-IO-Digest
-# Date created:				Sep 20 2004
-# Whom:					Rong-En Fan <rafan@infor.org>
-#
+# Created by: Rong-En Fan <rafan@infor.org>
 # $FreeBSD$
-#
 
 PORTNAME=	IO-Digest
 PORTVERSION=	0.10
@@ -18,7 +14,8 @@ BUILD_DEPENDS=	p5-PerlIO-via-dynamic>=0:${PORTSDIR}/devel/p5-PerlIO-via-dynamic
 		p5-Digest>=0:${PORTSDIR}/security/p5-Digest
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		IO::Digest.3
 
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index 1846cbe427a9..11f2312870a8 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devel/p5-Moose-Autobox
-# Date created:				25 July 2009
-# Whom:					Bill Brinzer <bill.brinzer@gmail.com>
-#
+# Created by: Bill Brinzer <bill.brinzer@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Moose-Autobox
 PORTVERSION=	0.12
@@ -23,7 +19,8 @@ RUN_DEPENDS=	p5-autobox>=2.23:${PORTSDIR}/devel/p5-autobox \
 		p5-Perl6-Junction>=1.40000:${PORTSDIR}/devel/p5-Perl6-Junction
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Moose::Autobox.3 \
 	Moose::Autobox::Array.3 \
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index 32756e7cf4d4..94a67558847e 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
 		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IKC.3 POE::Component::IKC::Channel.3 \
 		POE::Component::IKC::Client.3 POE::Component::IKC::ClientLite.3 \
diff --git a/devel/p5-Perl-Metrics-Lite/Makefile b/devel/p5-Perl-Metrics-Lite/Makefile
index 8db21eb4da88..871f2b1cfeb7 100644
--- a/devel/p5-Perl-Metrics-Lite/Makefile
+++ b/devel/p5-Perl-Metrics-Lite/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Perl::Metrics::Lite
-# Date created:		31 Dec 2011
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Perl-Metrics-Lite
 PORTVERSION=	0.080
@@ -21,7 +16,8 @@ RUN_DEPENDS=	\
 	p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	measureperl-checkstyle.1 \
 	measureperl.1
diff --git a/devel/p5-Tie-Simple/Makefile b/devel/p5-Tie-Simple/Makefile
index e6e750900958..1691aac2afd0 100644
--- a/devel/p5-Tie-Simple/Makefile
+++ b/devel/p5-Tie-Simple/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Tie-Simple
-# Date created:		2006-08-01
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Tie-Simple
 PORTVERSION=	1.03
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Variable ties made easier: much, much, much easier
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Tie::Simple.3
 
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index bce8bdf6c3c7..654c2732ed10 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Tree::Simple
-# Date created:				7 July 2004
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Tree-Simple
 PORTVERSION=	1.18
@@ -16,7 +12,8 @@ COMMENT=	A simple tree object
 
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Tree::Simple.3 Tree::Simple::Visitor.3