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.

50 files changed, 50 insertions, 55 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index cda6b71bdeef..6105cfccc2f2 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -22,7 +22,7 @@ COMMENT=	An Enhanced Printer Spooler
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST=	SYSCONFDIR="${SYSCONFDIR}"
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 2903c3b32e2a..afa4ebeecc7a 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 PORTDOCS=	AUTHORS COPYING BUGS FAQ NEWS README.attrcache
 
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index b999d0e634f0..40e7393af537 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	esn@x123.info
 COMMENT=	Apache RealTime log stats
 
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259:env
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
diff --git a/sysutils/coaster/Makefile b/sysutils/coaster/Makefile
index 39171bcae00d..0e390de68b77 100644
--- a/sysutils/coaster/Makefile
+++ b/sysutils/coaster/Makefile
@@ -28,7 +28,7 @@ USE_GCC=	3.4
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 276fa740bb54..ece75c764fee 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ebrandi@fugspbr.org
 COMMENT=	A full featured command-line backup tool, aimed for disks
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 CPPFLAGS+=	-DHAVE_DECL_GETOPT=0
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 4611629c9380..df4a1bf049a6 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.astron.com/pub/file/ \
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Utility to determine file type
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--enable-fsect-man5
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 5d80c3fa5d37..c5fa60f34edd 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index e4ecaabefef0..2e3d1cda5f9c 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	fuse-${PORTVERSION}
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	FUSE allows filesystem implementation in userspace
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	MOUNT_FUSE_PATH=${PREFIX}/sbin \
 		PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 96f3b310d69f..1fa12302f52b 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A utility to split and join files
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-WANT_AUTOMAKE_VER=14
+USE_AUTOTOOLS=	automake:14:env
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 1559a5b0a3fe..7530b3375fca 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 1889530bdef4..6924821d3f8d 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 1848f8e7c586..a6beba92606e 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 INSTALLS_OMF=		yes
 USE_GCC=		3.4+
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 USE_GSTREAMER=		vorbis mad flac
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnomesu/Makefile b/sysutils/gnomesu/Makefile
index 159cf0f36042..0b413f694f27 100644
--- a/sysutils/gnomesu/Makefile
+++ b/sysutils/gnomesu/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A gtk frontend to su
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libzvt
 
 MAN1=		gnomesu.1
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index d52c318a1ebc..d5c3b0e9952d 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Shows package dependencies in tree views
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
+USE_AUTOTOOLS=	automake:15 autoconf:253
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 PLIST_FILES=	bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index e7f555bc8644..1b7300139d80 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index c177d3b60e36..105b3947355c 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 
 MAN1=		hdup.1
 MAN5=		hdup.conf.5
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index d78260cffe2e..2e7e0520eb9b 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib12
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--disable-fatal-warnings
 
diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile
index d78260cffe2e..2e7e0520eb9b 100644
--- a/sysutils/heartbeat2/Makefile
+++ b/sysutils/heartbeat2/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib12
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--disable-fatal-warnings
 
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 05a2e6774f52..2c5be2385345 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 USE_KDELIBS_VER=	3
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 05a2e6774f52..2c5be2385345 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 USE_KDELIBS_VER=	3
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 0ef0ade67bcf..04ba28094a0f 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -18,7 +18,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index b6a8ea38c0d0..530c4a155f77 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Compact Disc Input and Control Library
 LIB_DEPENDS=	cddb.3:${PORTSDIR}/audio/libcddb \
 		popt.0:${PORTSDIR}/devel/popt
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnometarget pkgconfig gnomehack
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 15e2d08bb4e8..129eb3530b83 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	xauth:${X_CLIENTS_PORT} \
 USE_GNOME=	pkgconfig glib20
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-gtk-doc=no
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/libgksuui/Makefile b/sysutils/libgksuui/Makefile
index 5815eff7bea2..18c521a8b958 100644
--- a/sysutils/libgksuui/Makefile
+++ b/sysutils/libgksuui/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A graphical fronted to su library
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-gtk-doc=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile
index 0a4619b80c09..807b71d33720 100644
--- a/sysutils/libieee1284/Makefile
+++ b/sysutils/libieee1284/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IEEE1284 communications library
 
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 ONLY_FOR_ARCHS=	i386
 
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 126467335e02..999da62b567c 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Default plugins for lineakd
 
 LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index 4b7c71a2021b..c80d732efba2 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix=''
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=		lineak_kdeplugins.1
 
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index e7ce61250b31..2c5a7c3de979 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-prefix=''
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=		lineak_xosdplugin.1
diff --git a/sysutils/lineak_defaultplugin/Makefile b/sysutils/lineak_defaultplugin/Makefile
index 126467335e02..999da62b567c 100644
--- a/sysutils/lineak_defaultplugin/Makefile
+++ b/sysutils/lineak_defaultplugin/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Default plugins for lineakd
 
 LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/lineak_kdeplugins/Makefile b/sysutils/lineak_kdeplugins/Makefile
index 4b7c71a2021b..c80d732efba2 100644
--- a/sysutils/lineak_kdeplugins/Makefile
+++ b/sysutils/lineak_kdeplugins/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix=''
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=		lineak_kdeplugins.1
 
diff --git a/sysutils/lineak_xosdplugin/Makefile b/sysutils/lineak_xosdplugin/Makefile
index e7ce61250b31..2c5a7c3de979 100644
--- a/sysutils/lineak_xosdplugin/Makefile
+++ b/sysutils/lineak_xosdplugin/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-prefix=''
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=		lineak_xosdplugin.1
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 7e49ca8d59be..8621d9184519 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -37,7 +37,7 @@ USE_GCC=	3.4
 GNU_CONFIGURE=	yes
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-ltmain.sh
 .else
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 .endif
 
 post-patch:
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index c089f4ad76d3..90ea4b641718 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_ARGS=	--program-transform-name=""
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile
index 125c914fb0c2..cceed26af358 100644
--- a/sysutils/nvtv/Makefile
+++ b/sysutils/nvtv/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386
 CONFIGURE_ENV=	CC="${CC} -I${PREFIX}/include"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 81818a461c84..ebeb7cea770c 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Utilities and library to manipulate ReiserFS partitions
 
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/sjog/Makefile b/sysutils/sjog/Makefile
index a029d91e5e90..cbe946953105 100644
--- a/sysutils/sjog/Makefile
+++ b/sysutils/sjog/Makefile
@@ -16,8 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Userland daemon for Sony Vaio Jog Dial
 
 ONLY_FOR_ARCHS=	i386
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 7cbfc6de6115..521a12f61cce 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Rob Kaper's uptime daemon
 
 PREFIX=		${LOCALBASE}
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${LOCALBASE}
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 7138870f7c92..471faf1e4eb9 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -16,8 +16,7 @@ COMMENT=	An uptime showing dockapp with a similar look to wmcpuload
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_AUTOMAKE_VER=	15
-USE_AUTOHEADER_VER=	259
+USE_AUTOTOOLS=	automake:15 autoheader:259
 CONFIGURE_ARGS=	--program-prefix=""
 
 MAN1=		wmupmon.1
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 6bb6010e2e92..642a15b432bd 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=	i386
 USE_GNOME=	gtk20
 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/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index be7cbe3d5367..8792eea2e6d8 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GCC=	3.4
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 8b79fa9fd0f5..3db9aafde631 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 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/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index c48b2da08d81..bfaa33443200 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -23,7 +23,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
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 55a666dacd05..baac4895ec16 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index ea1a8ee2d9f1..9aeae841aaa4 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 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/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index d80cd30b2170..efa526116aed 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GNOME=	gtk20
 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/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index ebeec217a418..be7e3eaddb45 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20
 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/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 53ff1129e53c..f8caaf8909fe 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 0d66cd96c856..0fbceeb120d6 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 88362bf72317..2d60a396ea58 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A set of utilities and library to manipulate an xfs filesystem
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOCONF_VER=	259
-WANT_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	autoconf:259 libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
 			CFLAGS="${CFLAGS}" \
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index 96851a256394..29efbbd58372 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -16,7 +16,7 @@ COMMENT=	User utilities for zisofs
 
 PORTDOCS=	README CHANGES INSTALL
 
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes