76 files changed, 78 insertions, 78 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 922db0716318..89c97a9fa608 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A set of libraries and applications which provide a thesaurus
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
 USE_GNOME?=	gnomehack gnometarget
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 11cc7fd87b07..9ad2f4bd0d41 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A configuration editing tool
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS=	autoconf aclocal autoheader automake libtool
 ACLOCAL_ARGS=	-I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index ff2add573883..1a08e677712c 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	C-language sources to HTML converter
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 
 MAN1=			c2html.1
 
diff --git a/textproc/clucene-contrib/Makefile b/textproc/clucene-contrib/Makefile
index 726b019732d0..3bddc2f7a778 100644
--- a/textproc/clucene-contrib/Makefile
+++ b/textproc/clucene-contrib/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_DOS2UNIX=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 0093ae24a890..2793af2b5a28 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -17,7 +17,7 @@ COMMENT=	CLucene is a C++ port of Lucene
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 64406908c4c9..eef0ccf6eff7 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free C OLE library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 8fd7d1dd9d95..96ec80d58f2e 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 ALL_TARGET=	dict
 INSTALL_TARGET=	install.dict
 MAN1=		dict.1 dictl.1
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 12a1c94c4394..90becf2d0f01 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
 INSTALL_TARGET=	install.dictfmt
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 MAN1=		dictfmt.1 dictfmt_index2suffix.1 dictfmt_index2word.1 \
 		dictunformat.1
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
index fe129fe2caaa..e2f4106c43da 100644
--- a/textproc/ekhtml/Makefile
+++ b/textproc/ekhtml/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index d964e11026ee..4dd0fe4839d8 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
 CONFIGURE_ARGS=	--disable-uspell \
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index ddc80acdac7f..4bdef714b9fc 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A port of Adobe XMP SDK to work on UNIX
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack gnomehack gnometarget
 CONFIGURE_ARGS=	--enable-unittest=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 0ef7edc345a6..de78591882e8 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Gnome DOM Engine
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 6554afeb3180..3ff8760699ea 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 intlhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index eb069b3970b8..f65cf0a7a4fa 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimcf
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 8433e83bca89..2e5e12ad0ad3 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/CSConv
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 491d76fa20f5..4288129149b8 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_XORG=	x11
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index 6cdeccc9d144..2973700757b6 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimp
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 5d852b21de97..308313756080 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimsf
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 81074a0bff05..a33c115d8c08 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 9a34cafb8bf2..7751529cdcd4 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 ice xt
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 1ad7042e489d..a3ca9fe909a3 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -16,7 +16,7 @@ COMMENT=	XML parser library mainly designed for Jabber applications
 
 LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
 
-USE_AUTOTOOLS=	aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index ee34b397acb3..1b17cf50c25b 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 CONFLICTS=	sp-1.*
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 2212714466e9..59382a8a22da 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	Java sources to HTML converter
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 
 MAN1=			java2html.1
 
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index d51df200ee04..42a20128d97b 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An English-Bulgarian-English dictionary
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--with-kde
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 USE_KDELIBS_VER=	3
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 6ff69449e0c3..42e3e679c4b9 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT=	CSS2 parsing library
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack
 
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index a82a6fe58ce8..7116fd2a96a2 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mpeg2:${PORTSDIR}/multimedia/libmpeg2
 
 USE_GNOME=	glib20
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libltdl:22
+USE_AUTOTOOLS=	libltdl
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
@@ -62,7 +62,7 @@ PLIST_SUB+=	VORBIS=""
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-patch-autotools::
+patch-autotools-libtool::
 	@(cd ${PATCH_WRKSRC}; \
 	for file in ${LIBTOOLFILES}; do \
 		${CP} $$file $$file.tmp; \
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 4e901657cafb..27cf50b269f9 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF/lingoteach/OldFiles
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
 GNU_CONFIGURE=	yes
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index cf35e404d99d..78186ef94f94 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library for manipulating RDF files describing LADSPA plugins
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 5f3816a37db8..deb28302e5eb 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -36,7 +36,7 @@ pre-patch:
 .if defined(WITH_PHPMRSS)
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
-USE_AUTOTOOLS+=	autoconf:268:env
+USE_AUTOTOOLS+=	autoconf:env
 post-install:
 		@(cd ${WRKSRC}/phpmrss; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
 		@(cd ${WRKSRC}/phpmrss; ./configure; ${MAKE} install)
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index d33b0751f9aa..9247765d3df0 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.saunalahti.fi/~samiuus/toni/xmlproc/
 MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/libstree/Makefile b/textproc/libstree/Makefile
index 7d9fa0b38c3a..f73f5a057c45 100644
--- a/textproc/libstree/Makefile
+++ b/textproc/libstree/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.icir.org/christian/downloads/
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Generic Suffix Tree Library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile
index 4dedafb7e306..6a95bef764f6 100644
--- a/textproc/libtextcat/Makefile
+++ b/textproc/libtextcat/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	http://software.wise-guys.nl/download/
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Language guessing by N-Gram-Based Text Categorization
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index f0fe9c504204..01e1657052aa 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A lightweight fully POSIX compliant regexp matching library
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 USE_LDCONFIG=	yes
diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index b74658d1d56a..7c9e1cbf4239 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 ALL_TARGET=	both
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 2922f24c12cc..1864d1c7170b 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Microsoft file word processor format import filter library
 
 LIB_DEPENDS=	wpd-0.8.8:${PORTSDIR}/textproc/libwpd
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack ltverhack
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile
index 0ddc3e34d646..f20d1fa4362e 100644
--- a/textproc/libxdiff/Makefile
+++ b/textproc/libxdiff/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Create file differences/patches to both binary and text files
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 655e5f364eee..3afe90826d15 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 349afbe4e66c..e4f5df37736d 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	XML parser library for GNOME
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 1ef9fba4d06d..8ffa4591eab1 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 4afcdfe86d28..020cd4ee318f 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A grammar checking library
 
 USE_GNOME=	gnomehack gnometarget ltverhack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
 USE_CSTD=	gnu99
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index ad01e6e3719c..9043ae563079 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	m17n.4:${PORTSDIR}/devel/m17n-lib
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 intltool intlhack pkgconfig glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 7f0645ccc71f..ba1da3716517 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -16,7 +16,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 USE_GNOME=	gnomehack gnometarget
 USE_BISON=	build
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-unac
 USE_LDCONFIG=	yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index deae99e8d511..fbaf1b6a6df5 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A minimal implementation of the Document Object Model
 
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 221dc92687f1..1a7ce7e99185 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 .if defined(WITH_MYSQL)
 # To quote the author:
diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index 3504a22ef86d..ccc0a00d626f 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Small XML parsing library
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-docdir=no
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 2ad9ef70a9c5..519390d4ae9d 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Input method modules for OpenVanilla
 BUILD_DEPENDS=	${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
 RUN_DEPENDS=	${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
 
-USE_AUTOTOOLS=	libtool:22:env
+USE_AUTOTOOLS=	libtool:env
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index e6a83f5e5fe2..c0ea5c083269 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index ba13a947c74d..a94fe5526141 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	Perl sources to HTML converter
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 
 MAN1=			perl2html.1
 
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index e70e646dd5e0..ecdda36cb95d 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -19,7 +19,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 USE_GNOME=	gnomehack lthack gnometarget libxslt
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--with-python=${PYTHON_CMD}
 
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index fd4eeaf7706d..062926bcd393 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Full-text search system using N-gram
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	YES
 USE_BDB=	42
 GNU_CONFIGURE=	YES
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 4b7ba67757db..c26a1b204c6c 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -21,7 +21,7 @@ USE_BDB=	yes
 WITH_BDB_HIGHEST=	yes
 INVALID_BDB_VER=2
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig libxml2
-USE_AUTOTOOLS=	libltdl:22
+USE_AUTOTOOLS=	libltdl
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 9d829a0cd744..5df34748e8fa 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index b913945196a1..d441e78450b6 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A suffix array library and tools, which provide fast full-text search
 
 USE_GNOME=	glib20 gnomehack gnometarget
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 MAN1=		sary.1	mksary.1
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index a6e1480a77f7..0f499bcc57fb 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 8edf1d49359b..1aefc6d75404 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
 		scim:${PORTSDIR}/textproc/scim
 
 USE_XORG=	x11 xkbfile xproto
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gtk20 intlhack
 USE_GETTEXT=	yes
 USE_ICONV=	yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index c6fd3e0df186..8def822922c6 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim	\
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libltdl:22
+USE_AUTOTOOLS=	libltdl
 WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 716d63308cb3..fe1d0c7017a0 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -18,7 +18,7 @@ COMMENT=	SCIM table based input method engine
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
@@ -47,7 +47,7 @@ pre-patch:
 BUILD_DEPENDS+=	skim:${PORTSDIR}/textproc/skim
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB=	SKIM=""
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 post-patch:
 	@${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \
 		-e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 3c6a649449fd..527d6230216b 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Smart Common Input Method platform
 
 USE_GNOME=	gnomehack gnomehier gtk20 intlhack
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 xpm
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 17003c0a7416..02d92745bbd8 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -32,7 +32,7 @@ CONFLICTS=	rarian-[0-9]*
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BISON=	build
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 49e01354816f..701e0ce95107 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A text-based utility for work with dictionaries in StarDict's format
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index b8ab35a98ea3..c540a3850fc8 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 PYDISTUTILS_NOEGGINFO=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index ed6328a4b13c..755935af182e 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 
 USE_GNOME=	pkgconfig
 USE_SQLITE=	3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_path_CPPUNIT_CONFIG=no \
 		ac_cv_path_PYTHON=no \
diff --git a/textproc/ssddiff/Makefile b/textproc/ssddiff/Makefile
index 19b210a25635..d900b2c12949 100644
--- a/textproc/ssddiff/Makefile
+++ b/textproc/ssddiff/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://alioth.debian.org/frs/download.php/1469/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A diff application for semistructured data such as XML files
 
-USE_AUTOTOOLS=	automake:14
+USE_AUTOTOOLS=	automake14
 USE_BZIP2=	yes
 USE_GNOME=	libxml2
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index ad0a2ca8273d..4448e309d173 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Toolkit for converting data between 8-bit legacy encodings and Unicode
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 6ec408dd41e1..a6e074f886b4 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
 USE_GCC=	4.2+
 USE_KDELIBS_VER=3
 USE_QT_VER=	3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 14a009b50d4e..81efa7f02a53 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -17,7 +17,7 @@ USE_GCC=	4.2+
 USE_KDE4=	kdelibs automoc4
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build qt3support uic rcc
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 134c3e99b5f6..a9d5d7f984e9 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-qt
 COMMENT=	QT modules of uim input method
 
 USE_QT_VER=	3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
 
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index 024bc76cfd8e..6e3dd00c9776 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
 
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build qt3support uic
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 91aa4e25aad4..677d2915f552 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	gnometarget glib20 intltool
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index df83c498654c..4866b5a45262 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 USE_GNOME=	gnometarget libgsf
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MKDIR_P="${MKDIR}"
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 83654545e35d..519f1dcdd545 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xerces-c:${PORTSDIR}/textproc/xerces-c2 \
 		icuio:${PORTSDIR}/devel/icu
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	aclocal autoconf libtool
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I .
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 5edb32c93ae0..75394682827c 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert Excel and PowerPoint files to HTML and text
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:268
+USE_AUTOTOOLS=	automake14 autoconf
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index a052c2f43129..655cb32a0a77 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index 82ade15130c9..55f8f42eeac4 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Parser and Validator
 
 FETCH_CMD=	/usr/bin/fetch
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 1bd2c43d7277..5f9c8b11ac01 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -16,7 +16,7 @@ COMMENT=	XSL formatter that produces PDF and PostScript
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt \
 		libxml2 gtk20 glib20 pango
diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile
index 93f87eb110ac..bd946b843812 100644
--- a/textproc/yamcha/Makefile
+++ b/textproc/yamcha/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Yet Another Multipurpose CHunk Annotator
 
 BUILD_DEPENDS=	svm_learn:${PORTSDIR}/science/svmlight
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes