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.

28 files changed, 28 insertions, 29 deletions

diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index f0c00a586967..6f5be94acebe 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile
index 0db4f1a50480..593a4fa42cec 100644
--- a/deskutils/doodle/Makefile
+++ b/deskutils/doodle/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Quickly search documents
 LIB_DEPENDS=	extractor.2:${PORTSDIR}/textproc/libextractor
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 USE_FAM=	yes
 INSTALLS_SHLIB=	yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index b86e14683ea4..ac8ae9a7a704 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	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/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 2facb556302c..d88bea78ff08 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -21,7 +21,7 @@ COMMENT=	The GNU Gregorian calendar program
 USE_GETTEXT=	yes
 # required to rebuild info files if needed.
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	yes
 
 INFO=		gcal
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index f6de55bba49b..0ab33dd24966 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack librsvg2 pygnomeextras
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 028e82507594..a8d71e3eb04d 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtksourceview intlhack \
 		libgnomeui vte
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure mpfr/configure
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 8bdc80defab1..77c85e58194d 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui \
 		desktopfileutils intlhack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index f94f1f3bcc8e..65b681a9acff 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chm/_chmlib.so:${PORTSDIR}/textproc/pychm
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2 pygnomeextras
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index bfbad9c9a9d4..c1e580b8cbb4 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index bfbad9c9a9d4..c1e580b8cbb4 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 46cf63262977..fc9eed0a49f7 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
 USE_X_PREFIX=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	gnomehack lthack gnometarget
 CONFIGURE_ARGS=	--enable-gtkspell
 INSTALLS_SHLIB=	yes
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 8685060d734c..f22b68530258 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index a19d910d31c8..072e4a8f5d1e 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 # may or may not solve the alpha compilation issue....
 CONFIGURE_ARGS=	--with-pic
 
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 8ab2714b10c0..5631b85b42b9 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -36,7 +36,7 @@ MOZILLA=	mozilla
 USE_GNOME=	gnomeprefix gnomehack gconf2 intlhack
 USE_GMAKE=	yes
 USE_X_PREFIX=   yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile
index a1975c1733fc..daa031dcd3d8 100644
--- a/deskutils/multi-backgrounds-daemon/Makefile
+++ b/deskutils/multi-backgrounds-daemon/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Change your GNOME2 backgound when you switch to other workspace
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnomeprefix libgnomeui libwnck
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 57fd96090ef6..eadd33870758 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -20,8 +20,7 @@ WRKSRCMASTER=	${WRKDIR}/multisync-${PORTVERSION}
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
-WANT_AUTOMAKE_VER=19
+USE_AUTOTOOLS=	automake:19:env libtool:15
 USE_X_PREFIX=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 20ca6668933b..6b9162afcb40 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Extension for Nautilus to configure programs to launch on files
 
 USE_GNOME=	nautilus2 intlhack pygtk2
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index f9703a958e0d..a26991877321 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.ids.org.au/~jam6/locked-folders/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Nautilus plugin that allows you to encrypt the contents of a folder
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	nautilus2
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 237490c00f56..b30d18900d9f 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim \
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	intlhack gnomeprefix gnometarget nautilus2 gnomehack
 
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 2c6d82e89adc..fe76db91eb6e 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	dbus-1.1:${PORTSDIR}/devel/dbus \
 		sexy:${PORTSDIR}/x11-toolkits/libsexy
 
 USE_GNOME=	gnomehack gnometarget intlhack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-dbus-services=${PREFIX}/share/dbus-1/services
 
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 461d478978a8..e089274db418 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -26,7 +26,7 @@ WANT_GNOME=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-python \
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index be7f7be0bb39..70578a79e998 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
 USE_GNOME=	gnomehack gnometarget intltool gnomeprefix gnomepanel
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index 92fb0e138a4b..f192cf74b6eb 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 068fdcff6944..60995d967417 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
index 9ae2c5b11d04..63b7f1f38ff5 100644
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ b/deskutils/xfce4-taskbar-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
index 09cbfeee282e..8732812745de 100644
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ b/deskutils/xfce4-windowlist-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index bd6e31f7486f..135def87590d 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index 0841a64cb61a..0fcfc388acdf 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gnomehack gnomeprefix
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"