-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

15 files changed, 18 insertions, 16 deletions

diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 7292d3c58b78..57aa739cdf0f 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gnomehack intltool
 USE_XORG=	glproto
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 GCONF_SCHEMAS=	compiz-3d.schemas \
 		compiz-addhelper.schemas \
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 9f685f00f505..0ff6c1f8929b 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gnomehack intltool
 USE_XORG=	glproto
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-colorfilter.schemas \
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index df96b393a4d7..471197736be3 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomehack intltool
 USE_XORG=	glproto
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 GCONF_SCHEMAS=	compiz-atlantis.schemas \
 		compiz-cubemodel.schemas \
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index eb39274da38f..61df6dcf9b67 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -27,7 +27,7 @@ USE_GL=		glu
 USE_GNOME=	gnomehack gconf2 libxslt
 USE_XORG=	xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 GCONF_SCHEMAS=	gwd.schemas \
 		compiz-annotate.schemas \
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index e4b417071121..69134ef381b7 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 USE_GNOME=	gnomehack glib20 gconf2
 
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 51065f4061ba..bb527377b1a2 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack glib20
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 7bd51afb3820..8f27d0fb9125 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gtk20 libwnck pango
 USE_XORG=	xrender
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		emerald.1 \
 		emerald-theme-manager.1
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index c97fbc7fd4ba..5d674c60b316 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -24,7 +24,7 @@ USE_XORG=	xext
 USE_GNOME=	esound gnometarget
 USE_GL=		glut
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 autoconf:262
+USE_AUTOTOOLS=	libtool:22 autoconf:262
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index a2111740f4b5..eb2c4237f25e 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -8,17 +8,19 @@
 
 PORTNAME=	ion-2
 PORTVERSION=	20040729
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/archives/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tiling tabbed window manager
 
+BROKEN=		Does not build with new libltdl 2.2
+
 CONFLICTS=	ion-2002* ion-devel-* pwm-*
 
 USE_XORG=	x11 xext xinerama
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 USE_LUA=	5.0
 USE_GMAKE=	yes
 MAKE_ENV=	DEFINES="${IONDEFINES}"
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 4547d6211edc..24215707c887 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A dock-like applet for KDE3
 
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
 		--enable-threads \
 		--disable-closure
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 15bfa409ef0c..526a3b66373b 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 USE_GNOME=	gnomehack intltool libxml2
 
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index a34d996e7564..5057f32d8ae9 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Standard library for Window Maker dock apps
 USE_BZIP2=	yes
 USE_XORG=	xext xpm
 USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--without-font --without-examples
 USE_LDCONFIG=	yes
 
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 3c77e9e60711..41c6cbaba1bb 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_XORG=	x11 xcomposite xdamage
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index e04a2fd97630..bbf613f08692 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index fac395fd97ee..ccc4924f4156 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDI
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_XORG=	xpm