From 8d9d5197561118544281733430b48b0b60884450 Mon Sep 17 00:00:00 2001
From: ade <ade@FreeBSD.org>
Date: Tue, 15 Nov 2005 06:52:12 +0000
Subject: 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.
---
 x11-toolkits/9libs/Makefile             | 2 +-
 x11-toolkits/SoXt/Makefile              | 2 +-
 x11-toolkits/bakery/Makefile            | 2 +-
 x11-toolkits/efltk/Makefile             | 2 +-
 x11-toolkits/etox/Makefile              | 2 +-
 x11-toolkits/ewl/Makefile               | 2 +-
 x11-toolkits/fox-devel/Makefile         | 2 +-
 x11-toolkits/fox12/Makefile             | 2 +-
 x11-toolkits/fox14/Makefile             | 2 +-
 x11-toolkits/fox16/Makefile             | 2 +-
 x11-toolkits/freeglut/Makefile          | 2 +-
 x11-toolkits/fxscintilla/Makefile       | 2 +-
 x11-toolkits/gal/Makefile               | 2 +-
 x11-toolkits/gdl/Makefile               | 2 +-
 x11-toolkits/gtk--/Makefile             | 2 +-
 x11-toolkits/gtk--2/Makefile            | 2 +-
 x11-toolkits/gtk-sharp10/Makefile       | 2 +-
 x11-toolkits/gtk-sharp20/Makefile       | 2 +-
 x11-toolkits/gtk12/Makefile             | 2 +-
 x11-toolkits/gtkdatabox2/Makefile       | 2 +-
 x11-toolkits/gtkextra/Makefile          | 2 +-
 x11-toolkits/gtkextra2/Makefile         | 2 +-
 x11-toolkits/gtkglarea--/Makefile       | 2 +-
 x11-toolkits/gtkglarea/Makefile         | 2 +-
 x11-toolkits/gtkglarea2/Makefile        | 2 +-
 x11-toolkits/gtkglext/Makefile          | 2 +-
 x11-toolkits/gtkglextmm/Makefile        | 2 +-
 x11-toolkits/gtkmathview/Makefile       | 2 +-
 x11-toolkits/gtkmm12/Makefile           | 2 +-
 x11-toolkits/gtkmm20/Makefile           | 2 +-
 x11-toolkits/gtkmm30/Makefile           | 2 +-
 x11-toolkits/guile-gnome/Makefile       | 2 +-
 x11-toolkits/guile-gtk/Makefile         | 2 +-
 x11-toolkits/lesstif/Makefile           | 4 +---
 x11-toolkits/libXaw/Makefile            | 2 +-
 x11-toolkits/libXmu/Makefile            | 2 +-
 x11-toolkits/libXt/Makefile             | 2 +-
 x11-toolkits/libbonoboui/Makefile       | 2 +-
 x11-toolkits/libbonobouimm/Makefile     | 2 +-
 x11-toolkits/libgail-gnome/Makefile     | 2 +-
 x11-toolkits/libgnomeprintuimm/Makefile | 2 +-
 x11-toolkits/libgnomeuimm/Makefile      | 2 +-
 x11-toolkits/libgnomeuimm26/Makefile    | 2 +-
 x11-toolkits/libgtkeditor/Makefile      | 4 +---
 x11-toolkits/libpanelappletmm/Makefile  | 2 +-
 x11-toolkits/libsexy/Makefile           | 2 +-
 x11-toolkits/libxfce4gui/Makefile       | 2 +-
 x11-toolkits/libzvt/Makefile            | 2 +-
 x11-toolkits/movingmotif/Makefile       | 2 +-
 x11-toolkits/neXtaw/Makefile            | 2 +-
 x11-toolkits/p5-qt/Makefile             | 2 +-
 x11-toolkits/pangoxsl/Makefile          | 2 +-
 x11-toolkits/paragui-devel/Makefile     | 2 +-
 x11-toolkits/paragui/Makefile           | 2 +-
 x11-toolkits/php-gtk/Makefile           | 4 +---
 x11-toolkits/php-gtk2/Makefile          | 4 +---
 x11-toolkits/py-gnome/Makefile          | 2 +-
 x11-toolkits/py-gtk/Makefile            | 2 +-
 x11-toolkits/py-gtkglext/Makefile       | 2 +-
 x11-toolkits/qtpixmap/Makefile          | 2 +-
 x11-toolkits/sdl_gui/Makefile           | 2 +-
 x11-toolkits/soqt/Makefile              | 2 +-
 x11-toolkits/vdk/Makefile               | 2 +-
 x11-toolkits/vdkbuilder/Makefile        | 2 +-
 x11-toolkits/viewkit/Makefile           | 2 +-
 x11-toolkits/vte/Makefile               | 2 +-
 x11-toolkits/wxmozilla/Makefile         | 2 +-
 x11-toolkits/xbae/Makefile              | 2 +-
 x11-toolkits/xmhtml/Makefile            | 2 +-
 69 files changed, 69 insertions(+), 77 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index 1c51302..f892cf7 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plan9 compatibility libraries
 
 USE_XLIB=	YES
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/9libs
 
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 371ab31..0107524 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Coin.44:${PORTSDIR}/graphics/Coin
 
 USE_GL=		yes
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${X11BASE}
 # avoid renaming of soxt-config and soxt-config.1
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 2e066e8..39bc624 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index b3d7071..b8573d3 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -31,7 +31,7 @@ USE_MYSQL=	yes
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
diff --git a/x11-toolkits/etox/Makefile b/x11-toolkits/etox/Makefile
index 741ad66..fe16d1d 100644
--- a/x11-toolkits/etox/Makefile
+++ b/x11-toolkits/etox/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	evas.1:${PORTSDIR}/graphics/evas \
 		edb.1:${PORTSDIR}/databases/edb
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index f678f75..ac859ba 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	embryo.9:${PORTSDIR}/lang/embryo \
 		ecore.1:${PORTSDIR}/x11/ecore
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index fbeede7..5ae3d8b 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
 USE_GL=		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}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index f484ea5..e9660d5 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GNOME=	lthack
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index fbeede7..5ae3d8b 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
 USE_GL=		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}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index f484ea5..e9660d5 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GNOME=	lthack
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
index 0843819..144b842 100644
--- a/x11-toolkits/freeglut/Makefile
+++ b/x11-toolkits/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/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 5aeb02d..621bae0 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Fox toolkit reimplementation of Scintilla editing widget
 
 GNU_CONFIGURE=	yes
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS+=	--enable-shared --disable-static
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index c4fdf3f..17444c3 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier libglade gnomevfs
 USE_ICONV=	yes
 GNOME_HTML_DIR=	${PREFIX}/share/doc/gal
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS=	--enable-static --with-libiconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 403e3dcb3..0bcfbbe 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Components intended to be shared between GNOME development tools
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 8d6e345..68eb163 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 1874665..80e500e 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 01399dc..4ba1a1b 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtk-sharp10
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 7e6661f..1490abd 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtk-sharp20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 2467d23..a80b52d 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12 --with-native-locale \
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 03bcebb..a459c3a 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A GTK+2 widget to display large amounts of numerical data
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
 CONFLICTS=	gtkdatabox-0.1.*
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 86bb982..8d584d0 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index c6368fa..7685035 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+ 2.0
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk20 gnomehack
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index dedcefe..54386a3 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 98bc6da..ee2b896c 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-lib-GL
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index ad34a9f..28ce2a1 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gtk20
 USE_BZIP2=	yes
 USE_GL=		yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index e819f27..6fd73b6 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GL=		yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index fc6f3cd..adc06dd 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index ff821ef..581389e 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_GETOPT_LONG=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	glib20 gtk20 gnomehack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 8d6e345..68eb163 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 1874665..80e500e 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 1874665..80e500e 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 LATEST_LINK=	gtkmm2
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 000661e..8206585 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Guile binding library for GNOME
 LIB_DEPENDS=	guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	gnomeprefix bonobo gtkhtml libglade
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-bonobo --with-gtkhtml --without-gal \
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index fe35a50..da860d7 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12 gnometarget
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index da8035b..abb947a 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -19,11 +19,9 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFLICTS?=	open-motif-*
 MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
-WANT_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15:inc
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=	15
 LIBTOOLFILES=	aclocal.m4 test/aclocal.m4
 CONFIGURE_ARGS+=	--enable-static --enable-shared --enable-production
 CONFIGURE_ARGS+=	--disable-maintainer-mode
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 8ff895d..3074131 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -29,7 +29,7 @@ PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 5d4770b..2552db3 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -25,7 +25,7 @@ PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 8fcdf76..7424749 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -26,7 +26,7 @@ PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 6712a90..4dc9f1f 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
 		libgnomecanvas libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 6293cc5..473d2a0 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gnomeprefix libbonoboui
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 5b161b7..c6d7583 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomepanel atspi
 USE_REINPLACE=	yes
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index cf35f77..6aea556 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeprintui
 USE_GCC=	3.4
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.5" API_VERSION="2.6"
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 26b38fb..44ba283 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index ec79d99..7b1b791 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -31,7 +31,7 @@ USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack libgnomeui
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 8b2255f..fb76c6e 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -18,13 +18,11 @@ COMMENT=	A source code editor widget for GTK+
 
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
-WANT_AUTOMAKE_VER=15
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS=	automake:15:env autoconf:253:env libtool:13:inc
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CFLAGS+=	-fPIC
 
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 9e271e6..76b543a 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack lthack gnomepanel
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 396c3f3..e9969b6 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=		enchant:${PORTSDIR}/textproc/enchant
 RUN_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_GNOME=		gnomehack lthack gtk20 libxml2
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 USE_X_PREFIX=		yes
 
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 2c1fbef..d200da9 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
 USE_GNOME=	gtk20 gnomehack
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index ceb9dd1..615224d 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	gnomeprefix gnomehack gtk20 libartlgpl2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 25d43f8..b2a66f5 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index ce05096..6e54824 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index 874e2a5..f96e2a6 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -23,7 +23,7 @@ COMMENT=	A set of Perl bindings for the Qt toolkit
 
 USE_GL=		yes
 USE_QT_VER=	3
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 18eb3c5..b5f58f7 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pango
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 05b1476..0fa1be4 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 05b1476..0fa1be4 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index f77d8d4..2c2b216 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -15,9 +15,7 @@ MASTER_SITES=	http://gtk.php.net/distributions/ \
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	An extension to use gtk in PHP-applications
 
-WANT_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
-WANT_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15:env
 GNU_CONFIGURE=	yes
 USE_PHP=	pcre
 USE_PHP_BUILD=	yes
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index f77d8d4..2c2b216 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -15,9 +15,7 @@ MASTER_SITES=	http://gtk.php.net/distributions/ \
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	An extension to use gtk in PHP-applications
 
-WANT_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
-WANT_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15:env
 GNU_CONFIGURE=	yes
 USE_PHP=	pcre
 USE_PHP_BUILD=	yes
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index ddca3c0..f037130 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gtkhtml gnometarget
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 LIBTOOLFILES=	configure pygtk/configure
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
 		--with-gnome-config=${X11BASE}/bin/gnome-config		\
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index b5bbd76..6b31288 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gdkpixbuf libglade
 USE_PYTHON=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 841fa8e..a231eaf 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index fef9248..699674a 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Modifed GTK pixmap engine to obtain Theme information from Qt
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 WRKSRC=		${WRKDIR}/${DISTNAME:S/7043-//}
 
 .if !defined(WITHOUT_GTK1)
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index eca89e5..a00fa86 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Graphical User Interface library for SDL
 
 USE_SDL=	sdl image ttf
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 94f0b41..153e56b 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Coin.44:${PORTSDIR}/graphics/Coin
 
 USE_QT_VER=	3
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${X11BASE}
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 60b1028..eebe8ad 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ wrapper for GTK+ toolkit
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget gtk20
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 3d237fe..4a451ab 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20
 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=	--enable-opt=no
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index 8fa8160..05c4b9e 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	libvk-Apr19-2243
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ViewKit workalike from Hungry Programmers
 
-WANT_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253:env
 MOTIFPACKAGE?=	open-motif
 USE_X_PREFIX=	yes
 USE_MOTIF=	yes
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 116e49e..2fe96e6 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index 84f1948..928ae1c 100644
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack gnometarget
 WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} --enable-python
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 405469e..9b5caee 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	Xbae-${PORTVERSION}
 MAINTAINER=	ports@freebsd.org
 COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 8f0d2ed..6ea23a7 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A Motif widget set for displaying HTML 3.2 documents
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WANT_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:env
 USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-- 
cgit v1.1