50 files changed, 60 insertions, 312 deletions

diff --git a/MOVED b/MOVED
index e8c341e7aa76..5b91200cf24a 100644
--- a/MOVED
+++ b/MOVED
@@ -369,7 +369,6 @@ mail/evolution-devel|mail/evolution|2003-06-11|rolled into evolution
 misc/wmessage|x11/wmessage|2003-06-12|accurate category
 net/mldonkey-src|net/mldonkey|2003-06-15|no longer needed
 news/straw||2003-06-20|port was broken with no sign of a fix
-devel/libtool|devel/libtool13|2003-06-26|move to versioned libtool portnames
 www/mozilla-vendor|www/mozilla|2003-07-01|vendor tree in sync with 1.4
 www/mozilla-embedded-vendor|www/mozilla-embedded|2003-07-01|vendor tree in sync with 1.4
 www/mozilla-headers-vendor|www/mozilla-headers|2003-07-01|vendor tree in sync with 1.4
@@ -1154,8 +1153,6 @@ net/zebra-devel|net/zebra|2004-07-27|The same as net/zebra for some time
 mail/pear-mailparse|mail/pecl-mailparse|2004-07-30|Renamed
 security/lcrzo|net/netwib|2004-08-01|The project has been renamed and port moved to better category
 security/lcrzoex|net-mgmt/netwox|2004-08-01|The project has been renamed and port moved to better category
-devel/autoconf|devel/autoconf253|2004-08-03|autotools cleanup
-devel/automake|devel/automake15|2004-08-03|autotools cleanup
 mail/balsa2|mail/balsa|2004-08-06|Balsa 2.x has been moved to the balsa port
 net/pdtpd|net/squall|2004-08-08|The project has been renamed
 sysutils/fastresolve|dns/fastresolve|2004-08-08|Move to the right category
@@ -4707,3 +4704,7 @@ net-p2p/gift-openft||2010-12-04|Has expired: unmaintained upstream
 net-p2p/pyslsk||2010-12-04|Has expired: unmantaind upstream, use net-p2p/nicotine-plus
 security/pamsfs||2010-12-04|Has expired: SFS is dead, this project is dead, and site is gone
 www/p5-Catalyst-Plugin-CommandLine||2010-12-04|Has expired: The module is not needed any more. With new Catalyst (at least 5.7014) it works out of the box.
+devel/autoconf268|devel/autoconf|2010-12-08|Autotools cleanup
+devel/automake111|devel/automake|2010-12-08|Autotools cleanup
+devel/libtool22|devel/libtool|2010-12-08|Autotools cleanup
+devel/libltdl22|devel/libltdl|2010-12-08|Autotools cleanup
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index a04fa48c618f..9ef67dde25d3 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -140,7 +140,7 @@ GNU_CONFIGURE=				yes
 .if defined(_AUTOTOOL_automake)
 AUTOMAKE_VERSION=	1.11
 AUTOMAKE_APIVER=	1.11.1
-AUTOMAKE_PORT=		devel/automake111
+AUTOMAKE_PORT=		devel/automake
 
 . if ${_AUTOTOOL_automake} == "yes"
 _AUTOTOOL_rule_automake=	yes
@@ -199,7 +199,7 @@ GNU_CONFIGURE?=				yes
 
 .if defined(_AUTOTOOL_autoconf)
 AUTOCONF_VERSION=	2.68
-AUTOCONF_PORT=		devel/autoconf268
+AUTOCONF_PORT=		devel/autoconf
 
 . if ${_AUTOTOOL_autoconf} == "yes"
 _AUTOTOOL_rule_autoconf=	yes
@@ -253,7 +253,7 @@ BUILD_DEPENDS+=		${AUTOCONF_DEPENDS}
 #---------------------------------------------------------------------------
 
 .if defined(_AUTOTOOL_libltdl)
-LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/devel/libltdl22
+LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/devel/libltdl
 .endif
 
 #---------------------------------------------------------------------------
@@ -262,7 +262,7 @@ LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/devel/libltdl22
 
 .if defined(_AUTOTOOL_libtool) || defined(_AUTOTOOL_libtoolize)
 LIBTOOL_VERSION=	2.2.10
-LIBTOOL_PORT=		devel/libtool22
+LIBTOOL_PORT=		devel/libtool
 
 . if defined(_AUTOTOOL_libtool) && ${_AUTOTOOL_libtool} == "yes"
 _AUTOTOOL_rule_libtool=		yes
diff --git a/UPDATING b/UPDATING
index d6e49a0bb210..67e573342cd9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20101208:
+  AFFECTS: autotools
+  AUTHOR: autotools@FreeBSD.org
+
+  Another stage in the autotools cleanup that reduces tree churn whilst
+  updating components, a number of ports have now moved to non-versioned
+  locations since there is now only the concept of legacy and current
+  versions.
+
+  # portmaster -o devel/autoconf devel/autoconf268
+  # portmaster -o devel/automake devel/automake111
+  # portmaster -o devel/libtool devel/libtool22
+  # portmaster -o devel/libltdl devel/libltdl22
+
+  substitute 'portupgrade' for 'portmaster' accordingly if that's your
+  your upgrade tool of choice.
+
 20101205:
   AFFECTS: users of www/py-flexget
   AUTHOR: lioux@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index 2b55e0844d12..a5570803dd0b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -61,15 +61,15 @@
     SUBDIR += atlas
     SUBDIR += atlas-devel
     SUBDIR += autobook
+    SUBDIR += autoconf
     SUBDIR += autoconf-archive
     SUBDIR += autoconf-wrapper
     SUBDIR += autoconf213
-    SUBDIR += autoconf268
     SUBDIR += autodia
     SUBDIR += autodist
     SUBDIR += autogen
+    SUBDIR += automake
     SUBDIR += automake-wrapper
-    SUBDIR += automake111
     SUBDIR += automake14
     SUBDIR += automoc4
     SUBDIR += autotools
@@ -820,8 +820,7 @@
     SUBDIR += liblogging
     SUBDIR += liblouis
     SUBDIR += liblouisxml
-    SUBDIR += libltdl22
-    SUBDIR += libltdl24
+    SUBDIR += libltdl
     SUBDIR += libmaa
     SUBDIR += libmatheval
     SUBDIR += libmba
@@ -890,8 +889,7 @@
     SUBDIR += libticalcs
     SUBDIR += libtifiles
     SUBDIR += libtifiles2
-    SUBDIR += libtool22
-    SUBDIR += libtool24
+    SUBDIR += libtool
     SUBDIR += libtpl
     SUBDIR += libublio
     SUBDIR += libukcprog
diff --git a/devel/autoconf268/Makefile b/devel/autoconf/Makefile
index 28d381f08e68..b4fdab409601 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	autoconf268
+# New ports collection makefile for:	autoconf
 # Date created:		7th December 2006
 # Whom:			ade@FreeBSD.org
 #
diff --git a/devel/autoconf268/distinfo b/devel/autoconf/distinfo
index bf8470c80a1c..bf8470c80a1c 100644
--- a/devel/autoconf268/distinfo
+++ b/devel/autoconf/distinfo
diff --git a/devel/autoconf268/files/patch-autoconf.texi b/devel/autoconf/files/patch-autoconf.texi
index d37b7fbbedab..d37b7fbbedab 100644
--- a/devel/autoconf268/files/patch-autoconf.texi
+++ b/devel/autoconf/files/patch-autoconf.texi
diff --git a/devel/autoconf268/files/patch-doc-Makefile.in b/devel/autoconf/files/patch-doc-Makefile.in
index ba8a63bbcb84..ba8a63bbcb84 100644
--- a/devel/autoconf268/files/patch-doc-Makefile.in
+++ b/devel/autoconf/files/patch-doc-Makefile.in
diff --git a/devel/autoconf268/pkg-descr b/devel/autoconf/pkg-descr
index c404cc852ea8..c404cc852ea8 100644
--- a/devel/autoconf268/pkg-descr
+++ b/devel/autoconf/pkg-descr
diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf/pkg-plist
index 69fac8d76272..69fac8d76272 100644
--- a/devel/autoconf268/pkg-plist
+++ b/devel/autoconf/pkg-plist
diff --git a/devel/automake111/Makefile b/devel/automake/Makefile
index 793281836683..3eaff14b70e2 100644
--- a/devel/automake111/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	automake111
+# New ports collection makefile for:	automake
 # Date created:		5th December 2006
 # Whom:			Ade Lovett <ade@FreeBSD.org>
 #
diff --git a/devel/automake111/distinfo b/devel/automake/distinfo
index ec9d3c8e176d..ec9d3c8e176d 100644
--- a/devel/automake111/distinfo
+++ b/devel/automake/distinfo
diff --git a/devel/automake111/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in
index 55d85c2ed5b9..55d85c2ed5b9 100644
--- a/devel/automake111/files/patch-Makefile.in
+++ b/devel/automake/files/patch-Makefile.in
diff --git a/devel/automake111/files/patch-doc::Makefile.in b/devel/automake/files/patch-doc::Makefile.in
index 17a9dc7f012c..17a9dc7f012c 100644
--- a/devel/automake111/files/patch-doc::Makefile.in
+++ b/devel/automake/files/patch-doc::Makefile.in
diff --git a/devel/automake111/files/patch-doc::automake.texi b/devel/automake/files/patch-doc::automake.texi
index 3d9f61200a71..3d9f61200a71 100644
--- a/devel/automake111/files/patch-doc::automake.texi
+++ b/devel/automake/files/patch-doc::automake.texi
diff --git a/devel/automake111/pkg-descr b/devel/automake/pkg-descr
index c0c2845eff43..c0c2845eff43 100644
--- a/devel/automake111/pkg-descr
+++ b/devel/automake/pkg-descr
diff --git a/devel/automake111/pkg-plist b/devel/automake/pkg-plist
index 76698df4f74c..76698df4f74c 100644
--- a/devel/automake111/pkg-plist
+++ b/devel/automake/pkg-plist
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 8f001e0d8926..6db04f0c469e 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -16,23 +16,16 @@ DISTFILES=	# none
 MAINTAINER=	autotools@FreeBSD.org
 COMMENT=	Autotools meta-port
 
-RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool22
+RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
+		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
+		autoconf-2.68:${PORTSDIR}/devel/autoconf \
+		automake-1.4:${PORTSDIR}/devel/automake14 \
+		automake-1.11:${PORTSDIR}/devel/automake
 
 PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes
 NO_FETCH=	yes
 
-AVAIL_AUTOCONF=	2.13 2.68
-AVAIL_AUTOMAKE=	1.4 1.11
-
-.for VER in ${AVAIL_AUTOCONF}
-RUN_DEPENDS+=	autoconf-${VER}:${PORTSDIR}/devel/autoconf${VER:C/\.//}
-.endfor
-
-.for VER in ${AVAIL_AUTOMAKE}
-RUN_DEPENDS+=	automake-${VER}:${PORTSDIR}/devel/automake${VER:C/\.//}
-.endfor
-
 do-install:
 	@${ECHO_CMD} "Placeholder file" > ${PREFIX}/${PLIST_FILES}
 
diff --git a/devel/djgpp-gcc/Makefile b/devel/djgpp-gcc/Makefile
index ff69b42984b3..04e4b1aa716e 100644
--- a/devel/djgpp-gcc/Makefile
+++ b/devel/djgpp-gcc/Makefile
@@ -31,8 +31,8 @@ BROKEN=		Does not work with autoconf>=2.64 - no upstream fix.
 BUILD_DEPENDS=	${TARGET}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${LOCALBASE}/${TARGET}/bin/stubify:${PORTSDIR}/devel/${PKGNAMEPREFIX}crx \
 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		autoconf-2.68:${PORTSDIR}/devel/autoconf268 \
-		aclocal-1.11:${PORTSDIR}/devel/automake111
+		autoconf-2.68:${PORTSDIR}/devel/autoconf \
+		aclocal-1.11:${PORTSDIR}/devel/automake
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		mpfr.4:${PORTSDIR}/math/mpfr
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 7aa14431ee89..2a31a1dc00fb 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	C++ library for reading and generating files in the ELF binary format
 
-BUILD_DEPENDS=	libtoolize:${PORTSDIR}/devel/libtool22
+BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index 79bfea74aa4c..781d041b3ffd 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -17,8 +17,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.11:${PORTSDIR}/devel/automake111		\
-			autoconf-2.68:${PORTSDIR}/devel/autoconf268
+			automake-1.11:${PORTSDIR}/devel/automake		\
+			autoconf-2.68:${PORTSDIR}/devel/autoconf
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index db4d28e1dfee..5a41fb774d89 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl22 \
+BUILD_DEPENDS=	${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl \
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion \
diff --git a/devel/libltdl22/Makefile b/devel/libltdl/Makefile
index 4f41a7e1b779..ad5b86096964 100644
--- a/devel/libltdl22/Makefile
+++ b/devel/libltdl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libltdl
-MASTERDIR=	${.CURDIR}/../../devel/libtool22
+MASTERDIR=	${.CURDIR}/../../devel/libtool
 
 COMMENT=	System independent dlopen wrapper
 
@@ -23,7 +23,6 @@ BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	libltdl22
 INFO=		# empty
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl22/pkg-descr b/devel/libltdl/pkg-descr
index e57b99f21a5c..e57b99f21a5c 100644
--- a/devel/libltdl22/pkg-descr
+++ b/devel/libltdl/pkg-descr
diff --git a/devel/libltdl22/pkg-plist b/devel/libltdl/pkg-plist
index bd6781079532..bd6781079532 100644
--- a/devel/libltdl22/pkg-plist
+++ b/devel/libltdl/pkg-plist
diff --git a/devel/libltdl24/Makefile b/devel/libltdl24/Makefile
deleted file mode 100644
index 616c62e2345c..000000000000
--- a/devel/libltdl24/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	libltdl
-# Date created:		23 January 2002
-# Whom:			Jeremy Norris <ishmael27x@yahoo.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libltdl
-MASTERDIR=	${.CURDIR}/../../devel/libtool24
-
-COMMENT=	System independent dlopen wrapper
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${CONFIGURE_WRKSRC}/COPYING.LIB
-USE_GNOME=	ltverhack
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-LIBTOOLFILES=	libltdl/configure
-CONFIGURE_ARGS=	--enable-ltdl-install
-
-CONFIGURE_WRKSRC=${WRKSRC}/libltdl
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	libltdl24
-INFO=		# empty
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl24/pkg-descr b/devel/libltdl24/pkg-descr
deleted file mode 100644
index e57b99f21a5c..000000000000
--- a/devel/libltdl24/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
-
-It supports the following dlopen interfaces:
-* dlopen (Solaris, Linux and various BSD flavors)
-* shl_load (HP-UX)
-* LoadLibrary (Win16 and Win32)
-* load_add_on (BeOS)
-* GNU DLD (emulates dynamic linking for static libraries)
-* libtool's dlpreopen
diff --git a/devel/libltdl24/pkg-plist b/devel/libltdl24/pkg-plist
deleted file mode 100644
index bd6781079532..000000000000
--- a/devel/libltdl24/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-include/libltdl/lt_dlloader.h
-include/libltdl/lt_error.h
-include/libltdl/lt_system.h
-include/ltdl.h
-lib/libltdl.a
-lib/libltdl.la
-lib/libltdl.so
-lib/libltdl.so.7
-@dirrm include/libltdl
diff --git a/devel/libtool22/Makefile b/devel/libtool/Makefile
index 949e0de17534..949e0de17534 100644
--- a/devel/libtool22/Makefile
+++ b/devel/libtool/Makefile
diff --git a/devel/libtool22/distinfo b/devel/libtool/distinfo
index ee1757dd9c29..ee1757dd9c29 100644
--- a/devel/libtool22/distinfo
+++ b/devel/libtool/distinfo
diff --git a/devel/libtool22/files/patch-libltdl-Makefile.in b/devel/libtool/files/patch-libltdl-Makefile.in
index 02f03e7099d6..02f03e7099d6 100644
--- a/devel/libtool22/files/patch-libltdl-Makefile.in
+++ b/devel/libtool/files/patch-libltdl-Makefile.in
diff --git a/devel/libtool22/files/patch-libltdl_config_ltmain.sh b/devel/libtool/files/patch-libltdl_config_ltmain.sh
index ad0599710598..ad0599710598 100644
--- a/devel/libtool22/files/patch-libltdl_config_ltmain.sh
+++ b/devel/libtool/files/patch-libltdl_config_ltmain.sh
diff --git a/devel/libtool22/pkg-descr b/devel/libtool/pkg-descr
index 1dea88bf6d51..1dea88bf6d51 100644
--- a/devel/libtool22/pkg-descr
+++ b/devel/libtool/pkg-descr
diff --git a/devel/libtool22/pkg-plist b/devel/libtool/pkg-plist
index d4bbdd78ca36..d4bbdd78ca36 100644
--- a/devel/libtool22/pkg-plist
+++ b/devel/libtool/pkg-plist
diff --git a/devel/libtool24/Makefile b/devel/libtool24/Makefile
deleted file mode 100644
index f00ff849bf6e..000000000000
--- a/devel/libtool24/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	libtool
-# Date created:		6 May 1998
-# Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	libtool
-PORTVERSION=	2.4
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	libtool
-DISTNAME=	libtool-${PORTVERSION}
-
-MAINTAINER=	autotools@FreeBSD.org
-COMMENT?=	Generic shared library support script
-
-LICENSE?=        GPLv2
-LICENSE_FILE?=   ${WRKSRC}/COPYING
-
-NO_LATEST_LINK=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-INFO?=		libtool
-.if ${PORTNAME} != "libltdl"
-MAN1=		libtool.1 libtoolize.1
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|sed gsed|sed|g' \
-		-e 's|CC=cc|CC=${CC}|g' \
-		${WRKSRC}/configure ${WRKSRC}/libltdl/configure
-
-post-configure:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
-.include <bsd.port.mk>
diff --git a/devel/libtool24/distinfo b/devel/libtool24/distinfo
deleted file mode 100644
index 67c0bf25ceda..000000000000
--- a/devel/libtool24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libtool-2.4.tar.gz) = b32b04148ecdd7344abc6fe8bd1bb021
-SHA256 (libtool-2.4.tar.gz) = 13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e
-SIZE (libtool-2.4.tar.gz) = 2580417
diff --git a/devel/libtool24/files/patch-libltdl-Makefile.in b/devel/libtool24/files/patch-libltdl-Makefile.in
deleted file mode 100644
index 02f03e7099d6..000000000000
--- a/devel/libtool24/files/patch-libltdl-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- libltdl/Makefile.in.orig	2009-11-19 14:55:46.000000000 +0100
-+++ libltdl/Makefile.in	2009-11-19 14:56:35.000000000 +0100
-@@ -402,12 +402,6 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
--	$(am__cd) $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
--
- config.h: stamp-h1
- 	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
-@@ -418,7 +412,6 @@
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config-h.in:  $(am__configure_deps) 
--	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- 	rm -f stamp-h1
- 	touch $@
- 
diff --git a/devel/libtool24/files/patch-libltdl_config_ltmain.sh b/devel/libtool24/files/patch-libltdl_config_ltmain.sh
deleted file mode 100644
index b703de8ada48..000000000000
--- a/devel/libtool24/files/patch-libltdl_config_ltmain.sh
+++ /dev/null
@@ -1,83 +0,0 @@
---- libltdl/config/ltmain.sh.orig	2010-09-22 09:45:43.000000000 -0500
-+++ libltdl/config/ltmain.sh	2010-10-12 13:06:32.000000000 -0500
-@@ -1376,2 +1376,17 @@
-     $opt_debug
-+
-+    # FreeBSD-specific: where we install compilers with non-standard names
-+    tag_compilers_CC="*cc cc* *gcc gcc* clang"
-+    tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
-+    base_compiler=`set -- "$@"; echo $1`
-+
-+    # If $tagname isn't set, then try to infer if the default "CC" tag applies
-+    if test -z "$tagname"; then
-+      for zp in $tag_compilers_CC; do
-+        case $base_compiler in
-+	 $zp) tagname="CC"; break;;
-+	esac
-+      done
-+    fi
-+
-     if test -n "$available_tags" && test -z "$tagname"; then
-@@ -1412,3 +1427,18 @@
- 	    esac
--	  fi
-+
-+	    # FreeBSD-specific: try compilers based on inferred tag
-+	    if test -z "$tagname"; then
-+	      eval "tag_compilers=\$tag_compilers_${z}"
-+	      if test -n "$tag_compilers"; then
-+		for zp in $tag_compilers; do
-+		  case $base_compiler in   
-+		    $zp) tagname=$z; break;;
-+		  esac
-+		done
-+		if test -n "$tagname"; then
-+		  break
-+		fi
-+	      fi
-+            fi
-+          fi
- 	done
-@@ -3516,2 +3546,5 @@
- 	;;
-+      *-*-freebsd*)
-+	# FreeBSD doesn't need this...
-+	;;
-       *)
-@@ -5585,2 +5618,3 @@
- 	esac
-+	deplibs="$deplibs $arg"
- 	continue
-@@ -6155,9 +6189,26 @@
- 	    func_append compiler_flags " $deplib"
--	    if test "$linkmode" = lib ; then
--		case "$new_inherited_linker_flags " in
--		    *" $deplib "*) ;;
--		    * ) func_append new_inherited_linker_flags " $deplib" ;;
--		esac
--	    fi
- 	  fi
-+
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test "$pass" = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    ;;
-+	  prog)
-+	    if test "$pass" = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test "$pass" = scan; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    ;;
-+	  *)
-+	    ;;
-+	  esac # linkmode
-+
- 	  continue
diff --git a/devel/libtool24/pkg-descr b/devel/libtool24/pkg-descr
deleted file mode 100644
index 1dea88bf6d51..000000000000
--- a/devel/libtool24/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This is GNU Libtool, a generic library support script.  Libtool hides
-the complexity of using shared libraries behind a consistent, portable
-interface.
-
-To use libtool, add the new generic library building commands to your
-Makefile, Makefile.in, or Makefile.am.
-
-WWW: http://www.gnu.org/software/libtool/
diff --git a/devel/libtool24/pkg-plist b/devel/libtool24/pkg-plist
deleted file mode 100644
index d4bbdd78ca36..000000000000
--- a/devel/libtool24/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/libtool
-bin/libtoolize
-share/aclocal/argz.m4
-share/aclocal/libtool.m4
-share/aclocal/ltdl.m4
-share/aclocal/ltoptions.m4
-share/aclocal/ltsugar.m4
-share/aclocal/ltversion.m4
-share/aclocal/lt~obsolete.m4
-share/libtool/config/compile
-share/libtool/config/config.guess
-share/libtool/config/config.sub
-share/libtool/config/depcomp
-share/libtool/config/install-sh
-share/libtool/config/ltmain.sh
-share/libtool/config/missing
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/Makefile.inc
-share/libtool/libltdl/README
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/argz.c
-share/libtool/libltdl/argz_.h
-share/libtool/libltdl/config-h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.ac
-share/libtool/libltdl/libltdl/lt__alloc.h
-share/libtool/libltdl/libltdl/lt__dirent.h
-share/libtool/libltdl/libltdl/lt__glibc.h
-share/libtool/libltdl/libltdl/lt__private.h
-share/libtool/libltdl/libltdl/lt__strl.h
-share/libtool/libltdl/libltdl/lt_dlloader.h
-share/libtool/libltdl/libltdl/lt_error.h
-share/libtool/libltdl/libltdl/lt_system.h
-share/libtool/libltdl/libltdl/slist.h
-share/libtool/libltdl/loaders/dld_link.c
-share/libtool/libltdl/loaders/dlopen.c
-share/libtool/libltdl/loaders/dyld.c
-share/libtool/libltdl/loaders/load_add_on.c
-share/libtool/libltdl/loaders/loadlibrary.c
-share/libtool/libltdl/loaders/preopen.c
-share/libtool/libltdl/loaders/shl_load.c
-share/libtool/libltdl/lt__alloc.c
-share/libtool/libltdl/lt__dirent.c
-share/libtool/libltdl/lt__strl.c
-share/libtool/libltdl/lt_dlloader.c
-share/libtool/libltdl/lt_error.c
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/slist.c
-@dirrm share/libtool/libltdl/loaders
-@dirrm share/libtool/libltdl/libltdl
-@dirrm share/libtool/libltdl
-@dirrm share/libtool/config
-@dirrm share/libtool
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index b60f152d11cd..988b725faddd 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	GraphicsMagick-1.[13].*
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		jbig:${PORTSDIR}/graphics/jbigkit	\
 		wmflite:${PORTSDIR}/graphics/libwmf	\
-		xml2:${PORTSDIR}/textproc/libxml2	\
-		ltdl:${PORTSDIR}/devel/libltdl22
+		xml2:${PORTSDIR}/textproc/libxml2
 OTHERGRAPHICS=	jasper jpeg lcms png tiff
 LIB_DEPENDS+=	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
 OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
@@ -34,7 +33,7 @@ OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
 		TESTS "Run bundled self-tests after build" on
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	libtool libltdl
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 5e8a30774707..7812114e3655 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	GraphicsMagick-1.[12].*
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		jbig:${PORTSDIR}/graphics/jbigkit	\
 		wmflite:${PORTSDIR}/graphics/libwmf	\
-		xml2:${PORTSDIR}/textproc/libxml2	\
-		ltdl:${PORTSDIR}/devel/libltdl22
+		xml2:${PORTSDIR}/textproc/libxml2
 OTHERGRAPHICS=	jasper jpeg lcms png tiff
 LIB_DEPENDS+=	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
 
@@ -36,7 +35,7 @@ OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
 		TESTS "Run bundled self-tests after build" on
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	libtool libltdl
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 0b8cadf00e94..317106f72867 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	libgexiv2-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GObject-based wrapper around the Exiv2 library
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool22 \
+BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
 		gm4:${PORTSDIR}/devel/m4 \
 		pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index c3f5f8137cd2..ad39a9832f7c 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A Free Toolkit For Developing Mapping Applications
 
 LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
 		proj:${PORTSDIR}/graphics/proj \
-		ltdl:${PORTSDIR}/devel/libltdl22 \
 		png:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff \
 		cairo.2:${PORTSDIR}/graphics/cairo \
@@ -34,6 +33,7 @@ USE_BZIP2=	yes
 NO_BUILD=	yes
 USE_PYTHON=	2.4+
 USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libltdl
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile
index 32a267f60ecc..d474735305a7 100644
--- a/graphics/sane-epkowa/Makefile
+++ b/graphics/sane-epkowa/Makefile
@@ -60,12 +60,12 @@ WRKSRC=${WRKDIR}/iscan-${PORTVERSION}
 MAN5=		sane-epkowa.5
 
 # We use LIB_DEPENDS, but the dependency is also at build time
-LIB_DEPENDS+=	ltdl:${PORTSDIR}/devel/libltdl22
+LIB_DEPENDS+=	ltdl:${PORTSDIR}/devel/libltdl
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 LIB_DEPENDS+=	getline:${PORTSDIR}/devel/libgetline
 LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
 
-#BUILD_DEPENDS+=	${LOCALBASE}/lib/libltdl.so:${PORTSDIR}/devel/libltdl22
+#BUILD_DEPENDS+=	${LOCALBASE}/lib/libltdl.so:${PORTSDIR}/devel/libltdl
 
 # gtk libraries are used by the frontend, which we do not build, however
 # the configure script relies on that and fails if not present, so as
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index d9339a68fb4e..3fd54a4b878e 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Sather compiler
 #
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
 		gc-redirect.1:${PORTSDIR}/devel/boehm-gc-redirect
-BUILD_DEPENDS=	${LOCALBASE}/bin/libtool:${PORTSDIR}/devel/libtool22
+BUILD_DEPENDS=	${LOCALBASE}/bin/libtool:${PORTSDIR}/devel/libtool
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/net-mgmt/nagios-check_memcached_paranoid/Makefile b/net-mgmt/nagios-check_memcached_paranoid/Makefile
index 42a67edb025d..b65e5e1b0294 100644
--- a/net-mgmt/nagios-check_memcached_paranoid/Makefile
+++ b/net-mgmt/nagios-check_memcached_paranoid/Makefile
@@ -26,9 +26,9 @@ FILE=		${PORTNAME}.c
 PLUGINS=	${PORTSDIR}/net-mgmt/nagios-plugins
 NDIR_CMD=	cd ${PLUGINS} && ${MAKE} -VWRKSRC
 # Needed for build target on net-mgmt/nagios-plugins
-EXTRA_DEPENDS=	automake>0:${PORTSDIR}/devel/automake111 \
-		autoconf>0:${PORTSDIR}/devel/autoconf268 \
-		libtool>0:${PORTSDIR}/devel/libtool22 \
+EXTRA_DEPENDS=	automake>0:${PORTSDIR}/devel/automake \
+		autoconf>0:${PORTSDIR}/devel/autoconf \
+		libtool>0:${PORTSDIR}/devel/libtool \
 		gmake:${PORTSDIR}/devel/gmake
 
 do-extract:
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 7f3f92defcd1..c3bde0477561 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -99,8 +99,8 @@ CONFIGURE_ARGS+= --without-odbc
 .else
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.7:${PORTSDIR}/devel/libltdl22
+USE_AUTOTOOLS+=	libltdl
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/science/meep/Makefile b/science/meep/Makefile
index a68607e1bebb..6a8cb9f49dd6 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -20,6 +20,7 @@ USE_FORTRAN=	yes
 USE_GCC=	4.4+
 USE_ICONV=	yes
 USE_GETTEXT=	yes
+USE_AUTOTOOLS+=	libltdl
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -30,8 +31,7 @@ BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
 LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
 		blas.2:${PORTSDIR}/math/blas \
 		ctl.4:${PORTSDIR}/science/libctl \
-		hdf5.0:${PORTSDIR}/science/hdf5 \
-		ltdl.7:${PORTSDIR}/devel/libltdl22
+		hdf5.0:${PORTSDIR}/science/hdf5
 RUN_DEPENDS+=	harminv:${PORTSDIR}/science/harminv
 
 .include <bsd.port.mk>
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index ccd346203e19..e69aafcb1569 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		net-1.1.5:${PORTSDIR}/net/libnet-devel \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		xml2:${PORTSDIR}/textproc/libxml2
-PATCH_DEPENDS=	${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
+PATCH_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
 USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool libltdl
 AUTOMAKE_ARGS+=	--add-missing --include-deps --copy