-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

17 files changed, 16 insertions, 48 deletions

diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index 9725dabc15ad..66b2a7156c9a 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A program for back up of directories or files
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile
index cad8e9def996..cdbf48838538 100644
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 3a1e714e8d80..f0bd6afdf877 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
@@ -19,7 +19,7 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/archivers/libcomprex/files/patch-Makefile.in b/archivers/libcomprex/files/patch-Makefile.in
deleted file mode 100644
index 1a68fb3fb821..000000000000
--- a/archivers/libcomprex/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Mar  6 13:30:58 2003
-+++ Makefile.in	Tue Oct 28 13:55:01 2003
-@@ -126,7 +126,7 @@
- modlibdir = @modlibdir@
- sedpath = @sedpath@
- 
--@DYNAMIC_MODS_TRUE@LIBLTDLDIR = libltdl
-+@DYNAMIC_MODS_TRUE@LIBLTDLDIR =
- 
- SUBDIRS = debian docs intl $(LIBLTDLDIR) modules libcomprex po tests
- 
diff --git a/archivers/libcomprex/files/patch-libcomprex::Makefile.in b/archivers/libcomprex/files/patch-libcomprex::Makefile.in
deleted file mode 100644
index 7ed62a5a53f2..000000000000
--- a/archivers/libcomprex/files/patch-libcomprex::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- libcomprex/Makefile.in.orig	Thu Mar  6 13:33:01 2003
-+++ libcomprex/Makefile.in	Tue Oct 28 13:56:41 2003
-@@ -161,7 +161,7 @@
- 	utils.c
- 
- 
--libcomprex_la_LIBADD = @DLLDFLAGS@ $(LIBLTDL) $(STATIC_LINK_LIBS)
-+libcomprex_la_LIBADD = @DLLDFLAGS@ -lltdl $(STATIC_LINK_LIBS)
- 
- libcomprex_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-@@ -169,8 +169,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" \
--	$(INCLTDL)
-+	-DCOMPREX_LIBDIR=\""$(libdir)/comprex"\"
- 
- subdir = libcomprex
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index 273c3a25d65c..693501480550 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Decompress data compressed with PKWARE Data Compression Library
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index 39dec10b05de..3d8f8b1f75f6 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}alpha
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A library for Microsoft compression formats
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 2b9c08d310b9..f467762f16d3 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -26,7 +26,7 @@ OPTIONS=	LIBSYNCE	"Build with libsynce support"			on \
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_ICONV=	yes
diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index 35bf326e1d32..13f57282c2e8 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -16,7 +16,7 @@ COMMENT?=	LZRTF compression library
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index ca5138ff3dd2..d7a8807bbe01 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 56ad60beca8e..3a7407165779 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 9ecb943fa05f..08eabde03ebf 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	rpm-4.* rpm-5.*
 
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:15
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:22
 CONFIGURE_ARGS=	--with-glob
 USE_LDCONFIG=	yes
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 04337d653d0f..7d68a2f7fc7a 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure db3/configure db/dist/configure popt/configure \
 		beecrypt/configure
 USE_GMAKE=	yes
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 590a599fa746..2a7a56089cf4 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen \
 .endif
 
 DB_VERSION?=	45
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure db3/configure db/dist/configure \
 		file/configure zlib/configure xar/configure
 USE_GMAKE=	yes
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 5f9511728c61..3d2baece1c8e 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A data compression library with low memory usage
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index a4065b06025d..521bf67432a4 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=synce
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Extract data from InstallShield CAB files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_LDCONFIG=	yes
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 0b5e22bd577d..8de486d85138 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://vesuri.jormas.com/xpk/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The eXternal PacKer (XPK) library system
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes