Whoa there, boy, that's a mighty big commit y'all have there...

Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

	USE_LIBTOOL=YES		->	USE_LIBTOOL_VER=13
	USE_AUTOCONF=YES	->	USE_AUTOCONF_VER=213
	USE_AUTOMAKE=YES	->	USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.

46 files changed, 46 insertions, 46 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 4369c95e7795..994e67b6970c 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -21,7 +21,7 @@ COMMENT?=	Spelling checker with better suggestion logic than ispell
 BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR} \
 		--enable-doc-dir=${DOCSDIR}
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index d140f0f0db23..92bd7fe90050 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=		yes
+USE_AUTOCONF_VER=	213
 
 MAN1=			c2html.1
 
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 8f4705738b31..15042dc8ef2c 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/dico/Makefile b/textproc/dico/Makefile
index 556de2020c25..b83af49b3b3e 100644
--- a/textproc/dico/Makefile
+++ b/textproc/dico/Makefile
@@ -28,7 +28,7 @@ USE_REINPLACE=	true
 USE_ZIP=	true
 EXTRACT_CMD=	UNZIP= unzip
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE=	true
+USE_AUTOMAKE_VER=	14
 USE_GMAKE=	true
 AUTOMAKE_ARGS=	--add-missing --foreign --include-deps
 MAKE_ARGS=	prefix=${PREFIX}
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index ad35d5bbf802..02ea353cb236 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget glib20 lthack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 6ce12a6430bb..b5597d04249f 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=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 6a180ca4f159..7622c1a40c1f 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 60409dcbbd44..98dde8ae2724 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 libgnomeui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 60409dcbbd44..98dde8ae2724 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 libgnomeui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 d72768998574..f391766f1e15 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index d72768998574..f391766f1e15 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 454a1e5466f6..153f5b0144a4 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -21,7 +21,7 @@ COMMENT=	An object-oriented SGML/XML parser toolkit and DSSSL engine
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=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 1e609b99efd1..83c2e4f1792c 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=		yes
+USE_AUTOCONF_VER=	213
 
 MAN1=			java2html.1
 
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 2d02a275ea1f..c82e023cde31 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.latte.org/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple language for marking up text in a very expressive way
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX}"
 CONFIGURE_ARGS+=	--enable-shared
 
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 455fe9d32929..9f84b635c114 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT=	CSS2 parsing library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gtk20 libxml2
 
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 1aecefdd2c0f..fb9760f523a8 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_LIBTOOL=		yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
 
 .if defined(WITH_COMP)
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index a89325379dd9..1ae22016aba0 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 lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 1e7f7a4b691a..0fcb24243137 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 1d15a0f8b5d9..2b6cb337008c 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=	yes
+USE_LIBTOOL_VER=13
 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 1000e788b2e0..7298419d52ff 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig lthack
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index a667a9dbf373..fe2e1e8cf387 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	reed@pugetsoundtechnology.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GNOME=	libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index a667a9dbf373..fe2e1e8cf387 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	reed@pugetsoundtechnology.com
 COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GNOME=	libgsf
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 5c16f30e3937..c489792737a0 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 lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 5c16f30e3937..c489792737a0 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
 
 USE_GNOME=	gnomehack lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index f4870e3fd2f3..4c9f855803cd 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 8896b45ad82c..7e63153a07b6 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index ba3a9950ba24..2ca3436459da 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_REINPLACE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index b6105c667971..ebcbc06a375c 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--without-unac
 INSTALLS_SHLIB= yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index eb4cd87a46fe..af517f86c534 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 0a291116b85c..920579d49b1f 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -33,7 +33,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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 #LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 USE_REINPLACE=	yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 43c58f58056f..c1e0da086abb 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_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 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 54ce978a95a9..730700788737 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 USE_GETTEXT=	yes
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 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 68d55b484f3a..26413ffe9af8 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=		yes
+USE_AUTOCONF_VER=	213
 
 MAN1=			perl2html.1
 
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 9937319072e5..87bfc5eb4e82 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
 
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 9937319072e5..87bfc5eb4e82 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
 
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 028b41a70151..16215ed9772a 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_PERL5_BUILD=	yes
 
 MAN1=	sabcmd.1
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index c36373bf2afd..d185c2505e0b 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sagasu is a GNOME tool to find strings in a set of files
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index d2a9721ca336..98d07e205cf7 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE_ARGS=	-a
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=		sary.1	mksary.1
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 0831f8f03616..9b86e93cee85 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 96c2f9dd79d4..c9732a1c8ae7 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index d5776ad67d63..dc480ef77df7 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-exporter --with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index 81c3aca88425..01d645fbe20c 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFLAGS=	# none, we want to keep libwv2.la
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index e66cc9244108..869c709a1b3b 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	Convert Excel and PowerPoint files to HTML and text
 
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 7d5ae6d65e08..88bb7d06b617 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lcole"
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index ab185ea6c61a..34c271c2a267 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=	yes
+USE_LIBTOOL_VER=13
 
 CONFLICTS=	intltool-*
 
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index dca829c19c4b..a3b5aba14c80 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=	yes
+USE_LIBTOOL_VER=13
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \