-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

1 files changed, 5 insertions, 2 deletions

diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index b68645bd3ac7..faffaa5fa33c 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libbegemot
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://people.freebsd.org/~harti/libbegemot/
 DISTNAME=	libbegemot-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT=	A function library for begemot tools
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libltdl:15 libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libltdl:22 libtool:22
 USE_LDCONFIG=	yes
 
 
@@ -28,6 +28,9 @@ MLINKS=	xalloc.1 xrealloc.1
 run-autotools::
 	@(cd ${CONFIGURE_WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl/)
 	@(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
+	@${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+		-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+			${WRKSRC}/configure
 
 post-install:
 .for i in ${MAN1}