-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.

-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:	marcus and kwm
Pointyhat-exp:	a few times by pav
Tested by:	pgollucci, "Romain Tartière" <romain@blogreen.org>, and
		a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:	marcus
Approved by:	portmgr

68 files changed, 99 insertions, 68 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index e4f2e316447c..0dd629f88c5a 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -30,7 +30,7 @@ COUCH_USER?=	couchdb
 
 USE_RC_SUBR=	couchdb
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-erlang=${LOCALBASE}/lib/erlang/usr/include \
 		--localstatedir=/var \
diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index 3edd9e5ad53a..21ab54139429 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -10,7 +10,7 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_LDCONFIG=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 BDBVER=			${PORTVERSION:R}
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 72179c200d80..2ba73b0865e6 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Disk Based Hashtables
 
 CONFLICTS=	dbh-[2-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 2a5ee02adbb9..58a2d25f99c9 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -30,7 +30,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack \
 		ltasneededhack
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BDB=	41+
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index e6443e3fdfdf..205a8c7c6788 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -25,7 +25,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GCC=	3.4
 
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 0af8efcc91a4..7e03ccabda91 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -23,7 +23,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 MAKE_JOBS_UNSAFE=	yes
diff --git a/databases/firebird20-server/files/patch-libtool22 b/databases/firebird20-server/files/patch-libtool22
new file mode 100644
index 000000000000..47c94dafb599
--- /dev/null
+++ b/databases/firebird20-server/files/patch-libtool22
@@ -0,0 +1,11 @@
+--- autogen.sh.orig	2009-07-11 20:59:22.000000000 -0500
++++ autogen.sh	2009-07-11 20:59:32.000000000 -0500
+@@ -73,7 +73,7 @@
+  rm -f aclocal.m4
+  cp $LIBTOOL_M4 aclocal.m4
+ fi
+-$LIBTOOLIZE --copy --force || exit 1
++$LIBTOOLIZE --copy --force --install || exit 1
+ 
+ echo "Running autoheader ..."
+ $AUTOHEADER || exit 1
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index b2c61154fec6..4c18b7879955 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -23,7 +23,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262:env libtool:15
+USE_AUTOTOOLS=	autoconf:262:env libtool:22
 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 23105ed255f0..bd982cab47de 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -20,7 +20,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262:env libtool:15
+USE_AUTOTOOLS=	autoconf:262:env libtool:22
 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 06dafc4691ce..8cf202ba7a58 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Editor/browser for BibTeX bibliographic databases
 USE_GNOME=	gnomelibs
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 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 f919f6040fdd..a712d9ef3612 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	The GNU database manager
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/gdbm/files/patch-libtool22 b/databases/gdbm/files/patch-libtool22
new file mode 100644
index 000000000000..5f6d58758f08
--- /dev/null
+++ b/databases/gdbm/files/patch-libtool22
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2009-06-29 13:15:23.000000000 -0500
++++ Makefile.in	2009-06-29 13:16:42.000000000 -0500
+@@ -130,7 +130,7 @@
+ 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
+ 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
+ 		$(INSTALL_ROOT)$(infodir)
+-	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
++	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
+ 		$(INSTALL_ROOT)$(includedir)/gdbm.h
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
+@@ -141,7 +141,7 @@
+ install-compat:
+ 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
+ 		$(INSTALL_ROOT)$(includedir)
+-	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
++	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
+ 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
+ 		$(INSTALL_ROOT)$(includedir)/dbm.h
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 6d3a5e9d964f..bac4e330452e 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 76a16adaaac0..bd34f16dc059 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 58b2d6ac0346..c19be63e372b 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
 		--with-python-incdir=${PYTHON_INCLUDEDIR} \
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index a1273068a300..ea8a882e7ff7 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -16,7 +16,7 @@ COMMENT=	BibTeX editor for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		kbibtex.1
 
diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile
index 73cae4275813..49ee31255048 100644
--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=		kexicore:${PORTSDIR}/editors/koffice-kde3
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 
 .include <bsd.port.mk>
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 502d500d8ccd..42ee88b7feda 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical frontend for administration of mysql servers
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 5e0177aef58e..e2677b32a836 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_PYTHON=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 CONFIGURE_ARGS+=	--with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \
 		--with-hk_classes-incdir=${LOCALBASE}/include/hk_classes
diff --git a/databases/kpogre/Makefile b/databases/kpogre/Makefile
index 22620965c12e..fb921feebe68 100644
--- a/databases/kpogre/Makefile
+++ b/databases/kpogre/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpq
 RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
 
 USE_KDELIBS_VER=	3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PGSQL=	yes
diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile
index 21e2b6d8eb3f..0ad880a14205 100644
--- a/databases/ksqlanalyzer/Makefile
+++ b/databases/ksqlanalyzer/Makefile
@@ -16,7 +16,7 @@ COMMENT=	MSSQL database client for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile
index fadc765f68b6..1b24b1889c0a 100644
--- a/databases/ksqlshell/Makefile
+++ b/databases/ksqlshell/Makefile
@@ -16,7 +16,7 @@ COMMENT=	MySQL and PostgreSQL client for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_MYSQL=	yes
 USE_PGSQL=	yes
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 40198650b70a..b4285be86b46 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 274fa7936d02..974f34de1e15 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 929540f6081b..545a4f8d10ca 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 2e1fbf4b3c3c..a4a27d760812 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -25,7 +25,7 @@ LIBGDA3_SLAVE?=	no
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index ceb6941e0e17..52ad9ed52db5 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index c3ddbf85c478..04ec0e84c7d0 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -19,7 +19,7 @@ COMMENT=	C++ wrapper for libgda4 library
 LIB_DEPENDS=	glibmm-2.4:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgda4
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 56de5cf5f71b..6e7145f9d368 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
 		intlhack referencehack
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 0d657d7d8e19..d77941a58200 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	unixODBC-[0-9]*
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR}
 USE_LDCONFIG=	yes
diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 813081614092..c0779a93b2f9 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The C library for accessing a memcache cluster
 
 USE_BZIP2=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index d4a81aeb7161..d5c274bc2569 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-isqlxx
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index cdf071777f7f..cac05114429c 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -19,7 +19,7 @@ OPTIONS=	MYSQL "Add MySQL support" on \
 
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/databases/ludia/Makefile b/databases/ludia/Makefile
index 1d2fae272f96..9593b42499e3 100644
--- a/databases/ludia/Makefile
+++ b/databases/ludia/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \
 		senna-cfg:${PORTSDIR}/textproc/senna
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PGSQL=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index bb8b19ce71eb..ac96f0658ad6 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 # To build man-pages
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 USE_GNOME=	glib20
 WANT_GNOME=	yes
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 658ffa45bc5f..d043f4c39acc 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -23,7 +23,7 @@ NOT_FOR_ARCHS_REASON_sparc64=	Fails to compile
 
 USE_MYSQL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 USE_LDCONFIG=	yes
 
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 5b5e145f9e93..f6480ce4479f 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
 USE_MYSQL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} \
 		--includedir=${PREFIX}/include/mysql++ \
 		--disable-examples
diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile
index ebdf0808b0aa..1cbefe279468 100644
--- a/databases/mysql++3/Makefile
+++ b/databases/mysql++3/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	dudu@dudu.ro
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
 USE_MYSQL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 8d66f8f52217..4d2470f23508 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mysql-connector-odbc
 PORTVERSION=	3.51.26
 DISTVERSIONSUFFIX=	r1127
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-ODBC/3.51
@@ -21,7 +21,7 @@ USE_MYSQL=		yes
 IGNORE_WITH_MYSQL=	323
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 USE_LDCONFIG=	yes
 CFLAGS+=		-L${LOCALBASE}/lib
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile
index c11d6c7ef4e0..174cf5e1f63f 100644
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
 OPTIONS=	QUERY_BROWSER	"Build the MySQL Query Browser"	on \
 		ADMINISTRATOR	"Build the MySQL Administrator"	on
 
-USE_AUTOTOOLS=	autoconf:262 libtool:15 automake:110
+USE_AUTOTOOLS=	autoconf:262 libtool:22 automake:110
 USE_GNOME=	gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
 USE_GL=		gl glut
 USE_GMAKE=	yes
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 966fc44df514..d716576267b4 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -21,7 +21,7 @@ USE_MYSQL=	yes
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
 MAKE_ENV+=	MOC="${MOC}" QTDIR="${QT_PREFIX}"
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index f8dbd256ef31..d140feb00cfd 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/databases/mysql${MYSQL_VER}-server:bui
 RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 WANT_MYSQL_VER?=	51
 
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 024f97a25aa0..c1f4e2920ebf 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	PYTHON	"Enable Python scripting and modules" off
 
-USE_AUTOTOOLS=	autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:15:env
+USE_AUTOTOOLS=	autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:22
 AUTOMAKE_ARGS=	--add-missing --foreign
 ACLOCAL_ARGS=
 AUTOCONF_ARGS=
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index b78afab92c71..cb7bb32aa5df 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--with-iodbc
 CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 1a08458e272d..29b6b0946ee5 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index c052f60c0c0d..b53a2b34fb32 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index e33db162f7ef..c14854c69861 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index a61073e86068..f47a3a6602db 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/mysql51-client databases/mysql51-scripts
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 1666d8b69b84..4f98f7ce5712 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql60-client databases/mysql60-scripts
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 312d9837286b..856995029c9e 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=mysqlcppapi
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fork of mysql++ C++ API for MySQL
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 42e5d4ccd987..bd961631ebd2 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -22,7 +22,7 @@ PM_BASE=	${SITE_PERL}
 USE_PERL5=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE}
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 62d27b26c91d..9581ab0c3370 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -16,10 +16,10 @@ MAINTAINER=	tremere@cainites.net
 COMMENT=	A C library for accessing databases with a single API
 
 USE_GMAKE=	YES
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L../lib -L${LOCALBASE}/lib
+LDFLAGS+=	${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-backends="${CONFIGURE_MODULES}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index c06657821d69..3ae0e41e486a 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}" \
 		LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\
 		AUTOHEADER=true
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index dadf6b16dda2..d2a7330a76e0 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	postgresql
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	An easy-to-use C interface to PostgreSQL
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PGSQL=	YES
 USE_GMAKE=	YES
 USE_LDCONFIG=	YES
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index efd3fd829793..d74d10db121a 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	pure-db-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of libraries for creating and reading constant databases
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 60bf7551b178..de16808eb8fe 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C library to read various Paradox files
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 07874e2ea9a7..e2a9fffc39cc 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 
 CONFLICTS=	rrdtool-1.0*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 8b1f80de5607..a08a79657ed3 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV=	PERL=${PERL}
 CONFLICTS=	rrdtool-1.2*
 LATEST_LINK=	rrdtool10
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
 		--program-transform-name=''
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index bc350ef86d97..62a224b1b492 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK=	${PORTNAME}12
 
 CONFLICTS=	rrdtool-1.0* rrdtool-1.3*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 9527269e4999..d9c0d629c0c8 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An SQL database engine in a C library
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	YES
 
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 21953cc99fb0..3d2d424e5d3a 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	sqlite34-[0-9]*
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--prefix=${PREFIX}
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index 9b3d98a19dd9..3ccb41282dc3 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	sqlite3-[0-9]*
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_DOS2UNIX=	*.pc.in
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 6ba6381b2561..21a4fbd9fa5f 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A persistent DB connection pooling/proxying/load balancing system
 LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
 
 USE_GMAKE=		yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
 			CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 3e476cef29f7..cb67f3d878d7 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -24,7 +24,7 @@ ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
 
 ONLY_FOR_ARCHS=	i386
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:22
 USE_QT_VER=	4
 QT_COMPONENTS=	gui corelib sql xml network linguist moc_build uic_build rcc_build
 USE_GMAKE=	yes
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 802feffad4ab..c08803dc7011 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	libiodbc-[0-9]*
 
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index b9579fefe160..aba72ce77f04 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Universal SQL/Application Server
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-readline\
 		--with-iodbc=${LOCALBASE}\
 		--enable-bpel-vad\
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index 048d4a524f0a..0094c80543a9 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	lthack
 USE_LDCONFIG=	yes
 
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index f9a28b23b9f7..bb40d3e21026 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_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes