23 files changed, 23 insertions, 26 deletions

diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 1eec182ea1cf..6e92638e78d6 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -20,8 +20,7 @@ COMMENT=	The system Risa/Asir is a general computer algebra system
 LIB_DEPENDS=	pari-2.2:${PORTSDIR}/math/pari-devel
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	253
-USE_AUTOMAKE_VER=	15
+USE_AUTOTOOLS=	automake:15 autoconf:253
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari
 ASIR_SRC_VERSION= 20051010
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index bfaa60a3a669..2b2331990e82 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -25,7 +25,7 @@ MAKE_ARGS=	NOPORTDOCS=yes
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-cxx=gcc --disable-doxygen
 MAKE_ARGS+=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 22df3859a5c0..c6d40a010106 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -24,7 +24,7 @@ FFTW_SUFIX=
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-shared
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 95e15daae232..fa18c0a9a18b 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -22,7 +22,7 @@ FFTW3_FLAVOR?=	default
 FFTW3_SUFX=
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index eb3f03008a40..e77de7aa571d 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	glut.3:${PORTSDIR}/graphics/libglut
 USE_KDELIBS_VER=	3
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 75747b641494..58504545ec74 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Visualise multiple 2D-functions of one variable
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 AUTOMAKE_ARGS=	-a -i
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 0dc547385d3e..ce45cbb1fce3 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	gmp-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A free library for arbitrary precision arithmetic
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx
 INSTALLS_SHLIB=	yes
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 8d57b9337444..2f80faea3484 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 USE_FREETYPE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--includedir=${LOCALBASE}/include/ \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 880eaaf77388..6f96c06ce9f4 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
 PATCH_SITES=		http://www.bmsc.washington.edu/people/merritt/gnuplot/
 PATCHFILES=		datastrings_4.0.patch histograms_4.0.patch
 PATCH_DIST_STRIP=	-p1
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=		autoconf:259
 CONFIGURE_ARGS+=	--enable-datastrings \
 			--enable-histograms
 PLIST_SUB+=		HISTOGRAMS=""
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 1a66f341440b..da0f04a4a3fc 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	jon.drews@gmail.com
 COMMENT=	The GNU Scientific Library - mathematical libs
 
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	MAKEINFO='makeinfo --no-split'
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 82fa56ede456..958c3fe6e1e4 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -17,7 +17,7 @@ COMMENT=	KDEGUI for octave
 RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
 USE_BZIP2=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index 0dc547385d3e..ce45cbb1fce3 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	gmp-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A free library for arbitrary precision arithmetic
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx
 INSTALLS_SHLIB=	yes
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index 5342bade1b33..aa184ebb9ce0 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	C++ Library for Symbolic and Numeric Calculus Applications
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index b908b9dc5b71..3431157d61d6 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ieee.uow.edu.au/documents/contrib/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ implementation of the classic 3-layer perceptron in library form
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index f09385f03c36..da143ba45955 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	cln.4:${PORTSDIR}/math/cln
 USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	intlhack lthack pkgconfig gnomehack glib20 libxml2
 INSTALLS_SHLIB=	yes
 
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 4b6b7c43a5b9..e35c8284675d 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:14 autoconf:253
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-posix-shell=${LOCALBASE}/bin/bash \
 			--with-wish=${LOCALBASE}/bin/wish8.4 \
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index afbd31e8d326..1109611e0c5b 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A library for multiple-precision floating-point computations
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} \
 		--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 38a56dbb4f20..1d3544032212 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -18,7 +18,7 @@ COMMENT=	The GNU spreadsheet for X11 and terminals
 USE_PERL5_BUILD=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--with-x --without-xlt --without-SciPlot
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index a8553747e38c..02043498b1ae 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
 		gd.4:${PORTSDIR}/graphics/gd \
 		qhull.5:${PORTSDIR}/math/qhull
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 62d3db1db5d2..fab97c1731d6 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 libgnome
 INSTALLS_OMF=	yes
 
diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index 412c21823b08..65e139a8a117 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index 412c21823b08..65e139a8a117 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/spar/Makefile b/math/spar/Makefile
index 2be020fabb59..00866bf3f899 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A modular math parser
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=	spar.1