- Convert gmake,bzip2 to USES

Approved by:	portmgr

22 files changed, 22 insertions, 26 deletions

diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 3849f92..77fd340 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
 		gc-redirect.1:${PORTSDIR}/devel/boehm-gc-redirect
 BUILD_DEPENDS=	${LOCALBASE}/bin/libtool:${PORTSDIR}/devel/libtool
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 ALL_TARGET=	full optional
 MAN1=		sabrowse.1 sacomp.1
 
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index 9420359..a12a699 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -15,7 +15,7 @@ ATS_CTRBEXAMPLEDIR=	${PREFIX}/share/examples/${ATS_CTRBPREFIX}${PORTNAME}
 FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/lang/ats:patch
 BUILD_DEPENDS+=	${LOCALBASE}/bin/atscc:${PORTSDIR}/lang/ats
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV+=	ATSHOME=${ATS_LIBDIR} ATSHOMERELOC=ATS-${ATS_VER}
 MAKE_ARGS+=	-C contrib/${ATS_CTRB}
 
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index 9b2709c..4b05a95 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	${PREFIX}/lib/cint
 ALL_TARGET=
 MAN1=		cint.1 makecint.1
diff --git a/lang/elan/Makefile b/lang/elan/Makefile
index 99954b6..ec1f545 100644
--- a/lang/elan/Makefile
+++ b/lang/elan/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 MAN1=		elancc.1
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 670f8ba..1de6785 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 567713c..b5d0e1c 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -16,7 +16,7 @@ LICENSE=	APACHE20
 
 MAN1=		gsi.1
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS =--enable-single-host --enable-gcc-opts
 CONFIGURE_ARGS+=--prefix=${PREFIX} --docdir=${PREFIX}/share/doc/gambit-c
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index cb1d472..bd77226 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -14,7 +14,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GCC=	any
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}"
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 8f7b5f6..7cb36db 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -22,8 +22,7 @@ NOT_FOR_ARCHS_REASON=	does not compile on sparc64: assertion failed
 
 PORTDOCS=	*.txt *.hbd NEWS INSTALL TODO COPYING ChangeLog
 
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake
 USE_OPENSSL=	yes
 USE_LDCONFIG=	${LOCALBASE}/lib/harbour
 
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 1db7f51..c39e532 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -17,8 +17,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 #OPTIONS=	HUGS_OPENGL "OpenGL/GLUT support" off
 HUGS_DATE=	Sep2006
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake
 GNU_CONFIGURE=	yes
 #CONFIGURE_ARGS+=	--prefix=${PREFIX} --enable-ffi
 #CONFIGURE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/lang/mixal/Makefile b/lang/mixal/Makefile
index 04bed14..df49cf2 100644
--- a/lang/mixal/Makefile
+++ b/lang/mixal/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.catb.org/~esr/mixal/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assembler and interpreter for Donald Knuth's mythical MIX computer
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 ALL_TARGET=	${PORTNAME}
 
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index b88b74e..6a7a32f 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS_REASON=	uses assembly code for the target machine
 CONFLICTS=	mpd-[^1]*
 NO_LATEST_LINK=	yes
 
-USE_GMAKE=	yes
+USES=		gmake
 
 OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=	X11
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index b593df5..37f073c 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GMAKE=	yes
+USES=		gmake
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX} --buildwith=gcc
 
diff --git a/lang/nml/Makefile b/lang/nml/Makefile
index 4eecffa..cd5c139 100644
--- a/lang/nml/Makefile
+++ b/lang/nml/Makefile
@@ -19,7 +19,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		-prefix ${PREFIX}
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	all opt opt.opt
 INSTALL_TARGET=	install installopt
 
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index d094504..45661e5 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD
 CONFLICTS=	scsh-[0-9]*
 
 ALL_TARGET=	enough
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 MAN1=		scheme48.1
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index 06a47d4..055784c 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -24,7 +24,7 @@ BROKEN=		fails to install on ${ARCH}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lib-dirs-list='("${PREFIX}/lib/scsh/0.6")'
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	enough
 MAN1=		scsh.1
 STRIP=		#empty
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index fbbe784..ba9dc57 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	joemann@beefree.free.de
 COMMENT=	Popular functional language from Bell Labs
 
 NO_WRKSUBDIR=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 90b684b..0bbf6db 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -26,7 +26,7 @@ BROKEN=		Fails to build
 
 DIST_SUBDIR=	sml-nj/${PORTVERSION}
 NO_WRKSUBDIR=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index 92addbb..c2b9e70 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -21,7 +21,7 @@ MAKE_ARGS+=	JS_THREADSAFE=YES \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 
-USE_GMAKE=	YES
+USES=		gmake
 MAKEFILE=	Makefile.ref
 ALL_TARGET=	${OPSYS}`${UNAME} -r`_DBG.OBJ/js
 MAKE_ENV+=	CCC="${CXX}"
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 1f4af34..9c34470 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://shakespearelang.sourceforge.net/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Shakespeare programming language
 
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake
 
 ALL_EXAMPLES=	Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
 		primes.spl reverse.spl shakesbeer.spl
diff --git a/lang/stklos/Makefile b/lang/stklos/Makefile
index f4cd33b..01b7afe 100644
--- a/lang/stklos/Makefile
+++ b/lang/stklos/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_GMAKE=	yes
+USES=		gmake
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile
index 7972274..14f9276 100644
--- a/lang/urweb/Makefile
+++ b/lang/urweb/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	mlton:${PORTSDIR}/lang/mlton
 CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"
 
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
diff --git a/lang/xds/Makefile b/lang/xds/Makefile
index dc16579..376ed98 100644
--- a/lang/xds/Makefile
+++ b/lang/xds/Makefile
@@ -16,7 +16,7 @@ RESTRICTED=	Excelsior forbids any redistribution
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses assembly code
 USE_LINUX=	yes
-USE_GMAKE=	yes
+USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/lib/x86