-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

49 files changed, 55 insertions, 53 deletions

diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index a11977ae56da..d742e08096ac 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Active Directory administration tool
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 2195d38db115..c489756ae7b6 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 PORTDOCS=	AUTHORS BUGS COPYING FAQ NEWS README.attrcache
 
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index c3af40ea0387..00cee35ca476 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	A full featured command-line backup tool, aimed for disks
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 1321f9dcd1f0..dd22d096c4c6 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 78c05c584dcb..2870aae46bc4 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.astron.com/pub/file/ \
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Utility to determine file type
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=	--enable-fsect-man5
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index f12aaabf4672..39e3f57ced53 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	decept0@gmail.com
 COMMENT=	Represent a file system as a set of concentric segmented-rings
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index f12aaabf4672..39e3f57ced53 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	decept0@gmail.com
 COMMENT=	Represent a file system as a set of concentric segmented-rings
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 89c1342e781e..c85101ce029c 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -27,7 +27,7 @@ COMMENT=	Library and tools to support IPMI-capable hardware
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 7cb284a8bb6c..28dcf163af1d 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
 WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization
 CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 8c5ca8e1e0d8..8ea17170a7ae 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 91e1e2a6b4c1..e0508785e8d8 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -28,7 +28,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 OPTIONS+=	GMETAD "include gmetad" on
 
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure libmetrics/configure
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 47d210713e99..aa9ff2fd6285 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Viewer for kernel geom layer
 
 LIB_DEPENDS=	gvc:${PORTSDIR}/graphics/graphviz
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk20 librsvg2
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index c878f736689a..c5ac4071bc48 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 USE_XORG=	x11 xtst
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 1e8f32a0ba6e..cf248e97e194 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget intlhack ltverhack libgnomeui
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 039fd75aa049..ec4068a88b66 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GSTREAMER=	good
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
 		gnomedocutils gnomepanel
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 6167491d2b18..cf5be7c91975 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--enable-services
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index c2ef32c5c0af..71d618419250 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 80c30d2d19eb..a0ed228cd194 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 55adb87faf2f..420a8c101fda 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -21,9 +22,10 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		net-1.1.3:${PORTSDIR}/net/libnet-devel \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		xml2:${PORTSDIR}/textproc/libxml2
-PATCH_DEPENDS=	${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool15
+PATCH_DEPENDS=	${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
 
-USE_AUTOTOOLS=	autoconf:262 autoheader:262 automake:110 aclocal:110 libtool:15
+USE_AUTOTOOLS=	autoconf:262 autoheader:262 automake:110 aclocal:110 \
+		libtool:22 libltdl:22
 AUTOMAKE_ARGS+=	--add-missing --include-deps --copy
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 
@@ -36,8 +38,8 @@ USE_PYTHON=	yes
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libnet113" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/libnet113"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet113" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet113"
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--localstatedir=/var \
@@ -70,7 +72,7 @@ BATCH=NO
 
 .if defined(WITH_MGMT)
 BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
-RUN_DEPENDS+=		py-gtk2:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
 PLIST_SUB+=		MGMT=""
 .else
 CONFIGURE_ARGS+=	--disable-mgmt
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 98b9bdc67e3c..ad6b93e81efd 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -19,7 +19,7 @@ NOT_FOR_ARCHS=	sparc64
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS=	autoconf:262 aclocal:19 automake:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 automake:19 libtool:22
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR}
 
 USE_PYTHON_BUILD=	yes
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index b36e27c53fc2..2f9dedd7f625 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 		samplerate:${PORTSDIR}/audio/libsamplerate
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
 USE_GMAKE=	yes
 USE_CDRTOOLS=	yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index b36e27c53fc2..2f9dedd7f625 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 		samplerate:${PORTSDIR}/audio/libsamplerate
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
 USE_GMAKE=	yes
 USE_CDRTOOLS=	yes
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index 29d278755472..194b1b6de9a5 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CPU meter for Kicker
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 0410010709c0..f005752fb6e0 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	michael@ranner.eu
 COMMENT=	Another cpu load kicker applet for KDE
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index b5f068dc2be6..43574a62b844 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -22,7 +22,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 5e6581cb65ef..93cab2e3e74b 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index e31ee751896a..033ff05eed21 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	rdiff-backup:${PORTSDIR}/sysutils/rdiff-backup
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 17dad03f9337..3e9c057f06d9 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 CONFIGURE_ARGS += 	--with-qt-dir=${QT_PREFIX} \
 			--with-extra-includes=${LOCALBASE}/include \
diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile
index 3d59b7fb46ce..e0fc02ff8f12 100644
--- a/sysutils/kkeyled/Makefile
+++ b/sysutils/kkeyled/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Panel applet to display the keyboard's LED states
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index 6c6c4c0f9bbe..0744cd4ea402 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -25,7 +25,7 @@ USE_KDELIBS_VER=3
 ONLY_FOR_ARCHS=	i386
 USE_XORG=	xtst xscrnsaver
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdeutils-${PORTVERSION}
 
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index ee3690d401ab..ba455c2c584f 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 USE_KDELIBS_VER=3
 USE_XORG=	xkbfile
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/config.h.in
diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile
index ebb6bb9b0514..774c9f3829f5 100644
--- a/sysutils/kmilo/Makefile
+++ b/sysutils/kmilo/Makefile
@@ -23,7 +23,7 @@ PREFIX=		${KDE_PREFIX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdeutils-${PORTVERSION}
 
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index d334df0b9472..0db07fe1501c 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	automake>=0:${PORTSDIR}/devel/automake19
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-fast-perl --enable-mt --program-transform-name=''
 
 post-patch:
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index d334df0b9472..0db07fe1501c 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	automake>=0:${PORTSDIR}/devel/automake19
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-fast-perl --enable-mt --program-transform-name=''
 
 post-patch:
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index 985fb2a61520..dd870ef7d15b 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -16,7 +16,7 @@ COMMENT=	KDE app that searches and synchronizes two directories
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index d60dfed70818..d4f7835b02ec 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Very powerful batch file renamer for KDE3
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index cd572804c6ce..dc8fc83f73fe 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Advanced shutdown utility for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index cd572804c6ce..dc8fc83f73fe 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Advanced shutdown utility for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index c359f6cc3ff8..bd91c965eadf 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	synaptics:${PORTSDIR}/x11/libsynaptics
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 81a2ae39c18c..e9aa919c04d2 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Default plugins for lineakd
 
 LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_XORG=       x11 xext xt xtst xfixes
 USE_GMAKE=	yes
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index 4e8319c6cf12..7118d70e2d31 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix=''
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 9dffedb6d7e9..87523402e1b0 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 4ab773a62985..78684e9dfca4 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
 		desktopfileutils ltasneededhack eel2
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 149c13c8e21a..1561c33866bb 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate ReiserFS partitions
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-debug --disable-Werror
 CFLAGS+=	-Dgetopt_long_only=getopt_long
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 63f7f5c6c39d..8bbfb35c405e 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A small tool to generate secure, random passwords
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 
 post-patch:
diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 346c0aec5fe0..cb878a64dd9c 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Open source resource manager
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rcp=scp
 USE_GMAKE=	yes
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index b97bbd24a413..d859c2ebbb29 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -39,7 +39,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile
index aed96d76be0f..f0e460d27287 100644
--- a/sysutils/userinfo/Makefile
+++ b/sysutils/userinfo/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	bjk
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show information about local users
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 
 MAN1=		ui.1
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 93e8f078353a..c433ce3fd05d 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A set of utilities and library to manipulate an xfs filesystem
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15:env
+USE_AUTOTOOLS=	autoconf:262 libtool:22:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
 			CFLAGS="${CFLAGS}" \