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.

128 files changed, 128 insertions, 144 deletions

diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index c249433c7271..ff247f103f3c 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal \
 
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-pthread=yes --enable-threadsafe \
 		--enable-3ds-import --enable-sound
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -29,7 +29,7 @@ OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -29,7 +29,7 @@ OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -29,7 +29,7 @@ OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 7acb87acb855..1f790f32aa37 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fast pixel formats conversion library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0fea22e81b9d..fe7e00fa6d0e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -21,8 +21,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index eda454286c76..7e9f59048d75 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	openexr
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A high dynamic-range (HDR) image file format
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 234774f5b588..0fe51d08c0af 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An ascii art library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_X11)
diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index a57dd87a4cbf..8c2b73711de3 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	lib
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 45e74f6fa179..5d35e36ca0cc 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
 USE_XLIB=	yes
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index a9c7cd88ba66..cdb369089ae6 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index e203abf65215..f0a4dc5c2ac8 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -23,10 +23,8 @@ CONFLICTS=	cal3d-[0-9]*
 USE_BZIP2=		yes
 USE_GNOME=		pkgconfig
 USE_GCC=		3.2+
-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15:inc
 AUTOMAKE_ARGS=		"--add-missing"
-USE_AUTOHEADER_VER=	259
-USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include -I${X11BASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 4e4275c580aa..ce98c76ecf93 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -19,10 +19,8 @@ CONFLICTS=	cal3d-devel-[0-9]*
 
 USE_BZIP2=		yes
 USE_GNOME=		pkgconfig
-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15:inc
 AUTOMAKE_ARGS=		"--add-missing"
-USE_AUTOHEADER_VER=	259
-USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--disable-static
 
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 068fb803d16e..79abdeeb07bd 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil
 WRKSRC=		${WRKDIR}/${PORTNAME}_mk2
 CONFIGURE_ARGS=	--without-xerces-c
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
diff --git a/graphics/cegui04/Makefile b/graphics/cegui04/Makefile
index 068fb803d16e..79abdeeb07bd 100644
--- a/graphics/cegui04/Makefile
+++ b/graphics/cegui04/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil
 WRKSRC=		${WRKDIR}/${PORTNAME}_mk2
 CONFIGURE_ARGS=	--without-xerces-c
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 359f7186bf63..aa2774ee5743 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index 18cf15ec1e98..c6ee44dbeb8c 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile
index 5f9de0a1d18d..553b81d92a98 100644
--- a/graphics/demeter/Makefile
+++ b/graphics/demeter/Makefile
@@ -24,9 +24,7 @@ USE_GL=		yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 WANT_SDL=	yes
-USE_AUTOCONF_VER=	253
-USE_AUTOMAKE_VER=	15
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 4b8d1e44e9dc..e9128f1324c3 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -33,7 +33,7 @@ CFLAGS+=	"-I${LOCALBASE}/include/SDL11"
 .endif
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
 		-L${X11BASE}/lib"
 
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index e59dc079cc42..5e9964931e04 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 2d00c01ab6f4..6f5fa790f1a0 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gnomehack gnometarget pygnome2
 USE_PYTHON=	2.2+
 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_SHLIB=	yes
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 9392d1bac656..2d026b9a28c7 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -17,8 +17,7 @@ COMMENT=	DivX Calculator
 USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_GMAKE=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:15:env autoconf:253:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index f97ba7d553ab..7fe640bd287b 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -26,8 +26,7 @@ PKGNAMESUFFIX=	-nox11
 
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-USE_AUTOCONF_VER=259
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15:inc
 INSTALLS_SHLIB=	yes
 DATADIR=	${PREFIX}/share/djvu
 CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 0fff7cf98f83..36a84588b2f1 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	embryo.9:${PORTSDIR}/lang/embryo \
 		evas.1:${PORTSDIR}/graphics/evas \
 		ecore.1:${PORTSDIR}/x11/ecore
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index a3a82cdc1617..51b3c526bb9a 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A graphic view base imlib & gtk
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 9bb00c0e2ca5..5c8813c19847 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--enable-all-plugins \
 		--enable-plugins-dir \
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index d0e9de6e7c0a..3cf6fb49bd7e 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An image viewer written using libraries for Enlightenment 0.17 developm
 LIB_DEPENDS=	esmart_thumb.0:${PORTSDIR}/graphics/esmart
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index 3f3f22627b74..5b1d5cdc6345 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -15,7 +15,7 @@ COMMENT=	An IMMENSELY FAST JPEG thumbnailer library API
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 3181620d30db..7e484c0058ec 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A small, display independent, and quick thumbnailing library
 LIB_DEPENDS=	epeg.9:${PORTSDIR}/graphics/epeg \
 		edje.5:${PORTSDIR}/graphics/edje
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index 32276db967f2..dfef10670876 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Evas smart objects development libraries
 LIB_DEPENDS=	epsilon.0:${PORTSDIR}/graphics/epsilon
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 0cae41fa74c5..41e31ff45069 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		eet.9:${PORTSDIR}/devel/eet
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_FREETYPE2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index ca7f0e897f45..930d3ad7a60c 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Command line utility to read and manipulate EXIF data
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		popt.0:${PORTSDIR}/devel/popt
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-popt-prefix=${LOCALBASE}
 
 MAN1=		exif.1
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 5acc7542d592..97cdd593856e 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Exif and Iptc metadata manipulation library and tools
 BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index e4e9e863cc25..713965dd53ad 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Half:${PORTSDIR}/graphics/OpenEXR \
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 2416ad5a4179..06626b85aa91 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 9db83153d637..4f374b05d88f 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fonts and font libraries necessary for Enlightenment
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 084381995b54..144b8428f8a5 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		An alternative to the OpenGL Utility Toolkit (GLUT) library
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 USE_XLIB=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index e49244927392..b899c3f537c4 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -19,7 +19,7 @@ USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=${X11BASE}
diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 01f51a160e43..6cd91e856c46 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	YES
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 70364256e6ba..5f1551a33e9e 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index ca3921c1e734..aea4a8c2e3ff 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 442e451c7acf..7a3abc7bb550 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -41,7 +41,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index effea9eca041..4542d30cb1a1 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index d15f593246c3..c1c270382319 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	"LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}"
 
 MAN3=		gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle \
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 8acddcb1e3f8..63c42a6a8499 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -21,9 +21,7 @@ USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/Glide3
 USE_X_PREFIX=		yes
 INSTALLS_SHLIB=		yes
-USE_INC_LIBTOOL_VER=	13
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:14 autoconf:253 libtool:13:inc
 AUTOMAKE_ARGS=		-a
 USE_GMAKE=		yes
 MAKEFILE=		makefile.autoconf
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 2c0620c3544e..dc7ce9f1e857 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_FREETYPE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib"
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index d2622b192ed0..e2a23a4a69b1 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo gnomeprint
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index a719e4949826..c2b38d10102a 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
 USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-sdltest --enable-static
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 0946cb1d4aa2..7ea93a3182e4 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
 		desktopfileutils
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 4bbf930762be..f14a101c036a 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gtkcairo/Makefile b/graphics/gtkcairo/Makefile
index 83d155b7bcdf..46454a8fabd5 100644
--- a/graphics/gtkcairo/Makefile
+++ b/graphics/gtkcairo/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20 gnometarget gnomehack
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	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"
 
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index fbcb7eda699d..0de8e1781339 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 RUN_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index da600bd1493b..3452b85498db 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A very simple GUI framework for use with SDL
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 9e5d49ae343c..055be5a9b30f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib --disable-modules
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 8136bff67c71..a671181dc182 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -20,12 +20,10 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_LIBLTDL=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	autoconf:259 libltdl:15 libtool:15
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 67465e781632..0b555cd7fc3d 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		edb.1:${PORTSDIR}/databases/edb \
 		eet.9:${PORTSDIR}/devel/eet
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
 		LIBS="-L${PREFIX}/lib"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 8adc3fe4b085..ceefc950c44e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libxslt
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4
 CONFIGURE_ARGS=	--with-popt \
 		--with-gnome-print
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 79f0273ef390..e4d1da1bf689 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_ZIP=	yes
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index a335ceb704eb..a6d5bb9adaaf 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/jpeg-mmx
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 259eb60ae8b1..3dda0d190a6c 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -24,7 +24,7 @@ COMMENT=	IJG's jpeg compression utilities
 
 WRKSRC=		${WRKDIR}/jpeg-6b
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index db90cd0d00d6..96a7f8e98822 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++ \
 
 CONFLICTS=	atlas-3* superlu-3*
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 libxslt
 GNU_CONFIGURE=	yes
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index da51f215a86c..151b803e4863 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -24,7 +24,7 @@ USE_GL=		yes
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 39603711a33c..173625b917f4 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Light Color Management System -- a color management library
 
 USE_GNOME=	gnomehack gnometarget lthack
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--without-jpeg --without-tiff
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 30a8fa88c71a..063727b6303b 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Library for high-performance 2D graphics
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 CONFLICTS=	libart-[0-9]*
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 30a8fa88c71a..063727b6303b 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Library for high-performance 2D graphics
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 CONFLICTS=	libart-[0-9]*
 
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 6efc996d5a78..995377396217 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	Library to read digital camera file meta-data
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index f0c3348f1249..0f4aaa9e0dd9 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 435e438ca654..0efddb8416ff 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 4cb83ea376e1..6892e1d6749a 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gii.0:${PORTSDIR}/devel/libgii
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 734b853043a9..e136bc419096 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index 142627957048..052f082b6371 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index cb084fd650c9..ea206aa7b8db 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 8784f712907d..a0057e99df6e 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomecanvas
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index cfb591ab7ba7..7c1eb3a6776f 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=	gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure libgphoto2_port/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index 70b71c9cb428..3784474aa74a 100644
--- a/graphics/libgrass5/Makefile
+++ b/graphics/libgrass5/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library of functions from the GRASS GIS application for use by non-GRASS programs
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 INSTALLS_SHLIB=	yes
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index 19c58b7f9ce5..dd869ad9377e 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A library for loading (and saving) 3d modeller object files
 
 CONFLICTS=	xmorph*
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index a5d616acae0f..c3750b7012f7 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs gdkpixbuf
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index ca3921c1e734..aea4a8c2e3ff 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile
index 25bf437be6e7..84edd3ec2fa4 100644
--- a/graphics/libvisual-plugins/Makefile
+++ b/graphics/libvisual-plugins/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	visual.0:${PORTSDIR}/graphics/libvisual
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_XLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-alsa
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index ce7820530c56..c8d61cb3f178 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Abstraction library that sits between apps and visual plugin
 USE_XLIBS=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index ce7820530c56..c8d61cb3f178 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Abstraction library that sits between apps and visual plugin
 USE_XLIBS=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 84deff24d940..75808c662a76 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk
 MAN1=		lodju-create.1 lodju-gallery.1 lodju.1
 MANCOMPRESSED=	yes
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 HAS_CONFIGURE=  yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 gdkpixbuf
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index a3b8b0b720fa..74fb145eee0b 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV+=	GLVER="${GLVER}" LIBS="-lm"
 SUB_GL=		src si-glu src-glu
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 0102bdbddeec..6d3cdacffbad 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vips.14:${PORTSDIR}/graphics/vips \
 USE_GMAKE=	yes
 USE_GNOME=	gnomemimedata glib20 pkgconfig gtk20
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 
 MAN1=		nip2.1
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index e76e614b6da3..4255a52d940a 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ library for representing curves or surfaces
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/"
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre312/Makefile
+++ b/graphics/ogre312/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 WRKSRC=		${WRKDIR}/ogrenew
 CONFIGURE_ARGS=	--disable-cg --program-transform-name=
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 WRKSRC=		${WRKDIR}/ogrenew
 CONFIGURE_ARGS=	--disable-cg --program-transform-name=
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	zzip.10:${PORTSDIR}/devel/zziplib \
 WRKSRC=		${WRKDIR}/ogrenew
 CONFIGURE_ARGS=	--disable-cg --program-transform-name=
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile
index 13edd440d026..0abf4d7ee2da 100644
--- a/graphics/paintlib/Makefile
+++ b/graphics/paintlib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		tiff:${PORTSDIR}/graphics/tiff \
 		ungif:${PORTSDIR}/graphics/libungif
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-SDL --disable-dfb
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 26c7d5b9dfc9..9c5c2dcb3d93 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV=	CFALGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 32f0f3d8d9f4..0ff6978ea8ef 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,9 +22,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
-WANT_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	automake:15:env autoconf:213 libtool:13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 8b0663562cbc..4a3842cdf9e1 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index df5096dcfa26..8f481733fde6 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A plotting library and toolkit
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		MOTIFLIB="${MOTIFLIB}" \
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -33,7 +33,7 @@ USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 LATEST_LINK=	${PORTNAME}36
 
 .if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -33,7 +33,7 @@ USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 LATEST_LINK=	${PORTNAME}36
 
 .if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -33,7 +33,7 @@ USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 LATEST_LINK=	${PORTNAME}36
 
 .if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index e373d223b3aa..bde051576eee 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Cartographic Projections library
 
 NADFILES=	proj-nad27-1.2.tar.gz
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 41f4c84d0f30..e8f7c6d86481 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	IMAGEMAGICK "Enable magick++ interface" on \
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GHOSTSCRIPT=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 9d086aca5199..83ef7b8f272b 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYNUMERIC}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	2.3+
 USE_REINPLACE=	yes
 USE_XLIB=	yes
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index 53bb81dca4cb..6885ab61574c 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Use OpenGL to play around with three dimensional scenes
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index 6ee8f06fde5d..2cdd0d169b89 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 USE_GNOME=	glib12
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index ca7ccdd5e9e6..1a6b3bf7c34a 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	High level 3D graphics library compatible with Apple's QuickDraw(TM)
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GL=		yes
 USE_X_PREFIX=	yes
diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile
index 060f8a884026..4ba3568f0b8a 100644
--- a/graphics/sage/Makefile
+++ b/graphics/sage/Makefile
@@ -16,7 +16,7 @@ COMMENT=	OpenGL extension library
 
 USE_SDL=	sdl
 USE_GL=		yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 4691a4052921..45a5a96083ec 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	USB "USB support" on \
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --disable-locking
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index cbbc069d3b39..9ea8778fb926 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -19,7 +19,7 @@ COMMENT=	SDL graphics drawing primitives and other support functions
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/SDL11 \
 		--disable-mmx
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index b5319a2618b3..96a0711a0db2 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 2ec047abf909..67d6ecabddda 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -20,7 +20,7 @@ USE_SDL=	sdl
 USE_GL=		yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 92920dcaf489..18b21594566e 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_XLIB=	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/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 164534b873c5..1a1e1536078b 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--without-gnome-print \
 		--with-popt
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index a58dda8fce92..79c413867dfa 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/sswf-${PORTVERSION}
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index cb131f15b8f2..d1b48ab7d857 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -24,7 +24,7 @@ EXPIRATION_DATE=	2005-12-05
 
 BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
 
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	autoconf:253:env
 USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index f7a5425be96f..4467d697cce7 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -29,7 +29,7 @@ USE_QT_VER=	3
 USE_MESA=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index b3ffa56dff61..e6e80722719c 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	fftw3.3:${PORTSDIR}/math/fftw3 \
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 pkgconfig pango
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index a78b515414c2..8f74a1ec9055 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -15,7 +15,7 @@ COMMENT=	An image viewer for X
 
 USE_SDL=	image
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index c818c3c5605e..e79f60641ad9 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	tdv94ped@cs.umu.se
 COMMENT=	A medical image conversion utility and library
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_SUBMAKE=	yes
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index 5a76864e72df..02f251bab9cb 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_TARGET=       --build=${ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	lib/xmms/Visualization/libiris.so
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index a97d544c035f..aab99a01d51e 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GNOME=	gtk12
 USE_BZIP2=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile
index 4aebbb48b96d..ae9e407fd08e 100644
--- a/graphics/xmms-plazma/Makefile
+++ b/graphics/xmms-plazma/Makefile
@@ -20,7 +20,7 @@ USE_GL=		yes
 USE_GNOME=	gtk12
 USE_SDL=	sdl
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 
 PLIST_FILES=	lib/xmms/Visualization/libplazma.so
 
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index 1769ed7e8ea4..bf05c82e184b 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index 0a57ae19c0a0..b210ea858a70 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 DATADIR=	${PREFIX}/share/xmms/VU_Meter_skins
diff --git a/graphics/xmms-waterfall/Makefile b/graphics/xmms-waterfall/Makefile
index 557c0b956b69..cf3dad5c4325 100644
--- a/graphics/xmms-waterfall/Makefile
+++ b/graphics/xmms-waterfall/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 
 PLIST_FILES=	lib/xmms/Visualization/libwaterfall.so
 
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 51a98edd5784..5c131dd69c0f 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	libmorph*
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 04e2b486a182..69089f536217 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -25,7 +25,7 @@ USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index 931da686b541..076b2a262994 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile
index 931da686b541..076b2a262994 100644
--- a/graphics/yafray/Makefile
+++ b/graphics/yafray/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \