-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

30 files changed, 183 insertions, 32 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 53932a69361f..38419a32de52 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -31,7 +31,7 @@ USE_OPENSSL=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \
 		libgnomeprintui
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:22
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--enable-threads \
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index ac783066cbda..6fe7ec9e01d8 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -61,7 +61,7 @@ CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_FAM=	yes
 USE_GETTEXT=	yes
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index aa272ef8a959..8235aab9e30d 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -24,7 +24,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 8c95d331c011..3ca5fffab8b6 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	YES
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index aa272ef8a959..8235aab9e30d 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -24,7 +24,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		SIEVE		"Build w. support for Sieve mail sorting language" off \
 		LDAP		"Build with support for LDAP authentication" off
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 33afcd7a7e06..e44dc9ecd621 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -28,7 +28,7 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 		LDAP		"Build with support for LDAP authentication" off \
 		MANPAGES	"Install man pages" on
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	YES
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 5ef09db28b59..6442dfe056af 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -93,7 +93,7 @@ OPTIONS+=	CGI "Install CGI (pulls in Apache or see below)" off
 OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 .ifdef(SNAP_DATE)
 USE_AUTOTOOLS+=	autoconf:262:env automake:19
 .endif
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 31fcf045efdb..074bf5424196 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -89,7 +89,7 @@ OPTIONS+=	CGI "Install CGI (pulls in Apache or see below)" off
 OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index f8d15bf02dac..4e9cbcf09cb5 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 75fa18204423..2efccc09f603 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -25,7 +25,7 @@ USE_BISON=	build
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index cecad35f3d2c..ebee57f010c2 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library (written in C) for parsing and creating messages using MIME
 
 CONFLICTS=	gmime-2.1.*
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	YES
 USE_GNOME=	glib12
 USE_ICONV=	yes
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index 0ed7446cbc60..f26193ad7420 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	jamlib
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A JAM subroutine library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 NO_INSTALL_MANPAGES=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 697d5d8315ae..59f27dc71946 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mail notification utility for KDE with nice features
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-fast-perl
 
 MAN1=		kbiff.1
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index 0941d0896c64..07677ce5243d 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Gmail Notifier for KDE
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_KDELIBS_VER=3
 INSTALLS_ICONS=	yes
 
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index de0d661c7390..1572d55f4fb5 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 USE_KDELIBS_VER=	3
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:22:env
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 48a2c0b14f04..5aee533be143 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for posting electronic mail
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 3c93603819c5..44cbbe6342a0 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15 autoconf:262
+USE_AUTOTOOLS=	libtool:22 autoconf:262
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index ec77d88f5a67..8dc7e0c8ec6b 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnewmail
 PORTVERSION=	0.3
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	http://0pointer.de/lennart/projects/libnewmail/ \
 		http://www.stud.uni-hamburg.de/~lennart/projects/libnewmail/
@@ -18,7 +18,7 @@ COMMENT=	Generic mail checking library
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
 		oop.4:${PORTSDIR}/devel/liboop
 
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 27d86edceda7..f562f48c0525 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Sender Policy Framework (SPF) library and client
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile
index e15bce57a8c8..d4ec239c7fdb 100644
--- a/mail/libspf2-10/Makefile
+++ b/mail/libspf2-10/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	${PORTNAME}-1.2.*
 
 LATEST_LINK=	${PORTNAME}-${PORTVERSION:S/.//:R}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 092c1b409174..d56254600624 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Sender Rewriting Scheme 2 C Implementation
 
 CONFLICTS=	${PORTNAME}-1.0.*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index f06953b37259..1fcb08d65054 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	srs
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Sender Rewriting Scheme 2 C Implementation
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile
index 16a14749d266..428f91ddb2e9 100644
--- a/mail/libsrs_alt/Makefile
+++ b/mail/libsrs_alt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=		http://srs.mirtol.com/
 MAINTAINER=		simond@irrelevant.org
 COMMENT=		Sender Rewriting Scheme C Implementation
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=		yes
 USE_LDCONFIG=		yes
 SHLIB_MAJOR=		1
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index ec03c8618222..021f44bcd6a0 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -24,7 +24,7 @@ MAN8=		perdition.8
 
 MANCOMPRESSED=	no
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 8991f80309c7..8df7849a31ec 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 2c2a619e2769..9eca8273735e 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pop3lite
 PORTVERSION=	0.2.4a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,14 +15,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A flexible, modular RFC-compliant POP3 daemon
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN5=		pop3lite.conf.5
 MAN8=		pop3lite.8
 INFO=		pop3lite-admin
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/mail/pop3lite/files/patch-libtool22 b/mail/pop3lite/files/patch-libtool22
new file mode 100644
index 000000000000..689e80be2264
--- /dev/null
+++ b/mail/pop3lite/files/patch-libtool22
@@ -0,0 +1,145 @@
+--- bootstrap.mk.orig	2009-07-15 09:34:19.000000000 -0500
++++ bootstrap.mk	2009-07-15 09:34:31.000000000 -0500
+@@ -49,11 +49,7 @@
+ endef
+ 
+ all: bootstrap
+-update: aclocal.m4 config.h.in Makefile.in ltmain.sh configure \
+-	update-libltdl
+-update-libltdl: gnu/libltdl/aclocal.m4 gnu/libltdl/config.h.in \
+-		gnu/libltdl/Makefile.in gnu/libltdl/ltmain.sh \
+-		gnu/libltdl/configure
++update: aclocal.m4 config.h.in Makefile.in ltmain.sh configure
+ 
+ check-autoconf check-aclocal check-automake check-libtool \
+ check-libtoolize check-autoheader: check-%:
+@@ -66,42 +62,26 @@
+ 	fi
+ 
+ bootstrap: bootstrap-libtoolize bootstrap-aclocal bootstrap-autoheader \
+-	   bootstrap-automake bootstrap-autoconf bootstrap-ltdl
++	   bootstrap-automake bootstrap-autoconf
+ 
+ bootstrap-libtoolize bootstrap-aclocal bootstrap-autoheader \
+ bootstrap-automake bootstrap-autoconf: bootstrap-%: check-%
+ 	$($*) $(P3L_$*_OPTIONS)
+ 
+-bootstrap-ltdl: check-autoconf check-automake check-aclocal check-autoheader
+-	cd gnu/libltdl && $(aclocal)
+-	cd gnu/libltdl && $(autoheader)
+-	cd gnu/libltdl && $(automake) $(P3L_automake_OPTIONS)
+-	cd gnu/libltdl && $(autoconf) $(P3L_autoconf_OPTIONS)
+ 
+-gnu/libltdl/aclocal.m4: gnu/libltdl/configure.ac
+-	cd gnu/libltdl && $(aclocal)
+ aclocal.m4: configure.ac
+ 	$(aclocal) $(P3L_aclocal_OPTIONS)
+ 
+-gnu/libltdl/config.h.in: gnu/libltdl/aclocal.m4 gnu/libltdl/configure.ac
+-	cd gnu/libltdl && $(autoheader)
+-	touch $@
+ config.h.in: aclocal.m4 configure.ac
+ 	$(autoheader) $(P3L_autoheader_OPTIONS)
+ 	touch $@
+ 
+-gnu/libltdl/Makefile.in: gnu/libltdl/configure.ac gnu/libltdl/Makefile.am
+-	cd gnu/libltdl && $(automake) $(P3L_automake_OPTIONS)
+ Makefile.in: configure.ac Makefile.am
+ 	$(automake) $(P3L_automake_OPTIONS)
+ 
+-gnu/libltdl/ltmain.sh: gnu/libltdl/Makefile.am gnu/libltdl/configure.ac
+-	cd gnu/libltdl && $(libtoolize) $(P3L_libtoolize_OPTIONS)
+ ltmain.sh: Makefile.am configure.ac
+ 	$(libtoolize) $(P3L_libtoolize_OPTIONS)
+ 
+-gnu/libltdl/configure: gnu/libltdl/aclocal.m4 gnu/libltdl/configure.ac
+-	cd gnu/libltdl && $(autoconf) $(P3L_autoconf_OPTIONS)
+ configure: aclocal.m4 configure.ac
+ 	$(autoconf) $(P3L_autoconf_OPTIONS)
+ 
+@@ -111,4 +91,4 @@
+ .PHONY: check-autoconf check-aclocal check-automake check-libtool \
+ 	check-libtoolize check-autoheader boostrap boostrap-libtoolize \
+ 	bootstrap-aclocal bootstrap-autoheader bootstrap-automake \
+-	bootstrap-autoconf bootstrap-ltdl update update-libltdl
++	bootstrap-autoconf update
+--- configure.orig	2009-07-15 09:29:11.000000000 -0500
++++ configure	2009-07-15 09:31:35.000000000 -0500
+@@ -300,7 +300,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subdirs_all="$ac_subdirs_all gnu/libltdl"
++ac_subdirs_all="$ac_subdirs_all"
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -3144,15 +3144,8 @@
+ 
+   fi
+ 
+-  case $enable_ltdl_convenience in
+-  no) { { echo "$as_me:3148: error: this package needs a convenience libltdl" >&5
+-echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'gnu/libltdl/libltdlc.la
+-  INCLTDL='-I${top_srcdir}/'gnu/libltdl
++LIBLTDL='-lltdl'
++INCLTDL='-I/usr/local/include'
+ 
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+@@ -10374,7 +10367,7 @@
+ 	P3L_BUILTIN_LIST=`echo "$P3L_BUILTIN_LIST" | sed -e "s% test-modules % %g"`
+ fi
+ 
+-subdirs="$subdirs gnu/libltdl"
++subdirs="$subdirs"
+ 
+ if test "x$static_daemon" != "xno"
+ then
+--- gnu/Makefile.in.orig	2009-07-15 09:35:48.000000000 -0500
++++ gnu/Makefile.in	2009-07-15 09:35:51.000000000 -0500
+@@ -138,7 +138,7 @@
+ install_sh = @install_sh@
+ moddocdir = @moddocdir@
+ 
+-SUBDIRS = getopt libltdl md5
++SUBDIRS = getopt md5
+ 
+ EXTRA_DIST = README
+ subdir = gnu
+--- src/Makefile.in.orig	2009-07-15 09:37:37.000000000 -0500
++++ src/Makefile.in	2009-07-15 09:37:39.000000000 -0500
+@@ -143,7 +143,7 @@
+ CLEANFILES = *~ TAGS gmon.out builtin-modules.c
+ DISTCLEANFILES = stamp-builtin depcomp
+ 
+-LTDL_LIB = $(top_builddir)/gnu/libltdl/libltdlc.la
++LTDL_LIB = -lltdl
+ 
+ @HAVE_MD5_LIB_TRUE@MD5_LIB = -lmd
+ @HAVE_MD5_LIB_FALSE@MD5_LIB = $(top_builddir)/gnu/md5/libmd5.la
+@@ -157,7 +157,6 @@
+ 			$(EXTRA_CFLAGS)
+ 
+ INCLUDES = -I$(top_builddir)/includes \
+-			-I$(top_srcdir)/gnu/libltdl \
+ 			-I$(top_srcdir)/includes \
+ 			-DSYSCONFDIR=\"$(sysconfdir)\" \
+ 			-DMODULEDIR=\"$(pkglibdir)\" \
+@@ -204,10 +203,8 @@
+ 	misc.$(OBJEXT) module.$(OBJEXT) standalone.$(OBJEXT)
+ nodist_pop3lite_OBJECTS = builtin-modules.$(OBJEXT)
+ pop3lite_OBJECTS = $(am_pop3lite_OBJECTS) $(nodist_pop3lite_OBJECTS)
+-@HAVE_MD5_LIB_TRUE@pop3lite_DEPENDENCIES = \
+-@HAVE_MD5_LIB_TRUE@	$(top_builddir)/gnu/libltdl/libltdlc.la
++@HAVE_MD5_LIB_TRUE@pop3lite_DEPENDENCIES = 
+ @HAVE_MD5_LIB_FALSE@pop3lite_DEPENDENCIES = \
+-@HAVE_MD5_LIB_FALSE@	$(top_builddir)/gnu/libltdl/libltdlc.la \
+ @HAVE_MD5_LIB_FALSE@	$(top_builddir)/gnu/md5/libmd5.la
+ 
+ DEFS = @DEFS@
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 3b3109ebb75e..9c4889c93093 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Suite of programs for setting up large POP3 server systems
 
 BUILD_DEPENDS=	${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index 957da75f1caa..32100897a2a3 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Implementation of `WHO iS ONline' protocol
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		--with-config=${PREFIX}/etc/whoson.conf
 USE_LDCONFIG=	yes
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index d43f21917f6e..e97f9f2e2413 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An X Window System application for receiving electronic mail
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes