23 files changed, 22 insertions, 37 deletions

diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index 92a7f1628a34..126c6ba581cf 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-
 RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_OCAML=	yes
 
 MAN1=	alt-ergo.1
diff --git a/math/ann/Makefile b/math/ann/Makefile
index 69653bd3d4bc..46ef24f8f956 100644
--- a/math/ann/Makefile
+++ b/math/ann/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A Library for Approximate Nearest Neighbor Searching
 
 WRKSRC=		${WRKDIR}/ann_1.1.2
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 NO_STAGE=	yes
 post-install:
diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile
index 4bd64681747f..54e187b956ec 100644
--- a/math/arpack++/Makefile
+++ b/math/arpack++/Makefile
@@ -37,7 +37,7 @@ LAPACK=		-llapack
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
-USE_GMAKE=	yes
+USES=		gmake
 
 DOCS=		README doc/arpackpp.ps.gz doc/bugs.txt doc/structure.txt
 
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 78bc65b5ff66..225cb05db992 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -19,9 +19,8 @@ INFO=		blitz
 MAKE_ARGS=	NOPORTDOCS=yes
 .endif
 
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=	pathfix gmake
 CONFIGURE_ARGS=	--with-cxx=gcc --disable-doxygen
 MAKE_ARGS+=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 664ad356718a..e48be9cf4834 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -13,10 +13,8 @@ COMMENT=	A Euclidean geometry drawing language
 LIB_DEPENDS=	readline.6:${PORTSDIR}/devel/readline
 RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit
 
-USE_BZIP2=	yes
 USE_TEX=	latex
-USES=		bison gettext iconv
-USE_GMAKE=	yes
+USES=		bison gettext iconv gmake tar:bzip2
 
 MAN1=		eukleides.1 euktoeps.1 euktopdf.1 euktopst.1 euktotex.1
 
diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index 595d57d24555..60c7c0b8d0da 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -18,10 +18,8 @@ BUILD_DEPENDS=	noweb:${PORTSDIR}/devel/noweb \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_BZIP2=	yes
 USE_XORG=	x11 ice sm xpm
-USES=		gettext iconv
-USE_GMAKE=	yes
+USES=		gettext iconv gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lisp=sbcl
 USE_LDCONFIG=	${PREFIX}/lib/fricas/target/${CONFIGURE_TARGET}/lib
diff --git a/math/fxt/Makefile b/math/fxt/Makefile
index 2ce9cd9adac8..84c568c46bb9 100644
--- a/math/fxt/Makefile
+++ b/math/fxt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	FFT code and related stuff
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKEFILE=	makefile
 
 NO_STAGE=	yes
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index f84d7140a928..f0fab899a851 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -26,7 +26,6 @@ LAPACKVER=	3.4.0
 LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/GotoBLAS2
 
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 0a7dc0de9bc2..eb944a2339f6 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Provide an easy way to use existing grace-files as a template
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		BIN_PREFIX="${PREFIX}/bin" \
 		LIB_PREFIX="${PREFIX}/lib" \
diff --git a/math/gri/Makefile b/math/gri/Makefile
index a640b70b1961..56ec2a4202a5 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Extensible plotting language for producing scientific graphs
 
 LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 
-USES=		readline
-USE_GMAKE=	yes
+USES=		readline gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-FreeBSD
 
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index e2f374398940..9ebe95e41cd9 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	c99
-USE_GMAKE=	yes
+USES=		gmake
 
 CONFIGURE_ARGS	=	--enable-dynamic-build --enable-static-build
 
diff --git a/math/ltl/Makefile b/math/ltl/Makefile
index 82115882dcb8..b554417c32b1 100644
--- a/math/ltl/Makefile
+++ b/math/ltl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A C++ class SSE library for scientific computing
 LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack \
 		blas.2:${PORTSDIR}/math/blas
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-cxx=gcc --disable-doxygen --prefix=${PREFIX} --includedir=${PREFIX}/include/LTL
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index 51ab70b3214b..8fc927fc1dc5 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Fast factorization of big integers using MPQS and GNFS
 BUILD_DEPENDS=	${LOCALBASE}/lib/libecm.a:${PORTSDIR}/math/gmp-ecm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV=	ECM=1
 
 HEADERS=	mp.h msieve.h util.h
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index 45c831aa4449..c97b0681f698 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -13,12 +13,10 @@ COMMENT=	A computer algebra system
 BUILD_DEPENDS=	sbcl:${PORTSDIR}/lang/sbcl \
 		noweb:${PORTSDIR}/devel/noweb
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lisp=sbcl
-USE_GMAKE=	yes
 USE_XORG=	x11 ice sm xpm
-USES=		gettext iconv
+USES=		gettext iconv gmake tar:bzip2
 MAKE_JOBS_UNSAFE=yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index c6de2143f96c..bd0be2b09223 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/math/py-graphtool/Makefile b/math/py-graphtool/Makefile
index 8a45fe4fa129..7cb4b63972cb 100644
--- a/math/py-graphtool/Makefile
+++ b/math/py-graphtool/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
 		libboost_graph.so:${PORTSDIR}/devel/boost-libs \
 		libCGAL.so:${PORTSDIR}/math/cgal
 
-USE_BZIP2=	yes
 USE_GCC=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index a1971dd4306d..569fa4c7adfa 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		wget:${PORTSDIR}/ftp/wget
 
 USE_GNOME=	gnomehack gnomeprefix intlhack libglade2 libgnome
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index 9fbf01c146b5..d94fe506348a 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations, and halfspaces
 
 CONFLICTS=	qhull-2011* afni-[0-9]*
 
-USES=		libtool
-USE_GMAKE=	yes
+USES=		libtool gmake
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/math/reed-solomon/Makefile b/math/reed-solomon/Makefile
index 67c00524be3a..9e2f321554f5 100644
--- a/math/reed-solomon/Makefile
+++ b/math/reed-solomon/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	freebsduser@paradisegreen.co.uk
 COMMENT=	A Reed-Solomon CODEC library
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 MAKEFILE=	makefile
 
diff --git a/math/simd-viterbi/Makefile b/math/simd-viterbi/Makefile
index 7462fd74ca7d..4d18d4d0351b 100644
--- a/math/simd-viterbi/Makefile
+++ b/math/simd-viterbi/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	freebsduser@paradisegreen.co.uk
 COMMENT=	A fast Viterbi CODEC library
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 MAKEFILE=	makefile
 
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index 8b79df33b253..093995bbca45 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -16,10 +16,9 @@ RUN_DEPENDS=	pvm:${PORTSDIR}/net/pvm
 
 PVM_ROOT=	${PREFIX}/lib/pvm
 
-USE_GMAKE=	yes
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-USES=		gettext
+USES=		gettext gmake
 
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
 		PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
diff --git a/math/tomsfastmath/Makefile b/math/tomsfastmath/Makefile
index e08bfcfe422c..8f9f81f6a773 100644
--- a/math/tomsfastmath/Makefile
+++ b/math/tomsfastmath/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Portable fixed precision math library for fast exponentiations
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKEFILE=	makefile
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 ALL_TARGET=	default
 
 PLIST_FILES=	include/tfm.h lib/libtfm.a
diff --git a/math/unuran/Makefile b/math/unuran/Makefile
index 2c5867bcb8e6..0d7add9e4c57 100644
--- a/math/unuran/Makefile
+++ b/math/unuran/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Universal Non-Uniform RANdom number generators
 LIB_DEPENDS=	rngstreams:${PORTSDIR}/math/rngstreams
 
 LICENSE=	GPLv2
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-urng-rngstream --with-urng-default=rngstream \
 		--enable-info