Convert to new perl framework

Convert from USE_GMAKE to USES=gmake

19 files changed, 40 insertions, 58 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 05a73262959a..7d8395d88392 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	clang
-# Date created:		24 Oct 2009
-# Whom:			Brooks Davis
-#
+# Created by: Brooks Davis
 # $FreeBSD$
-#
 
 PORTNAME=	clang
 PORTVERSION=	3.4.r${SVN_REV}
@@ -37,10 +33,9 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
 GNU_CONFIGURE=	yes
+USES=		gmake perl5
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 USE_PYTHON=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index 505809f7c9c9..94cb2c0bb133 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -32,9 +32,8 @@ LATEST_LINK=	${PORTNAME}${LLVM_SUFFIX}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
-USE_GMAKE=	yes
+USES=		gmake perl5
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 USE_PYTHON_BUILD=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 4b1d24fa2d03..2e7d51fbfa61 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	ANSI Common Lisp implementation
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		gmake
-USE_PERL5_BUILD=yes
+USES=		gmake perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-system-gmp --with-gmp-prefix=${LOCALBASE} --enable-boehm=system
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index d297dc1f10a4..6c9583d943c0 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -53,6 +53,10 @@ OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE
 
 ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
 
+USES=		gmake perl5
+USE_CSTD=	gnu89
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -119,11 +123,6 @@ WX_UNICODE=	yes
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 .endif
 
-USE_GMAKE=	yes
-USE_CSTD=	gnu89
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 .if ${PORT_OPTIONS:MUNIXODBC}
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index d6ff7785c5c6..f8868d5a73b1 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -18,10 +18,9 @@ COMMENT=	GNU Compiler Collection 3.4
 
 SUFFIX=		34
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
-USES=		bison iconv
+USES=		bison gmake iconv perl5
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 2988edf33a83..44a6241f1a75 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -30,10 +30,10 @@ GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
-USES=		bison gmake iconv
+USES=		bison gmake iconv perl5
 USE_BINUTILS=	yes
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 3dc8903af2c7..fc48334432b0 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -29,10 +29,10 @@ GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		bison gmake iconv
+USES=		bison gmake iconv perl5
 USE_BINUTILS=	yes
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index b8df6b163288..83d35b6e06a0 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -29,10 +29,10 @@ GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv
+USES=		gmake iconv perl5
 USE_BINUTILS=	yes
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 8fb19fd27c24..58a5c058f1f4 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -26,9 +26,8 @@ USE_BZIP2=	yes
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 
 USE_AUTOTOOLS=		autoconf autoheader
-USE_PERL5_BUILD=	yes
-USE_GMAKE=		yes
-USES=			iconv ncurses
+USE_PERL5=		build
+USES=			gmake iconv perl5 ncurses
 USE_BINUTILS=		yes
 USE_GCC=		yes
 
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index 27822a77abcd..a545c31cac00 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -19,9 +19,8 @@ LICENSE=	GPLv3 LGPL3
 
 ONLY_FOR_ARCHS=		i386
 
-USE_GMAKE=		yes
-USES=			bison iconv
-USE_PERL5_BUILD=	yes
+USES=			bison gmake iconv perl5
+USE_PERL5=		build
 
 WRKSRC=			${WRKDIR}/build
 
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index dadcfa53ad9e..cc3c9a9a86ec 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -13,9 +13,9 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
     		bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
-USES=		bison pathfix gettext gmake
+USES=		bison gettext gmake pathfix perl5
 USE_GNOME=	glib20
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/lang/p5-TryCatch/Makefile b/lang/p5-TryCatch/Makefile
index 1cd22ce56edd..21049af910cc 100644
--- a/lang/p5-TryCatch/Makefile
+++ b/lang/p5-TryCatch/Makefile
@@ -30,7 +30,8 @@ OPTIONS_DEFINE=	AUTHOR
 
 AUTHOR_DESC=	Include dependencies for AUTHORING
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		TryCatch.3
 
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index a63769cdfae6..3889be35e1af 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    pfe-devel
-# Date created:         29 October 2000
-# Whom:                 patrick
-#
+# Created by: patrick
 # $FreeBSD$
-#
 
 PORTNAME=	pfe
 PORTVERSION=	0.33.71
@@ -14,9 +10,9 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Implementation of ANSI Forth
 
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USES=		gmake perl5
+USE_PERL5=	build
 USE_GCC=	4.2+
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	pfe/configure
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index cfa143a5afb1..ccf336011a33 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -83,12 +83,10 @@ CONFIGURE_ARGS+=	--without-debug \
 
 MAKE_ARGS=	CONFIGUREARGS="${CONFIGURE_ARGS}"
 
-USES=		bison gettext
-USE_GMAKE=	yes
+USES=		bison gettext gmake perl
 
 # Allow building Embedded Perl
 CONFIGURE_ARGS+=	--with-perl
-USE_PERL5=	YES
 
 PLIST_FILES=	bin/pike bin/pike76 bin/hilfe
 
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index a82e44c81b1b..e1b5957e789f 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -74,12 +74,10 @@ CONFIGURE_ARGS+=	--without-debug \
 MAKE_ARGS=	"CONFIGUREARGS=${CONFIGURE_ARGS}"
 MAKE_ENV=	"ac_cv_lib_nettle_nettle_md5_init=no"
 
-USES=		bison gettext
-USE_GMAKE=	yes
+USES=		bison gettext gmake perl5
 
 # Allow building Embedded Perl
 CONFIGURE_ARGS+=	--with-perl
-USE_PERL5=	YES
 
 PLIST_FILES=	bin/pike bin/pike78 bin/hilfe
 
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 02b09e9881cd..93a9e3bf3d24 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -21,8 +21,8 @@ RUST_TARGET=	x86_64-unknown-freebsd
 ONLY_FOR_ARCHS=	amd64
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USES=		gmake perl5
+USE_PERL5=	build
 USE_PYTHON_BUILD=	2.6-2.7
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/lang/see-devel/Makefile b/lang/see-devel/Makefile
index c281a916f77b..b795585a3c2f 100644
--- a/lang/see-devel/Makefile
+++ b/lang/see-devel/Makefile
@@ -19,9 +19,9 @@ SEE_DEBUG_DESC=	Internal SEE library debugging
 
 CONFLICTS=	see-[0-9]*
 
-USES=	pathfix
+USES=		pathfix perl5
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/lang/see/Makefile b/lang/see/Makefile
index b6b8519d4bb6..008c06eebfd8 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -22,13 +22,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMULTIPLE_THREADS}
 CFLAGS+=	-DMULTIPLE_THREADS
@@ -64,4 +65,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index 90ba32762627..bf99b7db5c8e 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -17,13 +17,11 @@ LIB_DEPENDS=		nspr4:${PORTSDIR}/devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
-#USES=			pkgconfig:build
+USES=			gmake pathfix pkgconfig
 USE_AUTOTOOLS=		autoconf213:env
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_GNOME=		gnomehack
 USE_LDCONFIG=		yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=		build
 USE_PYTHON_BUILD=	2.5-2.7
 
 WRKSRC=			${WRKDIR}/js-${PORTVERSION}/js/src