-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, 2 insertions, 4 deletions

diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 6bda394e7109..c4ea2e3265df 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xerces-c:${PORTSDIR}/textproc/xerces-c2 \
 		icuio:${PORTSDIR}/devel/icu
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:19 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:262 libtool:22
+ACLOCAL_ARGS=	-I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I .
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
@@ -49,9 +50,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.am -exec \
 		${REINPLACE_CMD} -e 's,^AM_CPPFLAGS.*$$,& $${icu_cppflags},' {} \;
 
-pre-configure:
-	@${CP} ${LIBTOOL_SHAREDIR}/libltdl/acinclude.m4 ${WRKSRC}/
-
 post-install:
 	@${CAT} ${PKGMESSAGE}