- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

13 files changed, 22 insertions, 24 deletions

diff --git a/irc/anope/Makefile b/irc/anope/Makefile
index 5983f05cd1fe..f1afe19ac936 100644
--- a/irc/anope/Makefile
+++ b/irc/anope/Makefile
@@ -9,14 +9,14 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/Anope%20${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A set of IRC services for IRC networks
 
-USE_GMAKE=	yes
+USES=		gmake perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" \
 		--includedir="${LOCALBASE}/include" \
 		--with-bindir=${PREFIX}/libexec/anope \
 		--with-datadir=${DATADIR} \
 		--with-rungroup=ircdru
-USE_PERL5_BUILD=	yes
 
 PORTDOCS=	BUGS COPYING DEFCON EVENTS \
 		FAQ INSTALL IRCD MODULES MYSQL \
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 922204d91720..ff76e74e2b59 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -12,9 +12,9 @@ MAINTAINER?=	dan.mashal@gmail.com
 COMMENT?=	Feature-rich scriptable IRC client
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C,-final$,,}
-USE_PERL5=	yes
+
+USES=		gmake perl5
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
index ba8ca2fd6ad7..cc2796d9e5b9 100644
--- a/irc/epic5/Makefile
+++ b/irc/epic5/Makefile
@@ -22,7 +22,6 @@ MAN1=		epic5.1
 USE_OPENSSL=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 USE_BZIP2=	yes
-WANT_PERL=	yes
 CFLAGS:=	${CFLAGS:C/-O2/-g -O/g}
 
 OPTIONS_DEFINE=	IPV6 TCL PERL SSL TERMCAP DOCS RUBY
@@ -48,7 +47,7 @@ CONFIGURE_ARGS+=	--without-tcl
 #  enable perl5 support (requires perl 5.6.1 or newer)
 #
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=	--with-perl
 .else
 CONFIGURE_ARGS+=	--without-perl
diff --git a/irc/inspircd12/Makefile b/irc/inspircd12/Makefile
index 3eea96424f83..1ad8b40eb64d 100644
--- a/irc/inspircd12/Makefile
+++ b/irc/inspircd12/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	inspircd-2.*
 
 LATEST_LINK=	inspircd12
 
-USES=		shebangfix
+USES=		shebangfix perl5
 USE_BZIP2=	yes
 USE_LDCONFIG=	${PREFIX}/lib/inspircd
 USE_RC_SUBR=	inspircd
@@ -40,7 +40,7 @@ SUB_LIST+=	\
 PLIST_SUB+=	INSPIRCD_GRP=${INSPIRCD_GRP}
 
 # Configure script is written in perl
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cc=${CXX} --config-dir=${ETCDIR}                   \
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index 717a1c87d5ea..cf5097a33476 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -99,7 +99,8 @@ PLIST_SUB+=		SERVICES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSHORTCUTS}
-USE_PERL5_BUILD=	yes
+USES+=			perl5
+USE_PERL5=		build
 PLIST_SUB+=		SHORTCUTS=""
 .else
 PLIST_SUB+=		SHORTCUTS="@comment "
diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index 7250bfe3b001..14934d384aa7 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://www.ircservices.za.net/download/ \
 MAINTAINER=	bu7cher@yandex.ru
 COMMENT=	A system of IRC services for IRC networks
 
-USE_PERL5_BUILD=yes
+USES=		gmake perl5
+USE_PERL5=	build
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_RC_SUBR=	ircservices
 
 DIST_SUBDIR=	${PORTNAME}
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index eb66863740d0..9e14055db1f9 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -16,9 +16,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20
 CONFLICTS=	irssi-0.8*
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GMAKE=	yes
-WANT_PERL=	yes
+USES=		pkgconfig gmake
 
 MAN1=		irssi.1
 
@@ -40,7 +38,7 @@ CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
 .else
diff --git a/irc/p5-POE-Component-IRC/Makefile b/irc/p5-POE-Component-IRC/Makefile
index fe012a7f0ed2..5d03743a3e60 100644
--- a/irc/p5-POE-Component-IRC/Makefile
+++ b/irc/p5-POE-Component-IRC/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 PORTEXAMPLES=	*
 
diff --git a/irc/p5-Parse-IRC/Makefile b/irc/p5-Parse-IRC/Makefile
index 48f468e7c75d..a11e9cc45268 100644
--- a/irc/p5-Parse-IRC/Makefile
+++ b/irc/p5-Parse-IRC/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Parser for the IRC protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Parse::IRC.3
 
diff --git a/irc/pisg/Makefile b/irc/pisg/Makefile
index 52e450439f02..ad49144c47c8 100644
--- a/irc/pisg/Makefile
+++ b/irc/pisg/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Perl IRC Statistics Generator
 
-USE_PERL5=	YES
+USES=		perl5
 NO_BUILD=	YES
 
 OPTIONS_DEFINE=	LOGCHARSET DOCS
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 6ed396050922..0c66b8aa92d4 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -21,12 +21,12 @@ LOGDIR?=	/var/log
 RUNDIR?=	/var/run
 DBDIR?=		/var/db/${PORTNAME}
 PERL?=		${LOCALBASE}/bin/perl
-USES=		pkgconfig
+USES=		pkgconfig perl5
 SUB_FILES=	pkg-message pkg-install
 PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
 
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 602ce6b929ee..8f777bcaf3db 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -20,7 +20,6 @@ USE_LDCONFIG=	yes
 USES=		cmake iconv
 CMAKE_ARGS+=	-DENABLE_GUILE=no
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-WANT_PERL=	yes
 
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		gcrypt:${PORTSDIR}/security/libgcrypt
@@ -102,7 +101,7 @@ CMAKE_ARGS+=	-DENABLE_GNUTLS=no
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 PLIST_SUB+=	PERL=""
 .else
 CMAKE_ARGS+=	-DENABLE_PERL=no
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 48b73b84aa24..f4895f72f7cf 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -18,7 +18,6 @@ USE_LDCONFIG=	yes
 USES=		cmake iconv
 CMAKE_ARGS+=	-DENABLE_GUILE=no
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-WANT_PERL=	yes
 
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		gcrypt:${PORTSDIR}/security/libgcrypt
@@ -91,7 +90,7 @@ CMAKE_ARGS+=	-DENABLE_GNUTLS=no
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 PLIST_SUB+=	PERL=""
 .else
 CMAKE_ARGS+=	-DENABLE_PERL=no