Sync to new bsd.autotools.mk

41 files changed, 41 insertions, 41 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index e4e4640b950..4e3321e117c 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Desktop organization tool
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 OPTIONS=	KONTACT	"Kontact plugin" on \
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 94934f88961..91e049b7ebc 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -19,7 +19,7 @@ COMMENT=	System tray controller for beep-media-player
 BUILD_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 RUN_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/bookreader/Makefile b/deskutils/bookreader/Makefile
index eec4bee3ad0..f7cef3085c5 100644
--- a/deskutils/bookreader/Makefile
+++ b/deskutils/bookreader/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index eecd9d35458..c0fb01aae08 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehier evolutiondataserver gnomevfs2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GCONF_SCHEMAS=	contacts.schemas
 MAN1=		${PORTNAME}.1
 # CFLAGS+=	-g
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index a87c7b67b50..4c7adf53001 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=		SF
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Drop stack applet for KDE
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_KDEBASE_VER=	3
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 05c0bec3ff6..88647584363 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
-USE_AUTOTOOLS=	libtool:22 autoconf:268:env automake:111:env
+USE_AUTOTOOLS=	libtool autoconf:env automake:env
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index c1c575b0c80..9bf07bfca3d 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-extra-gcc-optimization
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index d1bea50507e..c8919c9c604 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 4499763dee0..08030a5fbce 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=		yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22 automake:111:env autoheader:268:env
+USE_AUTOTOOLS=		libtool automake:env autoheader:env
 INSTALLS_ICONS=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index fbde3bf2af9..1aa2282d76c 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-maintainer-flags=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 29f42943be6..dd84b7514a1 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	gnote.schemas
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 5fdaa2c0e96..9a040d4b1ac 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -24,7 +24,7 @@ USE_XORG=	xscrnsaver
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22 libltdl:22
+USE_AUTOTOOLS=	libtool libltdl
 LIBTOOLFILES=	configure ../${QOF_DISTNAME}/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index d3b2e7db50b..aca38cba12a 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -38,7 +38,7 @@ USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
-USE_AUTOTOOLS=	libtool:22:env autoconf:268:env automake:111:env aclocal:111:env libltdl:22
+USE_AUTOTOOLS=	libtool:env autoconf:env automake:env aclocal:env libltdl
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 4e83726bb44..915b279593c 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	smyru@heron.pl
 COMMENT=	A simple customizable GTK screen ruler
 
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libglade2
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 7cfc9aac519..f920a45ca27 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
 PLIST_FILES=	bin/gtkjournal lib/libsqlitemm.a lib/libsqlitemm.la \
 		lib/libsqlitemm.so lib/libsqlitemm.so.0
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile
index 1361cad555b..aaff4f5c666 100644
--- a/deskutils/karamba/Makefile
+++ b/deskutils/karamba/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Display various information right on your desktop
 EXTRA_PATCHES=	${.CURDIR}/../../comms/kallers/files/patch-configure
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 9a52f506bbf..12aa714eda6 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fast, extensible launcher for KDE similar to Quicksilver on OSX
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${PREFIX}/lib/ ${PREFIX}/lib/kde3/
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index f6ccbf5fe62..942a1c69e5d 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.gfai.de/~jaham/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE kicker-applet that reminds you of birthdays and anniversaries
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index 5f2aaeeefec..40696a7daed 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		SF
 MAINTAINER=		mich@FreeBSD.org
 COMMENT=		KDE bloglines notifier
 
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 USE_GMAKE=		yes
 USE_KDELIBS_VER=	3
 
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index a78e3cde477..79304d994b0 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -20,6 +20,6 @@ LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 9002916514d..df4dabf6f3d 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	chm:${PORTSDIR}/misc/chmlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 DO_NOT_COMPILE+=chmlib
 CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 9252080b385..15dad4a4eea 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -29,7 +29,7 @@ _NO_KDE_FINAL=	yes
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 1984b7a501b..80a11758c1a 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -16,7 +16,7 @@ COMMENT=		Panel applet for editing and accessing the KDE addressbook
 USE_KDEBASE_VER=	3
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 CONFIGURE_ENV=		LDFLAGS="${PTHREAD_LIBS}"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
index 5f7ebb366ee..ba7fddd1a04 100644
--- a/deskutils/klipoquery/Makefile
+++ b/deskutils/klipoquery/Makefile
@@ -17,7 +17,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 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/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index 624aa9ace0d..f2f5a491159 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A KDE client for the popular online journal site LiveJournal
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g ; \
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 61a54aa5356..2e97b169cb9 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -21,7 +21,7 @@ WRKSRC=			${WRKDIR}/${PORTNAME}
 USE_GL=			glut
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22 automake:111:env autoheader:268:env
+USE_AUTOTOOLS=		libtool automake:env autoheader:env
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 USE_PERL5_BUILD=	yes
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 809210d062d..dc09798eee9 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 88135e236cb..93c70f0c850 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 USE_EFL=	imlib2
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 56ef0785ff4..1ed0a4e017c 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -18,7 +18,7 @@ WRKSRC=			${WRKDIR}/kooldock
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 INSTALLS_ICONS=		yes
 USE_GETTEXT=		yes
 USE_KDELIBS_VER=	3
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index fab59d29ecc..c905bd3d7a8 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Quick Reference sheets for KDE
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
 DOCSDIR=	share/doc/HTML
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 587bf667b0a..1097c1234f9 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -17,7 +17,7 @@ COMMENT=	KDE Rich Site Summary viewer
 
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
 MAKE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
 
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index e49be900db3..0e47fb08b90 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS=	autoconf:env automake:env libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5_BUILD=yes
diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile
index 7313424cefb..fa5208aa762 100644
--- a/deskutils/ktagebuch/Makefile
+++ b/deskutils/ktagebuch/Makefile
@@ -20,7 +20,7 @@ EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:22
+USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 INSTALLS_ICONS=		yes
 USE_GETTEXT=		yes
diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile
index 0c6a58c00ba..49fb29f77e5 100644
--- a/deskutils/kuake/Makefile
+++ b/deskutils/kuake/Makefile
@@ -15,7 +15,7 @@ COMMENT=	KDE konsole application acting like the Quake-console
 
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 525477d2537..2ef8611376b 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An integrated calendar for Thunderbird 3.1
 RUN_DEPENDS+=	${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
 
 CONFLICTS=	spidermonkey-1.[0-7]*
-USE_AUTOTOOLS=	autoconf:213 libtool:22
+USE_AUTOTOOLS=	autoconf213 libtool
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 MAKE_ENV=		PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 65f54178a6e..16bc408dcc2 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -19,7 +19,7 @@ OPTIONS+=	THUNDERBIRD "Install Thunderbird 3.0" on \
 		SEAMONKEY "Install SeaMonkey 2.0" off
 
 CONFLICTS=	spidermonkey-1.[0-7]*
-USE_AUTOTOOLS=	autoconf:213 libtool:22
+USE_AUTOTOOLS=	autoconf213 libtool
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 MAKE_ENV=		PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index c1d21cb1c63..9ffd02b5fe6 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Sidebar plugin for Konqueror
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDEBASE_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/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 084a23c9948..eb693c6c904 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -19,7 +19,7 @@ WRKSRCMASTER=	${WRKDIR}/multisync-${PORTVERSION}
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:111:env libtool:22
+USE_AUTOTOOLS=	automake:env libtool
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index efa3aae855e..0cfeddfc5a4 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	pav
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Nautilus plugin that allows you to encrypt the contents of a folder
 
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2 eel2 libgnomeui
 PKGCONFIGS=	gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index c538dc36532..a61624b9e10 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gconf2 gnomehack gnomeprefix libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 GCONF_SCHEMAS=	rubrica2.schemas
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 7b85d318228..e91b9cdd0be 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_PERL5_RUN=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS=	autoconf:env automake:env libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"