59 files changed, 60 insertions, 63 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index ae1f49dfe525..10db19d3e5e6 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -16,16 +16,14 @@ DISTNAME=	avidemux-${PORTVERSION}
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
 
-PATCH_DEPENDS=	${ACLOCAL}:${PORTSDIR}/devel/automake${WANT_AUTOMAKE_VER}
+PATCH_DEPENDS=	${ACLOCAL}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		mad.2:${PORTSDIR}/audio/libmad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-WANT_AUTOCONF_VER=259
-WANT_AUTOMAKE_VER=19
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
 USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_SDL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 6ab975170b10..ed49564e97ee 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -22,7 +22,7 @@ USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 LIBTOOLFILES=	acinclude.m4
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 9fc0229dbfa3..1665f8afdadc 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gtk20 libglade2
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index 48ff1db4db61..c3e8b5201a3a 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	libglade2 esound
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} \
 		--with-vorbis=${LOCALBASE}
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index cf303f9d776d..d881b2ef4bab 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -24,9 +24,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 ONLY_FOR_ARCHS=	i386 alpha
 
 USE_X_LIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=259
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 8372a9ce0e29..6b26119b2999 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 DVDSTYLER_ICON=	${DATADIR}/rc/dvdstyler.png
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--with-wx-config=wxgtk2-2.6-config
diff --git a/multimedia/dvts/Makefile b/multimedia/dvts/Makefile
index 44e3611e187c..ee62cb1d202f 100644
--- a/multimedia/dvts/Makefile
+++ b/multimedia/dvts/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP=	-p4
 MAINTAINER=	simokawa@FreeBSD.org
 COMMENT=	An implementation of Digital Video Transport System
 
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 
 MAN1=		dvts.1 dvsend.1 dvrecv.1
 
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index e0e9d14fd568..3887adb3ecf6 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 2ded53505a03..702179229f44 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library for handling uncompressed video and audio data
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/gnonlin/Makefile b/multimedia/gnonlin/Makefile
index 7b9e6a799388..56a67e3111f0 100644
--- a/multimedia/gnonlin/Makefile
+++ b/multimedia/gnonlin/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	pitivi-0.1.1*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index c2962f7268e7..82ea07479954 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 5a1bd20a4dde..7b46d74ac5bf 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 USE_GSTREAMER=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -fno-force-addr" \
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index 5a1bd20a4dde..7b46d74ac5bf 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 USE_GSTREAMER=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -fno-force-addr" \
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index c144e612859d..c74c81c7ce00 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GSTREAMER=	yes
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 7b9e6a799388..56a67e3111f0 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	pitivi-0.1.1*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index b69fbbb916a7..dc930afbc787 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -34,7 +34,7 @@ USE_GNOME+=	gnomehack \
 		gnometarget \
 		pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GST_PLUGIN?=	base
 
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index b69fbbb916a7..dc930afbc787 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -34,7 +34,7 @@ USE_GNOME+=	gnomehack \
 		gnometarget \
 		pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GST_PLUGIN?=	base
 
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index d689be0237f4..688d212f83eb 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gnomehack \
 		gnomeprefix \
 		glib20 \
 		libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
 		--disable-docs-build \
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index d689be0237f4..688d212f83eb 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gnomehack \
 		gnomeprefix \
 		glib20 \
 		libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
 		--disable-docs-build \
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 49cd5d3810b5..0012d14b7607 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomepanel gnomeprefix intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/istanbul/Makefile b/multimedia/istanbul/Makefile
index 704aae4117d5..545f7734c11e 100644
--- a/multimedia/istanbul/Makefile
+++ b/multimedia/istanbul/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=		${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-g
 
 USE_GNOME=		pygtk2
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=		2.4+
 USE_BZIP2=		yes
 USE_X_PREFIX=		yes
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 5d04288d1646..d220802c6811 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
 USE_GSTREAMER=		yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CXXFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=
diff --git a/multimedia/libdivxdecore/Makefile b/multimedia/libdivxdecore/Makefile
index c6b039fcff77..e487f3cfd721 100644
--- a/multimedia/libdivxdecore/Makefile
+++ b/multimedia/libdivxdecore/Makefile
@@ -16,7 +16,7 @@ COMMENT=	OpenDivX decoding engine from Project Mayo
 
 ONLY_FOR_ARCHS=	i386
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 2ea04115df0f..a698bc97848c 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-gtk-prefix="${X11BASE}" \
 		--x-includes="${X11BASE}/include" \
 		--x-libraries="${X11BASE}/lib"
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 3d6099ad2c9b..090eb9559a4e 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A library for MPEG TS and DVB PSI tables decoding and generation
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-release
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index a6613061ea65..35a696b0fbe5 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -20,7 +20,7 @@ NO_CDROM=	CSS code may violate the DMCA
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 267e48e223ee..2c9c512b932f 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-transform-name=''
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 8e26a5fc2d5a..d19416a7b34e 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -17,7 +17,7 @@ COMMENT=	This is needed by ogle, which is a DVD player that supports DVD menus
 LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index c866ccb4db03..eeea7c6eaa84 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	fame
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A video encoding library
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 0ff2c5f291cc..e79bfccb7e4d 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
 
 USE_GNOME=	lthack
 USE_XLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index b6eb8f563998..a6a0a3ac9267 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -28,7 +28,7 @@ USE_GL=		yes
 USE_GNOME=	gnometarget gnomehack pkgconfig
 WANT_GNOME=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-firewire
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 99189dbd43f9..47d8ab6310fe 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 17a1d76e4b71..66d9a827f39a 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -36,7 +36,7 @@ PATCH_DEPENDS=	libtool15:${PORTSDIR}/devel/libtool15
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index c5498f793339..4f425ab09dd5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 CONFLICTS=	mplex-*
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index eff5e81aa7f9..52f4916bac87 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mpeg-4 library and tools from mpeg4ip
 
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile
index eff5e81aa7f9..52f4916bac87 100644
--- a/multimedia/mpeg4ip-libmp4v2/Makefile
+++ b/multimedia/mpeg4ip-libmp4v2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mpeg-4 library and tools from mpeg4ip
 
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 4143fb318f7b..c7cb8ca37000 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 USE_GNOME=	gtk20
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL11 -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index ab7b46587375..a8a9a15d5e4e 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	xvidcore:${PORTSDIR}/multimedia/xvid \
 
 USE_REINPLACE=	yes
 USE_GNOME=	gtk20 glib20 gconf2 libglade2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index 171107a097d9..51efdbc04877 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A KDE frontend to the Ogle DVD player
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 6252881bf431..b8a34d18475b 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnometarget pygtk2 pkgconfig pygnome2
 USE_GSTREAMER=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs-build
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index f82ac47a7b8c..2dd3aea67866 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	pygtk2 \
 		gnomehack \
 		pkgconfig
 USE_GSTREAMER=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index f82ac47a7b8c..2dd3aea67866 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	pygtk2 \
 		gnomehack \
 		pkgconfig
 USE_GSTREAMER=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile
index 39d6c70dff83..98ff2da1f70d 100644
--- a/multimedia/slideshow/Makefile
+++ b/multimedia/slideshow/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-pre.*//}
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_SDL=	image ttf
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index b20d773b44f2..5713e79d67ea 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	lib/xmms/Input/libsmpeg_xmms.so
 USE_X_PREFIX=	yes
 USE_SDL=	sdl
 USE_GNOME=	gnomehack gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 3bd607c8a97f..25e7345d0795 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLBASE="${X11BASE}" \
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index c4c1b9417168..48e15c8cd1e1 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 WANT_SDL=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 5fecc4c8a2c6..646aa130a048 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		cdio.6:${PORTSDIR}/sysutils/libcdio
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 06531c477491..89d3cf2b20f6 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -17,7 +17,7 @@ COMMENT=	MBONE video tool
 LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84 \
 		uclmmbase:${PORTSDIR}/devel/uclmmbase
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_X_PREFIX=	yes
 CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
 		-x-includes=${PREFIX}/include \
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index 2ef225acc98f..aec3eb94280f 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv
 
 PLIST_FILES=	bin/xdvshow
 GNU_CONFIGURE=		YES
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 
 USE_REINPLACE=		YES
 
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index c748275391a7..d26bdcdf251d 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
 USE_GNOME=	libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index 2c22b77f4eaa..f16c799bd650 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/${PORTNAME}
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index c2d94259e125..c7bdb624aea0 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 705a914b58dd..d9f8cbc52984 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_SDL=	sdl
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32
 
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index ac5dbf7a253f..ddd6ee4a6774 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index 10dffe82eec5..ec522c98202a 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A XMMS plugin to hide the player
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index bd3ca2923a0f..0279eb925781 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 68077c37afc4..3f4539f144a1 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index b8ae840be4ff..ea080046345f 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 7c68d39ed1fd..2062f46f14ce 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gtk12
 USE_GL=		yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-gl