Mass-conversion to the USE_AUTOTOOLS New World Order. The code present

in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.

Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.

Preliminary documentation can be found at:
	http://people.FreeBSD.org/~ade/autotools.txt

which is in the process of being SGMLized before introduction into the
Porters Handbook.

Light blue touch-paper.  Run.

72 files changed, 72 insertions, 81 deletions

diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 1e189ac6f3f5..c57fc86bea19 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index ff9be911fad1..192a62c74557 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -9,7 +9,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=		libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index ea3d5ac9aeaf..334b0cdf1e99 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Use C++ object API to allow applications to connect to databases
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index ffa3f99edcfa..e4a7bf12d4da 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index ffa3f99edcfa..e4a7bf12d4da 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index afa34caec560..d109defdac86 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://enlightenment.freedesktop.org/files/
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Enlightenment Database Library
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 0923e32d3abc..1d7c34b4cfb6 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -20,8 +20,7 @@ COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
 
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-WANT_LIBTOOL_VER=	15
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259:env libtool:15:env
 GNU_CONFIGURE=		yes
 USE_GCC=		3.4
 USE_REINPLACE=		yes
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_GCC=	3.4+
 
 LOCALSTATEDIR=	/var/db/firebird
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index f4553e73ed12..e0509c549861 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -19,8 +19,7 @@ USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_LIBTOOL_VER=	15
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259:env libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index f4553e73ed12..e0509c549861 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -19,8 +19,7 @@ USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_LIBTOOL_VER=	15
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259:env libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile
index d7b74b68f4c6..96f680e8259b 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index b150bab27b24..1a9f34a8f466 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	The GNU database manager
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 6b2f38735eef..6b676c055b5b 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Object-Relational Database Management System
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS?=--prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 385a1d093608..702120dc2f21 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 385a1d093608..702120dc2f21 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index 71e686b21324..1430643eb779 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -68,7 +68,7 @@ USE_GL=		yes
 USE_PERL5=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index d33f0ba13fec..568e559113a6 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -44,7 +44,7 @@ USE_GL=		yes
 USE_PERL5=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 9c28bc20c023..569c16bb3e75 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--with-pythondir=${PYTHONBASE}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
 
 OPTIONS=	MYSQL "Build MySQL driver" on \
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index a630f0d88d91..8e05b1007662 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=		yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index f485f44defb6..5fecc1034f5b 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Drivers for libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 53efc0234b6b..8bd55243b218 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
 
 USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 
 post-patch:
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 2d79d522a229..cf2a5793e599 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gconf bonobo
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS=	--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 6a1b9164115a..f784a5aa4a87 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -25,7 +25,7 @@ USE_GCC=	3.4
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack libgda2
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index a50c32483a82..78ebf5539a36 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C++ class library and toolset for ODBC access to data sources
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index e7e252f24ced..4d897be57e73 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk	# To build man-pages
 USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_GNOME=	glib20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 7e77ed607f08..2df7576f09f8 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_SCRIPT=	../unix/configure
 LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 INSTALLS_SHLIB=	yes
diff --git a/databases/mird/Makefile b/databases/mird/Makefile
index 7230262a6635..41cb0535be2f 100644
--- a/databases/mird/Makefile
+++ b/databases/mird/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A free database library with transaction support
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index efc9a8de3e63..58538d79840e 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	ODBC driver for MySQL
 
 USE_MYSQL=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--with-mysql-path=${LOCALBASE} --without-samples \
 			--disable-gui --enable-test=no
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index cd01417946f8..1e617481742b 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL
 
 USE_MYSQL=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
 CONFIGURE_ARGS+=	--disable-examples
 INSTALLS_SHLIB=	yes
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index cd01417946f8..1e617481742b 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL
 
 USE_MYSQL=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
 CONFIGURE_ARGS+=	--disable-examples
 INSTALLS_SHLIB=	yes
diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index f695311f8f01..0d3f050fc312 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -25,7 +25,7 @@ COMMENT=	Powerful visual administration console for MySQL environment
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259:env
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/share/gnome
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index efc9a8de3e63..58538d79840e 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	ODBC driver for MySQL
 
 USE_MYSQL=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--with-mysql-path=${LOCALBASE} --without-samples \
 			--disable-gui --enable-test=no
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index d771a83565b5..f58dbdade32f 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql323-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index e0958e28dd8a..3e2eeff35917 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql40-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 7d9cc4a28c56..dd9b709a63eb 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql41-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index f1cbfb9b6c52..1122af73e51d 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A fork of mysql++ C++ API for MySQL
 
 USE_MYSQL=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
 
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index 63ece10098ca..7c04203ecb76 100644
--- a/databases/pgcluster/Makefile
+++ b/databases/pgcluster/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 WRKSRC?=	${WRKDIR}/postgresql-${BASEPGSQL}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_REINPLACE=	yes
 MAKE_FLAGS=	# empty
 MAKEFILE=	# empty
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	A new C++ interface for PostgreSQL
 
 USE_PGSQL=	YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	A new C++ interface for PostgreSQL
 
 USE_PGSQL=	YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	A new C++ interface for PostgreSQL
 
 USE_PGSQL=	YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 1eb38d45f43b..f9830a2b63d8 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -108,7 +108,7 @@ USE_BISON=	yes
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index 2405f89d86e3..3ba9950435db 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	pure-db-${PORTVERSION}
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Set of libraries for creating and reading constant databases
 
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
 DOCS=		AUTHORS FORMAT_DESCR NEWS README
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index f223c213a236..7fe718f8c598 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	cgi.1:${PORTSDIR}/devel/cgilib \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_PERL5=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-perl-site-install --disable-python
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 79efec6da00c..5175b663b3a7 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -19,7 +19,7 @@ MAKE_ENV=	PERL=${PERL}
 CONFLICTS=	rrdtool-1.2*
 LATEST_LINK=	rrdtool10
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 27058e41d030..49850895a000 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -56,7 +56,7 @@ MAKE_ENV+=	TCL_VER=${TCL_V}
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index a39dc6d876a7..e3d88d36c600 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
 USE_GMAKE=		YES
 USE_GNOME=		pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 HAS_CONFIGURE=		YES
 USE_REINPLACE=		YES
 INSTALLS_SHLIB=		YES
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index a39dc6d876a7..e3d88d36c600 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
 USE_GMAKE=		YES
 USE_GNOME=		pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 HAS_CONFIGURE=		YES
 USE_REINPLACE=		YES
 INSTALLS_SHLIB=		YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index a7c50baa3fb7..9eb55364d607 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	rudiments.0:${PORTSDIR}/devel/rudiments
 
 USE_REINPLACE=		yes
 USE_GMAKE=		yes
-USE_AUTOCONF_VER=	259
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
 			CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 69ce79967648..08a70ec77b07 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -16,9 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Trivial Database
 
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
 INSTALLS_SHLIB=		yes
 
 MAN3=	tdb.3 tdb_chainlock.3 tdb_close.3 tdb_delete.3 tdb_error.3 \
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 22eb5a489afe..5521d0a15d55 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -17,7 +17,7 @@ CONFLICTS=	libiodbc-*
 
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 INSTALLS_SHLIB=	yes
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index ca67981a8b71..4ab5357ec96c 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	lthack
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index d4eef2874089..2a7357e8af45 100644
--- a/databases/xbsql/Makefile
+++ b/databases/xbsql/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An SQL wrapper for the XBase DBMS library
 LIB_DEPENDS=	xbase-2.0.0:${PORTSDIR}/databases/xbase
 
 USE_BISON=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes