6 files changed, 10 insertions, 13 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index 30afca34b5f2..c99d2aabf0be 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -23,7 +23,6 @@ USE_OPENSSL=	yes
 SUB_FILES=	pkg-message
 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
@@ -51,7 +50,7 @@ CONFIGURE_ARGS+=	--without-tcl
 # SITE_PERL and PERL_VERSION to create the path.
 #
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=	--with-perl=${SITE_PERL}/../../${PERL_VERSION}/mach/CORE
 .else
 CONFIGURE_ARGS+=	--without-perl
diff --git a/irc/hexchat/Makefile b/irc/hexchat/Makefile
index 1595222c298c..3c639515ca2a 100644
--- a/irc/hexchat/Makefile
+++ b/irc/hexchat/Makefile
@@ -14,13 +14,11 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	proxy:${PORTSDIR}/net/libproxy
 
 USE_XZ=		yes
-USES=		desktop-file-utils pathfix pkgconfig
+USES=		desktop-file-utils pathfix pkgconfig gmake
 USE_GNOME=	gtk20 libxml2
-WANT_PERL=	yes
 USE_AUTOTOOLS=	automake autoconf libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-gtkfe --disable-sysinfo
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 
 LDFLAGS+=	-pthread
@@ -111,7 +109,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .else
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 40caba04c9c6..0878bc7757c2 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -35,7 +35,8 @@ SUB_LIST+=	PORTNAME=${PORTNAME} \
 		GROUPS=${GROUPS}
 
 # Configure script is written in perl
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cc=${CXX} --config-dir=${ETCDIR} \
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 3216c9158946..bd5da0992a8b 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -15,11 +15,12 @@ LICENSE=	GPLv2
 
 CONFLICTS=	ircd-ratbox-[0-9]* charybdis-[0-9]*
 
+USES=		perl5
 USE_BZIP2=	yes
 #MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox
 USE_SQLITE=	3
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
 
 USERS=		ircd
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 0900e994d9e8..814db4e3c85f 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -13,11 +13,9 @@ LIB_DEPENDS=	glib-2:${PORTSDIR}/devel/glib20
 
 CONFLICTS=	irssi-devel-[0-9]* zh-irssi-[0-9]*
 
-USES=		pkgconfig ncurses
+USES=		pkgconfig ncurses gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-WANT_PERL=	yes
 
 MAN1=		irssi.1
 
@@ -40,7 +38,7 @@ USE_OPENSSL=	yes
 # Process options.
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
 .else
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 581413b83daf..72552e8c7ef0 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -72,7 +72,7 @@ PLIST_SUB+=	TCL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .else