-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

14 files changed, 15 insertions, 16 deletions

diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index f249d70315d8..eff2373b10ed 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift
 USE_BZIP2=	yes
 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/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile
index 7cfbf6c414be..1d44eb0d8782 100644
--- a/net-p2p/cdonkey/Makefile
+++ b/net-p2p/cdonkey/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 
 PLIST_FILES=	bin/cDonkey
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net-p2p/gift-fasttrack/Makefile b/net-p2p/gift-fasttrack/Makefile
index 63530868a3cc..4901d3b13451 100644
--- a/net-p2p/gift-fasttrack/Makefile
+++ b/net-p2p/gift-fasttrack/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A FastTrack plugin for giFT
 
 LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
diff --git a/net-p2p/gift-openft/Makefile b/net-p2p/gift-openft/Makefile
index cbbc27aab225..c5c0ec70b5fa 100644
--- a/net-p2p/gift-openft/Makefile
+++ b/net-p2p/gift-openft/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An OpenFT plugin for giFT
 LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift \
 		db3.3:${PORTSDIR}/databases/db3
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 8e74a4bac5b3..d97fa3c1c10e 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFT
 PORTVERSION=	0.11.8.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -18,7 +18,7 @@ COMMENT=	An OpenFT, Gnutella and FastTrack p2p network client
 
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index b363ee3ca002..4c875d8fd321 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.6.6b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -20,7 +20,7 @@ COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 52e39d54026c..b2ca9fb0c414 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -18,7 +18,7 @@ COMMENT=	KDE integration for MLDonkey eDonkey P2P client
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--program-transform-name=''
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile
index 23fcb1b0d2bd..698b9af8700f 100644
--- a/net-p2p/ktorrent-devel/Makefile
+++ b/net-p2p/ktorrent-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	ktorrent-[0.9]*
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 95891393c8c3..24a88f494adf 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK=	${PORTNAME}2
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index 927b56cb4ab1..3d914ad6469d 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	rblibtorrent-[0-9]*
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I m4
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug \
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 91a90fdcf6a5..e96a386a6d6f 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -22,7 +22,7 @@ CONFLICTS?=	libtorrent-devel-[0-9]* \
 		rblibtorrent-[0-9]* \
 		rblibtorrent-devel-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig gnomehack
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile
index 927b56cb4ab1..3d914ad6469d 100644
--- a/net-p2p/rblibtorrent-devel/Makefile
+++ b/net-p2p/rblibtorrent-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	rblibtorrent-[0-9]*
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I m4
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug \
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index 47d7354c79b5..bbc203b27d92 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_RC_SUBR=	verlihub
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-p2p/verlihub/pkg-plist b/net-p2p/verlihub/pkg-plist
index 7293611fe5f1..9f4a5892f46b 100644
--- a/net-p2p/verlihub/pkg-plist
+++ b/net-p2p/verlihub/pkg-plist
@@ -97,7 +97,6 @@ lib/libverlihub.a
 lib/libverlihub.la
 lib/libverlihub.so
 lib/libverlihub.so.0
-lib/libvhapi.a
 lib/libvhapi.la
 lib/libvhapi.so
 lib/libvhapi.so.0