58 files changed, 63 insertions, 61 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index d9adc10c87c6..de8efe4518d1 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -51,7 +51,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 #	THREADS                 "Enable threads in apr"                 Off
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=		autoconf:268 libtool:22
+USE_AUTOTOOLS=		autoconf libtool
 USE_PERL5=		yes
 USE_RC_SUBR=		apache2
 USE_APACHE=		common20
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 80e03a7f5bc2..619ec6f81bc8 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -37,7 +37,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 USE_APACHE=		common22
 USE_BZIP2=		yes
 USE_ICONV=		yes
-USE_AUTOTOOLS=		autoconf:268 libtool:22
+USE_AUTOTOOLS=		autoconf libtool
 USE_PERL5=		yes
 USE_RC_SUBR=		apache22 htcacheclean
 LIBTOOLFILES=	configure
diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile
index 35044214dfb0..afd0e11d87ef 100644
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14 \
 		wget:${PORTSDIR}/ftp/wget
 
 PROJECTHOST=	asterisk-bsd
-USE_AUTOTOOLS=	autoconf:268 automake:111
+USE_AUTOTOOLS=	autoconf automake
 USE_GMAKE=	yes
 SUB_FILES=	pkg-message
 
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 3d7edd1eb9b5..6a5576ac88bc 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -22,7 +22,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui moc_build rcc_build uic_build qt3support
 USE_GNOME=	gnometarget libxml2
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS=	aclocal automake autoconf
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
 .include <bsd.port.pre.mk>
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 61364961b1e7..7a01af8d3528 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An implementation of an ICAP server
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	c_icap
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 SUB_FILES=	pkg-install pkg-deinstall
 
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index fb3862c48557..258c353a17cf 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ class library for writing CGI applications
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 USE_LDCONFIG=	yes
diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index a1e081a0bf85..6a549940ac89 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A history cleaner for Netscape Navigator and Communicator
 
 WANT_GNOME=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake14 autoconf213
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index bf5a851d983d..07b70b36cd88 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -30,7 +30,7 @@ ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
 
 INFO=		emacs-w3m-ja emacs-w3m
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 ALL_TARGET=	default
 
 PLIST_SUB+=	LISPDIR=${LISPDIR} \
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 3cecb64b1d5d..e8cd6ad48bea 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-devkit
 MAINTAINER=	kimelto@gmail.com
 COMMENT=	FastCGI Development Kit
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/www/fcgiwrap/Makefile b/www/fcgiwrap/Makefile
index 7faf43057135..a942d1eb5755 100644
--- a/www/fcgiwrap/Makefile
+++ b/www/fcgiwrap/Makefile
@@ -21,7 +21,7 @@ LICENSE=	MIT
 
 USE_RC_SUBR=	fcgiwrap
 
-USE_AUTOTOOLS=	autoconf:268:env autoheader:268
+USE_AUTOTOOLS=	autoconf autoheader
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.6:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft -cairo
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.6:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft -cairo
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 7bcaa4f21b42..5a9be71c0fd1 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.6:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213:run
+USE_AUTOTOOLS=	autoconf213:env
 LATEST_LINK=	firefox35
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
@@ -81,7 +81,6 @@ LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 post-extract::
-	@(cd ${WRKSRC} && ${AUTOCONF})
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
@@ -100,6 +99,9 @@ post-patch:
 		s|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/js/src/configure
 
+pre-configure:
+	@(cd ${WRKSRC} && ${AUTOCONF})
+
 port-pre-install:
 #	${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.6:${PORTSDIR}/devel/nspr
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft -cairo
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 21e797bc2ff8..5815400e8daa 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -16,7 +16,7 @@ COMMENT= 		C library for the Flickr API
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME= 		gnomehack gnometarget ltverhack libxml2 pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 301073024efc..2edc2cc61793 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		apr-1:${PORTSDIR}/devel/apr1
 
 WRKSRC=		${WRKDIR}/httpd-test/flood
-USE_AUTOTOOLS=	autoconf:268 libtool:22:env
+USE_AUTOTOOLS=	autoconf libtool:env
 CONFIGURE_ARGS=	--disable-shared \
 	--with-apr=${LOCALBASE}/bin/apr-1-config \
 	--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index c2ee0e008f7f..1ca669adecc2 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=		YES
 USE_PERL5=		YES
 HAS_CONFIGURE=		YES
 USE_APACHE=		13
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 NO_BUILD=		YES
 USE_PHP=		pgsql session pcre
 WANT_PHP_CLI=		YES
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index ff6ee8c53f09..c18ca7395b60 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library for people wanting to use libwww with gtk/gnome
 
 LIB_DEPENDS=	wwwzip.1:${PORTSDIR}/www/libwww
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 3bb4cec5b213..def55322d88f 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-gconf=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index eda3d7c5e73b..d031c6952059 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -30,7 +30,7 @@ USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 621399e6000f..c251b5beaf2f 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Collect information from all over the Internet
 
 USE_BZIP2=		yes
 USE_PERL5=		yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure src/gatherer/curl/configure
 USE_LDCONFIG=	yes
 NO_MTREE=		yes
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 8dc9493031c2..69063d7a6dd6 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Easy-to-use offline browser utility and website copier
 
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 46ec19428ce3..7b3afc75d799 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_XORG=	xpm
 USE_GMAKE=	yes
 USE_GETTEXT=	build
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 
 .include <${.CURDIR}/../../x11/kde3/Makefile.kde>
 .include <bsd.port.mk>
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index e58dc79994ca..6e6866f1cb60 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Generic Apache2 Request Library
 USE_APACHE=	2.0+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf:268 libtool:22
+USE_AUTOTOOLS=	autoconf libtool
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index fabd867be594..2efc5bd544ab 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME http client library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index d2422c2378ec..0c619cb697f8 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index f0e2c50077c8..ca381e6ad44b 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	The W3C Reference Library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE}
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index f54b07dcc1ae..b9555d08d05a 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	mozilla-[0-9]*
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 WANT_GNOME=	yes
 WANT_PERL=	yes
 ALL_TARGET=	default
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index f4a5fc22e38d..5a87c5458d57 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -22,9 +22,9 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	lthack
 
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 .else
-USE_AUTOTOOLS=	autoconf:268 autoheader:268 aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS=	autoconf autoheader aclocal automake libtool
 ACLOCAL_ARGS=	-I m4
 .endif
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/lighttpd --enable-static
diff --git a/www/links/Makefile b/www/links/Makefile
index 298b5beeea4e..b38e5feb11f1 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--without-directfb
 .endif
 
 .if defined(WITH_IPV6)
-USE_AUTOTOOLS+=	autoconf:268
+USE_AUTOTOOLS+=	autoconf
 PATCH_SITES+=	http://xpisar.wz.cz/links-ipv6/:ipv6
 PATCHFILES+=	links-2.2-ipv6-2.diff:ipv6
 .endif
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 78160ad3c7dd..b95bcb030dfb 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -30,7 +30,7 @@ OPTIONS=	\
 USE_LDCONFIG=	yes
 USE_GNOME=	lthack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=--enable-shared \
 		--sysconfdir=${PREFIX}/etc/mnogosearch \
 		--localstatedir=/var/mnogosearch \
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 93ad9bb30d34..69dc853dd10c 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_APACHE=	2.2
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index 2090f0d024f7..5338a4d03052 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Apache module for loading C++ objects as handlers
 MAKE_JOBS_SAFE=  yes
 
 USE_APACHE=	2.0+
-USE_AUTOTOOLS=	autoconf:268 autoheader:268 libtool:22 automake:111 aclocal:111
+USE_AUTOTOOLS=	autoconf autoheader libtool automake aclocal
 CFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index cdd2fd923cc9..60c19dd5630c 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 USE_APACHE=	2.0+
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--man=${PREFIX}/man
 
 MAN8=		mod_mono.8
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 05e8a9b48e1c..3e1cfd9cbc35 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -21,7 +21,7 @@ WRKSRC=			${WRKDIR}/rivet-${PORTVERSION}
 MAKE_JOBS_SAFE=	yes
 
 USE_APACHE=	2.2+
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 USE_TCL=	84+
 GMAKE=		yes
 
diff --git a/www/mod_transform/Makefile b/www/mod_transform/Makefile
index c63490d8ea75..a2c33be2c2b2 100644
--- a/www/mod_transform/Makefile
+++ b/www/mod_transform/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An XSLT and XIncludes Filter module for Apache 2.0
 MAKE_JOBS_SAFE=  yes
 
 USE_APACHE=	2.0
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 HAS_CONFIGURE=	yes
 USE_GNOME=	libxslt
 
diff --git a/www/moonshine/Makefile b/www/moonshine/Makefile
index 88609cedaa93..49ca9ed612ac 100644
--- a/www/moonshine/Makefile
+++ b/www/moonshine/Makefile
@@ -20,7 +20,7 @@ GITCOMMIT=	35085a4
 
 USE_GMAKE=	yes
 USE_GECKO=	libxul
-USE_AUTOTOOLS=	libtool:22 libtoolize aclocal:111 autoconf:268 autoheader:268 automake:111
+USE_AUTOTOOLS=	libtool libtoolize aclocal autoconf autoheader automake
 LIBTOOLIZE_ARGS=	--force --copy --automake
 AUTOMAKE_ARGS=	--gnu --add-missing --force --copy -Wno-portability
 ACLOCAL_ARGS=	
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 2b0e09c67722..6ae0ccfac5c9 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An HTTP and WebDAV client library for Unix systems
 
 CONFLICTS=	neon2[6|8]-[0-9]*
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 USE_GNOME=	gnomehack ltverhack
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 8a1bc9935f5f..c4773a542e91 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 OOPSVERSION=	1.5.24
 
 USE_SUBMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
 		--localstatedir=${OOPSVAR} \
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index fb74b1982399..a3b5d0c8c4ee 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
 RUN_DEPENDS=	osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
 
 USE_GNOME=	gnomehack gnometarget libglade2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index 004d45536478..ed73732a2dee 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	osb-nrcore>=0.5.2:${PORTSDIR}/www/osb-nrcore
 
 USE_GNOME=	gnomehack gnometarget gtk20 librsvg2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index b8e0d985d32a..08ec6477b0fe 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore
 
 USE_XORG=	x11 xt
 USE_GNOME=	gnomehack gnometarget gtk20
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index 1229acd9e8b7..d3c54285fe60 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A PHP Extension to help debugging a PHP script
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_PHP=	yes
 USE_PHPIZE=	yes
 WITH_PHP_MOD=	yes
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 3e269df3e746..9ce5d8080d85 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -19,7 +19,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CRYPTKEY?=	11152, 368, 192, 1281, 62
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_PHP=	zlib
 USE_PHPIZE=	yes
 IGNORE_WITH_PHP=4
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index 3d7fc6f545a0..1877ca07dbf6 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -24,7 +24,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/+ipv6//}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader:213
+USE_AUTOTOOLS=	autoheader213
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-user=${USER} --with-group=${GROUP} \
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index a3e3a0e1be67..a2dca3796ee4 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 USE_RC_SUBR=	privoxy
 SUB_FILES=	pkg-message
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 241c4ce7e99e..69f921046891 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -18,7 +18,7 @@ JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 USE_OPENSSL=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 
 # Customizable settings
diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index a4392dd76c48..6fde82788ef8 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -54,7 +54,7 @@ BUILD_DEPENDS+=	${CORE_DEPS} \
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USE_PERL5=	5.8.3+
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_DEV)
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index a4392dd76c48..6fde82788ef8 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -54,7 +54,7 @@ BUILD_DEPENDS+=	${CORE_DEPS} \
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USE_PERL5=	5.8.3+
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_DEV)
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index bfe6630a25a6..d975f11109b1 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	Securely execute PHP scripts under Apache
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:111:env automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	aclocal:env automake:env autoconf:env libtool:env
 
 # Maintainer has not tested suPHP 0.6.x on Apache 1.3.
 USE_APACHE=	2.0+
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 3c8167934411..a92852dc2dd5 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Flash rendering plugin
 
 LIB_DEPENDS=	swfdec-0.8:${PORTSDIR}/graphics/swfdec
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-plugin-dir="${WEBPLUGINS_DIR}"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 803b28fe7d22..1f697e8ef446 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://swish-e.org/distribution/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple web indexing for humans - enhanced
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index c12a39f01f7f..ffa1e7bcfa4a 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 PLIST_SUB=	SHLIB="@comment " NSHLIB=""
 CONFLICTS=	tidy-20000804* tidy-lib-[0-9]*
 .else
-USE_AUTOTOOLS=	automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	automake autoconf libtool
 AUTOMAKE_ARGS+=	-a -c --foreign
 USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIB="" NSHLIB="@comment "
@@ -87,7 +87,7 @@ post-patch:
 . endfor
 .endif
 
-patch-autotools::
+patch-autotools-libtool::
 .if defined(WITH_SHLIB)
 	(cd ${WRKSRC}				\
 	&& ${LIBTOOLIZE} --force --copy		\
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index b542fca5d346..ce45dcb9b9c6 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		pcre.0:${PORTSDIR}/devel/pcre
 
-USE_AUTOTOOLS=	autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS=	autoconf automake libtool
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_OPENSSL=	yes
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index e791d29bc59f..f85cc7d91cad 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt
 USE_BISON=	build
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 libxslt ltverhack:13
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 1015a6fbcf8a..ffb3fb7b8c2c 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE=	yes
 TCL_DVER=	${TCL_VER:S/.//}
 
 USE_TCL=	84+
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
 CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tcl=${TCL_LIBDIR}
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index b84d4d958e9e..4fca899c3ca9 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	World wide web server benchmarking with SSL support
 
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/WebStone${PORTVERSION}/src
 ALL_TARGET=	install
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index f5c800b6cf68..a93473ff82be 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 MAN1=		wsdlpull.1 wsdlpull-schema.1