18 files changed, 18 insertions, 21 deletions

diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index ccc145da1644..41855aa787e6 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -39,8 +39,7 @@ RUN_DEPENDS+=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 .else
 MAKE_ARGS+=	NO_GUI=yes
 .endif
-USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	autoconf:213 libtool:13
 .if defined(NO_AUTOKEY) && defined(PACKAGE_BUILDING)
 INGORE =	"cannot be build in batch mode whithout automated DES key generation"
 .endif
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 PATCH_STRIP=
 
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 PATCH_STRIP=
 
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 PATCH_STRIP=
 
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 PATCH_STRIP=
 
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index e5ff0092ae8f..8b391463a722 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
diff --git a/misc/edonkey-tool-hash/Makefile b/misc/edonkey-tool-hash/Makefile
index 42734de85a04..65e0bc642ad9 100644
--- a/misc/edonkey-tool-hash/Makefile
+++ b/misc/edonkey-tool-hash/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
 
 PLIST_FILES=	bin/edonkey-tool-hash
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/ed2k_hash-${PORTVERSION}
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index e3a591692f29..58334309f92b 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -20,7 +20,7 @@ RESTRICTED=	License forbids redistribution (source or binary)
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	lthack
 USE_GCC=	3.3	# Won't build with 3.4
 
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index 1c5775ce1b0b..0923d483081e 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -21,7 +21,7 @@ OPTIONS+=	DB4 "Support for DB4" off
 OPTIONS+=	PAM "Support for PAM (Experimental)" off
 OPTIONS+=	PGSQL "Support for PostgreSQL (Experimental)" off
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 1769ae525a04..bb486b60d23b 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -16,9 +16,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Modular Calendar Access Library
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:13
 HAS_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mstore --with-icap \
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 954c11a86170..9b8e0d33a046 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A GNOME application designed to manage cyclic tasks
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix gnometarget
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index ddce77995904..fa3b5cb55fac 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -18,7 +18,7 @@ COMMENT=	ISO-C & Perl API and CLI for generating Universally Unique Identifiers
 CONFLICTS=	e2fsprogs-[0-9]*
 
 USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--disable-shared --enable-static
 
diff --git a/misc/pointless/Makefile b/misc/pointless/Makefile
index b75bea2783b2..f4b31932f1c5 100644
--- a/misc/pointless/Makefile
+++ b/misc/pointless/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_GL=		yes
 USE_PYTHON=	yes
 
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --program-transform-name=""
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib/${PYTHON_VERSION}/config/
 
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 7bb83a0493d2..63b8429e8408 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
 USE_GNOME=	glib12 gnomehack gnomeprefix
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 3a0ba5b748d0..6e1a6609de0e 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -15,8 +15,7 @@ COMMENT=	A library required by smssend (same author)
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=	259
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	autoconf:259 libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 8baf2c5d459c..6f3b3698fded 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Set of filters to convert English text to various stereotyped dialects
 
 CONFLICTS=	jive* chef* filters-*
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index fb8a84330481..d98596420b13 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 027282e48287..028c8086466c 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}