-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

69 files changed, 73 insertions, 75 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 9f011b1c2492..986c827544d8 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	aiksaurus
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A set of libraries and applications which provide a thesaurus
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget
 USE_LDCONFIG=	yes
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 9c8fea8f31a5..2cf35f54e290 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -18,7 +18,7 @@ COMMENT=	CLucene is a C++ port of Lucene
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index ef384bb3ecec..64406908c4c9 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free C OLE library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index ea5ea4fc9ce7..82c0e3dd2f46 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	dict
 INSTALL_TARGET=	install.dict
 MAN1=		dict.1 dictl.1
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index bc74ad85b28d..ae5d7e185a02 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
 INSTALL_TARGET=	install.dictfmt
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		dictfmt.1 dictfmt_index2suffix.1 dictfmt_index2word.1 \
 		dictunformat.1
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
index df4c0e7d91dd..ca6d120ecbb4 100644
--- a/textproc/ekhtml/Makefile
+++ b/textproc/ekhtml/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 03e7bacf943e..c753c5bc76e5 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
 CONFIGURE_ARGS=	--disable-hspell \
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index eccfafd2589e..ddc80acdac7f 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A port of Adobe XMP SDK to work on UNIX
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	ltverhack gnomehack gnometarget
 CONFIGURE_ARGS=	--enable-unittest=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 0aed3e36fd33..0ef7edc345a6 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Gnome DOM Engine
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index dd7f4d5355c0..38209615691d 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 intlhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 3627d20aca77..42b10146cb11 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimcf
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 2c944a4c97d9..21ce8f894686 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/CSConv
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 7e9282db1457..7b0ff60f0907 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 GCONF_SCHEMAS=	gnome-im-properties.schemas gnome-im-switcher.schemas
 
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index a63c9136ffe0..6c308523791f 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -26,7 +26,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gtk20
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimgcf
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 12656f594408..3509ae905cd5 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_XORG=	x11
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index c20aaa1d2289..5b6480b508be 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimp
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 52076de9ff9a..aa08cf286ae6 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimsf
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index aa58fdb9414f..d9b1da2a0325 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index b27e25b05e5f..5c0685edb1de 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 ice xt
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index ab00afba157c..f768c4da5668 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -16,7 +16,7 @@ COMMENT=	XML parser library mainly designed for Jabber applications
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 6ec7fefb93bb..8ba3135253a1 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 CONFLICTS=	sp-1.*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 0e0db29210d4..8ae97e953d03 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An English-Bulgarian-English dictionary
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=	--with-kde
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 USE_KDELIBS_VER=	3
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 8bdef76846da..42893e88892f 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A KDE3 graphical frontend for diff
 
 USE_KDEBASE_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	${PREFIX}/lib/kde3
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 850a8b60b82d..849a61d9385f 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -15,7 +15,7 @@ COMMENT=	CSS2 parsing library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack
 
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 3f5af8e655c6..a1e417554f89 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.20b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mpeg2:${PORTSDIR}/multimedia/libmpeg2
 
 USE_GNOME=	glib20
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:22
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 40e8a770d020..2c65bd5b6257 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	lingoteach
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
 GNU_CONFIGURE=	yes
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 0a865779df6f..90bbf5105fb4 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Library for manipulating RDF files describing LADSPA plugins
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 8233c53cb992..d33b0751f9aa 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.saunalahti.fi/~samiuus/toni/xmlproc/
 MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/libstree/Makefile b/textproc/libstree/Makefile
index 4953ca3598c9..7d9fa0b38c3a 100644
--- a/textproc/libstree/Makefile
+++ b/textproc/libstree/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.icir.org/christian/downloads/
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Generic Suffix Tree Library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile
index 8d1eb1f40b34..4dedafb7e306 100644
--- a/textproc/libtextcat/Makefile
+++ b/textproc/libtextcat/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	http://software.wise-guys.nl/download/
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Language guessing by N-Gram-Based Text Categorization
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 5746786265d4..1ad52fc8b129 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A lightweight fully POSIX compliant regexp matching library
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 USE_LDCONFIG=	yes
diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index 64a238ea857f..6648d7ab1432 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	both
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 5e2fd4edba28..f3bdead3ebf1 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Microsoft file word processor format import filter library
 
 LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomeprefix gnomehack ltverhack
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile
index 68e8c2d36ce8..f8490acf9ecb 100644
--- a/textproc/libxdiff/Makefile
+++ b/textproc/libxdiff/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Create file differences/patches to both binary and text files
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 1477aae94c7d..655e5f364eee 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 1c38aa19f851..5f53cdb21dd8 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	XML parser library for GNOME
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 8db806945653..44b353d6f835 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 4ff2fe8651cc..7f8744d5ede9 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A grammar checking library
 
 USE_GNOME=	gnomehack gnometarget ltverhack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-pthreads \
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index cca51d25ad48..8a3365142a79 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	m17n.3:${PORTSDIR}/devel/m17n-lib
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk20 intltool intlhack pkgconfig glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index bdbba8f3b39d..7f0645ccc71f 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -16,7 +16,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 USE_GNOME=	gnomehack gnometarget
 USE_BISON=	build
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-unac
 USE_LDCONFIG=	yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index ffc32cd53ab2..deae99e8d511 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A minimal implementation of the Document Object Model
 
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index bc733f926b57..b5e5b82d336f 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 .if defined(WITH_MYSQL)
 # To quote the author:
diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index 706090f3df2c..3504a22ef86d 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Small XML parsing library
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-docdir=no
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index c5cfb2f44ad6..feebcf760482 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Input method modules for OpenVanilla
 BUILD_DEPENDS=	${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
 RUN_DEPENDS=	${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
 
-USE_AUTOTOOLS=	libtool:15:env
+USE_AUTOTOOLS=	libtool:22:env
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 2f31160a2913..6939db9a9ece 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 1f04e9d99e94..e70e646dd5e0 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -19,7 +19,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 USE_GNOME=	gnomehack lthack gnometarget libxslt
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--with-python=${PYTHON_CMD}
 
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index 6823ebe18673..dbfa52713a06 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Full-text search system using N-gram
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	YES
 USE_BDB=	42
 GNU_CONFIGURE=	YES
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 188cf632ac5b..9d829a0cd744 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 365939d622c4..b913945196a1 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A suffix array library and tools, which provide fast full-text search
 
 USE_GNOME=	glib20 gnomehack gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 MAN1=		sary.1	mksary.1
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index 6db5e6ee25c4..92cf6ecadecd 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index f51124624c11..bc4aacfaacaf 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 6cb38593d4e7..3a1a2060f091 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	kmfl:${PORTSDIR}/textproc/libkmfl
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_XORG=	x11 xkbfile
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk20 intltool intlhack pkgconfig glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 06db8ef2f446..d671077b5b3f 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-openvanilla
 PORTVERSION=	0.7.2.20070514
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	rafan
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim	\
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:22
 WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 4650955e6e8c..bf26d5667e05 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -19,7 +19,7 @@ COMMENT=	SCIM table based input method engine
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
@@ -48,7 +48,7 @@ pre-patch:
 BUILD_DEPENDS+=	skim:${PORTSDIR}/textproc/skim
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB=	SKIM=""
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 post-patch:
 	@${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \
 		-e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 3cc6e6425956..b7bff17bd553 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Smart Common Input Method platform
 
 USE_GNOME=	gnomehack gnomehier gtk20 intlhack
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 xpm
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index a35c505067db..d7bddaee73fa 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -32,7 +32,7 @@ CONFLICTS=	rarian-[0-9]*
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index b44a7cce0c81..0c6370b7c1b7 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A text-based utility for work with dictionaries in StarDict's format
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 5022825447c5..643a7db45080 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -22,7 +22,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 PYDISTUTILS_NOEGGINFO=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index cf0607c88205..a875de1cd0ba 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 
 USE_GNOME=	pkgconfig
 USE_SQLITE=	3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_path_CPPUNIT_CONFIG=no \
 		ac_cv_path_PYTHON=no \
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index a3f3159cc01a..95195eb570b8 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
 USE_GCC=	4.2+
 USE_KDELIBS_VER=3
 USE_QT_VER=	3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 05015d674c9e..15a7a4d01467 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-qt
 COMMENT=	QT modules of uim input method
 
 USE_QT_VER=	3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 76740fadf112..b6d91b6246a9 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	gnometarget glib20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 532f1e324987..83cff40397fb 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 USE_GNOME=	gnometarget libgsf
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index bee7bd34bd45..e7d97d7aafcb 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library providing routines to access Microsoft Word files
 
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} --disable-debug
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnometarget libgsf
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 6bda394e7109..c4ea2e3265df 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xerces-c:${PORTSDIR}/textproc/xerces-c2 \
 		icuio:${PORTSDIR}/devel/icu
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:19 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:262 libtool:22
+ACLOCAL_ARGS=	-I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I .
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
@@ -49,9 +50,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.am -exec \
 		${REINPLACE_CMD} -e 's,^AM_CPPFLAGS.*$$,& $${icu_cppflags},' {} \;
 
-pre-configure:
-	@${CP} ${LIBTOOL_SHAREDIR}/libltdl/acinclude.m4 ${WRKSRC}/
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index a2a6c5211ea5..a052c2f43129 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index 615dc8e8784d..82ade15130c9 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Parser and Validator
 
 FETCH_CMD=	/usr/bin/fetch
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 6f97466c43b0..05971ebfcbbb 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -16,7 +16,7 @@ COMMENT=	XSL formatter that produces PDF and PostScript
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt \
 		libxml2 gtk20 glib20 pango
diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile
index 6d7cb5bd218c..93f87eb110ac 100644
--- a/textproc/yamcha/Makefile
+++ b/textproc/yamcha/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Yet Another Multipurpose CHunk Annotator
 
 BUILD_DEPENDS=	svm_learn:${PORTSDIR}/science/svmlight
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes