-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

21 files changed, 31 insertions, 20 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 4386ac85eb2..f6b3220d18c 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		fontforge.1 fontimage.1 fontlint.1 sfddiff.1
 
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index c00e0f2d6f0..ea4c4c4d36f 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base \
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 
 TEXMFMAIN=	${PREFIX}/share/texmf
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 2e979cde72c..8d07b7d01b8 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -20,7 +20,7 @@ MASTER_SITE_SUBDIR=	freetype1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free and portable TrueType font rendering engine
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 492cbaae6aa..1d3b75cd1ae 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -22,7 +22,7 @@ DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A free and portable TrueType font rendering engine
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index a156bf70581..46e2c2adb28 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 USE_BZIP2=	yes
 USE_XORG=	xext
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:env
+USE_AUTOTOOLS=	libtool:22:env
 MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
 MAKE_ARGS=	X11_PATH="${LOCALBASE}"
 
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 40468abe42e..a0e7526d119 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Admistration tool for cups
 LIB_DEPENDS=	gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
 RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index f7b51f3b452..729f3d16176 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -24,7 +24,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile
index ba0a67e518a..df43d2128ec 100644
--- a/print/kaspaliste/Makefile
+++ b/print/kaspaliste/Makefile
@@ -17,7 +17,7 @@ COMMENT=		Bibliography tool for KDE/Postgres/BibTeX
 
 USE_PGSQL=		yes
 USE_KDEBASE_VER=	3
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_GMAKE=		yes
 CONFIGURE_ARGS+=	--with-pg-includes=${LOCALBASE}/include \
 			--with-pg-libs=${LOCALBASE}/lib
diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile
index 7de55c8777e..9a9f3711848 100644
--- a/print/kcdlabel/Makefile
+++ b/print/kcdlabel/Makefile
@@ -17,7 +17,7 @@ COMMENT=		Create covers, labels and booklets for your CD cases
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/print/kover/Makefile b/print/kover/Makefile
index f86cc9d3c20..d4ca5f38260 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -17,7 +17,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
 
 MAN1=	kover.1 cddb-id.1
 
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 3ce173894a1..e6786614eb1 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index f0888034d00..a5886d17d9a 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 7c94374de98..57125a100d1 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ bindings for the GNOME print support library
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeprint
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index 1ed0c58d380..e47cb046ff3 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -19,7 +19,7 @@ COMMENT=	C library that supports plugin printer driver for Ghostscript
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 MAN1=		ijs-config.1
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index c15ab50437d..daafb8ed7d3 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library providing routines for paper size management
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index 2e66ed2f81f..eae4fcb1e6b 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	lpr
 MAINTAINER=	e-masson@kisoft-services.com
 COMMENT=	A library providing routines for ppd files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	Yes
 USE_GNOME=	glib12
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 21986e82ce4..9303a5f869f 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A small library for rendering Postscript documents
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnomeprefix ltverhack
 USE_GHOSTSCRIPT=yes
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 1d9b9db5e03..a3b0fe4084a 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_BDB=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-berkeley-db
 USE_LDCONFIG=	yes
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index c3b3d8d82fd..142208bf5ef 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -18,7 +18,7 @@ RESTRICTED=	many odd restrictions on usage and distribution
 
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-java=no --with-py=no --with-ruby=no --with-tcl=no
 
 .if defined(WITH_PERL)
diff --git a/print/pdflib/files/patch-libtool22 b/print/pdflib/files/patch-libtool22
new file mode 100644
index 00000000000..9c6a7b5b82e
--- /dev/null
+++ b/print/pdflib/files/patch-libtool22
@@ -0,0 +1,11 @@
+--- config/mkmainlib.inc.in.orig	2009-07-11 20:11:59.000000000 -0500
++++ config/mkmainlib.inc.in	2009-07-11 20:12:49.000000000 -0500
+@@ -29,7 +29,7 @@
+ 	@-if test "$(WITH_SHARED)" = "no"; then	\
+ 	    cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\
+ 	fi
+-	$(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir);
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir);
+ 	@-if test "$(WITH_SHARED)" = "yes"; then	\
+ 	    $(LIBTOOL) -n --finish $(DESTDIR)$(libdir);\
+ 	else\
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 1e21e883552..ccda6fd8ead 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg \
 USE_GNOME=	gnomehack gnometarget intlhack pkgconfig
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 USE_LDCONFIG=	yes