19 files changed, 54 insertions, 102 deletions

diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index 73f0bd06b80a..fd34cd7ca00f 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-ZConf-BGSet
-# Date created:		2008-02-08
-# Whom:			Zane C, Bowers <vvelox@vvelox.net>
-#
+# Created by: Zane C, Bowers <vvelox@vvelox.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ZConf-BGSet
 PORTVERSION=	1.0.0
@@ -24,7 +20,8 @@ BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:${PORTSDIR}/graphics/p5-Image
 		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		ZConf::BGSet.3
 
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index 6898fa8c6e78..6222cd6b8afa 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-ZConf-Runner-GUI-GTK
-# Date created:		2009-10-19
-# Whom:			Zane C, Bowers <vvelox@vvelox.net>
-#
+# Created by: Zane C, Bowers <vvelox@vvelox.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ZConf-Runner-GUI-GTK
 PORTVERSION=	0.0.2
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf \
 		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		ZConf::Runner::GUI::GTK.3
 
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index b44dec38182a..bd9dd70c1617 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-ZConf-Runner
-# Date created:		2009-01-14
-# Whom:			Zane C, Bowers <vvelox@vvelox.net>
-#
+# Created by: Zane C, Bowers <vvelox@vvelox.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ZConf-Runner
 PORTVERSION=	2.1.4
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
 		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		ZConf::Runner.3 \
 		ZConf::Runner::GUI.3 \
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index b098a976a012..f7d80ce20e42 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -31,7 +31,8 @@ LICENSE=	GPLv2
 
 USE_ZIP=	yes
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
diff --git a/deskutils/when/Makefile b/deskutils/when/Makefile
index fca6d5a4a3cc..589ecf89ceea 100644
--- a/deskutils/when/Makefile
+++ b/deskutils/when/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	when
-# Date created:		1 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	when
 PORTVERSION=	1.1.22
@@ -13,7 +9,8 @@ MASTER_SITES=	LOCAL/culot
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	A very simple personal calendar
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git a/graphics/commons-utilities/Makefile b/graphics/commons-utilities/Makefile
index 4b0ee278e096..7549cb2ff4b3 100644
--- a/graphics/commons-utilities/Makefile
+++ b/graphics/commons-utilities/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    commons-utilities
-# Date created:                         18 September 2010
-# Whom:                                 Dereckson <dereckson@gmail.com>
-#
+# Created by: Dereckson <dereckson@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	commons-utilities
 PORTVERSION=	1.0
@@ -23,7 +19,8 @@ RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		exiv2:${PORTSDIR}/graphics/exiv2
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 USE_PYTHON=	2.5+
 
 LICENSE=	GPLv3
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 41ecfdefc9c5..c8e61daeeae2 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Acme-Steganography-Image-Png
-# Date created:		2006-07-23
-# Whom:			Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-#
+# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	Acme-Steganography-Image-Png
 PORTVERSION=	0.06
@@ -19,7 +15,8 @@ BUILD_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Acme::Steganography::Image::Png.3
 
diff --git a/graphics/p5-Image-Imgur/Makefile b/graphics/p5-Image-Imgur/Makefile
index b258dc51c915..cb3417b75c9a 100644
--- a/graphics/p5-Image-Imgur/Makefile
+++ b/graphics/p5-Image-Imgur/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Image-Imgur
-# Date created:		2010-10-27
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Image-Imgur
 PORTVERSION=	0.01
@@ -18,7 +14,8 @@ COMMENT=	Perl extension for uploading images to http://imgur.com
 RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Image::Imgur.3
 
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 27438ae97aad..a51e8c741250 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Image-Magick-Iterator
-# Date created:		2006-11-12
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Image-Magick-Iterator
 PORTVERSION=	0.01
@@ -19,7 +15,8 @@ COMMENT=	Sequentially read Image::Magick object from a filehandle
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		p5-Image-PBMlib>=0:${PORTSDIR}/graphics/p5-Image-PBMlib
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Image::Magick::Iterator.3 Image::Magick::Iterator::PPM.3
 
diff --git a/graphics/p5-Image-MetaData-GQview/Makefile b/graphics/p5-Image-MetaData-GQview/Makefile
index 101498f5dcca..d1a8517ce9db 100644
--- a/graphics/p5-Image-MetaData-GQview/Makefile
+++ b/graphics/p5-Image-MetaData-GQview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Image-MetaData-GQview
-# Date created:		2006-08-14
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Image-MetaData-GQview
 PORTVERSION=	1.9
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Perl extension for GQview image metadata
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Image::MetaData::GQview.3
 
diff --git a/graphics/p5-Image-Size-FillFullSelect/Makefile b/graphics/p5-Image-Size-FillFullSelect/Makefile
index 05e919eb1011..5875c825cbbf 100644
--- a/graphics/p5-Image-Size-FillFullSelect/Makefile
+++ b/graphics/p5-Image-Size-FillFullSelect/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-LDAP-Makepath
-# Date created:		2008-06-24
-# Whom:			Zane C, Bowers <vvelox@vvelox.net>
-#
+# Created by: Zane C, Bowers <vvelox@vvelox.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Image-Size-FillFullSelect
 PORTVERSION=	0.1.0
@@ -18,7 +14,8 @@ COMMENT=	Pick whether an image fill setting for a image should be fill or full
 BUILD_DEPENDS=	p5-Image-Size>=3.230:${PORTSDIR}/graphics/p5-Image-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Image::Size::FillFullSelect.3
 
diff --git a/russian/p5-Convert-Cyrillic/Makefile b/russian/p5-Convert-Cyrillic/Makefile
index 8da155364f2a..b33204e4c6e5 100644
--- a/russian/p5-Convert-Cyrillic/Makefile
+++ b/russian/p5-Convert-Cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Convert-Cyrillic
-# Date created:				07 May 2009
-# Whom:					Sergey Kandaurov <pluknet@gmail.com>
-#
+# Created by: Sergey Kandaurov <pluknet@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Convert-Cyrillic
 PORTVERSION=	1.05
@@ -18,7 +14,8 @@ COMMENT=	Routines for converting from one Cyrillic charset to another
 BUILD_DEPENDS=	p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Convert::Cyrillic.3 \
 		Lingua::DetectCharset.3
diff --git a/russian/p5-Lingua-DetectCyrillic/Makefile b/russian/p5-Lingua-DetectCyrillic/Makefile
index 1850d186275c..08b3efee90cb 100644
--- a/russian/p5-Lingua-DetectCyrillic/Makefile
+++ b/russian/p5-Lingua-DetectCyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Lingua-DetectCyrillic
-# Date created:		Jun 15 2011
-# Whom:			Dmitry Liakh <dliakh@ukr.net>
-#
+# Created by: Dmitry Liakh <dliakh@ukr.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Lingua-DetectCyrillic
 PORTVERSION=	0.02
@@ -17,7 +13,8 @@ COMMENT=	Detects 7 Cyrillic codings as well as the language
 RUN_DEPENDS=	p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8 \
 		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Lingua::DetectCyrillic.3
 
diff --git a/russian/p5-cyrillic/Makefile b/russian/p5-cyrillic/Makefile
index 14773113f82f..3925fd32fdc1 100644
--- a/russian/p5-cyrillic/Makefile
+++ b/russian/p5-cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-cyrillic
-# Date created:				13 May 2002
-# Whom:					Anatoliy Dmytriyev
-#
+# Created by: Anatoliy Dmytriyev
 # $FreeBSD$
-#
 
 PORTNAME=	cyrillic
 PORTVERSION=	2.09
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tolid@plab.ku.dk
 COMMENT=	Library for fast and easy Cyrillic text manipulation
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	cyrillic.3
 
diff --git a/security/hunch/Makefile b/security/hunch/Makefile
index 5cf59bdbae9c..2de6fd67f443 100644
--- a/security/hunch/Makefile
+++ b/security/hunch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: hunch
-# Date created:		26 October 2002
-# Whom:			Dan Pelleg <daniel+hunch@pelleg.org>
-#
+# Created by: Dan Pelleg <daniel+hunch@pelleg.org>
 # $FreeBSD$
-#
 
 PORTNAME=	hunch
 PORTVERSION=	1.1.8
@@ -16,7 +12,7 @@ COMMENT=	Scan httpd log files for vulnerability probes, mail admins
 
 RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
-USE_PERL5=	yes
+USES=		perl5
 
 IS_INTERACTIVE=	yes
 NO_BUILD=	true
diff --git a/security/p5-Authen-Passphrase/Makefile b/security/p5-Authen-Passphrase/Makefile
index 6b3773d9872c..a111550e89c3 100644
--- a/security/p5-Authen-Passphrase/Makefile
+++ b/security/p5-Authen-Passphrase/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Authen-Passphrase
-# Date created:				01 Jun 2008
-# Whom:					brix@FreeBSD.org
-#
+# Created by: brix@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	Authen-Passphrase
 PORTVERSION=	0.008
@@ -30,7 +26,8 @@ BUILD_DEPENDS=	p5-Authen-DecHpwd>=0:${PORTSDIR}/security/p5-Authen-DecHpwd \
 		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	Authen::Passphrase.3 \
 	Authen::Passphrase::AcceptAll.3 \
diff --git a/security/p5-Crypt-Khazad/Makefile b/security/p5-Crypt-Khazad/Makefile
index 62e4175ba7b5..cd339242b4da 100644
--- a/security/p5-Crypt-Khazad/Makefile
+++ b/security/p5-Crypt-Khazad/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-Khazad
-# Date created:				20 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-Khazad
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for Khazad block cipher
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::Khazad.3
 
diff --git a/security/pam_pgina/Makefile b/security/pam_pgina/Makefile
index 1bec15fcd7c3..b5d99cda0369 100644
--- a/security/pam_pgina/Makefile
+++ b/security/pam_pgina/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pam_pGina
-# Date created:		Thu Apr 29 16:03:45 UTC 2004
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pam_pGina
 PORTVERSION=	1.1.3
@@ -20,7 +16,8 @@ LICENSE_FILE=	${WRKSRC}/GPL
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 post-patch:
 # PREFIX safeness
diff --git a/x11-wm/wmanager-addons/Makefile b/x11-wm/wmanager-addons/Makefile
index 54b5f628e8ae..b8fa5d728816 100644
--- a/x11-wm/wmanager-addons/Makefile
+++ b/x11-wm/wmanager-addons/Makefile
@@ -9,7 +9,8 @@ MASTER_SITES=	http://devel.ringlet.net/x11/wmanager-addons/
 MAINTAINER=	c.petrik.sosa@gmail.com
 COMMENT=	Helper scripts and documentation for the X11 window manager selector
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 MAN1=		wmanager.1 wmanager-loop.1 wmanagerrc-update.1
 MANCOMPRESSED=	yes