Sync to new bsd.autotools.mk

67 files changed, 67 insertions, 68 deletions

diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index d742e08096ac..acd2296feeb9 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Active Directory administration tool
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index ecd4ec7babc9..1c6e28e539d9 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -27,7 +27,7 @@ USE_ICONV =	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--enable-s3=yes --libdir=${PREFIX}
 CONFIGURE_ENV=	CPPFLAGS='-DFUSE_USE_VERSION=26' \
 		LDFLAGS='${PTHREAD_LIBS}'
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index c489756ae7b6..00999790af2e 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 PORTDOCS=	AUTHORS BUGS COPYING FAQ NEWS README.attrcache
 
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 45330e1e1da3..f4c53f0e2a4d 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 autoheader:268
+USE_AUTOTOOLS=	autoconf aclocal autoheader
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 45330e1e1da3..f4c53f0e2a4d 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 autoheader:268
+USE_AUTOTOOLS=	autoconf aclocal autoheader
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index aac12acde046..3fe7b344b10f 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/condor_src-${PORTVERSION}/src/
 OPTIONS=	SUBMIT_NODE "Configure system to be able to submit jobs" On \
 		EXECUTE_NODE "Configure system to execute jobs in pool" On \
 		MANAGER_NODE "Configure system as central manager node" On
-USE_AUTOTOOLS=	autoconf:268:env
+USE_AUTOTOOLS=	autoconf:env
 USE_BISON=	build
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index b8335be5785e..eb0867267787 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	A full featured command-line backup tool, aimed for disks
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 1ac385591174..05e857bcd529 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2 libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 4b0cc3f0f74b..e9c9464093a1 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_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=	--enable-fsect-man5
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 0ce0b081b533..c2c9cfac05b2 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	decept0@gmail.com
 COMMENT=	Represent a file system as a set of concentric segmented-rings
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 0b1992474e8a..64922e5a1b1a 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -36,7 +36,7 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"invokes i386 asm"
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 02b2a7ee899e..b0405554af89 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 automake:111 autoheader:268
+USE_AUTOTOOLS=	autoconf aclocal automake autoheader
 CONFIGURE_ARGS+=	--with-puzzle=${LOCALBASE}
 PLIST_FILES=	bin/ftwin
 
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index f45f6221d66b..0a13110b47f7 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
 WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization \
 		--with-boost-filesystem=boost_filesystem
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile
index efc528fd0668..110ad22a762f 100644
--- a/sysutils/fusefs-fusexmp_fh/Makefile
+++ b/sysutils/fusefs-fusexmp_fh/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Dummy driver from fusefs-libs example
 LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 8e55fc61a0d5..e553810ee2c8 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
 		--disable-mtab --with-fuse=external
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 29910b3064ef..3e60b06e70c6 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -27,7 +27,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 OPTIONS+=	GMETAD "include gmetad" on
 
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure libmetrics/configure
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index ffe96db982bf..d1a6d8ad4442 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Viewer for kernel geom layer
 
 LIB_DEPENDS=	gvc:${PORTSDIR}/graphics/graphviz
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 librsvg2
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 6560a888aedf..077fc43aae8b 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}
 
-USE_AUTOTOOLS=	automake:14:env
+USE_AUTOTOOLS=	automake14:env
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 3125c5fba32b..dbc742b7fb44 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 USE_XORG=	x11 xtst
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index dbe44104c523..1e93947a8bc0 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget intlhack ltverhack libgnomeui
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 3245f23db47d..fd13bee4c29f 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack libwnck \
 		gnomedocutils gnomepanel
 CONFIGURE_ARGS=	--with-doc-dir=${PREFIX}/share/doc \
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index afb5383de081..ad8b69551bf3 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--enable-services
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index b53eaeb4c07e..84024f055926 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Shows package dependencies in tree views
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	automake:14 autoconf:268
+USE_AUTOTOOLS=	automake14 autoconf
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 PLIST_FILES=	bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index c6860537d5e9..acaf1ddf03df 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOTOOLS=	automake:111 autoconf:268
+USE_AUTOTOOLS=	automake autoconf
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 138a63e4c5c6..84d25638b03f 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 6fd3ce25d82e..e5ac6f73d242 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index de35c0d0d12e..58621cdaa1ab 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 MAN1=		hdup.1
 MAN5=		hdup.conf.5
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index c831630d322a..ccd346203e19 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		xml2:${PORTSDIR}/textproc/libxml2
 PATCH_DEPENDS=	${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
 
-USE_AUTOTOOLS=	autoconf:268 autoheader:268 automake:111 aclocal:111 \
-		libtool:22 libltdl:22
+USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool libltdl
 AUTOMAKE_ARGS+=	--add-missing --include-deps --copy
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 2cd0c5461c6c..1ff82978db0c 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_ARCHS=	sparc64
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS=	autoconf:268 aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS=	autoconf aclocal automake libtool
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR}
 
 USE_PYTHON_BUILD=	yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 47a721fb16a7..2fd6feb0eb5f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 		samplerate:${PORTSDIR}/audio/libsamplerate
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-k3bsetup=no \
 			--without-resmgr \
 			--without-hal \
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index 1072542312d7..85877cbc1883 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CPU meter for Kicker
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 391e7346ac2e..43583c17fcc2 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -18,7 +18,7 @@ DEPRECATED=	Project has vanished
 EXPIRATION_DATE=2010-12-31
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 42cc529d415f..cbdf39f3491b 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -22,7 +22,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 288590ad2606..37dfdb597ce4 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index 8504f797dbce..01b6aa0588d2 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	rdiff-backup:${PORTSDIR}/sysutils/rdiff-backup
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index eaa83d47b0ff..3ee4ad2a7428 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 
 CONFIGURE_ARGS += 	--with-qt-dir=${QT_PREFIX} \
 			--with-extra-includes=${LOCALBASE}/include \
diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile
index 549e7b806a6a..1e2980ad1f3b 100644
--- a/sysutils/kkeyled/Makefile
+++ b/sysutils/kkeyled/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Panel applet to display the keyboard's LED states
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index a004693575fa..e7093f049d24 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -25,7 +25,7 @@ USE_KDELIBS_VER=3
 ONLY_FOR_ARCHS=	i386
 USE_XORG=	xtst xscrnsaver
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdeutils-${PORTVERSION}
 
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index 5f0feb8984e8..057c7a3ea44b 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 USE_KDELIBS_VER=3
 USE_XORG=	xkbfile
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/config.h.in
diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile
index 164f2990a120..49ddcf3a89ae 100644
--- a/sysutils/kmilo/Makefile
+++ b/sysutils/kmilo/Makefile
@@ -23,7 +23,7 @@ PREFIX=		${KDE_PREFIX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:22
+USE_AUTOTOOLS=  libtool
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdeutils-${PORTVERSION}
 
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 7326ed6bf3af..a3c5840305a2 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -19,7 +19,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22 automake:111:env aclocal:111:env
+USE_AUTOTOOLS=	libtool automake:env aclocal:env
 CONFIGURE_ARGS=	--disable-fast-perl --enable-mt --program-transform-name=''
 
 post-patch:
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index cbc02df9499c..d18e7c0adf91 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -15,7 +15,7 @@ COMMENT=	KDE app that searches and synchronizes two directories
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index da62091b61cb..eb29f7e55b5b 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Very powerful batch file renamer for KDE3
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 0d311bf536f6..1dc15237288b 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Advanced shutdown utility for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index 0d311bf536f6..1dc15237288b 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Advanced shutdown utility for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index 749095a8600c..18b1b2c4a7f2 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	synaptics:${PORTSDIR}/x11/libsynaptics
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 5e8fd3c507d0..30dce05c4ead 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A client/server suite for LCD devices
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf:268 automake:111 aclocal:111
+USE_AUTOTOOLS=	autoconf automake aclocal
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_RC_SUBR=	LCDd lcdproc lcdexec
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 1543f8e5b70c..ea45af9fd8b3 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_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_XORG=       x11 xext xt xtst xfixes
 USE_GMAKE=	yes
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index c15142ac8fc5..e44d4bb934e8 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix=''
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 78d86d8af563..070ca8f04940 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1558de5ed687..cb7cb740ad2f 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
 		desktopfileutils ltasneededhack eel2 libgnomeui
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 0121e0768604..2c227adc7705 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Network UPS Tools
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index f918c110befa..d400c12fd1df 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network UPS Tools
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index c7228eaa9231..fa6c32ed1895 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	autoconf:268 autoheader:268 automake:111 aclocal:111 libtool:22
+USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool
 
 AUTOMAKE_ARGS+=	--add-missing --copy --foreign
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 2f99eb0d4e63..3ecfdf0b6d83 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate ReiserFS partitions
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-debug --disable-Werror
 CFLAGS+=	-Dgetopt_long_only=getopt_long
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 7435033b84e5..49b4dcb3cb9a 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A small tool to generate secure, random passwords
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 
 post-patch:
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 22a173c00108..64344e558b8f 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
 
 USE_BZIP2=	yes
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 99ffbb07424f..2ccdfc6eaa51 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Open source resource manager
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rcp=scp
 USE_GMAKE=	yes
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index c9395a67b032..d88655100bbc 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -44,7 +44,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 157f2d333e5b..123babb0cad6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack glib20
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index f282d88ca30f..16fd3b8ea305 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22 aclocal:111
+USE_AUTOTOOLS=	libtool aclocal
 ACLOCAL_ARGS=	# empty
 
 MAN1=		uprecords.1
diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile
index dba90224cbc7..737c575b5e10 100644
--- a/sysutils/userinfo/Makefile
+++ b/sysutils/userinfo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/bjk/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show information about local users
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 
 MAN1=		ui.1
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 574e307cc964..a181815cd0f8 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An uptime showing dockapp with a similar look to wmcpuload
 
 USE_BZIP2=	yes
 USE_XORG=	xpm
-USE_AUTOTOOLS=	autoheader:268
+USE_AUTOTOOLS=	autoheader
 CONFIGURE_ARGS=	--program-prefix=""
 
 MAN1=		wmupmon.1
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 245bcdf3b3fb..7997ebf6d9c5 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -24,7 +24,7 @@ OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
 		NLS		"Enable Native Language Support"	on
 
 CONFIGURE_ARGS=	--disable-sound-settings --disable-debug
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 611f72772f17..c777c8cdf04a 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A set of utilities and library to manipulate an xfs filesystem
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	autoconf:268 libtool:22:env
+USE_AUTOTOOLS=	autoconf libtool:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
 			CFLAGS="${CFLAGS}" \
diff --git a/sysutils/zetaback/Makefile b/sysutils/zetaback/Makefile
index 893d6cb3c9c8..6163ebcb8d7c 100644
--- a/sysutils/zetaback/Makefile
+++ b/sysutils/zetaback/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Zetaback ZFS backup and recovery management system
 
 USE_PERL5_RUN=	YES
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 
 MAN1=		zetaback.1 zetaback_agent.1
 
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index a5d2c4d8bf41..df701e43c94b 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT=	User utilities for zisofs
 
 PORTDOCS=	CHANGES COPYING INSTALL MRULES README
 
-USE_AUTOTOOLS=	autoconf:268
+USE_AUTOTOOLS=	autoconf
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes