38 files changed, 97 insertions, 149 deletions

diff --git a/security/chaosreader/Makefile b/security/chaosreader/Makefile
index 4062f2af90e5..d92e96f03f63 100644
--- a/security/chaosreader/Makefile
+++ b/security/chaosreader/Makefile
@@ -1,6 +1,5 @@
 # Created by: pauls
 # $FreeBSD$
-#
 
 PORTNAME=	chaosreader
 PORTVERSION=	0.94
@@ -15,7 +14,8 @@ MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Tool to extract data from tcpdump logs
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 PLIST_FILES=	bin/${PORTNAME} bin/sshkeydata
 
diff --git a/security/fcrackzip/Makefile b/security/fcrackzip/Makefile
index 16281af6a5ae..051a4417bc1b 100644
--- a/security/fcrackzip/Makefile
+++ b/security/fcrackzip/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fcrackzip
-# Date created:				16 Jul 2004
-# Whom:					Stefan Walter <sw@gegenunendlich.de>
-#
+# Created by: Stefan Walter <sw@gegenunendlich.de>
 # $FreeBSD$
-#
 
 PORTNAME=	fcrackzip
 PORTVERSION=	1.0
@@ -16,7 +12,8 @@ MAINTAINER=	stefan@FreeBSD.org
 COMMENT=	Portable, fast, and featureful ZIP password cracker
 
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 
 PLIST_FILES=	bin/fcrackzip bin/fcrackzipinfo
 .if !defined(NOPORTDOCS)
diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index d19027bebcf5..81e45a1c1302 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,6 +1,5 @@
 # Created by: mich@freebsdcluster.org
 # $FreeBSD$
-#
 
 PORTNAME=	hackbot
 PORTVERSION=	2.21
@@ -12,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Host exploration tool and bannergrabber
 
-USE_PERL5=	YES
+USES=		perl5
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/security/ipfilter2dshield/Makefile b/security/ipfilter2dshield/Makefile
index 0d1363edcd5e..7e6758bc012f 100644
--- a/security/ipfilter2dshield/Makefile
+++ b/security/ipfilter2dshield/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ipfilter2dshield
-# Date created:		2004-06-18
-# Whom:			Joe Barbish <fbsd_user@a1poweruser.com>
-#
+# Created by: Joe Barbish <fbsd_user@a1poweruser.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ipfilter2dshield
 PORTVERSION=	1.0
@@ -17,7 +13,7 @@ COMMENT=	Official DShield client for ipfilter firewall logs
 
 RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
-USE_PERL5=	yes
+USES=		perl5
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 7cfb687e6a83..43bf18a99882 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -1,7 +1,4 @@
-# New ports collection Makefile for:	libksba
-# Date created:				July 17 2002
-# Whom:					Tilman Linneweh <arved@FreeBSD.org>
-#
+# Created by: Tilman Linneweh <arved@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libksba
@@ -22,7 +19,8 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-static
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 
 INFO=		ksba
 
diff --git a/security/oinkmaster/Makefile b/security/oinkmaster/Makefile
index 45088d320ab8..11dbb24634e8 100644
--- a/security/oinkmaster/Makefile
+++ b/security/oinkmaster/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	oinkmaster
-# Date created:			Jan 28, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	oinkmaster
 PORTVERSION=	2.0
@@ -18,7 +13,8 @@ COMMENT=	Help you update your snort rules after each update
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 PLIST_FILES=	bin/oinkmaster etc/oinkmaster.conf.sample
 
diff --git a/security/p5-Apache-Htpasswd/Makefile b/security/p5-Apache-Htpasswd/Makefile
index c10c6c4146ed..034555c7b9d5 100644
--- a/security/p5-Apache-Htpasswd/Makefile
+++ b/security/p5-Apache-Htpasswd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Apache-Htpasswd
-# Date created:				30 Apr 2009
-# Whom:					Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Apache-Htpasswd
 PORTVERSION=	1.8
@@ -19,7 +15,8 @@ BUILD_DEPENDS=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Apache::Htpasswd.3
 
diff --git a/security/p5-App-TLSMe/Makefile b/security/p5-App-TLSMe/Makefile
index 52bc1f8bf940..5bf4de231a2e 100644
--- a/security/p5-App-TLSMe/Makefile
+++ b/security/p5-App-TLSMe/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	App::TLSMe
-# Date created:		06 Dec 2011
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	App-TLSMe
 PORTVERSION=	0.100000
@@ -21,7 +16,8 @@ RUN_DEPENDS=	\
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	tlsme.1
 MAN3=	App::TLSMe.3 \
diff --git a/security/p5-Authen-CyrusSASL/Makefile b/security/p5-Authen-CyrusSASL/Makefile
index 5ffce6747fb2..5b301f138e3d 100644
--- a/security/p5-Authen-CyrusSASL/Makefile
+++ b/security/p5-Authen-CyrusSASL/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Authen-CyrusSASL
-# Date created:				October 05 2005
-# Whom:					Attila Nagy <bra@fsn.hu>
-#
+# Created by: Attila Nagy <bra@fsn.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	Authen-CyrusSASL
 PORTVERSION=	0.01
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Perl5 module for accessing the SASL authentication daemon
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Authen::CyrusSASL.3
 
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index f103facbe731..7d536049aff7 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Authen-TypeKey
-# Date created:		2006-03-19
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Authen-TypeKey
 PORTVERSION=	0.05
@@ -20,7 +16,8 @@ BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Authen::TypeKey.3
 
diff --git a/security/p5-Cisco-Hash/Makefile b/security/p5-Cisco-Hash/Makefile
index 1c3f4e77db01..4b7147144142 100644
--- a/security/p5-Cisco-Hash/Makefile
+++ b/security/p5-Cisco-Hash/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Cisco-Hash
-# Date created:		2008-02-10
-# Whom:			Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-#
+# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	Cisco-Hash
 PORTVERSION=	0.02
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	De- and encrypts Cisco type 7 hashes
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Cisco::Hash.3
 
diff --git a/security/p5-Crypt-Camellia_PP/Makefile b/security/p5-Crypt-Camellia_PP/Makefile
index 50c254996687..08397b8b7a08 100644
--- a/security/p5-Crypt-Camellia_PP/Makefile
+++ b/security/p5-Crypt-Camellia_PP/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-Camellia_PP
-# Date created:				Thu Jul 12 16:35:39 JST 2007
-# Whom:	      				Yoshisato YANAGISAWA
+# Created by: Yoshisato YANAGISAWA
 # $FreeBSD$
 
 PORTNAME=	Crypt-Camellia_PP
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
 COMMENT=	Perl extension for Camellia Encryption Algorithm in pure Perl
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::Camellia_PP.3
 
diff --git a/security/p5-Crypt-GOST/Makefile b/security/p5-Crypt-GOST/Makefile
index 8b0af1c61555..4b643022f9f6 100644
--- a/security/p5-Crypt-GOST/Makefile
+++ b/security/p5-Crypt-GOST/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-GOST
-# Date created:				20 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-GOST
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for GOST Encryption Algorithm
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::GOST.3
 
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index 407c1b427619..dd2ca36ebc86 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-GPG
-# Date created:				17 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-GPG
@@ -16,7 +14,8 @@ COMMENT=	Perl extension for GnuPG
 RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 		p5-TimeDate>=1.20:${PORTSDIR}/devel/p5-TimeDate
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::GPG.3
 
diff --git a/security/p5-Crypt-HCE_MD5/Makefile b/security/p5-Crypt-HCE_MD5/Makefile
index b67f7a23ef9c..a5a201c5dfe3 100644
--- a/security/p5-Crypt-HCE_MD5/Makefile
+++ b/security/p5-Crypt-HCE_MD5/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-HCE_MD5
-# Date created:				17 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-HCE_MD5
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension implementing one way hash chaining encryption using MD5
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::HCE_MD5.3
 
diff --git a/security/p5-Crypt-Imail/Makefile b/security/p5-Crypt-Imail/Makefile
index 22e91aececb1..0a7bc126e149 100644
--- a/security/p5-Crypt-Imail/Makefile
+++ b/security/p5-Crypt-Imail/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-Imail
-# Date created:				20 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-Imail
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension to encrypt and decrypt Imail passwords
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::Imail.3
 
diff --git a/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index 1e992cae0328..4063f496c68f 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-Lite
-# Date created:				18 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-Lite
@@ -15,7 +13,8 @@ COMMENT=	Perl extension for a symmetric data encryption and decryption
 BUILD_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::Lite.3
 
diff --git a/security/p5-Crypt-RandPasswd/Makefile b/security/p5-Crypt-RandPasswd/Makefile
index f013495c2d41..685a73971bec 100644
--- a/security/p5-Crypt-RandPasswd/Makefile
+++ b/security/p5-Crypt-RandPasswd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Crypt::RandPasswd
-# Date created:				24 October 2002
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Crypt-RandPasswd
 PORTVERSION=	0.02
@@ -15,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	An implementation of the Automated Password Generator standard
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::RandPasswd.3
 
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index fc0a7ea91d63..e451006a4166 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-SKey
-# Date created:				20 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-SKey
@@ -18,7 +16,8 @@ BUILD_DEPENDS=	p5-Digest-MD4>=0:${PORTSDIR}/security/p5-Digest-MD4 \
 		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::SKey.3
 
diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile
index 53fdc7fb6d40..f4eb56181e43 100644
--- a/security/p5-Crypt-SaltedHash/Makefile
+++ b/security/p5-Crypt-SaltedHash/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension to work with salted hashes
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Crypt::SaltedHash.3
 
diff --git a/security/p5-Crypt-Shark/Makefile b/security/p5-Crypt-Shark/Makefile
index b74421bb5469..4e108da6f939 100644
--- a/security/p5-Crypt-Shark/Makefile
+++ b/security/p5-Crypt-Shark/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-Shark
-# Date created:				20 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-Shark
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for Shark block cipher
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::Shark.3
 
diff --git a/security/p5-Crypt-Simple/Makefile b/security/p5-Crypt-Simple/Makefile
index d0a8539e8852..469088b07848 100644
--- a/security/p5-Crypt-Simple/Makefile
+++ b/security/p5-Crypt-Simple/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
 		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
 		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Crypt::Simple.3
 
diff --git a/security/p5-Crypt-Twofish_PP/Makefile b/security/p5-Crypt-Twofish_PP/Makefile
index 8934bf9504de..bfaa50e3825f 100644
--- a/security/p5-Crypt-Twofish_PP/Makefile
+++ b/security/p5-Crypt-Twofish_PP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  p5-Crypt-Twofish_PP
-# Date created:                19 January 2010
-# Whom:                        Konstantin Menshikov <kostjnspb@yandex.ru>
-#
+# Created by: Konstantin Menshikov <kostjnspb@yandex.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	Crypt-Twofish_PP
 PORTVERSION=	0.17
@@ -19,7 +15,8 @@ COMMENT=	The Twofish Algorithm in Pure Perl
 BUILD_DEPENDS=	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Crypt::Twofish_PP.3 \
 	Crypt::Twofish_PP::Key16.3 \
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index c8a6bac893da..6aa4db4df5c7 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -1,6 +1,4 @@
-# New ports collection Makefile for:	p5-Crypt-X509
-# Date created:				18 Dec 2006
-# Whom:	      				Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Crypt-X509
@@ -14,7 +12,8 @@ COMMENT=	Perl extension to parse X.509 certificates
 
 BUILD_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Crypt::X509.3
 
diff --git a/security/p5-Dancer-Plugin-Passphrase/Makefile b/security/p5-Dancer-Plugin-Passphrase/Makefile
index 7ffb8f6de6ee..4419168973ce 100644
--- a/security/p5-Dancer-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer-Plugin-Passphrase/Makefile
@@ -24,7 +24,8 @@ RUN_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer \
 		p5-Digest-Bcrypt>0:${PORTSDIR}/security/p5-Digest-Bcrypt \
 		p5-Digest-SHA>=5.008:${PORTSDIR}/security/p5-Digest-SHA
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Dancer::Plugin::Passphrase.3
 
diff --git a/security/p5-Data-Password/Makefile b/security/p5-Data-Password/Makefile
index 9cdcdbc108eb..7c47d76574a3 100644
--- a/security/p5-Data-Password/Makefile
+++ b/security/p5-Data-Password/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Perl extension for assessing password quality
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Data::Password.3
 
diff --git a/security/p5-Digest-Elf/Makefile b/security/p5-Digest-Elf/Makefile
index 7627db5d3ed6..fbf849b66cb3 100644
--- a/security/p5-Digest-Elf/Makefile
+++ b/security/p5-Digest-Elf/Makefile
@@ -1,6 +1,4 @@
-# Ports collection Makefile for:	p5-Digest-Elf
-# Date created:				17 Dec 2005
-# Whom:					Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Digest-Elf
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for ElfHash hash algorithm
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Digest::Elf.3
 
diff --git a/security/p5-Digest-FNV/Makefile b/security/p5-Digest-FNV/Makefile
index c48a965c3c09..bf61c16342e9 100644
--- a/security/p5-Digest-FNV/Makefile
+++ b/security/p5-Digest-FNV/Makefile
@@ -1,6 +1,4 @@
-# Ports collection Makefile for:	p5-Digest-FNV
-# Date created:				17 Dec 2005
-# Whom:					Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Digest-FNV
@@ -15,7 +13,8 @@ COMMENT=	Perl extension for Fowler/Noll/Vo hash algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Digest::FNV.3
 
diff --git a/security/p5-Digest-JHash/Makefile b/security/p5-Digest-JHash/Makefile
index 7ec9a5f611c8..9fa89295d0ab 100644
--- a/security/p5-Digest-JHash/Makefile
+++ b/security/p5-Digest-JHash/Makefile
@@ -1,6 +1,4 @@
-# Ports collection Makefile for:	p5-Digest-JHash
-# Date created:				17 Dec 2005
-# Whom:					Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Digest-JHash
@@ -14,7 +12,8 @@ COMMENT=	Perl extension for JHash hash algorithm
 
 LICENSE=	ART20
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Digest::JHash.3
 
diff --git a/security/p5-Digest-ManberHash/Makefile b/security/p5-Digest-ManberHash/Makefile
index bafc5443fc87..684007063fbf 100644
--- a/security/p5-Digest-ManberHash/Makefile
+++ b/security/p5-Digest-ManberHash/Makefile
@@ -1,6 +1,4 @@
-# Ports collection Makefile for:	p5-Digest-ManberHash
-# Date created:				17 Dec 2005
-# Whom:					Gabor Kovesdan
+# Created by: Gabor Kovesdan
 # $FreeBSD$
 
 PORTNAME=	Digest-ManberHash
@@ -12,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for ManberHash hash algorithm
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Digest::ManberHash.3
 
diff --git a/security/p5-GnuPG/Makefile b/security/p5-GnuPG/Makefile
index 4c1c1f77b9a3..422e0ec96815 100644
--- a/security/p5-GnuPG/Makefile
+++ b/security/p5-GnuPG/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   p5-GnuPG
-# Date created:                                2012-07-17
-# Whom:                                        Marcello Coutinho
-#
+# Created by: Marcello Coutinho
 # $FreeBSD$
-#
 
 PORTNAME=	GnuPG
 PORTVERSION=	0.19
@@ -16,7 +12,8 @@ COMMENT=	Perl module for interfacing with GnuPG
 
 LICENSE=	GPLv2
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	GnuPG.3 \
 	GnuPG::Tie.3
diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index 8984e98cd7fa..41c01c78d433 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-SinFP
-# Date created:		26 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME?=	Net-SinFP
 PORTVERSION=	2.09
@@ -38,7 +34,8 @@ BUILD_DEPENDS+=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
 		p5-Net-Packet-Target>=1.00:${PORTSDIR}/net/p5-Net-Packet-Target
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 INSTALL_TARGET=	pure_install
 
 MAN3=	Net::SinFP.3 \
diff --git a/security/p5-openxpki-client-scep/Makefile b/security/p5-openxpki-client-scep/Makefile
index c5913b83e902..2e979fdc23b6 100644
--- a/security/p5-openxpki-client-scep/Makefile
+++ b/security/p5-openxpki-client-scep/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=	OpenXPKI::Client::SCEP.3
 USE_GMAKE=	yes
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/security/p5-openxpki-client/Makefile b/security/p5-openxpki-client/Makefile
index 73a1ba43dd12..29e26d885477 100644
--- a/security/p5-openxpki-client/Makefile
+++ b/security/p5-openxpki-client/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 MAN3=	OpenXPKI::Client.3 \
 	OpenXPKI::Client::API.3
 USE_GMAKE=	yes
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/security/p5-openxpki-deployment/Makefile b/security/p5-openxpki-deployment/Makefile
index c369e31369ca..3d66dba4fcb0 100644
--- a/security/p5-openxpki-deployment/Makefile
+++ b/security/p5-openxpki-deployment/Makefile
@@ -23,7 +23,7 @@ MAN1=	openxpki-configure.1 \
 	openxpki-metaconf.1 \
 	openxpkiadm.1 \
 	openxpkictl.1
-USE_PERL5=	yes
+USES=		perl5
 USE_GMAKE=	yes
 USE_RC_SUBR=	openxpki
 HAS_CONFIGURE=	yes
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index 69d877b1fe5a..46b7c6b43587 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=		pam_krb5-rh-2.*
 
 MAN5=			pam_krb5.5
 
-USE_PERL5=		yes
+USES=		perl5
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index c9568e081cf6..148733a4ed14 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sshit
-# Date created:				18 December 2005
-# Whom:					Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
-#
+# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	sshit
 PORTVERSION=	0.6
@@ -20,7 +16,8 @@ RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/security/sudoscript/Makefile b/security/sudoscript/Makefile
index d78a16a7dcdc..25e59dd026c5 100644
--- a/security/sudoscript/Makefile
+++ b/security/sudoscript/Makefile
@@ -15,7 +15,7 @@ MAN8=		sudoscriptd.8 sudoscript.8
 MANCOMPRESSED=	no
 
 USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		perl5
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^PREFIX=|^PREFIX?=|g' \