43 files changed, 43 insertions, 54 deletions

diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 98e037db39c0..0813aaf2e9d0 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_SDL=	sdl
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/asc/Makefile b/games/asc/Makefile
index bb611ff381a4..9468c86eb637 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=	yes
 CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags`" \
 		CXXFLAGS="-D_UNICODE_BROKEN_" \
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 58b0c9be8b43..b40aa6a1ac81 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -33,8 +33,7 @@ CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sound
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${SDL_CONFIG}"
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index df46e73fa4a0..6950b2ae52db 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_SDL=	mixer sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 1beea8c98a59..41371bf6c6c7 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Bomberman clone for GNOME
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 28cbf84ae544..5948c9c9ef8b 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 345f2139a048..0c97f91ab178 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Internet Go Server client and game editor
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 58f25b98b390..7b92eb683962 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
 
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
 		CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/games/ember/Makefile b/games/ember/Makefile
index b21b85d1815d..09046dfe6ff9 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 		openal.0:${PORTSDIR}/audio/openal
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 33e0f7b96e09..3e8dca0b3afd 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 USE_SDL=	mixer sdl
 USE_GL=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 AUTOMAKE_ARGS=	-a
 CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIBS}"
 MAKE_ENV=	${CONFIGURE_ENV}
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index a4e1d1ada715..dffa9d98dcc7 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -16,8 +16,7 @@ MAINTAINER=	laszlof@vonostingroup.com
 COMMENT=	Very popular card game with variable skill levels
 
 PLIST_FILES=	bin/euchre
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 538056d3c14f..2526c457937b 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://download.berlios.de/fc-solve/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program that automatically solves games of Freecell
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 03510a180689..71848e8fc87e 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_SDL=	mixer
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui pygnome2
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index f39181530f12..63dc0769ffff 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnometarget
 USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 INSTALLS_SHLIB=	yes
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 0cd1e8ba9005..4fc7a81e7989 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -24,8 +24,7 @@ USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_REINPLACE=	yes
 
 MAN6=		${PORTNAME}.6
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 6dfae69b64f7..5c3084bd3d00 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Conway's Game of Life for GNOME
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack libglade
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e7230ff69530..90a1b6ba98ec 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/games/gnome-music-quiz/Makefile b/games/gnome-music-quiz/Makefile
index 126bd7b97c5b..8381eb3f53fa 100644
--- a/games/gnome-music-quiz/Makefile
+++ b/games/gnome-music-quiz/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	rhythmbox:${PORTSDIR}/audio/rhythmbox
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 USE_GSTREAMER=	gconf
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 pre-configure:
 	@${RM} -f \
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index adf1999bf6f2..bf12ad3feb3f 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Memory Blocks game for GNOME
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 3168fd48822c..e3bcccc4e16f 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 
 USE_MESA=	YES
 USE_PERL5_BUILD=yes
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			  -I${LOCALBASE}/include/tcl8.2 \
 			  -I${X11BASE}/include" \
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index 082edaa5d4b1..7ffb1450db20 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GtkAtlantic is a game like Monopoly(tm)
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 98eceea3ca9b..e72b6706f2c8 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A simple turing machine simulator for GNOME 2
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 9dfa29215c51..cad83ccc2208 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	The GGZ Gaming Zone - Base Library
 
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 INSTALLS_SHLIB=	yes
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index b4ec86815888..9baf444a2f6a 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Core library of MaitreTarot, a Tarot card game
 
 USE_BZIP2=		yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=		glib20 libxml2 lthack
 INSTALLS_SHLIB=		yes
 
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index ff7129e23a82..cdd80d999abb 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -18,7 +18,7 @@ COMMENT=		Client-side library of MaitreTarot, a Tarot card game
 LIB_DEPENDS=		maitretarot.0:${PORTSDIR}/games/libmaitretarot
 
 USE_BZIP2=		yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=		glib20 libxml2 lthack
 INSTALLS_SHLIB=		yes
 
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 923b345168ec..e2911bef6d0a 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 HAS_MONKEYS=	yes
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GSTREAMER=	ogg gconf
 USE_GNOME=	gnomehack gnomeprefix librsvg2 libgnomeui \
diff --git a/games/moon-buggy/Makefile b/games/moon-buggy/Makefile
index fc7ebcfeff47..6ec14978dee5 100644
--- a/games/moon-buggy/Makefile
+++ b/games/moon-buggy/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Drive a buggy across the moons surface
 LIB_DEPENDS=	esd:${PORTSDIR}/audio/esound:install
 .endif
 
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--sharedstatedir=/var/games\
 		--with-setgid=games
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index bedc2f9503d6..128560f6e422 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -27,7 +27,7 @@ USE_SDL=	image mixer sdl
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GL=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 88ec0b12373f..c200d85fb761 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An Internet playable version of the Settlers of Catan for GNOME/GTK
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index f087a3fffadf..5324ca740f67 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -17,8 +17,7 @@ COMMENT=	First Person Shooter with many addons available
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_REINPLACE=	yes
 WANT_SDL=	yes
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 3723b9ca9d1f..5f0efaeb4056 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -30,7 +30,7 @@ WADFILE=	quakesw-1.0.6.tar.gz
 PROGFILE=	qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
 SKINFILES=	skinbase.zip qw_skins.zip
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index de77d54d42de..aef8511f2955 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -32,8 +32,7 @@ USE_SDL=		mixer net sdl
 GNU_CONFIGURE=		yes
 USE_GL=			yes
 USE_GMAKE=		yes
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:15 autoconf:253
 USE_REINPLACE=		yes
 
 WRKSRC=			${WRKDIR}/scorched
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 551b87d8333f..54c9f08b8d49 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A turn-based strategy game for GNOME
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index aa274731c77d..eaa858044db9 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	valley-${PORTVERSION}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	The Valley is a rewrite of an old RPG from the early 1980s
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_X=		yes
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index d0059e8e107c..7061bbd36df0 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	elfrink@introweb.nl
 COMMENT=	Generates ASCII tractors
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 
 MAN6=		tractorgen.6
 PLIST_FILES=	bin/tractorgen
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 33e0f7b96e09..3e8dca0b3afd 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 USE_SDL=	mixer sdl
 USE_GL=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 AUTOMAKE_ARGS=	-a
 CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIBS}"
 MAKE_ENV=	${CONFIGURE_ENV}
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 155ee7920bd0..c5e4a7546ae7 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -18,8 +18,7 @@ COMMENT=	An educational typing tutor starring Tux the Linux Penguin
 USE_SDL=	image mixer sdl
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index df03d8f45cc3..fac86bbb4b3f 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -25,7 +25,7 @@ USE_GL=		yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 58e072d37693..b503ecee073d 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 1cd0906a14f4..47f9c072c6de 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -21,8 +21,7 @@ NO_CDROM=	"don't sell for profit"
 
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 AUTOMAKE_ARGS=	--include-deps
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index e4bf746cf395..52bcc483bbfc 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A puzzle game, somewhat like Tetris
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 1dfb0bf5cb26..fd4f9af7d0ea 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 USE_XLIB=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-esd
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 34cf9dfe6139..e311c3e7fc7e 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Zangband (Zelazny Angband) with color, X11 support
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/lib \
 		--with-setgid=${SHAREGRP}