Sync to new bsd.autotools.mk

svn path=/head/; revision=265663
2010-12-04 07:34:27 +00:00 · 2010-12-04 07:34:27 +00:00 · 4a8684e352 · 2021-03-31 03:12:20 +00:00
commit 4a8684e352
parent 6029732777
1763 changed files with 1819 additions and 1822 deletions
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@ -690,7 +690,7 @@ PLIST_SUB+=			GTK2_VERSION="${GTK2_VERSION}" \
 # Then handle the ltverhack component (it has to be done here, because
 # we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is
 # included in the post-makefile section).
-.if defined(AUTOTOOL_libtool)
+.if defined(_AUTOTOOL_libtool)
 lthacks_CONFIGURE_ENV=		ac_cv_path_DOLT_BASH=
 lthacks_PRE_PATCH=		${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
 						${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@ -157,7 +157,7 @@ SUB_LIST+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 .if defined(USE_PHPIZE) || defined(USE_PHPEXT)
 BUILD_DEPENDS+=	${PHPBASE}/bin/phpize:${PORTSDIR}/${PHP_PORT}
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS+=	autoconf:268:env
+USE_AUTOTOOLS+=	autoconf:env
 CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config

 configure-message: phpize-message do-phpize
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -3748,6 +3748,11 @@ do-patch:
 	fi
 .endif

+.if !target(patch-autotools)
+patch-autotools:
+	@${DO_NADA}
+.endif
+
 .if !target(run-autotools)
 run-autotools:
 	@${DO_NADA}
@ -4412,7 +4417,7 @@ _EXTRACT_SEQ=	check-build-conflicts extract-message checksum extract-depends \
 				post-extract post-extract-script
 _PATCH_DEP=		extract
 _PATCH_SEQ=		ask-license patch-message patch-depends patch-dos2unix pre-patch \
-				pre-patch-script do-patch post-patch post-patch-script
+				pre-patch-script do-patch patch-autotools post-patch post-patch-script
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	build-depends lib-depends configure-message \
 				pre-configure pre-configure-script \
--- a/16
+++ b/16
@ -5,6 +5,22 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20101204:
+  AFFECTS: autotools
+  AUTHOR: autotools@FreeBSD.org
+
+  The next stage in the ongoing cleanup of autotools-using ports is
+  a refactoring of bsd.autotools.mk so that version numbers are no longer
+  needed within the USE_AUTOTOOLS stanza.  There is either
+  autoconf213/autoconf or automake14/automake (for the legacy versions,
+  and the currently available versions).  This will considerably reduce
+  the amount of tree-wide patching in future on an update.
+
+  IMPORTANT: if you have either devel/autoconf-wrapper or
+  devel/automake-wrapper installed on your system (and you most likely do)
+  PLEASE update these ports to their new versions before updating anything
+  else -- Bad Things[tm] are likely to happen otherwise.
+
 20101202:
  AFFECTS: users of multmidia/gstreamer-plugins
  AUTHOR: multimedia@FreeBSD.org
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@ -25,7 +25,7 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@ -20,7 +20,7 @@ USE_XORG=	xfixes xdamage ice xcomposite sm
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@ -21,7 +21,7 @@ PREFIX=		${KDE_PREFIX}

 USE_XORG=	xtst
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 USE_GMAKE=	yes

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Open-source ARJ

-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@ -17,7 +17,7 @@ COMMENT=	A program for back up of directories or files

 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 .include <bsd.port.mk>
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@ -18,7 +18,7 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl

 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@ -15,7 +15,7 @@ COMMENT=	Decompress data compressed with PKWARE Data Compression Library

 MAKE_JOBS_SAFE=	yes

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}alpha
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A library for Microsoft compression formats

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@ -25,7 +25,7 @@ OPTIONS=	LIBSYNCE	"Build with libsynce support"			on \

 MAKE_JOBS_SAFE=	yes

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_ICONV=	yes
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@ -15,7 +15,7 @@ COMMENT?=	LZRTF compression library

 MAKE_JOBS_SAFE=	yes

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@ -16,7 +16,7 @@ DISTNAME=	lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@ -23,7 +23,7 @@ ONLY_FOR_ARCHS=	i386 amd64 ia64
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS=	aclocal automake autoconf
 USE_GCC=	4.2+

 PORTDOCS=	README
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@ -22,7 +22,7 @@ CONFLICTS=	rpm-[45].*

 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:22
+USE_AUTOTOOLS=	automake14 autoconf213 libtool
 CONFIGURE_ARGS=	--with-glob
 USE_LDCONFIG=	yes
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed

 OPTIONS=	PYTHON "Build Python rpm module" Off

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LUA=	5.1+
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@ -35,7 +35,7 @@ OPTIONS=	PERL "Build Perl RPM module" Off \

 DB_VERSION?=	47
 USE_BDB=	${DB_VERSION}
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure db3/configure db/dist/configure \
 		file/configure xar/configure
 CONFIGURE_ARGS=	--without-js
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@ -15,7 +15,7 @@ DISTNAME=	trrntzip_v${PORTVERSION:S/.//}_src
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Efficient way to prepare zipfiles for BitTorrent

-USE_AUTOTOOLS=	aclocal:111 automake:111 autoheader:268
+USE_AUTOTOOLS=	aclocal automake autoheader
 AUTOMAKE_ARGS=		-a

 WRKSRC=		${WRKDIR}/trrntzip
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	A data compression library with low memory usage

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	SF/synce/Unshield/${PORTVERSION}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extract data from InstallShield CAB files

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_LDCONFIG=	yes
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	http://vesuri.jormas.com/xpk/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The eXternal PacKer (XPK) library system

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@ -18,7 +18,7 @@ COMMENT=	A java.util.zip-like C++ library for reading and writing Zip files
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:111:env
+USE_AUTOTOOLS=	automake:env
 CONFIGURE_ARGS+=--disable-static

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}+cvs.2004.02.07
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@ -24,7 +24,7 @@ RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
 LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float

 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:268:env automake:111:env
+USE_AUTOTOOLS=	autoconf:env automake:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@ -18,7 +18,7 @@ COMMENT=	Scriptable space flight simulator for X
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG=	x11 xt xext xmu xi
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@ -15,7 +15,7 @@ COMMENT=	A gps file translating tool

 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2

-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-expathdr=${LOCALBASE}/include \
 		--with-libexpat=${LOCALBASE}/lib
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@ -18,7 +18,7 @@ BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		xsltproc:${PORTSDIR}/textproc/libxslt

 USE_RC_SUBR=	gpsd
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 MAKE_JOBS_UNSAFE=	yes

 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@ -12,7 +12,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Astronomical julian date calculator

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/V%20${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Astronomical Calculation Library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnometarget lthack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@ -26,7 +26,7 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
 		nova:${PORTSDIR}/astro/libnova
 RUN_DEPENDS=	${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--datadir=${DATADIR}
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@ -23,7 +23,7 @@ LIB_DEPENDS=	gsl.15:${PORTSDIR}/math/gsl \
 USE_QT_VER=	3
 USE_GL=		gl
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I macros -I ${LOCALBASE}/share/aclocal
 CONFIGURE_ENV=	ac_cv_c_inline=no
 USE_LDCONFIG=	yes
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	saper@saper.info
 COMMENT=	MPEG audio analysis toolkit

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@ -27,7 +27,7 @@ PLUGIN=		ffmpeg_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@ -25,7 +25,7 @@ PLUGIN=		jack_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@ -23,7 +23,7 @@ PLUGIN=		mpc_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@ -25,7 +25,7 @@ PLUGIN=		mpeg_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@ -23,7 +23,7 @@ PLUGIN=		oss_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-pulseaudio/Makefile
+++ b/audio/akode-plugins-pulseaudio/Makefile
@ -25,7 +25,7 @@ PLUGIN=		polyp_sink
 PORTNAMESUFX=	pulseaudio

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@ -25,7 +25,7 @@ PLUGIN=		src_resampler
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@ -29,7 +29,7 @@ PLUGIN=		xiph_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}

 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@ -27,7 +27,7 @@ OPTIONS=	FFMPEG "FFMPEG decoder plugin" off \
 		RESAMPLER "Resampler processing plugin" on \
 		XIPH "FLAC/Speex/Vorbis decoder plugin" on

-USE_AUTOTOOLS=	libltdl:22 libtool:22
+USE_AUTOTOOLS=	libltdl libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@ -25,7 +25,7 @@ MIN_OPTIONS_VER=	${PORTNAME}-1.4.1
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 USE_SDL=	sdl
 USE_RUBY=	yes
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@ -28,7 +28,7 @@ PREFIX=		${KDE_PREFIX}
 WANT_GNOME=	yes
 USE_QT_VER=	3
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 QTCPPFLAGS+=	-L${LOCALBASE}/lib
--- a/audio/aube/Makefile
+++ b/audio/aube/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile

 USE_GNOME=	imlib
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@ -22,7 +22,7 @@ CONFLICTS=	audacity-[0-9]*

 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}-beta

-USE_AUTOTOOLS=	aclocal:111 autoconf:268
+USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GCC=	4.2+
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@ -17,7 +17,7 @@ COMMENT=	High-level audio API
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WANT_WX=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes

 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@ -21,7 +21,7 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:268 libtool:22
+USE_AUTOTOOLS=	autoconf libtool
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	lib${PKGNAMEPREFIX}${PORTNAME}.so
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@ -23,7 +23,7 @@ COMMENT=	A modplug-based plugin for beep-media-player
 LIB_DEPENDS?=	beep.2:${PORTSDIR}/multimedia/beep-media-player
 LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 PLUGDIR?=	lib/bmp/Input
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@ -27,7 +27,7 @@ USE_GMAKE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:268 libtool:22
+USE_AUTOTOOLS=	autoconf libtool
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	libbmp-mpc.so
 PLIST_FILES=	${PLUGDIR}/${PLUGFILE}
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@ -21,7 +21,7 @@ PLIST_FILES=	lib/bmp/Input/libwma.so \
 		lib/bmp/Input/libwma.a

 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool

 .include <bsd.port.pre.mk>

--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp

 CONFLICTS=	ccaudio-[0-9]*

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnometarget gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@ -17,7 +17,7 @@ COMMENT=	A real-time sound processor
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack

 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=	3
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@ -24,7 +24,7 @@ OPTIONS=	ARTS		"Enable aRts support"		off \
 		SAMPLERATE	"Enable libsamplerate support"	off

 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-pyecasound \
 		--disable-rubyecasound \
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@ -17,7 +17,7 @@ COMMENT=	A sound library for enlightenment package

 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gnomehack
 USE_LDCONFIG=	yes
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS= --with-mp4v2
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@ -18,7 +18,7 @@ COMMENT?=	A command line player for .nsf and .hes audio files

 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes

 MAKE_JOBS_SAFE=	yes
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@ -16,7 +16,7 @@ COMMENT=	Free lossless audio codec

 LIB_DEPENDS=	ogg.7:${PORTSDIR}/audio/libogg

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sse \
 		--with-ogg="${LOCALBASE}" \
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -21,7 +21,7 @@ OPTIONS=	JACK "Enable Jack audio support" On \

 USE_GNOME=	glib20 gnomehack pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-alsa-support --disable-midishare \
 		--disable-coreaudio --disable-coremidi \
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://connect.creativelabs.com/openal/Downloads/ALUT/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	The OpenAL Utility Toolkit

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@ -24,7 +24,7 @@ USE_XORG=	xbitmaps x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:22 libtool:22
+USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@ -23,7 +23,7 @@ LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 			ao:${PORTSDIR}/audio/libao

 USE_GNOME=		gnomehack gnomeprefix
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@ -26,7 +26,7 @@ RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123

 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:22
+USE_AUTOTOOLS=	autoconf213 libtool

 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 USE_XORG=	x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui vte
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24

 USE_GNOME=	gnomeprefix gnometarget libxml2
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:111:env
+USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
 CFLAGS:=	${CFLAGS} -O2
 USE_GSTREAMER=	yes good
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes

 OPTIONS=	MP3 "mp3 files support" on \
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@ -31,7 +31,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
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	k3b:${PORTSDIR}/sysutils/k3b
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${PREFIX}/lib/kde3

 post-patch:
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \

 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
--- a/audio/kirocker/Makefile
+++ b/audio/kirocker/Makefile
@ -20,7 +20,7 @@ COMMENT=	Kicker applet for displaying Amarok info
 RUN_DEPENDS=	amarok:${PORTSDIR}/audio/amarok

 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_KDELIBS_VER=3
 INSTALLS_ICONS=	yes

--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	SF \
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fast MP3 encoder kit

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@ -18,7 +18,7 @@ COMMENT=	A free library for decoding ATSC A/52 streams, aka AC-3
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@ -28,7 +28,7 @@ CONFLICTS=	aacplusenc-0*
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22 libtoolize aclocal:111 autoheader:268 automake:111
+USE_AUTOTOOLS=	libtool libtoolize aclocal autoheader automake
 GNU_CONFIGURE=	yes

 AUTOMAKE_ARGS=	--add-missing
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@ -16,7 +16,7 @@ COMMENT=	AdLib emulator library supporting many formats

 LIB_DEPENDS=	binio.1:${PORTSDIR}/devel/libbinio

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@ -24,7 +24,7 @@ RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@ -23,7 +23,7 @@ RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Portable audio output library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@ -16,7 +16,7 @@ DISTNAME=	audiofile-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A sound library for SGI audio file

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22 libltdl:22
+USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-gtk3
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	A library for playing audio CDs

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/audio/libdssialsacompat/Makefile
+++ b/audio/libdssialsacompat/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.smbolton.com/linux/
 MAINTAINER=	freebsd-ports@coreland.ath.cx
 COMMENT=	Alsa compatibility library to build DSSI

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@ -16,7 +16,7 @@ MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION} \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Libmad library (part of MAD project)

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@ -18,7 +18,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MikMod Sound Library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Abstraction around libmpdclient

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig glib20 gnomehack
 USE_LDCONFIG=	yes
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library, API for communicating with Creative and Dell audio players

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@ -16,7 +16,7 @@ COMMENT=	Generates three-dimensional coherent noise

 USE_ZIP=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22:env
+USE_AUTOTOOLS=	libtool:env
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-O3 -fomit-frame-pointer
 WRKSRC=		${WRKDIR}/noise
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		curl.6:${PORTSDIR}/ftp/curl

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@ -17,7 +17,7 @@ COMMENT=	Simple Ogg API

 LIB_DEPENDS=	ogg.7:${PORTSDIR}/audio/libogg

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw3.5:${PORTSDIR}/math/fftw3

 USE_GNOME=	gnomehack pkgconfig
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gcc-pipe
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@ -15,7 +15,7 @@ COMMENT=	Connect and transmit data to an Icecast media streaming server

 CONFLICTS=	libshout2-*

-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
--- 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_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes

 .include <bsd.port.pre.mk>
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@ -17,7 +17,7 @@ COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate

 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	builders/hardsid-builder/configure \
 		builders/resid-builder/configure \
 		libsidplay/configure \
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@ -18,7 +18,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library

 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USE_AUTOTOOLS=	automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS=	automake autoconf libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@ -29,7 +29,7 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
--- a/Show More
+++ b/Show More