Mass-conversion to the USE_AUTOTOOLS New World Order. The code present

in bsd.autotools.mk essentially makes this a no-op given that all the old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in exactly the same way as USE_AUTOTOOLS itself. Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME team -- all GNOME 2.12.x ports use it. Preliminary documentation can be found at: http://people.FreeBSD.org/~ade/autotools.txt which is in the process of being SGMLized before introduction into the Porters Handbook. Light blue touch-paper. Run.
svn path=/head/; revision=148323
2025-06-01 02:46:27 -04:00 · 2005-11-15 06:52:12 +00:00 · 2005-11-15 06:52:12 +00:00 · 54a0b86543 · 2021-03-31 03:12:20 +00:00
commit 54a0b86543
parent 1fccb46f14
1605 changed files with 1610 additions and 1866 deletions
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@ -168,7 +168,7 @@ PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 .if defined(USE_PHPIZE) || defined(USE_PHPEXT)
 BUILD_DEPENDS+=	phpize:${PHP_PORT}
 GNU_CONFIGURE=	YES
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS+=	autoconf:259:env
 CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config

 configure-message: phpize-message do-phpize
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
 		intlhack
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
 		libwnck
 WANT_GNOME=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GCC=	3.4+
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack libgnomecanvas lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@ -19,7 +19,7 @@ COMMENT=	GNOME text-to-speech API
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libbonobo
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@ -19,7 +19,7 @@ COMMENT=	GNOME text-to-speech API
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libbonobo
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@ -24,7 +24,7 @@ INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@ -20,7 +20,7 @@ MAN1=		katoob.1
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gnomeprefix gnomehack gtk20
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GETOPT_LONG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Open-source ARJ

 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}

 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@ -18,9 +18,8 @@ COMMENT=	Transparently handles automatic compression and decompression of files

 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl

-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	15
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@ -17,7 +17,7 @@ COMMENT=	A library for Microsoft compression formats

 USE_REINPLACE=		yes
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes

--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library

-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@ -17,7 +17,7 @@ DISTNAME=	lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library

-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
--- a/archivers/orange/Makefile
+++ b/archivers/orange/Makefile
@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@ -20,10 +20,8 @@ CONFLICTS=	rpm-4.*

 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--with-glob
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif

-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif

-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@ -16,9 +16,8 @@ DISTNAME=	trrntzip_v${PORTVERSION:S/.//}_src
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Efficient way to prepare zipfiles for BitTorrent

-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoheader:259
 AUTOMAKE_ARGS=		-a
-USE_AUTOHEADER_VER=	259

 WRKSRC=		${WRKDIR}/trrntzip

--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A data compression library with low memory usage

 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://www.jormas.com/~vesuri/xpk/ \
 MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	The eXternal PacKer (XPK) library system

-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes

 .include <bsd.port.mk>
--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@ -20,10 +20,9 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 # port don't strictly need it, but Wesnoth use it so must we
 USE_GCC=	3.4
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	automake:19:env libtool:15:inc
 CONFIGURE_ARGS+=--disable-static
 USE_REINPLACE=	yes
-WANT_AUTOMAKE_VER=19

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}+cvs.2004.02.07

--- a/astro/boinc-setiathome/Makefile
+++ b/astro/boinc-setiathome/Makefile
@ -32,10 +32,7 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		glut:${PORTSDIR}/graphics/libglut
 .endif

-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	automake:19 autoheader:259 autoconf:259 libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@ -79,7 +76,7 @@ FIND_SETI_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_PROG)

 pre-configure:
 	${TOUCH} ${WRKSRC}/missing
-	cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${USE_LIBTOOL_VER}/libltdl -I m4
+	cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${LIBTOOL_VERSION}/libltdl -I m4

 do-install:
 	${MKDIR} ${BOINC_HOME}/projects/${SETI_SITE}
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gail gnomehack gnomepanel gnomeprefix gnometarget intlhack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@ -22,7 +22,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_REINPLACE=	yes

 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@ -17,7 +17,7 @@ COMMENT=	Astronomical Calculation Library

 USE_GNOME=	gnometarget lthack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GCC=	3.3

--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@ -27,7 +27,6 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
 		nova-0.11.0:${PORTSDIR}/astro/libnova
 RUN_DEPENDS=	${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000

-#USE_AUTOMAKE_VER=17
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomepanel gnomeprefix 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@ -19,7 +19,7 @@ BROKEN=		Size mismatch

 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes

 post-patch:
--- 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_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
--- a/audio/anthem/Makefile
+++ b/audio/anthem/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	tse3:${PORTSDIR}/audio/tse3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15

 .include <bsd.port.pre.mk>

--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomecanvas
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DENODATA=255" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@ -23,10 +23,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \

 WRKSRC=		${WRKDIR}/${PORTNAME}

-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
-USE_AUTOHEADER_VER=	253
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	automake:15 autoheader:253 autoconf:253 libtool:13:inc
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GMAKE=		yes
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@ -24,7 +24,7 @@ PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 ##GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${X11BASE}"
--- a/audio/bmp-songchange/Makefile
+++ b/audio/bmp-songchange/Makefile
@ -17,7 +17,7 @@ COMMENT=	Beep Media Player do-this-on-song-change plugin
 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player

 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15

 PLIST_FILES=	lib/bmp/General/libsong_change.so

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

 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GCC=	3.4
 INSTALL_TARGET=	install man
 INSTALLS_SHLIB=	yes
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	ccgnu2-1.3.1:${PORTSDIR}/devel/commoncpp

 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GCC=	3.4
 INSTALL_TARGET=	install man
 INSTALLS_SHLIB=	yes
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@ -27,7 +27,7 @@ CONFLICTS=	easytag-[0-9]*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@ -15,9 +15,7 @@ MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	Multitrack audio processing software

 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

--- a/audio/ecawave/Makefile
+++ b/audio/ecawave/Makefile
@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes

 CFLAGS+=	${PTHREAD_CFLAGS:S/"//g}
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnometarget gnomehack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=yes

 CONFLICTS=	py*-ro-[0-9]*
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	fftw3.3:${PORTSDIR}/math/fftw3
 USE_X_PREFIX=	yes
 USE_GNOME=	esound imlib gnomehack gnometarget gnomeprefix
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	shout.4:${PORTSDIR}/audio/libshout2 \
 CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15

 post-install:
 .if !defined(NOPORTDOCS)
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@ -18,11 +18,9 @@ COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
 NO_PACKAGE=	Distribution in binary form is prohibited

 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=15
-USE_AUTOHEADER_VER=259
+USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:13
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@ -23,14 +23,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}

 NO_CDROM=	"Restrictive copyright (do not sell for profit)"

-USE_AUTOMAKE_VER=	15
-USE_AUTOHEADER_VER=	259
+USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:13:inc
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes

 CONFIGURE_ARGS=	--with-drm
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@ -16,7 +16,7 @@ COMMENT?=	A command line player for .nsf and .hes audio files

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

-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_BZIP2=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg

 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sse \
 		--with-libiconv-prefix="${LOCALBASE}" \
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -18,7 +18,7 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes

--- a/audio/gaim-festival/Makefile
+++ b/audio/gaim-festival/Makefile
@ -24,7 +24,7 @@ RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:env
 MAKE_ENV=	LOCALBASE=${LOCALBASE}

 PLIST_FILES=	lib/gaim/festival.so
--- 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_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@ -24,9 +24,8 @@ LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GCC=	3.4
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"

--- 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_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@ -27,7 +27,7 @@ USE_GCC=		3.4+
 USE_GNOME=		gnomehack gnomeprefix
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo
 USE_GSTREAMER=	cdparanoia gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@ -34,7 +34,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15

 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@ -28,8 +28,7 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=	13
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213 libtool:13

 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@ -22,7 +22,7 @@ PATCH_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui vte
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@ -21,7 +21,7 @@ USE_GCC=	3.4
 USE_GNOME=	gnomeprefix gnometarget libxml2
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@ -19,7 +19,7 @@ COMMENT=	GStreamer plugin for monkeysaudio files
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	lthack gnomehack gnomeprefix
 USE_GSTREAMER=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@ -16,7 +16,7 @@ COMMENT=	A guitar effects processor for GTK

 USE_GNOME=	gnometarget gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -fPIC" LDFLAGS="${PTHREAD_LIBS}"
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}

--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@ -23,7 +23,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		xslt.2:${PORTSDIR}/textproc/libxslt

 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_RC_SUBR=	icecast2.sh
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	shout.4:${PORTSDIR}/audio/libshout2 \
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes

 .include <bsd.port.mk>
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@ -26,7 +26,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 LATEST_LINK=	ices0

 MAN1=		ices.1
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags

 USE_ICONV=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes

--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@ -23,7 +23,7 @@ LATEST_LINK=		jack
 CONFIGURE_ENV=		LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include" \
 			CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libglade2
 USE_GSTREAMER=	vorbis mad gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@ -17,7 +17,7 @@ COMMENT=	ISO code based fast MP3 encoder kit

 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp --disable-gtktest

--- 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_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes

 .if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
--- 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_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes

 .if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@ -19,7 +19,7 @@ COMMENT=	AdLib emulator library supporting many formats
 LIB_DEPENDS=	binio.1:${PORTSDIR}/devel/libbinio

 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GCC=	3.4+

--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@ -15,7 +15,7 @@ COMMENT=	Portable audio output library

 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes

 .if defined(NOPORTDOCS)
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	A library for playing audio CDs

 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes

 .include <bsd.port.mk>
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A library to access data on a CDDB server

 USE_BZIP2=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget gnomehack pkgconfig
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-cdio
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	asa@gascom.ru
 COMMENT=	ID3 tags library (part of MAD project)

 USE_GNOME=	pkgconfig
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes

 post-build:
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Libmad library (part of MAD project)

-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-debugging \
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@ -17,7 +17,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 MAKE_ENV=	SHELL=/bin/sh
 INSTALLS_SHLIB=	yes
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@ -17,7 +17,7 @@ COMMENT=	ModPlug mod-like music shared libraries
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_REINPLACE=	yes

 post-patch:
--- a/audio/libmpcdec/Makefile
+++ b/audio/libmpcdec/Makefile
@ -16,7 +16,7 @@ COMMENT=	High quality audio compression format
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes

--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	musicbrainz-*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	musicbrainz-*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	musicbrainz-*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	musicbrainz-*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library

-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes

--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw3.3:${PORTSDIR}/math/fftw3

 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gcc-pipe
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@ -23,7 +23,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFLICTS=	libshout-1.0.7
 USE_REINPLACE=	yes

--- 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_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes

 .include <bsd.port.pre.mk>
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@ -18,7 +18,7 @@ COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	builders/hardsid-builder/configure \
 		builders/resid-builder/configure \
 		libsidplay/configure \
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)

 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-justsrc --disable-gcc-pipe
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@ -18,9 +18,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
 USE_REINPLACE=	yes
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes

--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@ -29,7 +29,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15

 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@ -29,7 +29,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15

 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
--- 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_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@ -19,7 +19,7 @@ COMMENT=	Monkey's Audio lossless audio (de)compressor
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS+=	--enable-backward

 WRKSRC=		${WRKDIR}/mac-3.99-u4
--- 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_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 ALL_TARGET=	all madtime
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburne
 USE_GSTREAMER=	flac gconf mad vorbis
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam"

--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@ -18,7 +18,7 @@ COMMENT=	Digit@lway MPIO MP3 player tool
 LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb

 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
--- a/Show more
+++ b/Show more