-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

29 files changed, 39 insertions, 29 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 5b4e2ec794fc..2ab98acdcf65 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ayttm
 PORTVERSION=	0.5.0.82
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
@@ -30,7 +30,7 @@ USE_XORG=	xpm xscrnsaver
 USE_GNOME=	gnometarget gtk20
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-oscar --disable-workwizu --enable-smtp --enable-lj
 
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index dc42c48614d0..1d250a460ce1 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -30,7 +30,7 @@ USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \
 		gnomepanel
 USE_GSTREAMER=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index 62e7cc172a9c..3b5d8d03a01f 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QQ IM Client for KDE3
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15 autoconf:262
+USE_AUTOTOOLS=	libtool:22 autoconf:262
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index ef303931b819..62a6860f0590 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack gnometarget \
 		pygtk2
 USE_GSTREAMER=	core good bad python
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index d5b6069402e3..ebf6a4ad0e59 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
 
 USE_ICONV=	yes
 USE_GNOME=	glib12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure liboop/configure
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 24ece8ff8c3e..834b2265a499 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Jabber/XMPP client library
 LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
 		gnutls.26:${PORTSDIR}/security/gnutls
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile
index 7de158d9fde9..8d4baf548aeb 100644
--- a/net-im/gnome-jabber/Makefile
+++ b/net-im/gnome-jabber/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnet-2.0.0:${PORTSDIR}/net/gnet2
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index eafaf26630d6..a6aaa02ec227 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 1c2fd072ce35..9684e799eb9c 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 4dd4aa18c2cc..da8475fdf5c7 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -33,7 +33,7 @@ USE_RC_SUBR=	jabber
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	${PREFIX}/lib/jabber
 
 .if !defined(NO_INSTALL_MANPAGES)
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index c1013d7e2b58..5a5e33684ce3 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An IM (Instant Messenger) KDE client for the Microsoft MSN Network
 
 USE_XORG=	xscrnsaver
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index ba694ed9292c..72b194c5d52b 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	freebsd-ports@club-internet.fr
 COMMENT=	MSN Messenger Client for KDE3
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index ba694ed9292c..72b194c5d52b 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	freebsd-ports@club-internet.fr
 COMMENT=	MSN Messenger Client for KDE3
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile
index 2aaf3fc0ca78..5e0fc366f90b 100644
--- a/net-im/konverse/Makefile
+++ b/net-im/konverse/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE Jabber Client
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index 9e9bb29b5e38..bbf92864ba38 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -32,7 +32,7 @@ USE_BZIP2=	yes
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \
diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index c96a6ce408ac..ae00cd252958 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -23,7 +23,7 @@ SUB_FILES=	pkg-message
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 
 KPOPUP_DIR=	/var/tmp/kpopup
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 19500c0889e2..a840d03b6621 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index bba48f54d883..a874d802e0f7 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An opensource C++ library to support icq2000/2001 protocol
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index ebd74b052957..a87295d3b288 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
 
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_DOS2UNIX=	README
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 62cfaf2f9c65..dad244fece7b 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack gnometarget
 USE_GSTREAMER=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 362824aeb1b2..5381e6b6e150 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -25,6 +25,6 @@ RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index 10cf8012750f..6ddb077c23f9 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A C library that handles the new Yahoo! Messenger protocol
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gnomehack gnometarget
 GNU_CONFIGURE=	yes
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 6d43e13581a8..a97ee056775c 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 49d64991dfdb..4f6ab1b8adf4 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open Source implementation of the Lotus Sametime protocol
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
diff --git a/net-im/meanwhile/files/patch-libtool22 b/net-im/meanwhile/files/patch-libtool22
new file mode 100644
index 000000000000..fab3b805a353
--- /dev/null
+++ b/net-im/meanwhile/files/patch-libtool22
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	2009-07-18 16:57:46.000000000 -0500
++++ src/Makefile.in	2009-07-18 16:58:05.000000000 -0500
+@@ -236,7 +236,6 @@
+ 	$(DEBUG_CFLAGS)	$(GLIB_CFLAGS)
+ 
+ libmeanwhile_la_LDFLAGS = \
+-	@MW_SO_OS_FLAGS@ \
+ 	-version-info @MW_SO_VERSION@
+ 
+ libmeanwhile_la_SOURCES = \
diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index 5e75322e8f7b..6032e67f6531 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	simicq-[0-9]* sim-im-[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_QT_VER=	3
 USE_XORG=	x11 xext xscrnsaver
 USE_OPENSSL=	yes
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index 69cecd3b8b20..df7c8aa67ffe 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	3
 USE_PERL5_BUILD=yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 5f2551c259dc..214b2f6287f0 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 7eb29315e2ec..877c3e91c06b 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_GNOME=	gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes