11 files changed, 32 insertions, 61 deletions

diff --git a/net-im/p5-AnyEvent-XMPP/Makefile b/net-im/p5-AnyEvent-XMPP/Makefile
index 50bf39ec16c0..bf3e95c56711 100644
--- a/net-im/p5-AnyEvent-XMPP/Makefile
+++ b/net-im/p5-AnyEvent-XMPP/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
 		p5-Object-Event>=0.7:${PORTSDIR}/devel/p5-Object-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	AnyEvent::XMPP.3 \
 	AnyEvent::XMPP::Connection.3 \
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 8d13e3199643..51ab9ea82b0a 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	DJabberd
-# Date created:	   28 February 2007
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	DJabberd
 PORTVERSION=	0.85
@@ -27,7 +23,8 @@ BUILD_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	DJabberd.3\
 	DJabberd::Agent.3\
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index fd1a29e6a256..69f60498b1c3 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Jabber-SimpleSend
-# Date created:		2006-08-19
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Jabber-SimpleSend
 PORTVERSION=	0.03
@@ -18,7 +14,8 @@ RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-Net-Jabber>=0:${PORTSDIR}/net-im/p5-Net-Jabber
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Jabber::SimpleSend.3
 
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 80eea7d5dc7e..85496e5e0727 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net::AOLIM
-# Date created:			31 Dec 2001
-# Whom:				Seamus Venasse <svenasse@polaris.ca>
-#
+# Created by: Seamus Venasse <svenasse@polaris.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-AOLIM
 PORTVERSION=	1.61
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl OO interface to the AOL Instant Messenger TOC client protocol
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN3=		Net::AOLIM.3
diff --git a/net-im/p5-Net-Async-XMPP/Makefile b/net-im/p5-Net-Async-XMPP/Makefile
index bb6be2302d6d..76cf3c21b410 100644
--- a/net-im/p5-Net-Async-XMPP/Makefile
+++ b/net-im/p5-Net-Async-XMPP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-Async-XMPP
-# Date created:		2011-03-07
-# Whom:			<ports@c0decafe.net>
-#
+# Created by: <ports@c0decafe.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-Async-XMPP
 PORTVERSION=	0.002
@@ -20,7 +16,8 @@ RUN_DEPENDS=	p5-IO-Async>=0.37:${PORTSDIR}/devel/p5-IO-Async \
 		p5-IO-Async-SSL>=0.04:${PORTSDIR}/security/p5-IO-Async-SSL \
 		p5-Protocol-XMPP>=0.002:${PORTSDIR}/net-im/p5-Protocol-XMPP
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::Async::XMPP.3 \
 		Net::Async::XMPP::Client.3 \
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 30925a55e37f..12938e2e195f 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-Jabber
-# Date created:				28 Augest 2000
-# Whom:	      				Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
-#
+# Created by: Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-Jabber
 PORTVERSION=	2.0
@@ -18,7 +14,8 @@ COMMENT=	Net::Jabber provides Perl Developer access to the Jabber protocol
 BUILD_DEPENDS=	p5-Net-XMPP>=0:${PORTSDIR}/net-im/p5-Net-XMPP
 RUN_DEPENDS=	p5-Net-XMPP>=0:${PORTSDIR}/net-im/p5-Net-XMPP
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \
 		Net::Jabber::Data.3 Net::Jabber::Debug.3 \
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 7d3eb1f373c6..49ce0981367d 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-OSCAR
-# Date created:				26 Sep 2004
-# Whom:					Kelly Cochran <kcochran@trolans.net>
-#
+# Created by: Kelly Cochran <kcochran@trolans.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-OSCAR
 PORTVERSION=	1.928
@@ -18,7 +14,8 @@ BUILD_DEPENDS=	p5-SOCKS>=0:${PORTSDIR}/net/p5-Socks \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Net::OSCAR.3 \
 	Net::OSCAR::Buddylist.3 \
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index 8a3235ad1852..5d94b694e20b 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net-Stomp
-# Date created:	   08 February 2007
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-Stomp
 PORTVERSION=	0.45
@@ -20,7 +16,8 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::Stomp.3 Net::Stomp::Frame.3
 
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index 8a482f28250d..4c7c36c950ce 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Net-XMPP
-# Date created:				2004-12-3
-# Whom:	      				Lars Eggert <lars.eggert@gmx.net>
-#
+# Created by: Lars Eggert <lars.eggert@gmx.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-XMPP
 PORTVERSION=	1.02.04
@@ -25,7 +21,8 @@ RUN_DEPENDS=	p5-Authen-SASL>=2.12:${PORTSDIR}/security/p5-Authen-SASL \
 TEST_DEPENDS=	p5-LWP-Online>=1.07:${PORTSDIR}/www/p5-LWP-Online \
 		p5-YAML-Tiny>=1.41:${PORTSDIR}/textproc/p5-YAML-Tiny
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::XMPP.3 \
 		Net::XMPP::Client.3 \
diff --git a/net-im/p5-POE-Component-Client-MSN/Makefile b/net-im/p5-POE-Component-Client-MSN/Makefile
index bac84f3348ba..fb7a5dd0361d 100644
--- a/net-im/p5-POE-Component-Client-MSN/Makefile
+++ b/net-im/p5-POE-Component-Client-MSN/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-POE-Component-Client-MSN
-# Date created:				2007/02/14
-# Whom:					chinsan
-#
+# Created by: chinsan
 # $FreeBSD$
-#
 
 PORTNAME=	POE-Component-Client-MSN
 PORTVERSION=	0.03
@@ -28,6 +24,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN3=		POE::Component::Client::MSN.3
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/net-im/p5-Protocol-XMPP/Makefile b/net-im/p5-Protocol-XMPP/Makefile
index 301c5c9038fe..f5e481d2fc81 100644
--- a/net-im/p5-Protocol-XMPP/Makefile
+++ b/net-im/p5-Protocol-XMPP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Protocol-XMPP
-# Date created:		2011-03-07
-# Whom:			<ports@c0decafe.net>
-#
+# Created by: <ports@c0decafe.net>
 # $FreeBSD$
-#
 
 PORTNAME=	Protocol-XMPP
 PORTVERSION=	0.005
@@ -19,7 +15,8 @@ COMMENT=	Protocol-level support for XMPP interaction
 RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
 		p5-XML-LibXML-SAX-ChunkParser>=0.00003:${PORTSDIR}/textproc/p5-XML-LibXML-SAX-ChunkParser
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Protocol::XMPP.3 \
 		Protocol::XMPP::Base.3 \