-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

40 files changed, 40 insertions, 40 deletions

diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 14e496691f5e..e731eff6185a 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Dynamic pixel format conversion library
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig gnomehack ltverhack
 USE_GMAKE=	yes
 
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 56d553c24748..8d5377431996 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib12
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.5.9
 
 MAN1=		dgs.1 dpsnx.agent.1
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index b3435524aae6..fae71f217b95 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -18,7 +18,7 @@ COMMENT?=	X11 terminal emulator based on rxvt/xterm
 BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
 LIB_DEPENDS=	ast.2:${PORTSDIR}/devel/libast
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--enable-trans --enable-utmp \
 		--enable-xim --with-theme-update \
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 0d5461fb77df..35cdcfb0ece9 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An anti-aliased font support for gtk+
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index a686bedfd933..32bd5a0144c2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -32,7 +32,7 @@ USE_BISON=	build
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 82dcbdaf5a35..3680311ec2f1 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui evolutiondataserver gnomemenus gnomedesktop
 
-USE_AUTOTOOLS=	autoconf:262 autoheader:262 automake:19 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 autoheader:262 automake:19 aclocal:19 libtool:22
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a
 LIBTOOLFILES=
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index d3ac034c9ea7..151f63199686 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 71a8156c06ae..cf428bd304e2 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -32,7 +32,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc \
 		--disable-network-manager \
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c3c82626f2e9..0854647ff7b8 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A simple GTK-2 terminal with tabs
 
 USE_GNOME=	gnometarget vte
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	README
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index d2999982dde0..e3db1b53aac6 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -41,7 +41,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 56f97f75e694..8e5e582cbea3 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -58,7 +58,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_LDCONFIG=	${PREFIX}/lib/kde3
 
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
 		--enable-mt \
diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile
index 50a34872e8ed..742885c5fb0a 100644
--- a/x11/kxgenerator/Makefile
+++ b/x11/kxgenerator/Makefile
@@ -16,7 +16,7 @@ COMMENT=	KDE utility to configure the X server
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index ff2f27fdbd81..36215b86fdc1 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Session Management library for X11
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
 
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 XORG_CAT=	lib
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 538d9c380c6a..d0bcf1ca34bf 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 XORG_CAT=	lib
 USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 		kbproto:both inputproto xf86bigfontproto xproto:both
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index de3888f4cfaa..8651ac199680 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -14,6 +14,6 @@ COMMENT=	The XTrap library
 
 XORG_CAT=	lib
 USE_XORG=	trapproto:both x11 xext xextproto xt
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 60e3f47df1f0..70b0496790c4 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -15,7 +15,7 @@ COMMENT=	X11 Xinerama library
 
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto xineramaproto:both
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN3=		Xinerama.3 \
 		XineramaQueryExtension.3 \
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 570d7245dced..16270d3a20a7 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -15,7 +15,7 @@ COMMENT=	X print library
 
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto xau printproto:both
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN3=	XpCancelDoc.3 \
 	XpCancelJob.3 \
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index 14aa8e7b6023..6a2f271d16a7 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -14,6 +14,6 @@ COMMENT=	The XprintAppUtil library
 
 XORG_CAT=	lib
 USE_XORG=	printproto x11 xau xp xprintutil xproto:both
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index c737e85cb528..9e87e7df8bd3 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -14,6 +14,6 @@ COMMENT=	The XprintUtil library
 
 XORG_CAT=	lib
 USE_XORG=	printproto:both x11 xau xp xt
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index f9aaf7d60a49..98d0dda564d7 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -15,7 +15,7 @@ COMMENT=	X Test extension
 
 XORG_CAT=	lib
 USE_XORG=	x11 xext recordproto:both xextproto inputproto:both
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN3=		XTestQueryExtension.3 \
 		XTestCompareCursorWithWindow.3 \
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index cf2ef638f937..02bb0d01e0e6 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -30,7 +30,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack esound libbonobo \
 USE_BISON=	build
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index b8805ec0e5ac..f1aa98c3c3e1 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier \
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack ltverhack gconf2 libglade2
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 14e003324282..54fb81d32e5c 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ wrapper for libgnome library
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnome
 GNU_CONFIGURE=	yes
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index 70ac3c47dc4f..14ca23431b9b 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -14,6 +14,6 @@ COMMENT=	Old X library
 
 XORG_CAT=	lib
 USE_XORG=	x11
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 7595a8dfbc96..3300c691b2ad 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 library for a freedesktop.org compliant menu implementation
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index c9edf268a199..ea5deb62693c 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 library with non-graphical helper functions
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 876c0abcfb1d..39f476385a79 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libxml2 glib20 ltverhack:12
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 69c4a88848cd..501bdafc12a3 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_XORG=	sm
 USE_GNOME=	gtk20 lthack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure kiklib/configure mkf/configure
 USE_PERL5_BUILD=yes
 USE_GETTEXT=	yes
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index b675a9a92981..9b906745c52a 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://download.berlios.de/segfaultskde/
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Quick launcher for Open Office
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
 
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index 3b9b46e6bb43..9a8be8403ffe 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=		http://download.berlios.de/segfaultskde/ \
 MAINTAINER=		citycat4@ngs.ru
 COMMENT=		KDE Quick launcher for Open Office 2.x
 
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 CONFIGURE_ARGS+=	--with-qt-dir=${QT_PREFIX}
 
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 09dcfacb9380..51c61d570c1c 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Low-level pixel manipulation library
 
 XORG_CAT=	lib
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PERL5_BUILD=yes
 USE_GNOME=	ltverhack:9
 
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 84e319d445cc..20eb0c3116e0 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A KDE RSI prevention tool
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	xscrnsaver
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 84e319d445cc..20eb0c3116e0 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A KDE RSI prevention tool
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	xscrnsaver
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index c2f5b11a27b4..e9830c055a55 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -17,7 +17,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	akosela@andykosela.com
 COMMENT=	A low memory usage xterm replacement that supports color
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PERL5_BUILD=yes
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index ad923f310335..ea9a402f6e10 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Library that supports startup notification spec from freedesktop.org
 LIB_DEPENDS=	xcb-aux.0:${PORTSDIR}/x11/xcb-util
 
 USE_XORG=	x11
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index bba039a65e11..01a4fb648015 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xau xdmcp
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 1b5d1ba6f95c..ffffdfcf7c41 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XFce 4 configuration mananger
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index b64bb6925d3c..d3f92e777c91 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -16,7 +16,7 @@ COMMENT=	RX helper program
 XORG_CAT=	app
 USE_XORG=	x11 xt xext xtrans xproxymngproto xau xaw
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		xrx.1 libxrx.1
 
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 7a66c0ff282d..faf2f0fd7f8b 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -24,7 +24,7 @@ USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdeartwork-${PORTVERSION}
 
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 97ff1055da3d..1b13587393b5 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	decept0@gmail.com
 COMMENT=	Quake-style terminal emulator based on KDE's Konsole
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes