19 files changed, 50 insertions, 99 deletions

diff --git a/lang/asn1c/Makefile b/lang/asn1c/Makefile
index c30f3f5084d2..2391bf0623bd 100644
--- a/lang/asn1c/Makefile
+++ b/lang/asn1c/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	vlm@lionet.info
 COMMENT=	Modern ASN.1 to C compiler
 
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
+USES=		perl5
 SUB_FILES=	pkg-message
 .if defined(.PARSEDIR)
 USE_GMAKE=	yes
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 249119aa6951..b04c0bb1140f 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 
 RESTRICTED=	Restrictions on for-profit distribution
 
-USE_PERL5=	yes	# XXX: shouldn't it be changed to USE_PERL5_BUILD?
+USES=		perl5
 ALL_TARGET=	world
 MAKE_ARGS=	MOSMLHOME="${MOSMLHOME}" DOCSDIR="${DOCSDIR}" \
 		LD_RUN_PATH="${PREFIX}/lib/mosml"
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index 45a01118c055..55c52b719a27 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-ePerl
-# Date created:		03-Sep-1997
-# Whom:	      		Ralf S. Engelschall <rse@engelschall.com>
-#
+# Created by: Ralf S. Engelschall <rse@engelschall.com>
 # $FreeBSD$
-#
 
 PORTNAME=	eperl
 PORTVERSION=	2.2.14
@@ -17,7 +13,8 @@ COMMENT=	Perl Modules of ePerl package: Parse::ePerl, Apache::ePerl
 
 MAKE_JOBS_UNSAFE=	yes
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Parse::ePerl.3 Apache::ePerl.3
 
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile
index d58847bc45ce..825ef70d2adc 100644
--- a/net-im/jarl/Makefile
+++ b/net-im/jarl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:		jarl
-# Date created:					10 November 2002
-# Whom:						dd
-#
+# Created by: dd
 # $FreeBSD$
-#
 
 PORTNAME=	jarl
 PORTVERSION=	0.5001
@@ -20,7 +16,7 @@ RUN_DEPENDS=	ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \
 
 NO_BUILD=	yes
 
-USE_PERL5=	yes
+USES=		perl5
 
 makeplist:
 	${ECHO_CMD} bin/jarl > ${PLIST}
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 2686f2faa1f6..27d671715cc0 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Jabber-Connection
-# Date created:				01 October 2003
-# Whom:	      				Lars Eggert
-#
+# Created by: Lars Eggert
 # $FreeBSD$
-#
 
 PORTNAME=	Jabber-Connection
 PORTVERSION=	0.04
@@ -17,7 +13,8 @@ COMMENT=	Jabber Perl library for client/component connectivity
 RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Jabber::Connection.3 Jabber::NS.3 Jabber::NodeFactory.3
 
diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile
index 9b243f1ba9cc..b4f0dd05b0cf 100644
--- a/net-im/p5-Jabber-Lite/Makefile
+++ b/net-im/p5-Jabber-Lite/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Jabber-Lite
-# Date created:		2007-09-03
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Jabber-Lite
 PORTVERSION=	0.8
@@ -19,7 +15,8 @@ RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
 		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Jabber::Lite.3
 
diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile
index 423f2cbfa522..759466eb9f58 100644
--- a/net-im/p5-Net-ICQ2000/Makefile
+++ b/net-im/p5-Net-ICQ2000/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net-ICQ2000
-# Date created:				06 December 2001
-# Whom:					Kevin Lo <kevlo@FreeBSD.org>
-#
+# Created by: Kevin Lo <kevlo@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-ICQ2000
 PORTVERSION=	0.2.1
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	A perl5 module for ICQv7 protocol realisation
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::ICQ2000.3
 
diff --git a/net-im/p5-Net-NetSend/Makefile b/net-im/p5-Net-NetSend/Makefile
index 0c691249b4bb..83f2c10dec96 100644
--- a/net-im/p5-Net-NetSend/Makefile
+++ b/net-im/p5-Net-NetSend/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-NetSend
-# Date created:		2005-10-23
-# Whom:			Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-#
+# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-NetSend
 PORTVERSION=	0.12
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Perl extension for sending Windows Popup Messages
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::NetSend.3
 
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index 3c8ddd0eaa41..4a4f87ca0188 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-XMPP2
-# Date created:		2008-04-10
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-XMPP2
 PORTVERSION=	0.14
@@ -37,7 +33,8 @@ RUN_DEPENDS:=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::XMPP2.3 \
 		Net::XMPP2::Client.3 \
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index ff819f0f1f20..29303ea831c0 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sendxmpp
-# Date created:				24 Jan 2006
-# Whom:	      				Max E. Kuznecov <mek@mek.uz.ua>
-#
+# Created by: Max E. Kuznecov <mek@mek.uz.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	sendxmpp
 PORTVERSION=	0.0.8
@@ -17,7 +13,8 @@ COMMENT=	Perl-script to send xmpp (jabber) messages
 RUN_DEPENDS+=	p5-Net-XMPP>0.0:${PORTSDIR}/net-im/p5-Net-XMPP \
 		p5-IO-Socket-SSL>0.0:${PORTSDIR}/security/p5-IO-Socket-SSL
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	sendxmpp.1
 
diff --git a/net-im/twitmail/Makefile b/net-im/twitmail/Makefile
index 0b0ec3b75d51..57c37caa7a3a 100644
--- a/net-im/twitmail/Makefile
+++ b/net-im/twitmail/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	twitmail
-# Date created:		2010-02-13
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	twitmail
 PORTVERSION=	0.42
@@ -22,7 +18,8 @@ BUILD_DEPENDS=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate \
 		p5-Getopt-GUI-Long>=0.91:${PORTSDIR}/devel/p5-Getopt-GUI-Long
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		twitmail.1
 
diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile
index 1433d0cad83a..833aa59f3990 100644
--- a/net-im/vicq/Makefile
+++ b/net-im/vicq/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vicq
-# Date created:				06 December 2001
-# Whom:					Kevin Lo<kevlo@FreeBSD.org>
-#
+# Created by: Kevin Lo<kevlo@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vicq
 PORTVERSION=	0.4.2
@@ -19,7 +15,8 @@ RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 SIGNAL_PATCH=p5.8-patch-sigalrm
 
diff --git a/net-p2p/ctcs/Makefile b/net-p2p/ctcs/Makefile
index b6aa9f6eb5e2..eda89cd2c95a 100644
--- a/net-p2p/ctcs/Makefile
+++ b/net-p2p/ctcs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    ctcs
-# Date created:                         7 July 2009
-# Whom:                                 Dereckson <dereckson@gmail.com>
-#
+# Created by: Dereckson <dereckson@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ctcs
 PORTVERSION=	1.4.1
@@ -14,7 +10,8 @@ MAINTAINER=	dereckson@gmail.com
 COMMENT=	CTorrent monitoring and managing interface
 
 NO_BUILD=	#
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 PLIST_FILES=	bin/ctcs share/doc/ctcs/readme.txt
 PLIST_DIRS=	share/doc/ctcs
 WRKSRC=		${WRKDIR}/ctcs-${PORTVERSION}
diff --git a/net-p2p/eiskaltdcpp-cli/Makefile b/net-p2p/eiskaltdcpp-cli/Makefile
index 792cfb3291da..863605638321 100644
--- a/net-p2p/eiskaltdcpp-cli/Makefile
+++ b/net-p2p/eiskaltdcpp-cli/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: net-p2p/eiskaltdcpp-cli
-# Date created:		06 Oct @011
-# Whom:			Maxim Ignatenko <gelraen.ua@gmail.com>
-#
+# Created by: Maxim Ignatenko <gelraen.ua@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	eiskaltdcpp-cli
 PORTVERSION=	2.2.4
@@ -23,7 +19,8 @@ PROJECTHOST=	eiskaltdc
 
 USE_XZ=		yes
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 MAN1=	${PORTNAME}.1
 MANCOMPRESSED=	no
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index 5fcb02846081..48f205f1470b 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	opendchub
-# Date created:			May 29, 2002
-# Whom:				Munish Chopra <mchopra@engmail.uwaterloo.ca>
-#
+# Created by: Munish Chopra <mchopra@engmail.uwaterloo.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	opendchub
 PORTVERSION=	0.8.2
@@ -13,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/Open%20DC%20Hub/${PORTVERSION}
 MAINTAINER=	yashin.dm@gmail.com
 COMMENT=	Unofficial Unix version of the Direct Connect Hub software
 
-USE_PERL5=	yes
+USES=		perl5
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile
index c2a138fe8edd..ddeb6491386d 100644
--- a/net-p2p/p5-Net-BitTorrent-File/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-File/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-BitTorrent-File
-# Date created:				February 06th 2006
-# Whom:	      				Oleg R. Muhutdinov <mor@WhiteLuna.com>
-#
+# Created by: Oleg R. Muhutdinov <mor@WhiteLuna.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-BitTorrent-File
 PORTVERSION=	1.02
@@ -22,7 +18,8 @@ BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-fix//}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::BitTorrent::File.3
 
diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile
index f3a39adc619f..fdc26b6777ab 100644
--- a/net-p2p/p5-Net-DirectConnect/Makefile
+++ b/net-p2p/p5-Net-DirectConnect/Makefile
@@ -24,7 +24,8 @@ BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-Sys-Sendfile-FreeBSD>=0:${PORTSDIR}/devel/p5-Sys-Sendfile-FreeBSD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		dcget.1 dcshare.1
 MAN3=		Net::DirectConnect.3 Net::DirectConnect::filelist.3
diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile
index d7d26923e664..1d1e00991b20 100644
--- a/net-p2p/p5-WWW-BitTorrent/Makefile
+++ b/net-p2p/p5-WWW-BitTorrent/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-WWW-BitTorrent
-# Date created:		2006-08-02
-# Whom:			Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-#
+# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	WWW-BitTorrent
 PORTVERSION=	0.01
@@ -17,7 +13,8 @@ COMMENT=	Search and Download .torrent(s) files from BitTorrents boards
 BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		WWW::BitTorrent.3
 
diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile
index 05cbe9ef6531..81fdf456eac3 100644
--- a/textproc/p5-XML-Canonical/Makefile
+++ b/textproc/p5-XML-Canonical/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-XML-Canonical
-# Date created:		2007-07-15
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	XML-Canonical
 PORTVERSION=	0.10
@@ -20,7 +16,8 @@ BUILD_DEPENDS=	p5-XML-GDOME>=0:${PORTSDIR}/textproc/p5-XML-GDOME
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gdome:${PORTSDIR}/textproc/gdome2
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		XML::Canonical.3