Mass-conversion to the USE_AUTOTOOLS New World Order. The code present

in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.

Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.

Preliminary documentation can be found at:
	http://people.FreeBSD.org/~ade/autotools.txt

which is in the process of being SGMLized before introduction into the
Porters Handbook.

Light blue touch-paper.  Run.

69 files changed, 69 insertions, 96 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 0811950ba8fc..1d5f7503c06e 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=--without-gtk
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 2db0eaa116bd..6a00b2245209 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	aspell-0.60.4.tar.gz
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-docdir=${DOCSDIR}	\
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 92bd7fe90050..984c84eb62a4 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_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 MAN1=			c2html.1
 
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 98f9bd466527..35ef0b30957c 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_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 6dff6861e271..77b2a792366b 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Dictionary Server Protocol (RFC2229) client
 
 USE_BISON=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index cb507cf1c2bc..c382c6e788b5 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 0b2a08dddee3..5b210030867d 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	expat
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	XML 1.0 parser written in C
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 2bea5046f1cd..a5a4f71472b8 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GNOME=	glib20 gnomehack
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" CPPFLAGS="-I${LOCALBASE}/include"
 PLIST_SUB=	DOCSDIR="share/doc/${DISTNAME}"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index a0915b56f51b..7012ac229427 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index a0915b56f51b..7012ac229427 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index e7f2e7066136..7ca1c9b14ea0 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index e7f2e7066136..7ca1c9b14ea0 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 631667284b54..2ab4d428834b 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -22,7 +22,7 @@ COMMENT=	A www indexing and searching system
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 5ea1b2a7203e..a1642fee7127 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -26,10 +26,8 @@ INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimcf
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index d680198a38fb..40f441c12ba8 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -22,10 +22,8 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/CSConv
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 985493423730..695aac8bbe86 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -27,10 +27,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/gnome-im-switcher
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 071cf66fe80a..0b6a3b774d79 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -30,10 +30,8 @@ USE_REINPLACE=  yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gtk20
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimgcf
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index cc9edcc1dfff..0f7bdabce240 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -29,10 +29,8 @@ USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_XLIB=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index 62c0d6372246..2735680426c3 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -22,10 +22,8 @@ INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimp
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index ee3aca7841a5..8f751c8c032f 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -27,10 +27,8 @@ USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=    yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimsf
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index f6f89341b302..b4b7260895b5 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -28,10 +28,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=      yes
 USE_OPENSSL=    yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 163a818ae3b6..8cd9ef2f16f4 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -26,10 +26,8 @@ USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
-WANT_AUTOMAKE_VER=	19
-WANT_LIBTOOL_VER=	15
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 938ee6d09988..4fd0088cad87 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	sp-1.*
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 83c2e4f1792c..beb4a9d2f099 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	Java sources to HTML converter
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 MAN1=			java2html.1
 
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 061a60ca759c..684fa3d99ab9 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A KDE3 graphical frontend for diff
 
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 7a252ec53697..db3614df3c8f 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Simple language for marking up text in a very expressive way
 USE_BISON=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	autoconf:213 libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index e2b26a9911cb..5222e8b6cbc7 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT=	CSS2 parsing library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack glib20 libxml2
 
diff --git a/textproc/libhtmlparse/Makefile b/textproc/libhtmlparse/Makefile
index 8cb83e8b9ffc..54a2352a18aa 100644
--- a/textproc/libhtmlparse/Makefile
+++ b/textproc/libhtmlparse/Makefile
@@ -17,7 +17,7 @@ BROKEN=		"mastersite disappeared"
 DEPRECATED=	${BROKEN}
 EXPIRATION_DATE=	2005-12-09
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 0e89e423baa7..0544b8ac227b 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
 
 USE_GMAKE=		yes
 USE_GNOME=		gnomehack gnometarget libxml2
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=		yes
 
 .if defined(WITH_COMP)
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index f4ce40711e56..7d36debd3606 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
 
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index c0d9d6e26126..062242cbfc1d 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 XERCESCROOT=	`cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index eeb438a7e07d..4936fc40b716 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 lthack
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 98c85827a161..fb4b39ec0f39 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 98c85827a161..fb4b39ec0f39 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index c3313267252f..229173d74bbd 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 9196450af85c..5b620beb2dfb 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XML parser library for GNOME
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ae2fd0807580..6ba286eb5441 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -25,7 +25,7 @@ COMMENT?=	XML parser library for GNOME
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME?=	gnomehack gnometarget pkgconfig
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 60262a932fd8..2338300b7e44 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 82a1e9f2f955..f59695094307 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -17,7 +17,7 @@ COMMENT?=	The XSLT C library for GNOME
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME?=	gnomehack gnometarget libxml2
 USE_REINPLACE=	yes
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 3c86aa100300..0af15ec31f4e 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -17,7 +17,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 DOCS=		LICENSE README
 
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index e6216b315c3f..c0de473a8cfe 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--without-unac
 INSTALLS_SHLIB=	yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index e239844c097b..7f2de3155b02 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-libxml2=yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index ff825d5f846b..fdd873d6fc24 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 # Please don't remove the comments, as soon as autoconf/libtool get's
 # updated in the ports collection the comments may be removed.
 # They serve as a reminder.
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 #LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 USE_REINPLACE=	yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index fbcf3af24607..e90ef86c2291 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	YES
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 1b903f1617fb..291310daf58b 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	YES
 USE_ICONV=	yes
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index 26413ffe9af8..265aebbe16d8 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	Perl sources to HTML converter
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 MAN1=			perl2html.1
 
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 55bb050910b5..e216935d9e53 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 55bb050910b5..e216935d9e53 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 9810cf87bc5e..64ea6b1ca6a3 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -39,7 +39,7 @@ USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 LIBTOOLFLAGS=	--enable-ltlibs
 LIBTOOLFILES=	configure rasqal/configure
 
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 9810cf87bc5e..64ea6b1ca6a3 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -39,7 +39,7 @@ USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 LIBTOOLFLAGS=	--enable-ltlibs
 LIBTOOLFILES=	configure rasqal/configure
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 1a60bef850b8..2a3611d286ab 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=	yes
 
 MAN1=	sabcmd.1
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 6468d33f499b..a84f955c57d5 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 3de0764b8ba2..780a861ea508 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -20,10 +20,8 @@ USE_GNOME=	glib20 gnomehack
 USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:13
 AUTOMAKE_ARGS=	-a
-USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=		sary.1	mksary.1
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 57c88dc1a327..c905c3f8b545 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intlhack
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index cdfb9b452174..caa78cce7860 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	intlhack
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 077d069750e6..c2b702288b5a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -22,7 +22,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 688c122f9538..1e66eb1688ed 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -35,7 +35,7 @@ DOCBOOK_VERSION=	4.1.2
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index df18a60dc023..fbffdbeed954 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -16,9 +16,7 @@ COMMENT=	Embeddable Fulltext Search Engine
 
 LIB_DEPENDS=	mecab-razil:${PORTSDIR}/japanese/mecab-razil
 
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER=	259
-USE_AUTOMAKE_VER=	14
+USE_AUTOTOOLS=	automake:14 autoconf:259 libtool:15
 USE_GMAKE=	YES
 INSTALLS_SHLIB=	YES
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 3a214166e5a0..d1afb160f1ca 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index ee2add526e09..105f2e2f60d2 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -25,7 +25,7 @@ WANT_GNOME=	yes
 USE_GNOME=	lthack gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 66ef6feae139..60879cb3fc4e 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://critical.ch/distfiles/
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 MAN1=		uni2ascii.1 ascii2uni.1
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index f3cc4b271904..a459954fcdba 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -19,10 +19,7 @@ COMMENT=	Library & tools for converting wbxml<->xml
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_LIBTOOL_VER=	15
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15
 AUTOMAKE_ARGS=		-acf
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index c1fb6cf82806..5ca9b7927684 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx-ssl
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnometarget pkgconfig glib20
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-exporter \
 		--with-glib=glib2 \
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index 7bf829416310..d0737313bf3b 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} --disable-debug
 
 USE_GNOME=	gnometarget libgsf
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index b32cb57a13e8..a7e5b836fa98 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -18,8 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert Excel and PowerPoint files to HTML and text
 
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index efd35e8f343d..5997cb9b281d 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 34c271c2a267..2411dc8c9e41 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Xml internationalization support for GNOME, and others
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 
 CONFLICTS=	intltool-*
 
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index 23c174309d3d..ae0a18590748 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XML Parser and Validator
 USE_REINPLACE=	yes
 FETCH_CMD=	/usr/bin/fetch
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 27e516d9362f..1ad37410264b 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \