-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, 3 insertions, 3 deletions

diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index cf8e4910a220..ada48b54ff93 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
-USE_AUTOTOOLS=	libtool:15 aclocal:19
-
+USE_AUTOTOOLS=	libtool:22 aclocal:19
+LIBTOOLFILES=	acinclude.m4 configure
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
 CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
 		--without-included-sqlite
@@ -40,6 +40,6 @@ USE_KDELIBS_VER=	3
 pre-configure:
 	@${CP} ${LTMAIN} ${WRKSRC}/admin
 	@${CP} ${LIBTOOL_M4} ${WRKSRC}/admin
-	@${CP} ${PREFIX}/include/clamav-config.h ${WRKSRC}/src/klamd
+	@${CP} ${LOCALBASE}/include/clamav-config.h ${WRKSRC}/src/klamd
 
 .include <bsd.port.post.mk>