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.

26 files changed, 26 insertions, 26 deletions

diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index c376bc372905..843edbaea2fe 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A console Yahoo! messenger client
 
 PLIST_FILES=	bin/ari-yahoo
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-configure:
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 589848d618f1..9d157cb8f675 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -30,7 +30,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gdkpixbuf gnometarget
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index f2f637f0c65d..1a88c01b0b3e 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -19,7 +19,7 @@ USE_OPENSSL=	yes
 USE_PYTHON=	yes
 USE_XLIB=	yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index ee245520bfe8..9546012eb493 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 PLIST_FILES=	lib/gaim/bangexec.so
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 1bdb215901c3..9cf63bd8af9b 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index 3f09f226ab42..4743d7dc29a7 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 SUB_FILES=	pkg-message
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 66013d979cba..5565cc0a4e2d 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/net-im/gaim-rss-reader/Makefile b/net-im/gaim-rss-reader/Makefile
index e4f840002211..b2b5cfb749e2 100644
--- a/net-im/gaim-rss-reader/Makefile
+++ b/net-im/gaim-rss-reader/Makefile
@@ -25,7 +25,7 @@ IGNORE=	Requires update to work with Gaim 0.82.1
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	"--with-gaim=${X11BASE}/include/gaim"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 9ef46b78bd5b..d6bc2ba47ce8 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_GNOME=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 77c115af01c6..04c21dd0b04e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 
 GCONF_SCHEMAS=	gnomeicu.schemas
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 77c115af01c6..04c21dd0b04e 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 
 GCONF_SCHEMAS=	gnomeicu.schemas
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 43ffffd487be..54b3770c435b 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 4faeeca229a9..f7304491eadc 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index bdc549485a32..0e30799a3f9a 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-im/jabber-aim/Makefile b/net-im/jabber-aim/Makefile
index 8e095f553b6e..bd4a81611573 100644
--- a/net-im/jabber-aim/Makefile
+++ b/net-im/jabber-aim/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net-im/jabber
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION:R}
 PLIST_FILES=	lib/jabber/aimtrans.so
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_ICONV=	yes
 
 CONFIGURE_ARGS+=--with-jabberd=${LOCALBASE}/include/jabber
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index 1373ff267519..04665debda14 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	libglade2
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 55586ef6accf..447be3ac200c 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index ba1a4308b186..01b5baff2a03 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An opensource C++ library to support icq2000/2001 protocol
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ARGS=	--disable-static
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index 5c826e22a7e8..114e7ddfd529 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library for connecting to MSN Messenger service
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index ab507e1d40d4..3a79ce614ea5 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A C library that handles the new Yahoo! Messenger protocol
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gnomehack gnometarget
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index 911edf611d6e..7eb093a96f4a 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	cdk.4:${PORTSDIR}/devel/cdk
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ncurses-based console plugin for Licq
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 4aba4f733a5a..77e032a7dc36 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net-im/licq-qt-gui
 # plugin (gtk+) and wish run osd with it. i've not tested with
 # plugins other than qt-gui
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 LICQ_PORT?=	net-im/licq
 
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index ca43440a4af6..045427974b44 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Lightweight Jabber client library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 928b8b0795bc..3c5f82b05404 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index b5ed547d1c1b..5aabbb818182 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-doxygen=no \
 		--with-gmp-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 1bdb215901c3..9cf63bd8af9b 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_NLS)