19 files changed, 47 insertions, 90 deletions

diff --git a/cad/p5-GDS2/Makefile b/cad/p5-GDS2/Makefile
index b752cc0af6a1..3f0c62845e9e 100644
--- a/cad/p5-GDS2/Makefile
+++ b/cad/p5-GDS2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-GDS2
-# Date created:				Sun, Apr 29 2007
-# Whom:					Hiroki Sato <hrs@FreeBSD.org>
-#
+# Created by: Hiroki Sato <hrs@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	GDS2
 PORTVERSION=	3.00
@@ -15,7 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S,.a$,a,}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDS2 - GDS2 stream module
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.a$,,}
 PLIST_FILES=	${SITE_PERL_REL}/GDS2.pm \
 		${PROGRAMS:S,^,bin/,}
diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index 315117764554..c371a67da338 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	convmv
-# Date created:		27 October 2004
-# Whom:			Kuang-che Wu <kcwu@csie.org>
-#
+# Created by: Kuang-che Wu <kcwu@csie.org>
 # $FreeBSD$
-#
 
 PORTNAME=	convmv
 PORTVERSION=	1.15
@@ -17,7 +13,7 @@ COMMENT=	Convert filenames from one encoding to another
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USE_PERL5=	yes
+USES=		perl5
 PLIST_FILES=	bin/convmv
 
 MAN1=		convmv.1
diff --git a/converters/iconv-extra/Makefile b/converters/iconv-extra/Makefile
index 4cccab60862d..3d05d315a9c1 100644
--- a/converters/iconv-extra/Makefile
+++ b/converters/iconv-extra/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	iconv
-# Date created:				10 September 2000
-# Whom:			Konstantin Chuguev <Konstantin.Chuguev@dante.org.uk>
-#
+# Created by: Konstantin Chuguev <Konstantin.Chuguev@dante.org.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	iconv-extra
 PORTVERSION=	2.0
@@ -16,6 +12,6 @@ COMMENT=	Additional charsets for the iconv library (those from the Unicode site)
 
 LIB_DEPENDS=	biconv.2:${PORTSDIR}/converters/iconv
 
-USE_PERL5=	yes
+USES=		perl5
 
 .include <bsd.port.mk>
diff --git a/converters/osm2mp/Makefile b/converters/osm2mp/Makefile
index 4bc8cc4a8705..cd75fb9e6887 100644
--- a/converters/osm2mp/Makefile
+++ b/converters/osm2mp/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 94fa707c4a80..46cdd95b0886 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Convert-UU
-# Date created:				October 20th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
+# Created by: James FitzGibbon <jfitz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Convert-UU
 PORTVERSION=	0.52.01
@@ -15,7 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl5 module for uuencode and uudecode
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		puuencode.1 puudecode.1
 MAN3=		Convert::UU.3
diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile
index 3762ab2ff237..fa2be37a8d4f 100644
--- a/converters/p5-JSON1/Makefile
+++ b/converters/p5-JSON1/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	JSON
-# Date created:		19 Aug 2005
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	JSON
 PORTVERSION=	1.15
@@ -18,7 +13,8 @@ RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 CONFLICTS=	p5-JSON-2.*
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 NO_LATEST_LINK=	yes
 MAN3=		Apache::JSONRPC.3 JSON.3 JSON::Converter.3 \
 		JSON::PP.3 JSON::PP5005.3 JSON::PP56.3 JSON::Parser.3 \
diff --git a/converters/p5-MIME-Base32/Makefile b/converters/p5-MIME-Base32/Makefile
index 9c7379c01984..45c74fe21002 100644
--- a/converters/p5-MIME-Base32/Makefile
+++ b/converters/p5-MIME-Base32/Makefile
@@ -1,4 +1,4 @@
-# Created by: nork@freebsd.org
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	MIME-Base32
@@ -14,7 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.02
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		MIME::Base32.3
 
diff --git a/converters/p5-Sereal-Decoder/Makefile b/converters/p5-Sereal-Decoder/Makefile
index 9a71a18c70cb..0d9bfd91132c 100644
--- a/converters/p5-Sereal-Decoder/Makefile
+++ b/converters/p5-Sereal-Decoder/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Perl extension for fast, compact, powerful binary deserialization
 TEST_DEPENDS=	\
 	p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Sereal::Decoder.3
 
diff --git a/converters/p5-String-SetUTF8/Makefile b/converters/p5-String-SetUTF8/Makefile
index a8dd6e60719f..29331889c9a4 100644
--- a/converters/p5-String-SetUTF8/Makefile
+++ b/converters/p5-String-SetUTF8/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	String::SetUTF8
-# Date created:				25 May 2009
-# Whom:					Andrei V. Shetuhin <reki@reki.ru>
-#
+# Created by: Andrei V. Shetuhin <reki@reki.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	String-SetUTF8
 PORTVERSION=	1.00
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	reki@reki.ru
 COMMENT=	Perl module to manipulate internal UTF-8 flag on strings
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		String::SetUTF8.3
 
diff --git a/converters/p5-URI-UTF8-Punycode/Makefile b/converters/p5-URI-UTF8-Punycode/Makefile
index d8f6a5040f4c..fa529a2c4114 100644
--- a/converters/p5-URI-UTF8-Punycode/Makefile
+++ b/converters/p5-URI-UTF8-Punycode/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Punycode conversion of UTF-8 string
 
 LICENSE=	GPLv3
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		URI::UTF8::Punycode.3
 
diff --git a/converters/p5-bsdconv/Makefile b/converters/p5-bsdconv/Makefile
index cf74b298d221..77a8e26b5c94 100644
--- a/converters/p5-bsdconv/Makefile
+++ b/converters/p5-bsdconv/Makefile
@@ -19,7 +19,8 @@ GH_ACCOUNT=	buganini
 GH_COMMIT=	092d398
 GH_PROJECT=	perl-${PORTNAME}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		bsdconv.3
 
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index d81fbf822f65..fc6cac135706 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	autoconf
-# Date created:		7th December 2006
-# Whom:			ade@FreeBSD.org
-#
+# Created by: ade@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	autoconf
 PORTVERSION=	2.69
@@ -24,7 +20,7 @@ BUILD_VERSION=	2.69
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		perl5
 INFO=		autoconf
 
 GNU_CONFIGURE=	yes
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index 290780e73946..051cdd201202 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mingw32-openssl
-# Date created:		5 December 2011
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.0k
@@ -23,7 +19,8 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt \
 		${LOCALBASE}/mingw32/lib/libz.a:${PORTSDIR}/devel/mingw32-zlib
 
-USE_PERL5_BUILD=	yes
+USES=		perl5
+USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_PREFIX=	${PREFIX}/mingw32
 OPENSSLDIR=		${CONFIGURE_PREFIX}/openssl
diff --git a/devel/p5-Class-Std/Makefile b/devel/p5-Class-Std/Makefile
index dd43c79f7a39..5d5aec2fbdb4 100644
--- a/devel/p5-Class-Std/Makefile
+++ b/devel/p5-Class-Std/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Class-Std
-# Date created:		30 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Class-Std
 DISTVERSION=	0.011
@@ -17,7 +13,8 @@ COMMENT=	Support for creating standard "inside-out" classes
 BUILD_DEPENDS=	p5-version>=0:${PORTSDIR}/devel/p5-version
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Class::Std.3
 
diff --git a/devel/p5-Data-Swap/Makefile b/devel/p5-Data-Swap/Makefile
index 92183dd7e1f2..77c8fbf8d462 100644
--- a/devel/p5-Data-Swap/Makefile
+++ b/devel/p5-Data-Swap/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Data::Swap
-# Date created:				10 December 2005
-# Whom:					Parv <parv@pair.org>
-#
+# Created by: Parv <parv@pair.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Data-Swap
 PORTVERSION=	0.08
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	parv@pair.com
 COMMENT=	XS module to swap the contents and types of referenced variables
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Data::Swap.3
 
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index e6852adb2474..9b0e55b63222 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	POEx::Role::Streaming
-# Date created:		10 Oct 2010
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	POEx-Role-Streaming
 PORTVERSION=	1.102610
@@ -24,7 +19,8 @@ RUN_DEPENDS=	\
 	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	POEx::Role::Streaming.3
 
diff --git a/devel/p5-Qudo/Makefile b/devel/p5-Qudo/Makefile
index ba24a4734f6c..ba6d9ccf75bc 100644
--- a/devel/p5-Qudo/Makefile
+++ b/devel/p5-Qudo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Qudo
-# Date created:		27 Jun 2012
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Qudo
 PORTVERSION=	0.0213
@@ -23,7 +18,8 @@ RUN_DEPENDS=	\
 	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Qudo.3 \
 	Qudo::Manager.3 \
diff --git a/devel/p5-Template-Provider-Encode/Makefile b/devel/p5-Template-Provider-Encode/Makefile
index 4df56e7aad55..f449742b34d1 100644
--- a/devel/p5-Template-Provider-Encode/Makefile
+++ b/devel/p5-Template-Provider-Encode/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Template-Provider-Encode
-# Date created:		2009-01-08
-# Whom:			Murilo Opsfelder <mopsfelder@gmail.com>
-#
+# Created by: Murilo Opsfelder <mopsfelder@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Template-Provider-Encode
 PORTVERSION=	0.02
@@ -16,7 +12,8 @@ COMMENT=	Encode templates for Template Toolkit
 
 RUN_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Template::Provider::Encode.3 \
 		Template::Provider::Encode::Guess.3
diff --git a/devel/p5-uni-perl/Makefile b/devel/p5-uni-perl/Makefile
index bc1bce965879..a6a1a288ed4d 100644
--- a/devel/p5-uni-perl/Makefile
+++ b/devel/p5-uni-perl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-uni-perl
-# Date created:		2009-10-20
-# Whom:			Mons Anderson <mons@cpan.org>
-#
+# Created by: Mons Anderson <mons@cpan.org>
 # $FreeBSD$
-#
 
 PORTNAME=	uni-perl
 PORTVERSION=	0.91
@@ -20,6 +16,7 @@ RUN_DEPENDS=	p5-Encode>=2.37:${PORTSDIR}/converters/p5-Encode \
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>