17 files changed, 14 insertions, 18 deletions

diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 7a355114cf89..ec7141aa6c15 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -33,8 +33,8 @@ RUN_DEPENDS+=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 .else
 MAKE_ARGS+=	NO_GUI=yes
 .endif
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
+USE_AUTOCONF_VER=	213
+USE_LIBTOOL_VER=	13
 .if defined(NO_AUTOKEY) && defined(PACKAGE_BUILDING)
 INGORE =	"cannot be build in batch mode whithout automated DES key generation"
 .endif
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
 USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 PATCH_STRIP=
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
 USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 PATCH_STRIP=
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
 USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 PATCH_STRIP=
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
 USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 PATCH_STRIP=
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index 018755dd8a2a..d6c1017bc827 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 LIBTOOLFILES=	#
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 3abc674af2bb..e71ecd33f385 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index 3929fe1036e3..8af96880d7a7 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU diction and style
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 
 PLIST_FILES=	bin/diction bin/style share/diction/C share/diction/de \
 		share/diction/en
diff --git a/misc/edonkey-tool-hash/Makefile b/misc/edonkey-tool-hash/Makefile
index 1f6b58ddc313..b83d57ae8a5b 100644
--- a/misc/edonkey-tool-hash/Makefile
+++ b/misc/edonkey-tool-hash/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
 
 PLIST_FILES=	bin/edonkey-tool-hash
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/misc/libelysium/Makefile b/misc/libelysium/Makefile
index c9020871b37a..cea4151e7af3 100644
--- a/misc/libelysium/Makefile
+++ b/misc/libelysium/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library of utility functions used by several Elysium projects
 
 USE_GNOME=	glib12
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index e8b13b377ea8..1a16fedeab00 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Modular Calendar Access Library
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 HAS_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mstore --with-icap \
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 372eeebaf331..de9deda3f612 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index db3f7582553b..cc6327e7715b 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A GNOME application designed to manage cyclic tasks
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix gnometarget
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index a2de173158da..d87b6a23468c 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
 USE_GNOME=	glib12 gnomehack gnomeprefix
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 33639d26661a..fbad4806674e 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 79948e938538..7419810d691d 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Set of filters to convert English text to various stereotyped dialects
 
 CONFLICTS=	jive* chef*
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index e8aaad394851..ce3b2e57388a 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \