75 files changed, 77 insertions, 79 deletions

diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index b0b817b32cb6..edbda3f6c68e 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -17,7 +17,7 @@ COMMENT=	MPEG audio analysis toolkit
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index 934de81da241..9170670501e0 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	glib12 gnomehack gnometarget
 WANT_GNOME=	yes
 USE_GETOPT_LONG=yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 089148b1da35..bde99b7bf265 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 94aae4989c06..f1144869fa0a 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Multitrack audio processing software
 
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 3f7bfa18e8a7..d65d9db4a220 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -21,7 +21,7 @@ USE_GETOPT_LONG=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnometarget gnomehack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 CONFLICTS=	py*-ro-*
 
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 5fc73cfff25f..394ce3c67b32 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 USE_X_PREFIX=	yes
 USE_GNOME=	esound imlib gnomehack gnomeprefix
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-alsa
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 0ac042ed904d..2ed21fc85f48 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -27,7 +27,7 @@ AUTOMAKE_ARGS=	--add-missing
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--program-transform-name='' --with-mp4v2
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 77d5f808430b..eb5b2bdcfd9c 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sse --enable-3dnow \
 		--with-libiconv-prefix="${LOCALBASE}" \
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 4792d04bc01a..bb472591e42a 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -18,7 +18,7 @@ INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 4b9e7891088c..14f830e56a5f 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -23,7 +23,7 @@ MAN1=		gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	libglade
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 1107bf8b36f7..490e38793c1f 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libglade
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \
 		MAKEINFO="makeinfo --no-split"
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index f28e44f26701..7d4e57353c32 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 594536de48dd..da9fdf9b7b71 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 594536de48dd..da9fdf9b7b71 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index fb587c380274..4dbb4f395996 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -25,8 +25,8 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	213
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index fb587c380274..4dbb4f395996 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -25,8 +25,8 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	213
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 41b73f492a8a..ce7ee526e9ad 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	spice3:${PORTSDIR}/cad/spice
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libxml2 gnomeprefix
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 01161d8e7843..58f23198837f 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://gtkgep.republika.pl/
 MAINTAINER=	linimon@lonesome.com
 COMMENT=	A guitar effects processor for GTK
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 87b53db54364..59bf47baa2f0 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 
 WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index b79343306d4c..cc2c6767612b 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	shout.3:${PORTSDIR}/audio/libshout2 \
 CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 WRKSRC=		${WRKDIR}/ices-2.0-Beta2
 
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index f589c0d7b2e1..d6f83230e34d 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 1fc8b7a7ecb1..ca945ed637b6 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp --disable-gtktest
diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile
index 79325291d4f4..2bf124e8cb99 100644
--- a/audio/liba52-devel/Makefile
+++ b/audio/liba52-devel/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-oss --enable-shared
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 79325291d4f4..2bf124e8cb99 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-oss --enable-shared
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index ea8fd1426677..e3846a38cb96 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Portable audio output library
 
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .if defined(NOPORTDOCS)
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 624c8d6c8a7d..aed12a896293 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for playing audio CDs
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 681a565ad7eb..b603405b0dce 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ahze@ahze.net
 COMMENT=	A library to access data on a CDDB server
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack pkgconfig
 INSTALL_SHLIBS=	yes
 
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index eeea6de75e0c..e13ca74c04cb 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	ID3 tags library (part of MAD project)
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 77fe00fa5a73..f15dcba6c09c 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Libmad library (part of MAD project)
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-debugging \
 		--enable-sso \
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 2f3b81057c33..0fc2ba2105ad 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -18,7 +18,7 @@ COMMENT=	MikMod Sound Library
 
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ENV=	SHELL=/bin/sh
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index b5ba0a364add..013722ea447b 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 3dca20f162fc..f7adcddeac23 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw.2:${PORTSDIR}/math/fftw
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gcc-pipe
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 2d90c2b96e38..914b29c697f7 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator library to play SID music files
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 081b633d8058..a30ecfede121 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
 
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-justsrc --disable-gcc-pipe
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 6fd9a12933b2..7de13e26d46f 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Audio compression codec library
 
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index dab32ef3efc6..a68ac69e57ab 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 WANT_GNOME=	yes
 
 USE_GETTEXT=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 ALL_TARGET=	all madtime
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 20726079b5db..35772aec2cf0 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 MODULES?=	/modules
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/audio/net-rhythmbox/Makefile b/audio/net-rhythmbox/Makefile
index 1fee78b63664..3c85d6e61f5b 100644
--- a/audio/net-rhythmbox/Makefile
+++ b/audio/net-rhythmbox/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 CONFIGURE_ARGS=	--disable-lirc
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 5650b024bab3..0cc5c92bed24 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -19,7 +19,7 @@ COMMENT=	IPv4/v6 Multicast and unicast audio conferencing tool
 TCLTK_VERSION=  8.3
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 MAN1=		rat.1
 MANCOMPRESSED=	no
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index bdce962947c5..d714b4bf4051 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index c53fe63c8123..e2e439268924 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c53fe63c8123..e2e439268924 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 09165dc680bc..4dc481551157 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	MAKEDEPEND=${TRUE}
 CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.2
 
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 873dcecab380..7a47077ce39b 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 8cb035e52d07..c409970f61fd 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A SDL audio library and player for some popular sound file formats
 
 USE_SDL=	sdl
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 866660bc7e1d..376bfd3bd8f1 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui gstreamerplugins
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 
 pre-everything::
diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index d8219fc5a35e..894b40650b4d 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index d8219fc5a35e..894b40650b4d 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 7657955efd75..a5bde70fd853 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 USE_SIZE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GNOME=	gnomeprefix gnomehier gnomehack gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index b3fc8afbbcab..21d841d99731 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -I${LOCALBASE}/include" \
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index fb1655ed362c..85d39110137e 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${X11BASE}/lib/xmms \
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 2921e30dbbf5..97ca722aaf4a 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
 		gsm.1:${GSM_DIR}
 
 USE_X_PREFIX=	yes
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ARGS=	--with-gsm=${GSM_WORK}
 INSTALL_TARGET=	install install-man
 MAN1=		vat.1
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 5d3514740788..1c8b5ed5ef6a 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_GETTEXT=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index a21447965a55..7bf18be497d6 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Utility for capturing audio streams from programs with OSS output
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 50d3bd663d3c..2e1dc8c0a8e9 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/WINGs"
 
 MAN1=		get-wsound-flags.1x getsoundset.1x setsoundset.1x \
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 947dc949e002..a025374a45ed 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -18,7 +18,7 @@ COMMENT=	X11-based MP3 player with nice graphical interface
 
 USE_XLIB=	yes
 USE_GNOME=	gtk12 esound
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 LIBTOOLFILES=	configure libx11amp/configure
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 8237a2437238..d59468493453 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 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 \
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index b56564e100f5..8fe7711de45b 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 USE_GNOME=	gtk12
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 
 MAN1=		xmixer.1
 MLINKS=		xmixer.1 xgmixer.1
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 4d605602bfbc..dd509e33742a 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${X11BASE}/include"
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 613023feb127..7b2e2163f4c1 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	lib/xmms/Output/libarts.so
diff --git a/audio/xmms-cdparanoia/Makefile b/audio/xmms-cdparanoia/Makefile
index 794762ee6ba3..cf52bf674627 100644
--- a/audio/xmms-cdparanoia/Makefile
+++ b/audio/xmms-cdparanoia/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index a68e5be7c138..d11caa8f9087 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XMMS Output plugin for crossfading between songs
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index ffdbc1e83d09..b78efd3479f8 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		FLAC.5:${PORTSDIR}/audio/flac
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${X11BASE}"
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 2337e079987e..8f820e35039c 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_KDELIBS_VER=3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/0.0/0/}
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 174c5ca550e9..77fba645acb1 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -23,6 +23,6 @@ WRKSRC=		${WRKDIR}/LiveIce-1.0.0
 PLIST_FILES=	lib/xmms/Effect/libliveice.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index db7ae04bf56e..0c71deb39981 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -17,7 +17,7 @@ COMMENT=	"XMMS plugin, that plays a sound on incoming mail and opens the MUA"
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 35fc88a0874b..75c5b87c59f1 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
-
-USE_AUTOMAKE=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=	14
+USE_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index c3292642dbcd..a3a162683886 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	lib/xmms/Input/xmms-mpegplus-1.8.0.so
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/xmms-real-random/Makefile b/audio/xmms-real-random/Makefile
index fc4cfe88a8ea..627a984fe32b 100644
--- a/audio/xmms-real-random/Makefile
+++ b/audio/xmms-real-random/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 8489a85e1bc7..f53818583a25 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index ac77d2c18823..1c8f1c52567c 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	lib/xmms/Input/libxmms_sndfile.so
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index ede26288db50..f8ed434210f6 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -21,6 +21,6 @@ PLIST_FILES=	lib/xmms/Input/libtfmx.so
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index fb1655ed362c..85d39110137e 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${X11BASE}/lib/xmms \
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index dd2ddb96af37..8e41e74727b4 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include -fPIC"
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	213
 WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index d45566b76356..a50613fa62f3 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnomehack gnometarget gtk20 lthack
 WANT_GNOME=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-ipv6