Sync to new bsd.autotools.mk

52 files changed, 52 insertions, 52 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index c4ab8cc6496a..025bb763cbf8 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 USE_SUBMAKE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 86054307b23c..405359dc7da1 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -19,7 +19,7 @@ COMMENT=	GTK2 multimedia player
 USE_GNOME=	gtk20 libglade2 desktopfileutils
 WANT_GNOME=	yes
 USE_XORG=	x11
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 72ab4da12019..907f3358b625 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 ONLY_FOR_ARCHS=	i386 alpha
 
-USE_AUTOTOOLS=	autoconf:268 libtool:22 libltdl:22
+USE_AUTOTOOLS=	autoconf libtool libltdl
 USE_EFL=	imlib2
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include \
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index fd43380e7c64..5520a7934c5f 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack ltverhack gnomeprefix
 USE_GSTREAMER=	yes
 USE_XORG=	xp x11
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index a4c58747eaca..46fa320316ae 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-codec/Dirac-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Open source video codec from the BBC
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/dvts/Makefile b/multimedia/dvts/Makefile
index 05e18d7e6152..5b26639450e7 100644
--- a/multimedia/dvts/Makefile
+++ b/multimedia/dvts/Makefile
@@ -21,7 +21,7 @@ COMMENT=	An implementation of Digital Video Transport System
 
 CONFLICTS=	gdvrecv-[0-9]*
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 MAN1=		dvts.1 dvsend.1 dvrecv.1
 
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index ed2e86354cb4..1371d78c2f43 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A playlist for Noatun
 LIB_DEPENDS=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
 
 USE_KDEBASE_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index a11bf95fed96..20820848bb8c 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Buzztard gstreamer plugins
 
 LIB_DEPENDS=	fluidsynth.4:${PORTSDIR}/audio/fluidsynth
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 USE_GNOME=	gnomehack ltverhack
 USE_LDCONFIG=	yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 7020cc17e164..98422797e6af 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -52,7 +52,7 @@ WANT_GSTREAMER=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	gnomehack gnometarget pkgconfig ltverhack ltasneededhack
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GST_PLUGIN?=	base
 
 CONFIGURE_ARGS=	--disable-option-checking
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 1a8479ac25ea..ee26168fc8f1 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack ltasneededhack
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
 		--disable-failing-tests \
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 6b8a3f2190c6..fbdccd5f4936 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An alternative GUI for the Xine media player
 LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 gnomehier
 USE_GMAKE=	yes
 USE_GCC=	4.2+
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 0f4894d4a1e9..7fc13d4d906b 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -38,7 +38,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_GMAKE=	yes
 
-USE_AUTOTOOLS=	libtool:22 aclocal:111
+USE_AUTOTOOLS=	libtool aclocal
 
 LIBTOOLFILES=	${WRKSRC}/configure
 
diff --git a/multimedia/hayes/Makefile b/multimedia/hayes/Makefile
index 532bb25fcd07..8938bf3bcc3e 100644
--- a/multimedia/hayes/Makefile
+++ b/multimedia/hayes/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=		noatun:${PORTSDIR}/multimedia/kdemultimedia3
 USE_KDEBASE_VER=	3
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 CONFIGURE_ENV=		LDFLAGS="${PTHREAD_LIBS}"
 
 post-patch:
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 42168128a99d..20095603c819 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 31f817e49c66..2d412c7550aa 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -23,7 +23,7 @@ USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=kaffeineplugin.so
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 433b338bfe9f..27761fe10c1c 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -33,7 +33,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index c70554b22cce..47c7ab6a94a1 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -24,7 +24,7 @@ OPTIONS=	QUICKTIME "With Quicktime support" off	\
 		FFMPEG_KINO "With ffmpeg-kino" off
 
 USE_XORG=	x11 xv ice
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade2 libxml2
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 6ddc3f5e390c..309cb0c07c7c 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	atk glib20 gtk20 libxml2 pango # See above
 WANT_GSTREAMER=	yes # Can't be set after bsd.port.pre.mk
diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile
index 83208681e91a..8ad613390109 100644
--- a/multimedia/konverter/Makefile
+++ b/multimedia/konverter/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	avimerge:${PORTSDIR}/multimedia/transcode \
 LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index 748208c86c81..d3f0d67a54d9 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
-USE_AUTOTOOLS=	automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS=	automake:env autoconf:env libtool
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index f216246d1306..59a10f5029e0 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/stamp-h.in
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 08c9ab64fbb4..61f1945a64b3 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library for MPEG TS and DVB PSI tables decoding and generation
 
 USE_DOS2UNIX=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS=		--enable-debug
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 8f0147dea0ff..045f50cd4979 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Portable abstraction library for DVD decryption
 
 NO_CDROM=	CSS code may violate the DMCA
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 897632fd86e4..e568eda039a4 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Portable abstraction library for DVD navigation
 
 LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-dvdread-tree=${LOCALBASE}/include
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index caefe24ce86f..b21f00097992 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	SF/fame/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A video encoding library
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index b757416a043f..00f7b397ec03 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
 
 USE_GNOME=	gnometarget ltverhack
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 89707c93306f..24698ea9f48d 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnometarget gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 1ad1ab2894ee..e09d52540247 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile
index f1f9ae051321..678b6b0a1f3a 100644
--- a/multimedia/libxspf/Makefile
+++ b/multimedia/libxspf/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test
 
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 8f47878f0fd7..2e98fe3acdec 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/mediainfo
 EXTRACT_CMD=	7z
 EXTRACT_BEFORE_ARGS=	x -o${WRKSRC}
 EXTRACT_AFTER_ARGS=	>/dev/null
-USE_AUTOTOOLS=	aclocal:111:env automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS=	aclocal:env automake:env autoconf:env libtool:env
 
 WRKSRC=		${WRKDIR}/MediaInfo${DISTVERSIONSUFFIX}
 
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index e067d6803f2b..0ba7cd4e5fd5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomehack
 WANT_GNOME=	yes
 WANT_SDL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index de2b54379fe0..286efb8d548e 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 MAN1=		motion.1
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MANCOMPRESSED=	no
diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile
index cb67271ca524..7158e0348a3d 100644
--- a/multimedia/noatun-plugins/Makefile
+++ b/multimedia/noatun-plugins/Makefile
@@ -24,7 +24,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 USE_GMAKE=	yes
 USE_SDL=	sdl
 
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index a7273c08f2e2..37db8239ec89 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gnomehack \
 		gtk20
 WANT_GNOME=	yes
 USE_XORG=	xpm
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 		--with-dvdcontrol=${LOCALBASE} \
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index f5c3a9daa1f7..203810eea353 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		mad.2:${PORTSDIR}/audio/libmad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_XORG=	x11 xext sm
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index b22fbae6c77f..64ccd40df14c 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -38,7 +38,7 @@ OPTIONS=	GUI      "Build the GTK+ GUI"                           on  \
 USE_GNOME=	glib20 gnomehack intlhack libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index ba3eb03c797c..1507df7db35a 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_AUTOTOOLS=	autoconf:268 libtool:22
+USE_AUTOTOOLS=	autoconf libtool
 USE_KDELIBS_VER=3
 CONFIGURE_ARGS=	--with-ogle-dir=${LOCALBASE}/bin \
 		--with-ogle-includes=${LOCALBASE}/include \
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 3cb245f50888..c9b659d9ff1a 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg \
 
 USE_GNOME=	gnomehack gtk12
 USE_SDL=	sdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index eb1ed595b1f2..b11e6a2d48ea 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A free MPEG1 video player library with sound support
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index 9bd8fcb6ce3f..7df83afea2b2 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 automake:111
+USE_AUTOTOOLS=	autoconf aclocal automake
 AUTOMAKE_ARGS=	--add-missing
 
 NOMAN=		defined
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index eeda3176baa5..f210c8eddf4e 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Subtitle editor for KDE
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_KDELIBS_VER=3
 USE_XORG=	xext
 GNU_CONFIGURE=	yes
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 31eb263da66c..8f0233d98485 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 intlhack ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ab31bec18247..6c1601fc7fc8 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -34,7 +34,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index a39633d6ba6e..2d3f36179875 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 WANT_SDL=	yes
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-isystem /usr/include -isystem ${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		SDL_CONFIG="${SDL_CONFIG}"
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index 454e3ca3f341..bc8ac812720d 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index e9161a8add88..c318daf58a64 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		cdio.12:${PORTSDIR}/sysutils/libcdio
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index d4573de7ed94..549c0661d49e 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	uclmmbase:${PORTSDIR}/devel/uclmmbase
 USE_TK=		84
 USE_TK_BUILD=	84
 
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf213
 USE_XORG=	xext
 CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \
 		-x-includes=${LOCALBASE}/include \
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index c17ff48b5085..627b9b802ac0 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_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_SDL=	sdl
 
 post-patch:
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index 05312c0a8434..7284cafc2523 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
 USE_LDCONFIG=	yes
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 99f7bb6c03f9..13a18407f944 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index dee600716241..fb7547ae566c 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	automake autoconf libtool
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 2c56054a0361..926c1e80d5cf 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -19,7 +19,7 @@ COMMENT=	MPEG-1 player in GTK+ capable of playing MPEG-1 format streams
 
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl
 USE_BZIP2=	yes
 USE_GNOME=	gtk12