42 files changed, 42 insertions, 49 deletions

diff --git a/lang/ccscript/Makefile b/lang/ccscript/Makefile
index 53713abbeb9c..b313756ed923 100644
--- a/lang/ccscript/Makefile
+++ b/lang/ccscript/Makefile
@@ -18,7 +18,7 @@ COMMENT=	State-event driven class extendible C++ script interpreter
 LIB_DEPENDS=	ccgnu2-1.3.1:${PORTSDIR}/devel/commoncpp
 
 USE_GNOME=	gnometarget
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GCC=	3.4
 INSTALL_TARGET=	install man
 INSTALLS_SHLIB=	yes
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 3a804f8b50d4..684c3e08aff1 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Scheme-to-C compiler
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=		chicken-config.1 chicken-profile.1 chicken-setup.1 chicken.1 \
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 9ba94ec29e93..a160abf641f4 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for the SIMULA programming language
 
 USE_PERL5=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/lang/clips/Makefile b/lang/clips/Makefile
index 40b6e62a30ae..210f8999f87e 100644
--- a/lang/clips/Makefile
+++ b/lang/clips/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@dougdidit.com
 COMMENT=	CLIPS is a productive development and delivery expert system tool
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 38693fd1aeca..c80c7f414ff5 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -45,7 +45,7 @@ ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	default
 
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 0d27fa77074f..48d90133d51a 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -29,7 +29,7 @@ INFO=		ecl ecldev
 USE_GMAKE=	YES
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	YES
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ARGS=	--with-asdf --with-tcp --with-system-gmp --enable-boehm=included
 
 # We need to tell ECL where to find the GMP includes
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index b7139f3e8d15..98bf309a115b 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFLAGS=	# none
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 92d0b56702ba..f649136268bb 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	emacs
 MAINTAINER=	amakawa@jp.FreeBSD.org
 COMMENT=	An introduction to Emacs Lisp programming
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 .include <bsd.port.mk>
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index c4791dbca8eb..8db78b4a7039 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://enlightenment.freedesktop.org/files/
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A C like scripting language used in parts of the Enlightenment
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index a356b0863375..c42373d8dad0 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An embeddable scripting language
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index 31549d5fc6fc..cdc53326ae20 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	OPTIM="${CFLAGS}"
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ARGS=	--disable-float
 
 MAN1=		pfe.1
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index f21811ce0614..44c1d6b10a3d 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -16,11 +16,10 @@ COMMENT=		Gambas Almost Means BASic
 LIB_DEPENDS=		curl.3:${PORTSDIR}/ftp/curl	\
 			ml.0:${PORTSDIR}/math/ldouble
 
-USE_LIBLTDL=		yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_KDELIBS_VER=	3
 USE_GETTEXT=		yes
 USE_BZIP2=		yes
-USE_LIBTOOL_VER=	15
 LIBTOOLFILES=		configure libltdl/configure
 LIBTOOLFLAGS=		# none
 USE_GMAKE=		yes
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index a980f074a69a..389245726c83 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 ONLY_FOR_ARCHS=	i386
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=--prefix=${PREFIX} \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 15fe7b9f4f94..309b0fcfcca8 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 IGNORE=		requires newer version of perl
 .endif
 
-WANT_AUTOCONF_VER=259	# Need this to regenerate patched configure in OpenAL
+USE_AUTOTOOLS=	autoconf:259:env
 LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4 \
 		glut.3:${PORTSDIR}/graphics/libglut \
 		openal.0:${PORTSDIR}/audio/openal \
diff --git a/lang/glade-gpl/Makefile b/lang/glade-gpl/Makefile
index ba10cd586bcf..38e3e9b6c1a1 100644
--- a/lang/glade-gpl/Makefile
+++ b/lang/glade-gpl/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 .if ${OSVERSION} >= 500039
 WITHOUT_CPU_CFLAGS=	yes
 .endif
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	ADA=adagcc
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index ba10cd586bcf..38e3e9b6c1a1 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 .if ${OSVERSION} >= 500039
 WITHOUT_CPU_CFLAGS=	yes
 .endif
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	ADA=adagcc
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 495619cc4d74..dd6d2de3b5c4 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 PREFIX=		${LOCALBASE}/GNUstep
 NO_MTREE=	yes
 ETCDIR=		${LOCALBASE}/etc
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-procfs
 CONFIGURE_TARGET=
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index a8765a57b71e..8d8e1bbfdc86 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}.orig/src/src
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}" \
 		--with-doc-dir=none \
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 99ec957b21de..3ca9229269b8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/lang/libjit/Makefile b/lang/libjit/Makefile
index aaeb01e968e4..ff1c821dea95 100644
--- a/lang/libjit/Makefile
+++ b/lang/libjit/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libjit implements Just-In-Time compilation functionality
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile
index e3cabeed5f24..a9ab01a5a884 100644
--- a/lang/libutils/Makefile
+++ b/lang/libutils/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support lib for Tensile/NSL
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/lang/ml-pnet/Makefile b/lang/ml-pnet/Makefile
index 5e1048020616..fbf849b1f136 100644
--- a/lang/ml-pnet/Makefile
+++ b/lang/ml-pnet/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	cscc:${PORTSDIR}/lang/pnet-base \
 		${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
 RUN_DEPENDS=	${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../pnet/Makefile.pnet"
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index cff7242de90e..44d699154658 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -22,7 +22,7 @@ USE_BISON=	yes
 USE_GNOME=	gnomehack glib20
 USE_GMAKE=	yes
 LIBTOOLFILES=	configure libgc/configure
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index e5c0bb666d13..8860d4593625 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -32,7 +32,7 @@ USE_BISON=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 # magic wand: set INSTALL to some absurd value, or else
 # mozart's configure will not find the right install
 # when configuring as root.
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 687299a18ba2..1b98e3051671 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -18,7 +18,7 @@ COMMENT=	NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
 
 CONFLICTS=	js-1.5.*
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 .if defined(NOPORTDOCS)
 USE_REINPLACE=	yes
 .endif
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 161fdc49b678..d151d39fa414 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gc4.14.tar.gz
 MAINTAINER=	ob@breuninger.org
 COMMENT=	Optimizing Oberon-2 compiler of University of Kaiserslautern, Germany
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		oo2c.1 oob.1 ooef.1 oocn.1 oowhereis.1
 
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index c89a8f81dda2..77227d1d688e 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -17,10 +17,9 @@ COMMENT=	An open-source COBOL compiler
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index c89a8f81dda2..77227d1d688e 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -17,10 +17,9 @@ COMMENT=	An open-source COBOL compiler
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile
index 466f4da77e10..cca566fbe7ea 100644
--- a/lang/osb-jscore/Makefile
+++ b/lang/osb-jscore/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	gtk-webcore
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Javascript interpreter port from Apple's KHTML and part of Gtk-Webcore
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GNOME=	gtk20 gnomehack
 INSTALLS_SHLIB=	yes
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 129e7f39ecbd..f6dc4be7ec8d 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	MIT Object Tcl
 
 LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
 INSTALLS_SHLIB=	yes
 
diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile
index 6a968c35b878..da568681c1b1 100644
--- a/lang/pfe-devel/Makefile
+++ b/lang/pfe-devel/Makefile
@@ -19,7 +19,7 @@ LATEST_LINK=	pfe-devel
 USE_PERL5_BUILD=yes
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	pfe/configure
 LIBTOOLFLAGS=	# none
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 6a968c35b878..da568681c1b1 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -19,7 +19,7 @@ LATEST_LINK=	pfe-devel
 USE_PERL5_BUILD=yes
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	pfe/configure
 LIBTOOLFLAGS=	# none
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index d222d04bf5e8..56a31f86b18b 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -177,7 +177,7 @@ LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 .endif
 
 .if ${PHP_MODNAME} == "mcve"
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 7666667c2e32..11eef6fbfb59 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -166,7 +166,7 @@ LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 .endif
 
 .if ${PHP_MODNAME} == "mcve"
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 7666667c2e32..11eef6fbfb59 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -166,7 +166,7 @@ LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 .endif
 
 .if ${PHP_MODNAME} == "mcve"
diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index a24999a44fe6..391b0400141c 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -24,7 +24,7 @@ USE_XLIB=	yes
 .endif
 
 USE_GCC=	3.4
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/lang/pnetc/Makefile b/lang/pnetc/Makefile
index ced10d737fbf..be9fbb39dd13 100644
--- a/lang/pnetc/Makefile
+++ b/lang/pnetc/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	cscc:${PORTSDIR}/lang/pnet-base \
 		${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
 RUN_DEPENDS=	${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../pnet/Makefile.pnet"
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 52f62731e2cd..5d974baa283a 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	cscc:${PORTSDIR}/lang/pnet-base \
 USE_XLIB=	yes
 .endif
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 50b35e5e2d49..f49ec232ca1d 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -86,7 +86,7 @@ PLIST_SUB+=		HC08=""
 CONFIGURE_ARGS+=	--disable-ucsim
 PLIST_SUB+=		UCSIM="@comment "
 .else
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=		sim/ucsim/aclocal.m4
 PLIST_SUB+=		UCSIM=""
 .endif
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index 9bc4aa10db69..cd23fede6f40 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-pic16-port
 PLIST_SUB+=		PIC16="@comment "
 .else
 BUILD_DEPENDS+=		gpasm:${PORTSDIR}/devel/gputils
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 PLIST_SUB+=		PIC16=""
 .endif
 
@@ -89,7 +89,6 @@ PLIST_SUB+=		HC08=""
 CONFIGURE_ARGS+=	--disable-ucsim
 PLIST_SUB+=		UCSIM="@comment "
 .else
-USE_LIBTOOL_VER=	15
 LIBTOOLFILES=		sim/ucsim/aclocal.m4
 PLIST_SUB+=		UCSIM=""
 .endif
diff --git a/lang/see-devel/Makefile b/lang/see-devel/Makefile
index 05d1525ad5ad..9c39984d72f8 100644
--- a/lang/see-devel/Makefile
+++ b/lang/see-devel/Makefile
@@ -29,7 +29,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile
index 19e1f2758f63..2432776d22c2 100644
--- a/lang/tensile/Makefile
+++ b/lang/tensile/Makefile
@@ -18,10 +18,9 @@ COMMENT=	Programming language designed for especially complex processing texts
 
 LIB_DEPENDS=	utils.1:${PORTSDIR}/lang/libutils
 
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
 LIBTOOLFLAGS=	# none
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \