17 files changed, 46 insertions, 86 deletions

diff --git a/irc/cgiirc/Makefile b/irc/cgiirc/Makefile
index 0b555029373e..03c6405f46d3 100644
--- a/irc/cgiirc/Makefile
+++ b/irc/cgiirc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IRC web gateway written in Perl
 
 LICENSE=	GPLv2
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 pre-install:
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index 79ddc0e277ce..f392d32fcfda 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nethirc
-# Date created:		15 Dec 1999
-# Whom:			Will Andrews <andrews@technologist.com>
-#
+# Created by: Will Andrews <andrews@technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	NetHirc
 PORTVERSION=	0.94
@@ -18,7 +14,8 @@ BUILD_DEPENDS=	p5-POE-Component-IRC>=0:${PORTSDIR}/irc/p5-POE-Component-IRC \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		nethirc.pl.1
 MAN3=		NetHirc.3
diff --git a/irc/p5-Bot-BasicBot/Makefile b/irc/p5-Bot-BasicBot/Makefile
index 6bb3c6b3c0c0..dbd90e3c61bc 100644
--- a/irc/p5-Bot-BasicBot/Makefile
+++ b/irc/p5-Bot-BasicBot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Bot-BasicBot
-# Date created:				23 Dec 2006
-# Whom:					Aaron Dalton <aaron@FreeBSD.org>
-#
+# Created by: Aaron Dalton <aaron@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Bot-BasicBot
 PORTVERSION=	0.89
@@ -21,6 +17,7 @@ RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 
 MAN3=	Bot::BasicBot.3
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/irc/p5-IRC-Utils/Makefile b/irc/p5-IRC-Utils/Makefile
index 871e8d96a42a..dbbd0b40ae42 100644
--- a/irc/p5-IRC-Utils/Makefile
+++ b/irc/p5-IRC-Utils/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-IRC-Utils
-# Date created:		2011-04-12
-# Whom:			TERAMOTO Masahiro <markun@onohara.to>
-#
+# Created by: TERAMOTO Masahiro <markun@onohara.to>
 # $FreeBSD$
-#
 
 PORTNAME=	IRC-Utils
 PORTVERSION=	0.12
@@ -18,7 +14,8 @@ COMMENT=	Common utilities for IRC-related tasks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		IRC::Utils.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
index 6ca5a8919fa8..35f891f8aef6 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Blowfish/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	POE-Component-IRC-Plugin-Blowfish
-# Date created:	   June 05 2010
-# Whom:		   Jase Thew <freebsd@beardz.net>
-#
+# Created by: Jase Thew <freebsd@beardz.net>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-Blowfish
 PORTVERSION=	0.01
@@ -24,7 +20,8 @@ BUILD_DEPENDS=	p5-POE>=0.37:${PORTSDIR}/devel/p5-POE \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::Blowfish.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
index 27c927ab6c94..3f47314fe3e0 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Bollocks/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	POE-Component-IRC-Plugin-Bollocks
-# Date created:	   31 may 2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-Bollocks
 PORTVERSION=	1.00
@@ -21,7 +17,8 @@ BUILD_DEPENDS=	p5-Dev-Bollocks>=0.06:${PORTSDIR}/textproc/p5-Dev-Bollocks \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::Bollocks.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
index 3fe291d124ef..2d1bdcc837b2 100644
--- a/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-CoreList/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	POE-Component-IRC-Plugin-Corelist
-# Date created:	   31 may 2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-CoreList
 PORTVERSION=	1.02
@@ -20,7 +16,8 @@ RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 		p5-POE-Component-IRC>=0:${PORTSDIR}/irc/p5-POE-Component-IRC
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::CoreList.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
index 758faccab586..04acf4a3e119 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	POE-Componenet-IRC-Plugin-Hailo
-# Date created:	   2011-07-19
-# Whom:		   milki <milki@rescomp.berkeley.edu>
-#
+# Created by: milki <milki@rescomp.berkeley.edu>
 # $FreeBSD$
 
 PORTNAME=	POE-Component-IRC-Plugin-Hailo
@@ -25,7 +22,8 @@ BUILD_DEPENDS=	p5-IRC-Utils>=0.05:${PORTSDIR}/irc/p5-IRC-Utils \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Script>=1.07:${PORTSDIR}/devel/p5-Test-Script
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	irchailo-seed.1
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
index a9e726ded583..fd45d094cd43 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-Karma/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::Karma.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
index 48d3d00e3149..a545daa8d336 100644
--- a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	POE-Component-IRC-Plugin-POE-Knee
-# Date created:	   31 may 2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-POE-Knee
 PORTVERSION=	1.08
@@ -21,7 +17,8 @@ BUILD_DEPENDS=	p5-Math-Random>=0.69:${PORTSDIR}/math/p5-Math-Random \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::POE::Knee.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
index c61deb746811..3eda47c269aa 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Component-IRC-Plugin-QueryDNS
-# Date created:	   20.06.2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-QueryDNS
 PORTVERSION=	1.04
@@ -20,7 +16,8 @@ BUILD_DEPENDS=	p5-Net-IP>=1.25:${PORTSDIR}/net-mgmt/p5-Net-IP \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::QueryDNS.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
index 67f5808d3a0c..3e3808e632ea 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Component-IRC-Plugin-QueryDNSBL
-# Date created:	   20.06.2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-QueryDNSBL
 PORTVERSION=	1.04
@@ -24,7 +20,8 @@ RUN_DEPENDS:=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 		p5-Net-IP>=1.25:${PORTSDIR}/net-mgmt/p5-Net-IP
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::QueryDNSBL.3
 
diff --git a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
index 519b6677af5d..d71ef473b347 100644
--- a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
+++ b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Component-IRC-Plugin-RSS-Headlines
-# Date created:	   20.06.2008
-# Whom:		   Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-IRC-Plugin-RSS-Headlines
 PORTVERSION=	1.08
@@ -27,7 +23,8 @@ RUN_DEPENDS:=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE \
 		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Component::IRC::Plugin::RSS::Headlines.3
 
diff --git a/irc/p5-POE-Component-Server-IRC/Makefile b/irc/p5-POE-Component-Server-IRC/Makefile
index 03591d8691e9..fde766d2c16b 100644
--- a/irc/p5-POE-Component-Server-IRC/Makefile
+++ b/irc/p5-POE-Component-Server-IRC/Makefile
@@ -27,7 +27,8 @@ RUN_DEPENDS=	p5-Crypt-PasswdMD5>=1.3:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		p5-POE-Filter-Zlib>0:${PORTSDIR}/archivers/p5-POE-Filter-Zlib
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		pmkpasswd.1
 MAN3=		POE::Component::Server::IRC.3 \
diff --git a/irc/p5-POE-Filter-IRCD/Makefile b/irc/p5-POE-Filter-IRCD/Makefile
index 08684767d8c0..b030ad2cf26a 100644
--- a/irc/p5-POE-Filter-IRCD/Makefile
+++ b/irc/p5-POE-Filter-IRCD/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Filter-IRCD
-# Date created:		6 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Filter-IRCD
 PORTVERSION=	2.42
@@ -17,7 +13,8 @@ COMMENT=	A POE-based parser for the IRC protocol
 BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 MAN3=		POE::Filter::IRCD.3
 
 .include <bsd.port.mk>
diff --git a/irc/p5-POE-Session-Irssi/Makefile b/irc/p5-POE-Session-Irssi/Makefile
index 79a76fc8eeaf..dea9a2e882c1 100644
--- a/irc/p5-POE-Session-Irssi/Makefile
+++ b/irc/p5-POE-Session-Irssi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Session-Irssi
-# Date created:	   Jul 29 2010
-# Whom:		   Jase Thew <freebsd@beardz.net>
-#
+# Created by: Jase Thew <freebsd@beardz.net>
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Session-Irssi
 PORTVERSION=	0.50
@@ -26,7 +22,8 @@ RUN_DEPENDS=	p5-POE>=1.003:${PORTSDIR}/devel/p5-POE \
 		irssi:${PORTSDIR}/irc/irssi
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		POE::Session::Irssi.3
 
diff --git a/irc/tircd/Makefile b/irc/tircd/Makefile
index 4f68518b5f43..705f4a4edb67 100644
--- a/irc/tircd/Makefile
+++ b/irc/tircd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tircd
-# Date created:		6th March 2010
-# Whom:			Gavin Atkinson <gavin@FreeBSD.org>
-#
+# Created by: Gavin Atkinson <gavin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tircd
 PORTVERSION=	0.10
@@ -24,7 +20,7 @@ RUN_DEPENDS=	p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
 		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 		p5-POE-Filter-IRCD>=0:${PORTSDIR}/irc/p5-POE-Filter-IRCD
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 MAN1=		tircd.1