aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/ace/Makefile2
-rw-r--r--devel/adacurses/Makefile2
-rw-r--r--devel/alf/Makefile2
-rw-r--r--devel/allegro-devel/Makefile2
-rw-r--r--devel/allegro/Makefile2
-rw-r--r--devel/anjuta/Makefile3
-rw-r--r--devel/apr0/Makefile2
-rw-r--r--devel/apr1/Makefile2
-rw-r--r--devel/apr2/Makefile2
-rw-r--r--devel/argp-standalone/Makefile2
-rw-r--r--devel/argtable/Makefile2
-rw-r--r--devel/atlas-devel/Makefile2
-rw-r--r--devel/atlas/Makefile2
-rw-r--r--devel/autoconf-archive/Makefile2
-rw-r--r--devel/autoconf-wrapper/Makefile4
-rw-r--r--devel/autoconf-wrapper/files/autotools-wrapper.sh16
-rw-r--r--devel/automake111/Makefile2
-rw-r--r--devel/automake14/Makefile2
-rw-r--r--devel/avr-gcc-3/Makefile2
-rw-r--r--devel/avra/Makefile2
-rw-r--r--devel/bglibs/Makefile2
-rw-r--r--devel/c_c++_reference/Makefile2
-rw-r--r--devel/cdialog/Makefile2
-rw-r--r--devel/clanlib/Makefile2
-rw-r--r--devel/clint/Makefile2
-rw-r--r--devel/cppunit/Makefile2
-rw-r--r--devel/cstringbuffer/Makefile2
-rw-r--r--devel/cunit/Makefile2
-rw-r--r--devel/dbus-glib/Makefile2
-rw-r--r--devel/dbus-sharp/Makefile2
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/devhelp/Makefile2
-rw-r--r--devel/directfb/Makefile2
-rw-r--r--devel/dotconf++/Makefile2
-rw-r--r--devel/dotconf/Makefile2
-rw-r--r--devel/eboxy/Makefile2
-rw-r--r--devel/elfio/Makefile2
-rw-r--r--devel/entity/Makefile2
-rw-r--r--devel/epm/Makefile2
-rw-r--r--devel/fam/Makefile2
-rw-r--r--devel/fb303/Makefile2
-rw-r--r--devel/flatzebra/Makefile2
-rw-r--r--devel/flowdesigner/Makefile2
-rw-r--r--devel/gamin/Makefile2
-rw-r--r--devel/gaul/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gcvs/Makefile2
-rw-r--r--devel/gengameng/Makefile2
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/gflags/Makefile2
-rw-r--r--devel/glade3/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/glibmm/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gobject-introspection/Makefile2
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--devel/goffice04/Makefile2
-rw-r--r--devel/goffice06/Makefile2
-rw-r--r--devel/goffice1/Makefile2
-rw-r--r--devel/gpsim/Makefile2
-rw-r--r--devel/gtkparasite/Makefile2
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile2
-rw-r--r--devel/hs-alex/Makefile2
-rw-r--r--devel/hs-haddock-docs/Makefile2
-rw-r--r--devel/hs-happy/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/jakelib2/Makefile2
-rw-r--r--devel/jclassinfo/Makefile2
-rw-r--r--devel/jrtplib/Makefile2
-rw-r--r--devel/json-glib/Makefile2
-rw-r--r--devel/jzmq/Makefile2
-rw-r--r--devel/kBuild-devel/Makefile2
-rw-r--r--devel/kBuild/Makefile2
-rw-r--r--devel/kcachegrind/Makefile2
-rw-r--r--devel/kdbg/Makefile2
-rw-r--r--devel/kdesdk3/Makefile2
-rw-r--r--devel/kdevelop/Makefile5
-rw-r--r--devel/klassmodeler/Makefile2
-rw-r--r--devel/kprof/Makefile2
-rw-r--r--devel/kscope/Makefile2
-rw-r--r--devel/kxl/Makefile2
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/lasi/Makefile2
-rw-r--r--devel/lfc/Makefile2
-rw-r--r--devel/lfcxml/Makefile2
-rw-r--r--devel/libPropList/Makefile2
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbegemot/Makefile2
-rw-r--r--devel/libbinio/Makefile2
-rw-r--r--devel/libbnr/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libcapsinetwork/Makefile2
-rw-r--r--devel/libcfg/Makefile2
-rw-r--r--devel/libchipcard-kde/Makefile2
-rw-r--r--devel/libchipcard/Makefile2
-rw-r--r--devel/libconfuse/Makefile2
-rw-r--r--devel/libcwd/Makefile2
-rw-r--r--devel/libdaemon/Makefile2
-rw-r--r--devel/libdnsres/Makefile2
-rw-r--r--devel/libdsp/Makefile2
-rw-r--r--devel/libfs++/Makefile2
-rw-r--r--devel/libftdi/Makefile2
-rw-r--r--devel/libgdata/Makefile2
-rw-r--r--devel/libghthash/Makefile2
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libgutenfetch/Makefile2
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libltdl22/Makefile2
-rw-r--r--devel/libltdl24/Makefile2
-rw-r--r--devel/libmaa/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/libnotifymm/Makefile2
-rw-r--r--devel/liboil/Makefile2
-rw-r--r--devel/libol/Makefile2
-rw-r--r--devel/libole2/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopendaap/Makefile2
-rw-r--r--devel/libpeak/Makefile2
-rw-r--r--devel/libphish/Makefile2
-rw-r--r--devel/libpperl/Makefile2
-rw-r--r--devel/librcc/Makefile2
-rw-r--r--devel/libredblack/Makefile2
-rw-r--r--devel/librelp/Makefile2
-rw-r--r--devel/libshbuf/Makefile2
-rw-r--r--devel/libsigc++/Makefile2
-rw-r--r--devel/libsigc++12/Makefile2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libsigcx/Makefile2
-rw-r--r--devel/libsigsegv/Makefile2
-rw-r--r--devel/libsoup/Makefile2
-rw-r--r--devel/libsoup22/Makefile2
-rw-r--r--devel/libstrfunc/Makefile2
-rw-r--r--devel/libstroke/Makefile2
-rw-r--r--devel/libtap/Makefile2
-rw-r--r--devel/libthai/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libtifiles2/Makefile2
-rw-r--r--devel/libukcprog/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/libunwind/Makefile4
-rw-r--r--devel/libusb/Makefile4
-rw-r--r--devel/libvanessa_adt/Makefile2
-rw-r--r--devel/libvanessa_logger/Makefile2
-rw-r--r--devel/libvanessa_socket/Makefile2
-rw-r--r--devel/libvc/Makefile2
-rw-r--r--devel/libytnef/Makefile2
-rw-r--r--devel/log4c/Makefile2
-rw-r--r--devel/log4cplus/Makefile2
-rw-r--r--devel/log4cpp/Makefile2
-rw-r--r--devel/log4cxx/Makefile2
-rw-r--r--devel/log4shib/Makefile2
-rw-r--r--devel/m17n-lib/Makefile2
-rw-r--r--devel/memcheck/Makefile2
-rw-r--r--devel/mico/Makefile2
-rw-r--r--devel/mimir/Makefile2
-rw-r--r--devel/monodevelop/Makefile2
-rw-r--r--devel/mq4cpp/Makefile2
-rw-r--r--devel/ncnf/Makefile2
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/ois/Makefile2
-rw-r--r--devel/open-beagle/Makefile2
-rw-r--r--devel/openzz/Makefile2
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--devel/orc/Makefile2
-rw-r--r--devel/patch/Makefile2
-rw-r--r--devel/pcre++/Makefile2
-rw-r--r--devel/php-java-bridge/Makefile2
-rw-r--r--devel/physfs-devel/Makefile4
-rw-r--r--devel/physfs/Makefile4
-rw-r--r--devel/pikdev/Makefile2
-rw-r--r--devel/piklab/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/ppl/Makefile2
-rw-r--r--devel/prepstools/Makefile2
-rw-r--r--devel/present/Makefile2
-rw-r--r--devel/privman/Makefile2
-rw-r--r--devel/psptoolchain-pspsdk-stage1/Makefile2
-rw-r--r--devel/pwlib/Makefile2
-rw-r--r--devel/py-dbus/Makefile2
-rw-r--r--devel/raknet/Makefile2
-rw-r--r--devel/rapidsvn/Makefile2
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/rlog/Makefile2
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/safestr/Makefile2
-rw-r--r--devel/sdl12/Makefile2
-rw-r--r--devel/sdlmm/Makefile2
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/seed/Makefile2
-rw-r--r--devel/shapelib/Makefile2
-rw-r--r--devel/shmap/Makefile2
-rw-r--r--devel/silc-toolkit/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--devel/spatialindex/Makefile2
-rw-r--r--devel/stringencoders/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--devel/subversion/Makefile.common2
-rw-r--r--devel/subversion16/Makefile.common2
-rw-r--r--devel/swig13/Makefile2
-rw-r--r--devel/swig20/Makefile2
-rw-r--r--devel/sysconftool/Makefile2
-rw-r--r--devel/t1lib/Makefile2
-rw-r--r--devel/ta-lib/Makefile2
-rw-r--r--devel/talloc/Makefile2
-rw-r--r--devel/tclcl/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/tevent/Makefile2
-rw-r--r--devel/thrift/Makefile4
-rw-r--r--devel/towitoko/Makefile2
-rw-r--r--devel/umem/Makefile2
-rw-r--r--devel/vstr/Makefile2
-rw-r--r--devel/wand-libconfig/Makefile2
-rw-r--r--devel/xfce4-dev-tools/Makefile3
-rw-r--r--devel/xlslib/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--devel/xxl/Makefile2
-rw-r--r--devel/zthread/Makefile2
229 files changed, 242 insertions, 247 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 2fa796ead901..4b883817f987 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack libidl ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index af9009d15f2b..3143133ef37c 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -18,7 +18,7 @@ COMMENT= The Adaptive Communication Environment for C++
CONFLICTS= ace+tao-5*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index e1a51aa32fc9..cc2c3a2b3483 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -17,7 +17,7 @@ COMMENT= Curses library for Ada
BUILD_DEPENDS= gnat:${PORTSDIR}/lang/gnat
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index 0dea0bcaaa25..bbbdd35473a3 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/largefiles/largefiles/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 099f31bf17b7..a586bb87cf3b 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX= -devel
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= A cross-platform library for games and multimedia programming
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG= yes
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 3f074e6233d9..6e95b1704121 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/alleg/${PORTNAME}/${PORTVERSION}
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= A cross-platform library for games and multimedia programming
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 76cb2081d1ae..453eca0f904d 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -25,15 +25,14 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
gdl-1.3:${PORTSDIR}/x11-toolkits/gdl
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
+ ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
- libtool:${PORTSDIR}/devel/libtool22 \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
exctags:${PORTSDIR}/devel/ctags \
gdb66:${PORTSDIR}/devel/gdb66 \
yelp:${PORTSDIR}/x11/yelp
USE_BZIP2= yes
-USE_AUTOTOOLS= autotools:run
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 3d8b333f6626..3f03e989128f 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -32,7 +32,7 @@ APU_VERSION= 0.9.19
NO_LATEST_LINK= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22:env
+USE_AUTOTOOLS= automake autoconf libtool:env
USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 1e0f30699acc..6d4943f1a2e2 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -33,7 +33,7 @@ APR_VERSION= 1.4.2
APU_VERSION= 1.3.10
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22:env
+USE_AUTOTOOLS= automake autoconf libtool:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= -2.7
USE_LDCONFIG= yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index d9c94e977304..27a8cf8f3baf 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -35,7 +35,7 @@ OPTIONS= THREADS "Enable Threads in apr" on \
DEVELOPER_ONLY "I want to test apr2 not the maintainer" off
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22:env
+USE_AUTOTOOLS= automake autoconf libtool:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= -2.7
USE_LDCONFIG= yes
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index f4c111f6e1c0..8ae7cfffc609 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sem@FreeBSD.org
COMMENT= Standalone version of arguments parsing functions from GLIBC
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:111 autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal autoconf automake libtool
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index b1a7b31e125b..a496b255c6b1 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= corky1951@comcast.net
COMMENT= An ANSI C library for parsing GNU style command line arguments
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN3= argtable2.3
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index ccc512ea3054..14226e0538a9 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GNOME= gnomehack
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 2bb55f1517f5..f25d0cc59dcc 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GNOME= gnomehack
diff --git a/devel/autoconf-archive/Makefile b/devel/autoconf-archive/Makefile
index 3229fce6edd2..8296083e43ac 100644
--- a/devel/autoconf-archive/Makefile
+++ b/devel/autoconf-archive/Makefile
@@ -18,7 +18,7 @@ COMMENT= A set of useful GNU Autoconf macros
DISTDATE= 2009-04-19
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
GNU_CONFIGURE= yes
PLIST_SUB= MACRODIR=share/aclocal
diff --git a/devel/autoconf-wrapper/Makefile b/devel/autoconf-wrapper/Makefile
index 089448bdc224..d775569f9b8b 100644
--- a/devel/autoconf-wrapper/Makefile
+++ b/devel/autoconf-wrapper/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME?= autoconf-wrapper
-PORTVERSION= 20071109
+PORTVERSION= 20101119
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
-MAINTAINER= des@FreeBSD.org
+MAINTAINER= autotools@FreeBSD.org
COMMENT?= Wrapper script for GNU autoconf
WRKSRC= ${WRKDIR}
diff --git a/devel/autoconf-wrapper/files/autotools-wrapper.sh b/devel/autoconf-wrapper/files/autotools-wrapper.sh
index e569db1cf926..2d8e3e38da36 100644
--- a/devel/autoconf-wrapper/files/autotools-wrapper.sh
+++ b/devel/autoconf-wrapper/files/autotools-wrapper.sh
@@ -50,11 +50,7 @@ if [ -n "${AUTOTOOLS_DEBUG}" -a -n "${%%TOOL%%_VERSION}" ] ; then
fi
#
-# Identify available versions. Most of the complexity here stems from
-# the fact that some versions are installed as "toolXYZ" while some
-# are installed as "tool-X.YZ". The latter is the canonical form,
-# i.e. the one intended by the authors and expected by the tools
-# themselves.
+# Identify available versions.
#
# The double sort is necessary to correctly identify 1.10 as newer
# than 1.9.
@@ -64,12 +60,10 @@ fi
# measures to handle this case.
#
/usr/bin/find ${bindir}/ -name "${tool}*[0-9]" | /usr/bin/sed -E \
- -e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 -\1.\2@" \
- -e "s@^.*/${tool}([0-9])([0-9]+)\$@\1 \2 \1\2@" | \
+ -e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 \1.\2@" | \
/usr/bin/sort -n -k1 | /usr/bin/sort -n -s -k2 | {
while read maj min suffix ; do
- selected_version="$maj$min"
- selected_suffix=$suffix
+ selected_version=$suffix
if [ -n "${%%TOOL%%_VERSION}" -a \
"x${%%TOOL%%_VERSION}" = x${selected_version} ] ; then
break
@@ -88,8 +82,8 @@ fi
if [ -n "${AUTOTOOLS_DEBUG}" ] ; then
echo "Selecting ${tool} version ${selected_version}" \
- "(${bindir}/${tool}${selected_suffix})" 1>&2
+ "(${bindir}/${tool}-${selected_version})" 1>&2
fi
-exec ${bindir}/${tool}${selected_suffix} "$@"
+exec ${bindir}/${tool}-${selected_version} "$@"
}
diff --git a/devel/automake111/Makefile b/devel/automake111/Makefile
index c91239ee819f..793281836683 100644
--- a/devel/automake111/Makefile
+++ b/devel/automake111/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.11)
RUN_DEPENDS= ${AUTOCONF_DEPENDS} \
automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
BUILD_VERSION= 1.11
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake111
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index d114d982f90a..bb70ea91e2df 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -22,7 +22,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.4)
RUN_DEPENDS= ${AUTOCONF_DEPENDS} \
automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
BUILD_VERSION= 1.4
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake14
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index d0f860f62cc0..2dac27bd656f 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
-USE_AUTOTOOLS= autoheader:213
+USE_AUTOTOOLS= autoheader213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index f123d52b3b26..69274b6129c4 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= wes@FreeBSD.org
COMMENT= Macro Assembler for Atmel AVR microcontrollers
WRKSRC= ${WRKDIR}
-USE_AUTOTOOLS= aclocal:111 autoconf:268 automake:111
+USE_AUTOTOOLS= aclocal autoconf automake
AUTOMAKE_ARGS= -a
PORTDOCS= README
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index fb2450ab4c4b..49d0085a1200 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -17,7 +17,7 @@ COMMENT= One stop library package by Bruce Guenter
NOT_FOR_ARCHS= alpha
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
LDFLAGS?= -s
BGLIBS_INC= ${PREFIX}/include/${PORTNAME}
BGLIBS_LIB= ${PREFIX}/lib/${PORTNAME}
diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile
index 37849b97b446..f4921a038886 100644
--- a/devel/c_c++_reference/Makefile
+++ b/devel/c_c++_reference/Makefile
@@ -18,7 +18,7 @@ COMMENT= C/C++ reference manual for KDevelop
RUN_DEPENDS= kdevelop:${PORTSDIR}/devel/kdevelop
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER= 3
USE_GMAKE= yes
diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index 85b6347cddb8..69474e500da5 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sylvio@FreeBSD.org
COMMENT= An enhanced version of 'dialog' to work with ncurses
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} --with-libtool
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index a2639186b27c..7a891e349c61 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION}
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index 1c850263bc5c..4f31d4f505d6 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A static source code checker for C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 87c0b2945858..e6e3424d448e 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF
MAINTAINER= yzlin@FreeBSD.org
COMMENT= C++ port of the JUnit framework for unit testing
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile
index 40d64b3a1d44..e10e3939c1bb 100644
--- a/devel/cstringbuffer/Makefile
+++ b/devel/cstringbuffer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= # disappeared
MAINTAINER= ports@FreeBSD.org
COMMENT= File-like IO for strings
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAN3= csb.3
diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
index 6bc93acd9895..6a5b45d73afb 100644
--- a/devel/cunit/Makefile
+++ b/devel/cunit/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/^cu/CU/}-${DISTVERSION}
DOCSDIR= ${PREFIX}/share/doc/CUnit
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
USE_LDCONFIG= yes
MAN3= CUnit.3
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 72e46cb3264f..f19dfec99858 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
USE_GNOME= gnomehack glib20 ltverhack
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
--disable-doxygen-docs \
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index affbe73ac689..44a86a9abe3e 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -23,7 +23,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
USE_GNOME= gnomehack gnometarget gtksharp10
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-mono \
--disable-python \
--disable-gcj \
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 0fb9d6415216..847b53817315 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_GNOME?= gnomehack libxml2 ltverhack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS=--localstatedir=/var \
--with-test-socket-dir=${WRKDIR} \
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index d4f3d27dbdec..c76505fcc9c1 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -23,7 +23,7 @@ USE_XORG= x11
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index b81a304b777e..4436bab767e4 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -24,7 +24,7 @@ OPTIONS= FREETYPE2 "Enable Freetype support" on \
TESTS "Install test apps" off
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index f4fa15bf8f5d..ac0503ebf7b3 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mark_sf@kikg.ifmo.ru
COMMENT= Configuration file parser written in C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index d6479c0d6037..a1a1a82e5ae2 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.azzit.de/dotconf/download/v1.1/
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple, powerful configuration-file parser
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 58087a28330f..7530071070e3 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -19,7 +19,7 @@ USE_BISON= build
USE_BZIP2= yes
USE_SDL= sdl gui mixer
USE_GNOME= gnometarget libxml2 lthack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-lirc
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 5d573f9b39bc..7aa14431ee89 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool22
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
diff --git a/devel/entity/Makefile b/devel/entity/Makefile
index ec15a1eb3c63..41a0c94c7af0 100644
--- a/devel/entity/Makefile
+++ b/devel/entity/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= python:${PORTSDIR}/lang/python
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-tcl=no
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gtk12
USE_LDCONFIG= ${PREFIX}/lib/entity/clib
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index c7d0ce07064a..3ab2eb4ecbbb 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -18,7 +18,7 @@ COMMENT= A free UNIX software/file packaging program
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAN1= epm.1 epminstall.1 mkepmlist.1 setup.1
MAN5= epm.list.5 setup.types.5
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index d5475f5d8133..2a77a26cb505 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -17,7 +17,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
AUTOMAKE_ARGS= -c -a
USE_GMAKE= yes
USE_GNOME= gnometarget
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index e883df0c047b..9c00ff5ec1f1 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -24,7 +24,7 @@ AUTOMAKE_ARGS= -a
CONFIGURE_ARGS= PY_PREFIX="${PREFIX}"
PLIST_SUB+= PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
PYTHON_VERSION_SHORTNAME= ${PYTHON_VERSION:S/thon//}
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 32d1f2e3d18a..9d1ee9843406 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -16,7 +16,7 @@ COMMENT= A generic game engine for 2D double-buffering animation
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl mixer image
USE_GNOME= pkgconfig
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index e7bf495e8b57..e546e15a1658 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
USE_GNOME= gnomehack gnometarget libgnomeui libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= ${CONFIGURE_SCRIPT} FuzzyEngine/configure \
HMM/configure NNet/configure \
VQ/configure audio_blocks/configure \
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 34f10e1965a2..e3bf5dbbfc1f 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://people.gnome.org/~veillard/gamin/sources/
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A file and directory monitoring system
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME?= gnomehack _glib20
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 54dc0be65a34..9a01be98d4f0 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 4a84665749a6..a7847edbc39f 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -20,7 +20,7 @@ COMMENT= A configuration database system for GNOME
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 9443a9a741e6..4582b4071659 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -33,7 +33,7 @@ USE_GETTEXT= yes
USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
referencehack intlhack dconf
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 697a0bf0d866..6e9d33e0cf42 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for gconf2 API library
LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gconf2
GNU_CONFIGURE= yes
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index e9639ad7ecf0..f66ba11efcce 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -29,7 +29,7 @@ MAN1= cvs.1
MAN5= cvs.5
MAN8= cvsbug.8
INFO= cvs cvsclient
-USE_AUTOTOOLS= automake:14:env autoconf:268:env
+USE_AUTOTOOLS= automake14:env autoconf:env
MAKE_JOBS_UNSAFE= yes
.include <bsd.port.pre.mk>
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index a77dd6ac4145..8baebdff3e46 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/FreeBSD/distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= An SDL game engine library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= image sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 7a051edb9df0..689c571f68da 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -20,7 +20,7 @@ COMMENT= GNU gettext package
USE_ICONV= yes
LIBTOOLFILES= gettext-runtime/configure \
gettext-runtime/libasprintf/configure gettext-tools/configure
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= ACLOCAL="${TRUE}" \
AUTOCONF="${TRUE}" \
AUTOMAKE="${TRUE}" \
diff --git a/devel/gflags/Makefile b/devel/gflags/Makefile
index d4a66781f203..9b697523e464 100644
--- a/devel/gflags/Makefile
+++ b/devel/gflags/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= leeym@FreeBSD.org
COMMENT= Commandline flags module for C++
PROJECTHOST= google-gflags
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 1d7fa62b1be0..574bce2d5e35 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -24,7 +24,7 @@ WANT_GNOME= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index c6bfae710771..cfc391ce7a3f 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
USE_CSTD= gnu89
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index acf729310312..1429ecbc4263 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -34,7 +34,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig ltverhack
USE_GMAKE= yes
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 474e72284afe..8d71ecff63b4 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack glib20 ltverhack
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static --disable-documentation
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index caa250ad4313..78dd001d229d 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
ltverhack referencehack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-openssl \
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index a093619c8b0e..addc3f52a131 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack glib20 ltverhack
USE_PYTHON= yes
USE_BISON= both
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 24fb0205f218..35aab281d4da 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgsf gconf2 \
ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index f3ae00b3c9f7..968ffa71a523 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile
index 227871f814d2..1a753bb6b1a9 100644
--- a/devel/goffice06/Makefile
+++ b/devel/goffice06/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 59b75258b446..03fd16328a65 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 4e4599390252..548b8b6cacbd 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index 4c7f36fd5ebd..c94a0cc5b32e 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -23,7 +23,7 @@ PORTDOCS= USAGE
PLIST_FILES= lib/gtk-2.0/modules/libgtkparasite.a \
lib/gtk-2.0/modules/libgtkparasite.la \
lib/gtk-2.0/modules/libgtkparasite.so
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
pre-configure:
cd ${WRKSRC} && ${REINPLACE_CMD} -e '/.\/configure/d' ./autogen.sh \
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index e48297b5b14d..38a669266387 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= mva@FreeBSD.org
COMMENT= A small, efficient C++ GUI library designed for games
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 407c7e7fe6da..fced5ac36e26 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
OPTIONS= MEMDEBUG "Enable memory debugger statistic" off \
PORTDOCS "Install documentation (requires doxygen)" off
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index be4ed13586c2..c06fd20c270c 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= haskell@FreeBSD.org
COMMENT= Alex is a tool for generating lexical analysers in Haskell
XMLDOCS= doc/alex:html
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
STANDALONE= yes
EXECUTABLE= alex
diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile
index 25082ea880f4..27f986739929 100644
--- a/devel/hs-haddock-docs/Makefile
+++ b/devel/hs-haddock-docs/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Documentation for Haddock
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
DOCUMENTATION= yes
XMLDOCS= doc/haddock:users_guide
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 21e4d9a4ac42..3a504b215c42 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= haskell@FreeBSD.org
COMMENT= An LALR(1) parser generator for the functional language Haskell
XMLDOCS= doc/happy:html
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
STANDALONE= yes
EXECUTABLE= happy
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index f8100f39453c..361355938c6a 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A small C++ tools library based on STL
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/jakelib2/Makefile b/devel/jakelib2/Makefile
index 505baf91201b..37eb8681e0bd 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -16,7 +16,7 @@ COMMENT= A cross platform C++ class library with a Java-like API
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index cac2b94eda14..27e7e3aee191 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Shows information about Java class, dependencies and more
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/jrtplib/Makefile b/devel/jrtplib/Makefile
index 26f18a0df509..1ab18212a0d3 100644
--- a/devel/jrtplib/Makefile
+++ b/devel/jrtplib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://research.edm.uhasselt.be/jori/jrtplib/
MAINTAINER= hopet@ics.muni.cz
COMMENT= Object-oriented RTP library written in C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 2eda5da51dbc..d641c7f09837 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile
index 0bcf0678e988..25e9403c3d5a 100644
--- a/devel/jzmq/Makefile
+++ b/devel/jzmq/Makefile
@@ -16,7 +16,7 @@ COMMENT= Java bindings for ZeroMQ
LIB_DEPENDS= zmq.0:${PORTSDIR}/devel/zmq
-USE_AUTOTOOLS= autoconf:268 libtool:22 automake:111
+USE_AUTOTOOLS= autoconf libtool automake
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_JAVA= 1.4+
diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index 185338ad57ef..88ac7778ee58 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
COMMENT= Makefile framework
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 185338ad57ef..88ac7778ee58 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
COMMENT= Makefile framework
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 6fd857dd3a6e..3be005d1220a 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= i386 amd64
CONFLICTS= kdesdk3-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
INSTALLS_ICONS= yes
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 3cb4052c1421..9ea40cc3f871 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -16,7 +16,7 @@ COMMENT= A graphical user interface around gdb using KDE
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-kde-version=3
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index d034f3142333..a82e46094dcc 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -27,7 +27,7 @@ USE_PERL5= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_BDB= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index e5d06da20702..2feb7ccad925 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -20,7 +20,8 @@ COMMENT= IDE for a wide variety of programming tasks
BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \
dot:${PORTSDIR}/graphics/graphviz
LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion
-RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \
+RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
+ extractrc:${PORTSDIR}/devel/kdesdk3 \
gdb66:${PORTSDIR}/devel/gdb66 \
gmake:${PORTSDIR}/devel/gmake
@@ -53,7 +54,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= build
USE_BDB= yes
-USE_AUTOTOOLS= libtool:22 autotools:run
+USE_AUTOTOOLS= libtool
_NO_KDE_FINAL= yes
CONFIGURE_ARGS+=--with-qtdoc-dir=${LOCALBASE}/share/doc/qt/html \
--with-db-includedir=${BDB_INCLUDE_DIR} \
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index e17905cf78a7..211666ad201f 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -19,7 +19,7 @@ COMMENT= A tool for visually creating and documenting classes
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= WXWINDOWS="yes"
USE_WX= 2.4
diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile
index 4b4d0f484823..d894b03c7656 100644
--- a/devel/kprof/Makefile
+++ b/devel/kprof/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A profiling tool for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= KDB2HTML=${PREFIX}/bin/kdb2html
USE_GMAKE= yes
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index f7c4c98aa5ef..b686cc5ac911 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -23,7 +23,7 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME}
USE_BISON= build
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
INSTALLS_ICONS= yes
diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile
index e3e3716cecaa..40f3a604e3ea 100644
--- a/devel/kxl/Makefile
+++ b/devel/kxl/Makefile
@@ -15,7 +15,7 @@ DISTNAME= KXL-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A visual, sound library for games
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_XORG= xpm x11
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 94c701d3c90c..d76d763aea05 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= image sdl
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 8a5aed40aa0c..a481e50a454c 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lme@FreeBSD.org
COMMENT= C++ stream output interface for creating Postscript documents
USE_GNOME= pango pkgconfig
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
PKG_CONFIG_PATH= ${PREFIX}/libdata/pkgconfig
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
diff --git a/devel/lfc/Makefile b/devel/lfc/Makefile
index 0ab178946fec..59a155286998 100644
--- a/devel/lfc/Makefile
+++ b/devel/lfc/Makefile
@@ -15,6 +15,6 @@ COMMENT= A collection of basic c++ classes, used for databases/cego
LICENSE= GPLv2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
.include <bsd.port.mk>
diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile
index 719e52cdd2ec..79ba511f3d24 100644
--- a/devel/lfcxml/Makefile
+++ b/devel/lfcxml/Makefile
@@ -19,6 +19,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
.include <bsd.port.mk>
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 8fdb76d863b1..ef2944010f28 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Property library for gnome and Window Maker
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 38cec572f224..9f37474c7c98 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -17,7 +17,7 @@ COMMENT= Devel Library to share image and audio files between projects
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
USE_GETTEXT= yes
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 18d95bc719b1..207cce8f6c13 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library of assorted spiffy things
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_EFL= imlib2
GNU_CONFIGURE= yes
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index 233b70516b83..aa66eeb6e835 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -17,7 +17,7 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libltdl:22 libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libltdl libtool
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index cc1cfd7e5102..a36c28e79d93 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Binary I/O stream class library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/libbnr/Makefile b/devel/libbnr/Makefile
index 5acc47e99bfa..19b9375bbd97 100644
--- a/devel/libbnr/Makefile
+++ b/devel/libbnr/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://dspam.nuclearelephant.com/sources/extras/ \
MAINTAINER= itetcu@FreeBSD.org
COMMENT= GPL implementation of the Bayesian Noise Reduction algorithm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index d25dbaac98aa..4dd094f4b770 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack libbonobo
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index aaf288d54a88..f8da6fa95afd 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/
MAINTAINER= ports@FreeBSD.org
COMMENT= Network library aimed at easy development of C++ server daemons
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libcfg/Makefile b/devel/libcfg/Makefile
index 56e004cc68dc..094bcdd14dde 100644
--- a/devel/libcfg/Makefile
+++ b/devel/libcfg/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}+-${DISTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Library for command line and configuration file parsing
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile
index d8321675d6a3..54ef1f06290f 100644
--- a/devel/libchipcard-kde/Makefile
+++ b/devel/libchipcard-kde/Makefile
@@ -17,7 +17,7 @@ COMMENT= KDE tools for LibChipCard
LIB_DEPENDS= chipcard.20:${PORTSDIR}/devel/libchipcard:install
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-distri=freebsd --with-kde3-prefix=${LOCALBASE}\
--with-applnk-dir=${PREFIX}/share/applnk/Utilities
USE_KDELIBS_VER= 3
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 018e992ddab0..4f07b7c56779 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for easy access to chipcards
LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile
index 2b13506fbd7e..d94ea12ddde5 100644
--- a/devel/libconfuse/Makefile
+++ b/devel/libconfuse/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck
.endif
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index da3bed3d8841..9bc069f91eea 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -16,7 +16,7 @@ COMMENT= The C++ Debugging Support Library
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-alloc --disable-location --disable-threading \
--disable-pch
USE_LDCONFIG= yes
diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile
index 48d56aae0767..91fb162a250b 100644
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight C library that eases the writing of UNIX daemons
CONFIGURE_ARGS= --disable-lynx
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget ltverhack
USE_LDCONFIG= yes
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index 455a00db1de0..863841528d5e 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -17,7 +17,7 @@ COMMENT= Provides a non-blocking thread-safe API for resolving DNS names
BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS=--with-libevent=${LOCALBASE}
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index c4d0fe87f10d..7c327bd34884 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ class library of common digital signal processing functions
WRKSRC= ${WRKDIR}/libdsp-src-${PORTVERSION}/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_GMAKE= yes
MAKE_ENV= MKDIR="${MKDIR}" INLINE_VER="${INLINE_VER}"
MAKEFILE= Makefile.BSD
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index 07d6abf709fe..3a5e6f40271f 100644
--- a/devel/libfs++/Makefile
+++ b/devel/libfs++/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= . archive
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library which provides a file_iterator class
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index 0c0e1bdfc22a..c9faf0e14d3f 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library (using libusb) to talk to FTDI chips
OPTIONS= BOOST "Build with boost" off
-USE_AUTOTOOLS= autoconf:268 libtool:22 automake:111
+USE_AUTOTOOLS= autoconf libtool automake
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
USE_LDCONFIG= yes
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 40e5358b29c5..a25e7f3dd68c 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack intltool ltverhack glib20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index d8fce11e085d..f7b681ee6043 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
MAINTAINER= gahr@FreeBSD.org
COMMENT= Generic Hash Table
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --datarootdir=${PREFIX}
USE_LDCONFIG= yes
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index d214cc03494d..e523e721ca7c 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -18,7 +18,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 13661d8f65de..4f75569af2db 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_XORG= x11 sm
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index e23c4c37bfb4..68364957cb16 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
--without-bonobo
CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index db2d94ad3ca7..8b99344b7992 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack intlhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index 05bc99cfe78d..987acc7bcf07 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library that allows application developers to connect to PG
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index c5c76e0fa7f9..0bfeba6a320e 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gnome@freebsd.org
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/devel/libltdl22/Makefile b/devel/libltdl22/Makefile
index 3b80d97ea33e..4f41a7e1b779 100644
--- a/devel/libltdl22/Makefile
+++ b/devel/libltdl22/Makefile
@@ -14,7 +14,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${CONFIGURE_WRKSRC}/COPYING.LIB
USE_GNOME= ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= libltdl/configure
CONFIGURE_ARGS= --enable-ltdl-install
diff --git a/devel/libltdl24/Makefile b/devel/libltdl24/Makefile
index 23011326d967..616c62e2345c 100644
--- a/devel/libltdl24/Makefile
+++ b/devel/libltdl24/Makefile
@@ -14,7 +14,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${CONFIGURE_WRKSRC}/COPYING.LIB
USE_GNOME= ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:24
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= libltdl/configure
CONFIGURE_ARGS= --enable-ltdl-install
diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile
index de8c5f8bf8d8..299f2911491e 100644
--- a/devel/libmaa/Makefile
+++ b/devel/libmaa/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
ALL_TARGET= lib
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index ffaea726eee5..bfef6228762c 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -14,7 +14,7 @@ COMMENT= Library for parsing RFC2425 MIME Directory Profile information
USE_GNOME= gnometarget
USE_BISON= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
regression-test:
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 56229781611e..745d6e76939d 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack
USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libnotifymm/Makefile b/devel/libnotifymm/Makefile
index f1fcaf43100c..3ea684c855b0 100644
--- a/devel/libnotifymm/Makefile
+++ b/devel/libnotifymm/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig gnomehack gnomeprefix ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/libnotify `pkg-config --cflags glibmm-2.4 libnotify gtkmm-2.4`"
USE_LDCONFIG= yes
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 46867df07283..e8c458d533f6 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= mm@FreeBSD.org
COMMENT= Library of optimized inner loops
USE_GNOME= pkgconfig gnomehack gnometarget ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--disable-glib
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index ced6b77a9789..047e6dcbfddd 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.balabit.com/downloads/files/libol/0.3/
MAINTAINER= araujo@FreeBSD.org
COMMENT= Library needed by syslog-ng
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 4e03e8eef450..b2748be9a3f5 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Support library for OLE functions (MS-Excel) for gnumeric
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= glib12
GNU_CONFIGURE= yes
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 7f9cedd4459a..a9479888cb41 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
tcl84.1:${PORTSDIR}/lang/tcl84 \
wwwcore.1:${PORTSDIR}/www/libwww
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack gnometarget
GNU_CONFIGURE= yes
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index f13ef07644bd..7f450d7eb4ce 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://crazney.net/programs/itunes/files/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= C lib used to connect to iTunes(R) music shares
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index 754fa5e295a3..f5ee2ee5488a 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -23,6 +23,6 @@ USE_GNOME= gnometarget
MAKE_ARGS= CFLAGS="${CFLAGS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile
index 9ef92ae947f9..94d60f3b6f0b 100644
--- a/devel/libphish/Makefile
+++ b/devel/libphish/Makefile
@@ -16,7 +16,7 @@ COMMENT= A cross-platform library to interact with the Open Phishing Database
BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/libpperl/Makefile b/devel/libpperl/Makefile
index 6ac7db30f159..59b9464775f1 100644
--- a/devel/libpperl/Makefile
+++ b/devel/libpperl/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library easing embedding perl interpreters into C programs
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 2265c29df624..b5c8d0532e3a 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gnomehack lthack libxml2
USE_GMAKE= yes
USE_ICONV= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
CPPFLAGS= -I${LOCALBASE}/include
LIBS= -L${LOCALBASE}/lib
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index f5427e4f82f3..ccbb20cfb69a 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Library that provides the red-black balanced tree algorithm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile
index 685739e550ec..b53d844f27ae 100644
--- a/devel/librelp/Makefile
+++ b/devel/librelp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Reliable event logging protocol library
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
PLIST_FILES= include/${PORTNAME}.h \
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 5c2b42f76a5f..3561378b0b9f 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for Shared Buffer IPC
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index f1ba541ee208..cd4d0ce7156a 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index a09268c78fde..c4b69a3a525e 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -18,7 +18,7 @@ COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
LATEST_LINK= libsigc++12
USE_LDCONFIG= yes
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index e8245274e91d..7f96375c0fb8 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -16,7 +16,7 @@ COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index c159d0006de2..252599c3676b 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
USE_GNOME= gnomehack gnometarget gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
ac_cv_path_DOXYGEN=""
USE_LDCONFIG= yes
diff --git a/devel/libsigsegv/Makefile b/devel/libsigsegv/Makefile
index 2a993423b0b8..52403339524e 100644
--- a/devel/libsigsegv/Makefile
+++ b/devel/libsigsegv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= libsigsegv
MAINTAINER= gaod@hychen.org
COMMENT= Handling page faults in user mode
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index b0e4fe405f5d..8de9843b9dbc 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 267ba4db4e60..f298b7c5de58 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -23,7 +23,7 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile
index 45242cb1c0c9..edd8aea138e6 100644
--- a/devel/libstrfunc/Makefile
+++ b/devel/libstrfunc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= vlm@lionet.info
COMMENT= Handles CGI forms, MIME, templates, date conversions, etc
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --program-prefix=""
MAN3= \
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 8d9486e7302e..c1545e038021 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -16,7 +16,7 @@ COMMENT= A stroke translation library
USE_XORG= x11
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_LDCONFIG= yes
diff --git a/devel/libtap/Makefile b/devel/libtap/Makefile
index f8527f2d5f40..a98958c60226 100644
--- a/devel/libtap/Makefile
+++ b/devel/libtap/Makefile
@@ -16,7 +16,7 @@ DISTNAME= tap-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library implementing the Test Anything Protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 29d2f55ed056..c44c8601a2c0 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -17,7 +17,7 @@ COMMENT= Thai language support library
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= all check
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 7e51f3675bf1..5e010d23c5e9 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 6ccf3259bf0f..10febb39029b 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -16,7 +16,7 @@ COMMENT= TI calculator file types library
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index d1f7c0f4a15f..87f56cbd3660 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -16,7 +16,7 @@ COMMENT= TI calculator file types library
LIB_DEPENDS= ticonv.4:${PORTSDIR}/converters/libticonv
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack pkgconfig
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index 2492bf4c2840..eacecd854193 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -21,7 +21,7 @@ COMMENT= Generally useful low level routines
NO_CDROM= License (see source) does not permit selling for profit
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 9808f171fe1e..4caa9f3c5d36 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for manipulating Unicode characters and strings
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index 109b2e2c292b..b304fb800afb 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -19,8 +19,8 @@ ONLY_FOR_ARCHS= i386 amd64
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 \
- libtoolize libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf \
+ libtoolize libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -c -a
LIBTOOLFILES= #empty
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index de25bc65a461..fbc2ff5e0a35 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -33,9 +33,9 @@ CONFIGURE_ARGS= --disable-build-docs
PLIST_SUB= SGML="@comment "
.endif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' ${WRKSRC}/configure
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index e937ee58e001..1a350967392e 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger
USE_LDCONFIG= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile
index c78a805e19c5..c527de913fe5 100644
--- a/devel/libvanessa_logger/Makefile
+++ b/devel/libvanessa_logger/Makefile
@@ -15,7 +15,7 @@ DISTNAME= vanessa_logger-${PORTVERSION}
MAINTAINER= thomas@bsdunix.ch
COMMENT= Library that provides a generic logging layer
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index eba2aec85418..3f35612e6762 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
MAN1= vanessa_socket_pipe.1
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile
index f6999a5eac89..f63ce0f21578 100644
--- a/devel/libvc/Makefile
+++ b/devel/libvc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/rolo/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A vCard library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_BISON= build
GNU_CONFIGURE= yes
diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile
index 1c48064f2963..aca8713cdb2f 100644
--- a/devel/libytnef/Makefile
+++ b/devel/libytnef/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= delphus@gmail.com
COMMENT= Unpack data in MS Outlook TNEF format
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
PORTDOCS= AUTHORS NEWS README
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index f5235012d20e..0ef2a4ee0235 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Logging for C Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 4c85b72539e7..44ecc1e2efbd 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -15,7 +15,7 @@ DISTFILES= log4cplus-${PORTVERSION}.tar.gz log4cplus-${PORTVERSION}-docs.tar.gz
MAINTAINER= petri.totterman@hmv.fi
COMMENT= A logging library for C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index be7cda36140c..9e6037ad9b7c 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}.x%20%28current%29/${PORT
MAINTAINER= clsung@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 8f2db74970b1..de40a4c11491 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -34,7 +34,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-lib
.endif
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile
index b42b98abde72..98b8068a36f7 100644
--- a/devel/log4shib/Makefile
+++ b/devel/log4shib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://shibboleth.internet2.edu/downloads/${PORTNAME}/${DISTVERSIO
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnometarget gnomehack
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index b23b6732d5c7..397f1f8210d5 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE= yes
USE_XORG= ice sm x11 xaw xft xt
USE_GNOME= gnometarget libxml2 pkgconfig
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
OPTIONS= ANTHY "With Anthy support" off \
diff --git a/devel/memcheck/Makefile b/devel/memcheck/Makefile
index f845d6412ca2..60011adb5394 100644
--- a/devel/memcheck/Makefile
+++ b/devel/memcheck/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://hald.dnsalias.net/projects/memcheck/
MAINTAINER= demon@FreeBSD.org
COMMENT= Memory Allocation Checker
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index a312da7d4176..557ca30a766d 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV+= EGREP=`which egrep`
OPTIONS= NOSERVICES "Without services, plain ORB" off \
diff --git a/devel/mimir/Makefile b/devel/mimir/Makefile
index 50019597991b..b5b119257889 100644
--- a/devel/mimir/Makefile
+++ b/devel/mimir/Makefile
@@ -15,7 +15,7 @@ COMMENT= Data-structure library used by the Elan Programming Environment
MAN1= dcg.1
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 9a9111019aa1..568712066f34 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libgdiplus.a:${PORTSDIR}/x11-toolkits/libgdiplus \
USE_GNOME= gnometarget gnomehack gtksharp20 gnomesharp20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
CONFIGURE_ARGS+= DATADIRNAME=share GMSGFMT=msgfmt \
--enable-aspnet --enable-aspnetedit
diff --git a/devel/mq4cpp/Makefile b/devel/mq4cpp/Makefile
index 767b3e64a3dd..a4e62e0f5b3a 100644
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= vanilla@FreeBSD.org
COMMENT= Message Queuing for C++
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 7c0994baf57b..817dfe662aac 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -16,7 +16,7 @@ COMMENT= Generic configuration management library
LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
GNU_CONFIGURE= yes
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 7aaaf910ba6b..48aaba8c5f03 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -19,7 +19,7 @@ COMMENT= Object Activation Framework for GNOME
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index c4504903a434..06d592d9a79a 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -18,7 +18,7 @@ COMMENT= Object Oriented Input System
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:22:env aclocal:111:env autoheader:268:env automake:111:env autoconf:268:env
+USE_AUTOTOOLS= libtool:env aclocal:env autoheader:env automake:env autoconf:env
USE_XORG= x11 xaw
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index 55a0769e0d55..dc0477776742 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An Evolutionary Computation Framework
CONFLICTS= beagle-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-optimization --with-zlib=/usr
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index 1854912b9339..0d9acc9c3fc3 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -18,7 +18,7 @@ COMMENT= An interpreted dynamic parser
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index bd8976e7c770..c23e7d730d2b 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack ltverhack orbit2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS =.*\)test\(.*\)|\1\2|' ${WRKSRC}/Makefile.in
diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index 24a46a751deb..2fb2d6d2896b 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= mm@FreeBSD.org
COMMENT= Library and toolset to operate arrays of data
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 47545767b1cd..25f5d3dd5c4c 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= patch
MAINTAINER= glarkin@FreeBSD.org
COMMENT= GNU patch utility
-USE_AUTOTOOLS= autoconf:268 aclocal:111
+USE_AUTOTOOLS= autoconf aclocal
CONFIGURE_ARGS= --program-prefix=g
USE_GMAKE= yes
USE_XZ= yes
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 1daf3c49cbf4..9bffe680b778 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile
index b986e4931c7a..16c84fb0319f 100644
--- a/devel/php-java-bridge/Makefile
+++ b/devel/php-java-bridge/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP module wich connects the PHP object with the Java/ECMA 335 object
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_JAVA= yes
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index 9915b09ec559..16c82b8825ca 100644
--- a/devel/physfs-devel/Makefile
+++ b/devel/physfs-devel/Makefile
@@ -15,11 +15,11 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_CMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
NO_LATEST_LINK= yes
-patch-autotools:
+patch-autotools-libtool:
@${DO_NADA}
post-patch:
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index dbe2c45693d0..abf0ad84532d 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -14,10 +14,10 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_CMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-patch-autotools:
+patch-autotools-libtool:
@${DO_NADA}
post-patch:
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index 47402a7035b7..39f2ec67167e 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index f6e9020a055c..9fc94c6d74e4 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE IDE for microcontroller development
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_KDELIBS_VER=3
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 6e8c549c955b..f9ac93bdc539 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 9ed230796770..9c7545af39ef 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/posadis/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Posadis C++ DNS library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 625707543882..6c63a23930e8 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure Watchdog/configure
USE_GCC= 4.2+
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index fcc8235c43b8..433d39a15e45 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -15,7 +15,7 @@ COMMENT= Problem reporting system
RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PGSQL= yes
USE_GMAKE= yes
USE_GNOME= gtk20 gconf2 glib20 libgnomeui
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 7d0137c13dca..0fdf0767c8e5 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for reading Microsoft PowerPoint(tm) documents
LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice1
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 2ebcaf34bce3..7de054a9e0ae 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.isso.sparta.com/opensource/privman/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= Library that makes it easy for programs to use privilege separation
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/psptoolchain-pspsdk-stage1/Makefile b/devel/psptoolchain-pspsdk-stage1/Makefile
index afd267fb4d13..77df5e83e036 100644
--- a/devel/psptoolchain-pspsdk-stage1/Makefile
+++ b/devel/psptoolchain-pspsdk-stage1/Makefile
@@ -18,7 +18,7 @@ COMMENT= PlayStation Portable development toolchain ${PORTNAME}
PSP_SDK_STAGE_PREFIX= psp/stage1
-USE_AUTOTOOLS= libtool:22:env aclocal:111:env autoheader:268:env automake:111:env autoconf:268:env
+USE_AUTOTOOLS= libtool:env aclocal:env autoheader:env automake:env autoconf:env
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_SDK_STAGE_PREFIX} --with-pspdev="${PREFIX}/${PSP_SDK_STAGE_PREFIX}"
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 472d742fd42c..2c75c5a6bf87 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/ptlib_v${PORTVERSION:S/./_/g}
USE_BISON= build
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GNOME= gnometarget
WANT_GNOME= yes
WANT_SDL= yes
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 5fab1959abe2..55877e370eca 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GNOME= gnomehack gnometarget
USE_PYTHON= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${PYTHON_INCLUDEDIR}"
CONFIGURE_ARGS= --docdir=${DOCSDIR} \
--disable-api-docs
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index c9ff67079ee7..bf43d4bf8972 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -21,7 +21,7 @@ COMMENT= Networking API that provides reliable UDP primarily for online games
USE_ZIP= yes
NO_WRKSUBDIR= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal autoheader autoconf automake libtool
AUTOMAKE_ARGS= --add-missing
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \
-I ${LOCALBASE}/share/aclocal \
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index e49d5839fed5..81bad46baa11 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -25,7 +25,7 @@ WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22 automake:111
+USE_AUTOTOOLS= autoconf libtool automake
CONFIGURE_TARGET=
CONFIGURE_ARGS= --with-apr-config=apr-1-config \
--with-apu-config=apu-1-config \
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 3469815c12db..0939a3865732 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A complete regular expressions C++ solution
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre"
diff --git a/devel/rlog/Makefile b/devel/rlog/Makefile
index f2b8e5a2abf5..bbe44ed74364 100644
--- a/devel/rlog/Makefile
+++ b/devel/rlog/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible message logging facility for C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index c1d0cea4a3b0..c16ff1ce8690 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -16,7 +16,7 @@ COMMENT= A utility C++ class library for daemons, clients, servers and more
USE_GNOME= gnometarget pkgconfig
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
PTHREADLIB="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLINC} \
diff --git a/devel/safestr/Makefile b/devel/safestr/Makefile
index 947d23aac774..a82b31512475 100644
--- a/devel/safestr/Makefile
+++ b/devel/safestr/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xxl.2:${PORTSDIR}/devel/xxl:install
CONFIGURE_ARGS= --with-xxl=${LOCALBASE}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index c90f8b7e830a..2cdbfcda4352 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -18,7 +18,7 @@ COMMENT= Cross-platform multimedia development API
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 58490ea0b46c..8b784ed0bc6f 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -16,7 +16,7 @@ DISTNAME= SDLmm-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 9e5c5e704706..0debc968cb0e 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ library for SDTS related development
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index d11060768b63..6220b2403fee 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -31,7 +31,7 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gtk20 intltool libxml2
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index cb9d8cc50204..2162be498085 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= sunpoet@FreeBSD.org
COMMENT= C API for reading and writing ArcView Shapefiles
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER}
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index 458f7925f65f..026f7f456b01 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -17,7 +17,7 @@ COMMENT= Shared-memory-based hashmaps
LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index d538f5b03bb4..8c7bddf7f5b9 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -24,7 +24,7 @@ COMMENT= Secure Internet Live Conferencing (SILC) network toolkit
CONFLICTS= silc-client-1.1.* silc-irssi-client-1.1.*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 133ef1d7b8a4..ec81e0ed5e1d 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -17,7 +17,7 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack glib12 libxml
USE_LDCONFIG= yes
diff --git a/devel/spatialindex/Makefile b/devel/spatialindex/Makefile
index 01b06f6241fc..d80b6162867b 100644
--- a/devel/spatialindex/Makefile
+++ b/devel/spatialindex/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
COMMENT= A General Framework for Developing Spatial Indices
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile
index 2572054bad1d..ad8d4c7e209e 100644
--- a/devel/stringencoders/Makefile
+++ b/devel/stringencoders/Makefile
@@ -17,7 +17,7 @@ COMMENT= Collection of high performance c-string transformations
USE_PERL5= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index a6bcb207f807..b9a308854f37 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.speculate.de/styx/
MAINTAINER= ports@FreeBSD.org
COMMENT= A scanner/parser generator
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index b914de531108..b80f4fcb747c 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -23,7 +23,7 @@ PATCHFILES+= svn_hacks_1.4.diff
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index b914de531108..b80f4fcb747c 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -23,7 +23,7 @@ PATCHFILES+= svn_hacks_1.4.diff
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index c6da83d2454b..5697f324aa91 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-USE_AUTOTOOLS= autoconf:268:env libtool:22
+USE_AUTOTOOLS= autoconf:env libtool
MAN1= ccache-swig.1
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index c6da83d2454b..5697f324aa91 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-USE_AUTOTOOLS= autoconf:268:env libtool:22
+USE_AUTOTOOLS= autoconf:env libtool
MAN1= ccache-swig.1
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index 93e335fea9a0..09ece4efbb66 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -19,7 +19,7 @@ USE_PERL5= yes
HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:268
+USE_AUTOTOOLS= automake aclocal autoconf
MAN1= sysconftool.1 sysconftoolcheck.1
MAN7= sysconftool.7
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 34922f4ebae7..896059723e9f 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
ALL_TARGET= without_doc
USE_LDCONFIG= yes
diff --git a/devel/ta-lib/Makefile b/devel/ta-lib/Makefile
index 260201630ed5..36ab199240f1 100644
--- a/devel/ta-lib/Makefile
+++ b/devel/ta-lib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A UNIX, POSIX Library for Technical Analysis
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 0edea1ce4348..f53f2ca5e897 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= samba-3.3*
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
IPATHS= -I${WRKSRC}/libreplace
AUTOHEADER_ARGS= ${IPATHS}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index bce95540ea75..6a8858b58b5e 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= otcl:${PORTSDIR}/lang/otcl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 07253d6a75fb..b96f8ba7124b 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GNU readline for TCL
USE_TCL= 82+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MANN= tclreadline.n
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 162c60053d96..b5ed1c38e811 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
IPATHS= -I${WRKSRC}/libreplace
AUTOHEADER_ARGS= ${IPATHS}
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index c0964822d1b9..4ac08d3338b2 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -20,8 +20,8 @@ COMMENT= Framework for scalable cross-language services development
LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \
event-1.4:${PORTSDIR}/devel/libevent
-USE_AUTOTOOLS= autoconf:268:env autoheader:268:env aclocal:111:env \
- automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \
+ automake:env libtool:env
USE_GNOME= pkgconfig
USE_GCC= 4.2+
GNU_CONFIGURE= yes
diff --git a/devel/towitoko/Makefile b/devel/towitoko/Makefile
index d3799fa16e96..06a00d638bf1 100644
--- a/devel/towitoko/Makefile
+++ b/devel/towitoko/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.geocities.com/cprados/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= UNIX driver for Towitoko smartcard readers
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/umem/Makefile b/devel/umem/Makefile
index 89d234c574b9..82b3aeeb6930 100644
--- a/devel/umem/Makefile
+++ b/devel/umem/Makefile
@@ -15,7 +15,7 @@ COMMENT= A port of the Solaris memory allocator
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
ONLY_FOR_ARCHS= i386 amd64
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index a3b1d6153f31..bdade6083beb 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= General purpose string library for C
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile
index 46e9d93032b2..7b9ddfcf49e0 100644
--- a/devel/wand-libconfig/Makefile
+++ b/devel/wand-libconfig/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= wand-
MAINTAINER= matt@peterson.org
COMMENT= C library for parsing config files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index d61deba8d38c..aaddb249bdb3 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -14,7 +14,8 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 development tools
-USE_AUTOTOOLS= autotools:run
+RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined
diff --git a/devel/xlslib/Makefile b/devel/xlslib/Makefile
index bbfee0e7cd29..f467d9a50b3c 100644
--- a/devel/xlslib/Makefile
+++ b/devel/xlslib/Makefile
@@ -15,7 +15,7 @@ COMMENT= A C++ library for generation of Excel(TM) files
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*src\).*|\1|' \
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index 42e14f092092..a969e74932ab 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A general-purpose tool for parameter handling in C++
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index a030116b9311..c44581da3b69 100644
--- a/devel/xxl/Makefile
+++ b/devel/xxl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.zork.org/software/
MAINTAINER= stas@FreeBSD.org
COMMENT= C/C++ library for exception handling and asset management
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 10a844bba052..44abd8d2eafa 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
COMMENT= A platform-independent object-oriented C++ threading library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-ftime --disable-static
USE_GMAKE= yes