-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

63 files changed, 71 insertions, 79 deletions

diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 06cdc648f763..176751c4196f 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
 
 USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 MAN1=		geoiplookup.1 geoipupdate.1 geoiplookup6.1
diff --git a/net/asterisk-addons/Makefile b/net/asterisk-addons/Makefile
index df92efbe7b36..f796fb12e599 100644
--- a/net/asterisk-addons/Makefile
+++ b/net/asterisk-addons/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 44219281de78..4ba1c733f20b 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.25
-#PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.4:${PORTSDIR}/devel/libltdl15
+		ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 44219281de78..4ba1c733f20b 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.25
-#PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.4:${PORTSDIR}/devel/libltdl15
+		ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
index df92efbe7b36..f796fb12e599 100644
--- a/net/asterisk14-addons/Makefile
+++ b/net/asterisk14-addons/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 44219281de78..4ba1c733f20b 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.25
-#PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.4:${PORTSDIR}/devel/libltdl15
+		ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile
index 42d78f7e3f5c..f4a75764b8fc 100644
--- a/net/asterisk16-addons/Makefile
+++ b/net/asterisk16-addons/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk16
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 1fc93a64351b..9dfb4ca9eae5 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.6.0.9
-PORTREVISION=	1
+PORTREVISION=	3
 PKGNAMESUFFIX=	16
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --without-odbc
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.4:${PORTSDIR}/devel/libltdl15
+		ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile
index 22a15b0bdc0c..b8c0087042b0 100644
--- a/net/atmsupport/Makefile
+++ b/net/atmsupport/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tools for testing the ATM subsystem
 
 LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-tcldir=${LOCALBASE}
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 109ed08710c9..8043b91b7d9a 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -25,7 +25,7 @@ USE_GNOME?=	gnomehack ltverhack glib20 intltool
 USE_GETTEXT=	yes
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 AVAHI_SLAVE?=	no
 CONFIGURE_ARGS?=--with-distro=freebsd \
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index 3432f9cd5908..ea245ae2000c 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-ldap
 
 COMMENT=	LDAP support for the Courier authentication library
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 38ae5138e4b4..732828288369 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -22,7 +22,7 @@ MAN8=		dictd.8
 
 USE_RC_SUBR=	${PORTNAME}.sh
 USE_BISON=	build
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
 		--without-local-zlib
diff --git a/net/freeradius-client/Makefile b/net/freeradius-client/Makefile
index 17d75dcd1409..2e00c2fb0011 100644
--- a/net/freeradius-client/Makefile
+++ b/net/freeradius-client/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Client library and basic utilities for RADIUS AAA
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 CONFLICTS=	radiusclient-ng-[0-9]*
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 42a12eb19fd3..dded7173ffe6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freeradius
 PORTVERSION?=	1.1.7
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -39,7 +39,7 @@ CONFLICTS+=	freeradius-mysql-[0-9].* freeradius-[02-9].*
 NO_LATEST_LINK=	yes
 
 USE_RC_SUBR=	radiusd.sh
-USE_AUTOTOOLS=	libltdl:15 libtool:15 autoconf:262
+USE_AUTOTOOLS=	libltdl:22 libtool:22 autoconf:262
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 49715c4b0efb..47021bd2a064 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -32,7 +32,7 @@ CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
 		freeradius-mysql-[0-9].* freeradius-[013-9].*
 
 USE_RC_SUBR=	radiusd.sh
-USE_AUTOTOOLS=	libltdl:15 libtool:15 autoconf:262
+USE_AUTOTOOLS=	libltdl:22 libtool:22 autoconf:262
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 2deb4f08c257..c08e27e04cd0 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.gnetlibrary.org/src/
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A simple network library built upon Glib
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack glib12
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 84563062e245..0ee0edcbe7fe 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib-2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 531a5fcb1e05..109839098a9e 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gnu-radius
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
@@ -19,7 +19,7 @@ CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
 USE_RC_SUBR=	radiusd.sh
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index 186535234d1b..e2b5a947abb7 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A C library for writing servers
 
 USE_GNOME=	glib20 gnomehack
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-gtk-doc
 USE_LDCONFIG=	yes
 
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 1e6d2fc93947..b4c8b552db23 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent \
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-libdnet=${LOCALBASE} \
 		--with-libevent=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 9912619494d4..109bd79de45a 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Zeroconf/Bonjour(tm) implementation
 
 CONFLICTS=	avahi-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_LDCONFIG=	yes
diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile
index 66b044d0eaae..dad2e5ec9d20 100644
--- a/net/ilbc/Makefile
+++ b/net/ilbc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://simon.morlat.free.fr/download/1.2.x/source/
 MAINTAINER=	asm@asm.kiev.ua
 COMMENT=	Internet Low Bit Rate codec (RFC3951)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 6163bd59cb4a..1af23d15353f 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_XORG=	xtst
 
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 DO_NOT_COMPILE+=kopete lanbrowsing filesharing
diff --git a/net/kmuddy/Makefile b/net/kmuddy/Makefile
index c218c46260db..dace72ac0a70 100644
--- a/net/kmuddy/Makefile
+++ b/net/kmuddy/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mxp:${PORTSDIR}/net/libmxp
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index be855b1181b4..48e2433b53b2 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Network monitor for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/net/knemo/Makefile b/net/knemo/Makefile
index be855b1181b4..48e2433b53b2 100644
--- a/net/knemo/Makefile
+++ b/net/knemo/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Network monitor for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile
index 499771454358..c8dc38d3a2d9 100644
--- a/net/lanbrowsing/Makefile
+++ b/net/lanbrowsing/Makefile
@@ -27,7 +27,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_RC_SUBR=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdenetwork-${PORTVERSION}
 USE_LDCONFIG=	yes
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index fd2d89889e19..4ffe33182cb8 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GLib-based networking wrapper
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 9e97aa7d308d..b5a62e7d2f79 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gnomevfs2 ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index fa16513d63a1..e2ddd3171c9e 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r1$//}-RC-01
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library for creating IP packets (development version)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index f0868a5c004a..3588b7739f26 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library for manipulating libpcap/tcpdump trace files
 
 LIB_DEPENDS=	pcapnav.0:${PORTSDIR}/net/libpcapnav
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib12
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index 44e61638bcd2..d95115243e76 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libnss-mysql
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	NSS module using a MySQL database for backend
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index e23e356ed878..a7b4dbb5add5 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A low layer of SIP implementation
 CONFLICTS=	libosip2-2*
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-debug --disable-trace
 USE_LDCONFIG=	yes
 
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index 09677a2f5d7f..ba485ad35978 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	netdude
 MAINTAINER=	brenton.chang@gmail.com
 COMMENT=	A libpcap wrapper library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 30264856eb13..212aa71f0e7a 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Library for delta compression of streams
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index d60681905bab..6c74285f2560 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A C++ wrapper library to the sockets
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15
+USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:22
 SCRIPTS_ENV+=	ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
 
 INFO=	socket++
diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile
index f55df820faca..8311d7e7030c 100644
--- a/net/libsocketcpp/Makefile
+++ b/net/libsocketcpp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libsocket
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ wrapper library to the sockets
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 28093a582565..afde04f6bd78 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index c3308788d881..2b81e12e29a4 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	ortp-[0-9]*
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure oRTP/configure mediastreamer2/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 1a2d80c889c9..c890d29836ee 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 .endif
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_BDB=	41+
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 2c5785508ae7..12358d8fa10c 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	netdude
 PORTVERSION=	0.4.8a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
 LIB_DEPENDS=	netdude.0:${PORTSDIR}/net/libnetdude
 
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 84e2b7e0b051..3bc047c36446 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
 DBDIR?=		/var/db
 
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	libtool:15 automake:19 autoconf:262
+USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:262
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index b1dcf7cd8f23..0f05754c1b77 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -5,16 +5,12 @@ etc/ntop/oui.txt.gz
 etc/ntop/specialMAC.txt.gz
 lib/libcpacketPlugin-%%PORTVERSION%%.so
 lib/libcpacketPlugin.so
-lib/libcpacketPlugin.a
 lib/libicmpPlugin-%%PORTVERSION%%.so
 lib/libicmpPlugin.so
-lib/libicmpPlugin.a
 lib/liblastSeenPlugin-%%PORTVERSION%%.so
 lib/liblastSeenPlugin.so
-lib/liblastSeenPlugin.a
 lib/libnetflowPlugin-%%PORTVERSION%%.so
 lib/libnetflowPlugin.so
-lib/libnetflowPlugin.a
 lib/libntop-%%PORTVERSION%%.so
 lib/libntop.so
 lib/libntop.a
@@ -25,16 +21,12 @@ lib/libntopreport.a
 lib/libntopreport.la
 lib/libpdaPlugin-%%PORTVERSION%%.so
 lib/libpdaPlugin.so
-lib/libpdaPlugin.a
 lib/libremotePlugin-%%PORTVERSION%%.so
 lib/libremotePlugin.so
-lib/libremotePlugin.a
 lib/librrdPlugin-%%PORTVERSION%%.so
 lib/librrdPlugin.so
-lib/librrdPlugin.a
 lib/libsflowPlugin-%%PORTVERSION%%.so
 lib/libsflowPlugin.so
-lib/libsflowPlugin.a
 lib/ntop/plugins/cpacketPlugin.so
 lib/ntop/plugins/icmpPlugin.so
 lib/ntop/plugins/lastSeenPlugin.so
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 57c0a711d768..42bac078c4ae 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -114,7 +114,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 
 .endif
 
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
 PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -168,7 +168,7 @@ USE_RC_SUBR=		slapd.sh ${SLURPDSH}
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_AUTOTOOLS+=		libltdl:15
+USE_AUTOTOOLS+=		libltdl:22
 CONFIGURE_ARGS+=	--enable-modules
 PLIST_SUB+=		MODULES=""
 .else
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index d188f749a92b..e646a0014281 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -126,7 +126,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 
 .endif
 
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
 PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -178,7 +178,7 @@ USE_RC_SUBR=		slapd.sh
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_AUTOTOOLS+=		libltdl:15
+USE_AUTOTOOLS+=		libltdl:22
 CONFIGURE_ARGS+=	--enable-modules
 PLIST_SUB+=		MODULES=""
 .else
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 56d170a78d4f..7ea1acf69888 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	openslp
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open-source implementation of the Service Location Protocol
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 57d859f48aee..b80999678dea 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A C++-Library for PVM
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pvm-incs=${LOCALBASE}/include \
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 6dd0b4c364f2..90df7c0f5318 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software
 
 CONFLICTS=	openbgpd-[0-9]* zebra-0*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
 USE_PERL5_BUILD=	yes
diff --git a/net/roadrunner/Makefile b/net/roadrunner/Makefile
index c6f460cd2a41..d8882cfb5f4f 100644
--- a/net/roadrunner/Makefile
+++ b/net/roadrunner/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A portable BEEP protocol implementation
 
 USE_GNOME=	glib20 libxml2 pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 256f0cb18237..5d0916ec8f01 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	SDL_net-${PORTVERSION}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A small sample cross-platform networking library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 19438d975bc3..0d4ab5edd4d7 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
 
 GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index e05c4cc90213..aebbe7fe4f3a 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=		sudo:${PORTSDIR}/security/sudo \
 
 USE_KDEBASE_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 089bc4fe01f3..6ddbeff64796 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Abstraction layer for interprocess communication
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig glib20 gnomehack
 USE_LDCONFIG=	yes
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 24c000b68a11..fa894ac3316d 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--enable-os-dir=no --with-ssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
 
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 3cad36d3e6af..74659780cc45 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-gamma
 MAINTAINER=	andy.lavr@gmail.com
 COMMENT=	Most SOCKS-friendly applications way with Tor
 
-USE_AUTOTOOLS=	libtool:15 aclocal:110 autoconf:262
+USE_AUTOTOOLS=	libtool:22 aclocal:110 autoconf:262
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
 USE_GMAKE=	yes
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index fbc84589b207..77b9b08b9fd7 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Lightweight, portable bandwidth shaper
 
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 90df0102bb9f..892c993fc9c9 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -20,7 +20,7 @@ OPTIONS=	GNOME		"Build with gnome support" on \
 		TIGHTVNC	"vncviewer support" off \
 		XNEST		"X via Xnest support (experimental)" off
 
-USE_AUTOTOOLS=	libtool:15 automake:19 autoconf:262
+USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:262
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 43b9da96beaa..2e1793b0c881 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp \
 		zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 USE_XORG=	xext
 USE_GMAKE=	yes
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index 66bec17ee809..e1d44f9b280d 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile
index 44ed950b12e8..c30c599078b0 100644
--- a/net/uriparser/Makefile
+++ b/net/uriparser/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--disable-doc --disable-test
 
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 12253418976d..e13c36c2e2b7 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 USE_GNOME=	gnometarget
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:env
+USE_AUTOTOOLS=	libtool:22:env
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 2431815a8601..46bf8ad8a5d3 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-devel-[0-9]*
 USE_GNOME=	gnometarget
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:env
+USE_AUTOTOOLS=	libtool:22:env
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index 555d382ca201..e0c17e3effd0 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"		\
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
 CONFIGURE_ARGS=	--program-transform="s|^|xre-|" \