aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnome.mk2
-rw-r--r--Mk/bsd.php.mk2
-rw-r--r--Mk/bsd.port.mk7
-rw-r--r--UPDATING16
-rw-r--r--accessibility/atk/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile2
-rw-r--r--accessibility/kdeaccessibility/Makefile2
-rw-r--r--archivers/arj/Makefile2
-rw-r--r--archivers/kbackup/Makefile2
-rw-r--r--archivers/kio_p7zip/Makefile2
-rw-r--r--archivers/libcomprex/Makefile2
-rw-r--r--archivers/libdynamite/Makefile2
-rw-r--r--archivers/libmspack/Makefile2
-rw-r--r--archivers/liborange/Makefile2
-rw-r--r--archivers/librtfcomp/Makefile2
-rw-r--r--archivers/lzo/Makefile2
-rw-r--r--archivers/lzo2/Makefile2
-rw-r--r--archivers/par2cmdline-tbb/Makefile2
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--archivers/rpm4/Makefile2
-rw-r--r--archivers/rpm5/Makefile2
-rw-r--r--archivers/torrentzip/Makefile2
-rw-r--r--archivers/ucl/Makefile2
-rw-r--r--archivers/unshield/Makefile2
-rw-r--r--archivers/xpk/Makefile2
-rw-r--r--archivers/zipios++/Makefile2
-rw-r--r--astro/boinc-setiathome-enhanced/Makefile2
-rw-r--r--astro/celestia/Makefile2
-rw-r--r--astro/gpsbabel/Makefile2
-rw-r--r--astro/gpsd/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/jday/Makefile2
-rw-r--r--astro/libnova/Makefile2
-rw-r--r--astro/nova/Makefile2
-rw-r--r--astro/orsa/Makefile2
-rw-r--r--audio/Maaate/Makefile2
-rw-r--r--audio/akode-plugins-ffmpeg/Makefile2
-rw-r--r--audio/akode-plugins-jack/Makefile2
-rw-r--r--audio/akode-plugins-mpc/Makefile2
-rw-r--r--audio/akode-plugins-mpeg/Makefile2
-rw-r--r--audio/akode-plugins-oss/Makefile2
-rw-r--r--audio/akode-plugins-pulseaudio/Makefile2
-rw-r--r--audio/akode-plugins-resampler/Makefile2
-rw-r--r--audio/akode-plugins-xiph/Makefile2
-rw-r--r--audio/akode/Makefile2
-rw-r--r--audio/amarok/Makefile2
-rw-r--r--audio/arts/Makefile2
-rw-r--r--audio/aube/Makefile2
-rw-r--r--audio/audacity-devel/Makefile2
-rw-r--r--audio/audiere/Makefile2
-rw-r--r--audio/bmp-mac/Makefile2
-rw-r--r--audio/bmp-modplug/Makefile2
-rw-r--r--audio/bmp-musepack/Makefile2
-rw-r--r--audio/bmp-wma/Makefile2
-rw-r--r--audio/ccaudio2/Makefile2
-rw-r--r--audio/creox/Makefile2
-rw-r--r--audio/ecasound/Makefile2
-rw-r--r--audio/esound/Makefile2
-rw-r--r--audio/faac/Makefile2
-rw-r--r--audio/faad/Makefile2
-rw-r--r--audio/festalon/Makefile2
-rw-r--r--audio/flac/Makefile2
-rw-r--r--audio/fluidsynth/Makefile2
-rw-r--r--audio/freealut/Makefile2
-rw-r--r--audio/glame/Makefile2
-rw-r--r--audio/gnomoradio/Makefile2
-rw-r--r--audio/gqmpeg/Makefile2
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/gstreamer-plugins-moodbar/Makefile2
-rw-r--r--audio/id3lib/Makefile2
-rw-r--r--audio/juk/Makefile2
-rw-r--r--audio/k3bmonkeyaudioplugin/Makefile2
-rw-r--r--audio/kid3/Makefile2
-rw-r--r--audio/kirocker/Makefile2
-rw-r--r--audio/lame/Makefile2
-rw-r--r--audio/liba52/Makefile2
-rw-r--r--audio/libaacplus/Makefile2
-rw-r--r--audio/libadplug/Makefile2
-rw-r--r--audio/libamrnb/Makefile2
-rw-r--r--audio/libamrwb/Makefile2
-rw-r--r--audio/libao/Makefile2
-rw-r--r--audio/libaudiofile/Makefile2
-rw-r--r--audio/libcanberra/Makefile2
-rw-r--r--audio/libcdaudio/Makefile2
-rw-r--r--audio/libdssialsacompat/Makefile2
-rw-r--r--audio/libmad/Makefile2
-rw-r--r--audio/libmikmod/Makefile2
-rw-r--r--audio/libmpd/Makefile2
-rw-r--r--audio/libnjb/Makefile2
-rw-r--r--audio/libnoise/Makefile2
-rw-r--r--audio/libofa/Makefile2
-rw-r--r--audio/libogg/Makefile2
-rw-r--r--audio/liboggz/Makefile2
-rw-r--r--audio/libsamplerate/Makefile2
-rw-r--r--audio/libshout/Makefile2
-rw-r--r--audio/libsidplay/Makefile2
-rw-r--r--audio/libsidplay2/Makefile2
-rw-r--r--audio/libtremor/Makefile2
-rw-r--r--audio/libtunepimp-old/Makefile2
-rw-r--r--audio/libtunepimp/Makefile2
-rw-r--r--audio/libvorbis/Makefile2
-rw-r--r--audio/liquidsoap/Makefile2
-rw-r--r--audio/mac/Makefile2
-rw-r--r--audio/mpeglib_artsplug/Makefile2
-rw-r--r--audio/mpiosh/Makefile2
-rw-r--r--audio/mt-daapd/Makefile2
-rw-r--r--audio/musepack/Makefile2
-rw-r--r--audio/ncmpcpp/Makefile2
-rw-r--r--audio/oggsplit/Makefile2
-rw-r--r--audio/openal/Makefile2
-rw-r--r--audio/openspc/Makefile2
-rw-r--r--audio/orpheus/Makefile2
-rw-r--r--audio/pocketsphinx/Makefile2
-rw-r--r--audio/pulseaudio/Makefile2
-rw-r--r--audio/py-taglib/Makefile2
-rw-r--r--audio/rat/Makefile2
-rw-r--r--audio/resid/Makefile2
-rw-r--r--audio/rhythmbox/Makefile2
-rw-r--r--audio/rioutil/Makefile4
-rw-r--r--audio/rsynth/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile2
-rw-r--r--audio/sdl_sound/Makefile2
-rw-r--r--audio/speex/Makefile2
-rw-r--r--audio/sphinx/Makefile2
-rw-r--r--audio/sphinx3/Makefile2
-rw-r--r--audio/sphinxbase/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--audio/swhplugins/Makefile2
-rw-r--r--audio/terminatorx/Makefile2
-rw-r--r--audio/thunar-media-tags-plugin/Makefile2
-rw-r--r--audio/tse3/Makefile2
-rw-r--r--audio/vat/Makefile2
-rw-r--r--audio/vsound/Makefile2
-rw-r--r--audio/wsoundserver/Makefile2
-rw-r--r--audio/xanalyser/Makefile2
-rw-r--r--audio/xmms-arts_output/Makefile2
-rw-r--r--audio/xmms-flac/Makefile2
-rw-r--r--audio/xmms-jack/Makefile2
-rw-r--r--audio/xmms-kde/Makefile2
-rw-r--r--audio/xmms-mac/Makefile2
-rw-r--r--audio/xmms-midi/Makefile2
-rw-r--r--audio/xmms-sndfile/Makefile2
-rw-r--r--audio/xmms-tfmx/Makefile2
-rw-r--r--audio/xsynth-dssi/Makefile2
-rw-r--r--audio/yammi/Makefile2
-rw-r--r--benchmarks/dbench/Makefile2
-rw-r--r--benchmarks/dkftpbench/Makefile2
-rw-r--r--benchmarks/sysbench/Makefile2
-rw-r--r--biology/emboss/Makefile2
-rw-r--r--biology/iolib/Makefile2
-rw-r--r--biology/libgenome/Makefile2
-rw-r--r--biology/mopac/Makefile2
-rw-r--r--biology/phyml/Makefile2
-rw-r--r--cad/brlcad/Makefile2
-rw-r--r--cad/freehdl/Makefile2
-rw-r--r--cad/gerbv/Makefile2
-rw-r--r--cad/gtkwave/Makefile2
-rw-r--r--cad/ngspice_rework/Makefile2
-rw-r--r--cad/pcb/Makefile2
-rw-r--r--cad/salome/Makefile.ext6
-rw-r--r--cad/tclspice/Makefile2
-rw-r--r--chinese/iiimf-le-newpy/Makefile2
-rw-r--r--chinese/iiimf-le-ude/Makefile2
-rw-r--r--chinese/scim-pinyin/Makefile2
-rw-r--r--chinese/wenju/Makefile2
-rw-r--r--comms/aldo/Makefile2
-rw-r--r--comms/dfu-util/Makefile2
-rw-r--r--comms/ghfaxviewer/Makefile2
-rw-r--r--comms/gnuradio/Makefile2
-rw-r--r--comms/gsmlib/Makefile2
-rw-r--r--comms/hamlib/Makefile2
-rw-r--r--comms/kallers/Makefile2
-rw-r--r--comms/klog/Makefile2
-rw-r--r--comms/kmobiletools/Makefile2
-rw-r--r--comms/kpsk/Makefile2
-rw-r--r--comms/ktrack/Makefile2
-rw-r--r--comms/libsyncml/Makefile2
-rw-r--r--comms/libticables/Makefile2
-rw-r--r--comms/libticables2/Makefile2
-rw-r--r--comms/libticalcs2/Makefile2
-rw-r--r--comms/lirc/Makefile2
-rw-r--r--comms/spandsp-devel/Makefile2
-rw-r--r--comms/spandsp/Makefile2
-rw-r--r--comms/tilp2/Makefile2
-rw-r--r--comms/tlf/Makefile2
-rw-r--r--comms/unixcw/Makefile2
-rw-r--r--comms/wsjt/Makefile2
-rw-r--r--comms/wspr/Makefile2
-rw-r--r--comms/xwota/Makefile2
-rw-r--r--converters/enca/Makefile2
-rw-r--r--converters/ktextdecode/Makefile2
-rw-r--r--converters/libiconv/Makefile2
-rw-r--r--converters/libticonv/Makefile2
-rw-r--r--converters/mimelib/Makefile2
-rw-r--r--converters/psiconv/Makefile2
-rw-r--r--converters/recode/Makefile2
-rw-r--r--databases/cego/Makefile2
-rw-r--r--databases/couchdb/Makefile2
-rw-r--r--databases/db42/Makefile.db2
-rw-r--r--databases/dbconnect/Makefile2
-rw-r--r--databases/dbh10/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/firebird20-server/Makefile2
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds/Makefile2
-rw-r--r--databases/gbib/Makefile2
-rw-r--r--databases/gdbm/Makefile2
-rw-r--r--databases/gigabase/Makefile2
-rw-r--r--databases/gnome-db/Makefile2
-rw-r--r--databases/hk_classes/Makefile2
-rw-r--r--databases/kbibtex/Makefile2
-rw-r--r--databases/keximdb/Makefile2
-rw-r--r--databases/kmysqladmin/Makefile2
-rw-r--r--databases/knoda/Makefile2
-rw-r--r--databases/kpogre/Makefile2
-rw-r--r--databases/ksqlanalyzer/Makefile2
-rw-r--r--databases/ksqlshell/Makefile2
-rw-r--r--databases/kumofs/Makefile2
-rw-r--r--databases/libdbi-drivers/Makefile2
-rw-r--r--databases/libdbi/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgda3/Makefile2
-rw-r--r--databases/libgda4/Makefile2
-rw-r--r--databases/libgdamm/Makefile2
-rw-r--r--databases/libgnomedb/Makefile2
-rw-r--r--databases/libiodbc/Makefile2
-rw-r--r--databases/libmemcache/Makefile2
-rw-r--r--databases/libodbc++/Makefile2
-rw-r--r--databases/libzdb/Makefile2
-rw-r--r--databases/ludia/Makefile2
-rw-r--r--databases/mdbtools/Makefile2
-rw-r--r--databases/memcached/Makefile2
-rw-r--r--databases/mird/Makefile2
-rw-r--r--databases/my2cego/Makefile2
-rw-r--r--databases/mysql++/Makefile2
-rw-r--r--databases/mysql++1/Makefile2
-rw-r--r--databases/mysql++3/Makefile2
-rw-r--r--databases/mysql-connector-odbc/Makefile2
-rw-r--r--databases/mysql-gui-tools/Makefile2
-rw-r--r--databases/mysql-navigator/Makefile2
-rw-r--r--databases/mysql-q4m/Makefile2
-rw-r--r--databases/mysql-workbench51/Makefile2
-rw-r--r--databases/mysql2odbc/Makefile2
-rw-r--r--databases/mysql323-server/Makefile2
-rw-r--r--databases/mysql40-server/Makefile2
-rw-r--r--databases/mysql41-server/Makefile2
-rw-r--r--databases/mysqlcppapi/Makefile2
-rw-r--r--databases/namazu2/Makefile2
-rw-r--r--databases/opendbx/Makefile2
-rw-r--r--databases/oracle_odbc_driver/Makefile2
-rw-r--r--databases/pgcluster/Makefile2
-rw-r--r--databases/postgresql-libpgeasy/Makefile2
-rw-r--r--databases/postgresql80-server/Makefile2
-rw-r--r--databases/postgresql81-server/Makefile2
-rw-r--r--databases/postgresql82-server/Makefile2
-rw-r--r--databases/postgresql83-server/Makefile2
-rw-r--r--databases/postgresql84-server/Makefile2
-rw-r--r--databases/postgresql90-server/Makefile2
-rw-r--r--databases/postgresql91-server/Makefile2
-rw-r--r--databases/postgresql92-server/Makefile2
-rw-r--r--databases/puredb/Makefile2
-rw-r--r--databases/pxlib/Makefile2
-rw-r--r--databases/rrdtool/Makefile2
-rw-r--r--databases/rrdtool10/Makefile2
-rw-r--r--databases/rrdtool12/Makefile2
-rw-r--r--databases/sqlite2/Makefile2
-rw-r--r--databases/sqlite34/Makefile2
-rw-r--r--databases/sqlrelay/Makefile2
-rw-r--r--databases/tdb/Makefile2
-rw-r--r--databases/tora/Makefile2
-rw-r--r--databases/virtuoso/Makefile2
-rw-r--r--databases/xbase/Makefile2
-rw-r--r--databases/xbsql/Makefile2
-rw-r--r--deskutils/basket/Makefile2
-rw-r--r--deskutils/bmp-docklet/Makefile2
-rw-r--r--deskutils/bookreader/Makefile2
-rw-r--r--deskutils/contacts/Makefile2
-rw-r--r--deskutils/dragstack/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/genius/Makefile2
-rw-r--r--deskutils/glabels/Makefile2
-rw-r--r--deskutils/global-menu/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile2
-rw-r--r--deskutils/gnote/Makefile2
-rw-r--r--deskutils/gnotime/Makefile2
-rw-r--r--deskutils/google-gadgets/Makefile2
-rw-r--r--deskutils/gruler/Makefile2
-rw-r--r--deskutils/gtkjournal/Makefile2
-rw-r--r--deskutils/karamba/Makefile2
-rw-r--r--deskutils/katapult/Makefile2
-rw-r--r--deskutils/kbirthday/Makefile2
-rw-r--r--deskutils/kblticker/Makefile2
-rw-r--r--deskutils/kchm/Makefile2
-rw-r--r--deskutils/kchmviewer/Makefile2
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kickpim/Makefile2
-rw-r--r--deskutils/klipoquery/Makefile2
-rw-r--r--deskutils/kluje/Makefile2
-rw-r--r--deskutils/kmatrix3d/Makefile2
-rw-r--r--deskutils/knowit/Makefile2
-rw-r--r--deskutils/kompose/Makefile2
-rw-r--r--deskutils/kooldock/Makefile2
-rw-r--r--deskutils/krefty/Makefile2
-rw-r--r--deskutils/krss/Makefile2
-rw-r--r--deskutils/ksmoothdock/Makefile2
-rw-r--r--deskutils/ktagebuch/Makefile2
-rw-r--r--deskutils/kuake/Makefile2
-rw-r--r--deskutils/lightning-thunderbird/Makefile2
-rw-r--r--deskutils/lightning/Makefile2
-rw-r--r--deskutils/metabar/Makefile2
-rw-r--r--deskutils/multisync/Makefile2
-rw-r--r--deskutils/nautilus-locked-folder/Makefile2
-rw-r--r--deskutils/rubrica/Makefile2
-rw-r--r--deskutils/taskjuggler/Makefile2
-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
-rw-r--r--dns/dnswall/Makefile2
-rw-r--r--dns/fastresolve/Makefile2
-rw-r--r--dns/hesiod/Makefile2
-rw-r--r--dns/idnkit/Makefile2
-rw-r--r--dns/ldns/Makefile2
-rw-r--r--dns/nss_mdns/Makefile2
-rw-r--r--dns/posadis/Makefile2
-rw-r--r--dns/powerdns-devel/Makefile2
-rw-r--r--dns/powerdns/Makefile2
-rw-r--r--editors/cooledit/Makefile2
-rw-r--r--editors/emacs21/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile2
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/gphpedit/Makefile2
-rw-r--r--editors/kate-plugins/Makefile2
-rw-r--r--editors/kile/Makefile2
-rw-r--r--editors/klat/Makefile2
-rw-r--r--editors/koffice-kde3/Makefile2
-rw-r--r--editors/kxmleditor/Makefile2
-rw-r--r--editors/lpe/Makefile2
-rw-r--r--editors/mlview/Makefile2
-rw-r--r--editors/nvi-devel/Makefile2
-rw-r--r--editors/xemacs-devel-mule/Makefile2
-rw-r--r--editors/xemacs-devel/Makefile2
-rw-r--r--editors/xemacs/Makefile2
-rw-r--r--editors/xemacs21-mule/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile2
-rw-r--r--editors/xmleditor/Makefile2
-rw-r--r--editors/yui/Makefile2
-rw-r--r--emulators/bochs/Makefile2
-rw-r--r--emulators/desmume/Makefile2
-rw-r--r--emulators/gnuboy/Makefile2
-rw-r--r--emulators/hercules/Makefile2
-rw-r--r--emulators/lib765/Makefile2
-rw-r--r--emulators/libdsk/Makefile2
-rw-r--r--emulators/pcsxr/Makefile2
-rw-r--r--emulators/tiemu3/Makefile2
-rw-r--r--emulators/twin/Makefile2
-rw-r--r--emulators/uae/Makefile2
-rw-r--r--emulators/xsystem35/Makefile2
-rw-r--r--emulators/yabause/Makefile2
-rw-r--r--finance/eqonomize-kde3/Makefile2
-rw-r--r--finance/gnofin/Makefile2
-rw-r--r--finance/kexchange/Makefile2
-rw-r--r--finance/khacc/Makefile2
-rw-r--r--finance/kmymoney2/Makefile2
-rw-r--r--finance/ktoblzcheck/Makefile2
-rw-r--r--finance/libofx/Makefile2
-rw-r--r--finance/openhbci/Makefile2
-rw-r--r--finance/qhacc/Makefile2
-rw-r--r--finance/quantlib/Makefile2
-rw-r--r--french/dico/Makefile2
-rw-r--r--french/med/Makefile2
-rw-r--r--french/verbiste/Makefile2
-rw-r--r--ftp/gproftpd/Makefile2
-rw-r--r--ftp/junglemonkey/Makefile2
-rw-r--r--ftp/kasablanca/Makefile2
-rw-r--r--ftp/kbear/Makefile2
-rw-r--r--ftp/kftpgrabber/Makefile2
-rw-r--r--ftp/kpum/Makefile2
-rw-r--r--ftp/proftpd-devel/Makefile2
-rw-r--r--ftp/proftpd/Makefile2
-rw-r--r--ftp/tnftpd/Makefile2
-rw-r--r--ftp/urlgfe/Makefile2
-rw-r--r--ftp/wu-ftpd+ipv6/Makefile2
-rw-r--r--ftp/wu-ftpd/Makefile2
-rw-r--r--ftp/wzdftpd/Makefile2
-rw-r--r--games/adgali/Makefile2
-rw-r--r--games/antrix/Makefile2
-rw-r--r--games/apricots/Makefile2
-rw-r--r--games/atlantikdesigner/Makefile2
-rw-r--r--games/atr3d/Makefile2
-rw-r--r--games/brutalchess/Makefile2
-rw-r--r--games/cheech/Makefile2
-rw-r--r--games/critterding/Makefile2
-rw-r--r--games/crossfire-server/Makefile2
-rw-r--r--games/d2x-xl/Makefile2
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/duel/Makefile2
-rw-r--r--games/easysok/Makefile2
-rw-r--r--games/euchre/Makefile2
-rw-r--r--games/exult/Makefile2
-rw-r--r--games/flightgear-atlas/Makefile2
-rw-r--r--games/ggz-client-libs/Makefile2
-rw-r--r--games/ggz-gtk-client/Makefile2
-rw-r--r--games/glest/Makefile2
-rw-r--r--games/gno3dtet/Makefile2
-rw-r--r--games/gnomememoryblocks/Makefile2
-rw-r--r--games/gnubg/Makefile2
-rw-r--r--games/gracer/Makefile2
-rw-r--r--games/gturing/Makefile2
-rw-r--r--games/kamikaze/Makefile2
-rw-r--r--games/kbilliards/Makefile2
-rw-r--r--games/kdegames3/Makefile2
-rw-r--r--games/kfreerings/Makefile2
-rw-r--r--games/kmastermind/Makefile2
-rw-r--r--games/knights/Makefile2
-rw-r--r--games/kpicframer/Makefile2
-rw-r--r--games/kpictorial/Makefile2
-rw-r--r--games/kpuzzle/Makefile2
-rw-r--r--games/krosswordplayer/Makefile2
-rw-r--r--games/kslide/Makefile2
-rw-r--r--games/ktritoc/Makefile2
-rw-r--r--games/kwappen/Makefile2
-rw-r--r--games/lianliankan/Makefile2
-rw-r--r--games/libfov/Makefile2
-rw-r--r--games/libggz/Makefile2
-rw-r--r--games/libmaitretarot/Makefile2
-rw-r--r--games/libmt_client/Makefile2
-rw-r--r--games/mangos/Makefile2
-rw-r--r--games/moon-buggy/Makefile2
-rw-r--r--games/naev/Makefile2
-rw-r--r--games/openalchemist/Makefile2
-rw-r--r--games/pinball/Makefile2
-rw-r--r--games/quake2forge/Makefile2
-rw-r--r--games/quakeforge/Makefile2
-rw-r--r--games/scorched3d/Makefile2
-rw-r--r--games/scourge/Makefile2
-rw-r--r--games/sdlCC/Makefile2
-rw-r--r--games/six/Makefile2
-rw-r--r--games/spacejunk/Makefile2
-rw-r--r--games/taxipilot/Makefile2
-rw-r--r--games/tecnoballz/Makefile2
-rw-r--r--games/teg/Makefile2
-rw-r--r--games/thevalley/Makefile2
-rw-r--r--games/tuxracer/Makefile2
-rw-r--r--games/ufoai/Makefile2
-rw-r--r--games/vamos/Makefile2
-rw-r--r--games/wesnoth-devel/Makefile2
-rw-r--r--games/wesnoth/Makefile2
-rw-r--r--games/xinvaders/Makefile2
-rw-r--r--games/xpuyopuyo/Makefile2
-rw-r--r--games/xracer/Makefile2
-rw-r--r--games/zangband/Makefile2
-rw-r--r--german/kheisereg/Makefile2
-rw-r--r--german/ksteak/Makefile2
-rw-r--r--graphics/GraphicsMagick/Makefile2
-rw-r--r--graphics/GraphicsMagick12/Makefile2
-rw-r--r--graphics/GraphicsMagick13/Makefile2
-rw-r--r--graphics/Hermes/Makefile2
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/OpenEXR/Makefile2
-rw-r--r--graphics/aalib/Makefile2
-rw-r--r--graphics/aaphoto/Makefile2
-rw-r--r--graphics/agg/Makefile2
-rw-r--r--graphics/ampasCTL/Makefile2
-rw-r--r--graphics/autotrace/Makefile2
-rw-r--r--graphics/bmp-rootvis/Makefile2
-rw-r--r--graphics/bugle/Makefile2
-rw-r--r--graphics/cairo/Makefile2
-rw-r--r--graphics/cairomm/Makefile2
-rw-r--r--graphics/cal3d-devel/Makefile2
-rw-r--r--graphics/cal3d/Makefile2
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/clutter-box2d/Makefile2
-rw-r--r--graphics/clutter-gtk/Makefile2
-rw-r--r--graphics/clutter-qt/Makefile2
-rw-r--r--graphics/clutter/Makefile2
-rw-r--r--graphics/corona/Makefile2
-rw-r--r--graphics/devil/Makefile2
-rw-r--r--graphics/diacanvas2/Makefile2
-rw-r--r--graphics/digikam/Makefile2
-rw-r--r--graphics/divxcalc/Makefile2
-rw-r--r--graphics/enblend/Makefile2
-rw-r--r--graphics/enfle/Makefile2
-rw-r--r--graphics/evince/Makefile2
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/freeglut/Makefile2
-rw-r--r--graphics/gdal/Makefile2
-rw-r--r--graphics/gdk-pixbuf2/Makefile2
-rw-r--r--graphics/geomview/Makefile2
-rw-r--r--graphics/geos/Makefile2
-rw-r--r--graphics/giblib/Makefile2
-rw-r--r--graphics/giflib/Makefile2
-rw-r--r--graphics/gimp-app/Makefile2
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gle/Makefile2
-rw-r--r--graphics/glide3/Makefile2
-rw-r--r--graphics/gltt/Makefile2
-rw-r--r--graphics/gnash-devel/Makefile2
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/goocanvas/Makefile2
-rw-r--r--graphics/goocanvasmm/Makefile2
-rw-r--r--graphics/goom/Makefile2
-rw-r--r--graphics/graphviz/Makefile2
-rw-r--r--graphics/gsnapshot/Makefile2
-rw-r--r--graphics/gtkdps/Makefile2
-rw-r--r--graphics/guilib/Makefile2
-rw-r--r--graphics/gwenview-kde4/Makefile2
-rw-r--r--graphics/gwenview/Makefile2
-rw-r--r--graphics/ilmbase/Makefile2
-rw-r--r--graphics/imlib/Makefile2
-rw-r--r--graphics/iulib/Makefile2
-rw-r--r--graphics/ivtools/Makefile2
-rw-r--r--graphics/jasper/Makefile2
-rw-r--r--graphics/jpeg/Makefile2
-rw-r--r--graphics/kalbum/Makefile2
-rw-r--r--graphics/kallery/Makefile2
-rw-r--r--graphics/kamera-kde4/Makefile2
-rw-r--r--graphics/kamera/Makefile2
-rw-r--r--graphics/kbarcode/Makefile2
-rw-r--r--graphics/kdegraphics3/Makefile2
-rw-r--r--graphics/kipi-plugins/Makefile2
-rw-r--r--graphics/kooka/Makefile2
-rw-r--r--graphics/kphotoalbum/Makefile2
-rw-r--r--graphics/kradview/Makefile2
-rw-r--r--graphics/kuickshow/Makefile2
-rw-r--r--graphics/leptonica/Makefile2
-rw-r--r--graphics/leptonlib/Makefile2
-rw-r--r--graphics/libart/Makefile2
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libcaca/Makefile2
-rw-r--r--graphics/libchamplain/Makefile2
-rw-r--r--graphics/libecwj2/Makefile2
-rw-r--r--graphics/libemf/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--graphics/libflash/Makefile2
-rw-r--r--graphics/libgltext/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/libgnomecanvasmm/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile2
-rw-r--r--graphics/libiptcdata/Makefile2
-rw-r--r--graphics/libjpeg-turbo/Makefile2
-rw-r--r--graphics/libkdcraw-kde4/Makefile2
-rw-r--r--graphics/libkdcraw/Makefile2
-rw-r--r--graphics/libkexif/Makefile2
-rw-r--r--graphics/libkexiv2-kde4/Makefile2
-rw-r--r--graphics/libkexiv2/Makefile2
-rw-r--r--graphics/libkipi-kde4/Makefile2
-rw-r--r--graphics/libkipi/Makefile2
-rw-r--r--graphics/libmorph/Makefile2
-rw-r--r--graphics/libpano12/Makefile4
-rw-r--r--graphics/libpano13/Makefile4
-rw-r--r--graphics/librsvg/Makefile2
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--graphics/libsvg-cairo/Makefile2
-rw-r--r--graphics/libsvg/Makefile2
-rw-r--r--graphics/libungif/Makefile2
-rw-r--r--graphics/libvisual/Makefile2
-rw-r--r--graphics/libvisual04/Makefile2
-rw-r--r--graphics/libwmf/Makefile2
-rw-r--r--graphics/libwpg/Makefile2
-rw-r--r--graphics/libwpg01/Makefile2
-rw-r--r--graphics/lodju/Makefile2
-rw-r--r--graphics/nurbs++/Makefile2
-rw-r--r--graphics/ocaml-images/Makefile2
-rw-r--r--graphics/ocropus/Makefile2
-rw-r--r--graphics/ogre3d/Makefile2
-rw-r--r--graphics/opendx/Makefile2
-rw-r--r--graphics/openexr_ctl/Makefile2
-rw-r--r--graphics/paintlib/Makefile2
-rw-r--r--graphics/pfstools/Makefile2
-rw-r--r--graphics/pixie/Makefile2
-rw-r--r--graphics/plotutils/Makefile2
-rw-r--r--graphics/poppler/Makefile2
-rw-r--r--graphics/potracegui/Makefile2
-rw-r--r--graphics/povray/Makefile2
-rw-r--r--graphics/povray36/Makefile2
-rw-r--r--graphics/povray37/Makefile2
-rw-r--r--graphics/pstoedit/Makefile2
-rw-r--r--graphics/py-clutter-gtk/Makefile2
-rw-r--r--graphics/py-clutter/Makefile2
-rw-r--r--graphics/qglviewer/Makefile2
-rw-r--r--graphics/quesa/Makefile2
-rw-r--r--graphics/sdl_gfx/Makefile2
-rw-r--r--graphics/sdl_image/Makefile2
-rw-r--r--graphics/sdl_ttf/Makefile2
-rw-r--r--graphics/showimg/Makefile2
-rw-r--r--graphics/simage/Makefile2
-rw-r--r--graphics/sodipodi/Makefile2
-rw-r--r--graphics/solang/Makefile2
-rw-r--r--graphics/sswf/Makefile2
-rw-r--r--graphics/swfdec/Makefile2
-rw-r--r--graphics/swfmill/Makefile2
-rw-r--r--graphics/tiff/Makefile2
-rw-r--r--graphics/tulip/Makefile2
-rw-r--r--graphics/vigra/Makefile2
-rw-r--r--graphics/vips/Makefile2
-rw-r--r--graphics/wxsvg/Makefile4
-rw-r--r--graphics/xmedcon/Makefile2
-rw-r--r--graphics/xmms-goom/Makefile2
-rw-r--r--graphics/xmorph/Makefile2
-rw-r--r--graphics/xpdf/Makefile2
-rw-r--r--irc/bopm/Makefile2
-rw-r--r--irc/kmyirc/Makefile2
-rw-r--r--irc/konversation/Makefile2
-rw-r--r--irc/kwirc/Makefile2
-rw-r--r--japanese/FreeWnn-lib/Makefile2
-rw-r--r--japanese/FreeWnn-server/Makefile2
-rw-r--r--japanese/aterm/Makefile2
-rw-r--r--japanese/celrw/Makefile2
-rw-r--r--japanese/chasen-base/Makefile2
-rw-r--r--japanese/eb/Makefile2
-rw-r--r--japanese/ebview/Makefile2
-rw-r--r--japanese/emacs-emcws/Makefile2
-rw-r--r--japanese/epic4/Makefile2
-rw-r--r--japanese/grep/Makefile2
-rw-r--r--japanese/iiimf-le-canna/Makefile2
-rw-r--r--japanese/iiimf-le-freewnn/Makefile2
-rw-r--r--japanese/jd/Makefile2
-rw-r--r--japanese/kakasi/Makefile2
-rw-r--r--japanese/libicq/Makefile2
-rw-r--r--japanese/mecab/Makefile2
-rw-r--r--japanese/mell/Makefile2
-rw-r--r--japanese/migemo/Makefile2
-rw-r--r--japanese/mutt-devel/Makefile2
-rw-r--r--japanese/mutt/Makefile2
-rw-r--r--japanese/ochusha/Makefile2
-rw-r--r--japanese/prime-dict/Makefile2
-rw-r--r--japanese/prime-el/Makefile2
-rw-r--r--japanese/prime/Makefile2
-rw-r--r--japanese/rskkserv/Makefile2
-rw-r--r--japanese/scim-canna/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile2
-rw-r--r--japanese/scim-honoka/Makefile2
-rw-r--r--japanese/scim-skk/Makefile2
-rw-r--r--japanese/suikyo/Makefile2
-rw-r--r--japanese/tcl76/Makefile2
-rw-r--r--japanese/tcl80/Makefile2
-rw-r--r--japanese/tk80/Makefile2
-rw-r--r--japanese/tkstep80/Makefile2
-rw-r--r--japanese/vflib/Makefile2
-rw-r--r--japanese/xyaku/Makefile2
-rw-r--r--korean/eterm/Makefile2
-rw-r--r--korean/iiimf-le-hangul/Makefile2
-rw-r--r--korean/imhangul/Makefile2
-rw-r--r--lang/cim/Makefile2
-rw-r--r--lang/elan/Makefile2
-rw-r--r--lang/elk/Makefile2
-rw-r--r--lang/emacs-lisp-intro/Makefile2
-rw-r--r--lang/expect-devel/Makefile2
-rw-r--r--lang/ferite/Makefile2
-rw-r--r--lang/gambas/Makefile2
-rw-r--r--lang/gambas2-base/Makefile2
-rw-r--r--lang/ghc/Makefile2
-rw-r--r--lang/gjs/Makefile2
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--lang/gprolog/Makefile2
-rw-r--r--lang/guile/Makefile2
-rw-r--r--lang/kawa/Makefile2
-rw-r--r--lang/klogoturtle/Makefile2
-rw-r--r--lang/kroc/Makefile2
-rw-r--r--lang/libhx/Makefile2
-rw-r--r--lang/libjit/Makefile2
-rw-r--r--lang/libutils/Makefile2
-rw-r--r--lang/mozart/Makefile2
-rw-r--r--lang/neko/Makefile2
-rw-r--r--lang/njs/Makefile2
-rw-r--r--lang/ofc/Makefile2
-rw-r--r--lang/oo2c/Makefile2
-rw-r--r--lang/open-cobol-devel/Makefile2
-rw-r--r--lang/open-cobol/Makefile2
-rw-r--r--lang/osb-jscore/Makefile2
-rw-r--r--lang/otcl/Makefile2
-rw-r--r--lang/pfe/Makefile2
-rw-r--r--lang/php4/Makefile2
-rw-r--r--lang/php4/Makefile.ext2
-rw-r--r--lang/php5/Makefile2
-rw-r--r--lang/php5/Makefile.ext2
-rw-r--r--lang/php52/Makefile2
-rw-r--r--lang/php52/Makefile.ext2
-rw-r--r--lang/php53/Makefile2
-rw-r--r--lang/php53/Makefile.ext2
-rw-r--r--lang/pnetlib/Makefile2
-rw-r--r--lang/racket-textual/Makefile2
-rw-r--r--lang/racket/Makefile2
-rw-r--r--lang/ruby18/Makefile2
-rw-r--r--lang/ruby19/Makefile2
-rw-r--r--lang/sdcc-devel/Makefile4
-rw-r--r--lang/sdcc/Makefile4
-rw-r--r--lang/smalltalk/Makefile2
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/bogofilter/Makefile2
-rw-r--r--mail/claws-mail-archiver/Makefile2
-rw-r--r--mail/claws-mail-att_remover/Makefile2
-rw-r--r--mail/claws-mail-attach_warner/Makefile2
-rw-r--r--mail/claws-mail-bsfilter/Makefile2
-rw-r--r--mail/claws-mail-cachesaver/Makefile2
-rw-r--r--mail/claws-mail-fancy/Makefile2
-rw-r--r--mail/claws-mail-fetchinfo/Makefile2
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile2
-rw-r--r--mail/claws-mail-mailmbox/Makefile2
-rw-r--r--mail/claws-mail-newmail/Makefile2
-rw-r--r--mail/claws-mail-notification/Makefile2
-rw-r--r--mail/claws-mail-perl/Makefile2
-rw-r--r--mail/claws-mail-python/Makefile2
-rw-r--r--mail/claws-mail-rssyl/Makefile2
-rw-r--r--mail/claws-mail-spamreport/Makefile2
-rw-r--r--mail/claws-mail-synce/Makefile2
-rw-r--r--mail/claws-mail-tnef/Makefile2
-rw-r--r--mail/claws-mail-vcalendar/Makefile2
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/cyrus-imapd22/Makefile2
-rw-r--r--mail/cyrus-imapd23/Makefile2
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/dbmail/Makefile2
-rw-r--r--mail/dbmail21/Makefile2
-rw-r--r--mail/dbmail22/Makefile2
-rw-r--r--mail/dbmail23/Makefile2
-rw-r--r--mail/dspam-devel/Makefile4
-rw-r--r--mail/dspam/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile2
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/gmime/Makefile2
-rw-r--r--mail/jamlib/Makefile2
-rw-r--r--mail/kbiff/Makefile2
-rw-r--r--mail/kcheckgmail/Makefile2
-rw-r--r--mail/kshowmail/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--mail/libspf/Makefile2
-rw-r--r--mail/libspf2-10/Makefile2
-rw-r--r--mail/libspf2/Makefile2
-rw-r--r--mail/libsrs2/Makefile2
-rw-r--r--mail/libsrs_alt/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/nmh/Makefile2
-rw-r--r--mail/perdition/Makefile2
-rw-r--r--mail/pfqueue/Makefile2
-rw-r--r--mail/pop3lite/Makefile2
-rw-r--r--mail/pop3proxy/Makefile2
-rw-r--r--mail/popular/Makefile2
-rw-r--r--mail/postfix-gps/Makefile2
-rw-r--r--mail/qpopper/Makefile2
-rw-r--r--mail/quickml/Makefile2
-rw-r--r--mail/sccmilter/Makefile2
-rw-r--r--mail/smtp-gated/Makefile2
-rw-r--r--mail/thunderbird-esr/Makefile2
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--mail/thunderbird3/Makefile2
-rw-r--r--mail/up-imapproxy/Makefile2
-rw-r--r--mail/vmailmgr/Makefile2
-rw-r--r--mail/whoson/Makefile2
-rw-r--r--mail/xfmail/Makefile2
-rw-r--r--math/GiNaC/Makefile2
-rw-r--r--math/algae/Makefile2
-rw-r--r--math/asir2000/Makefile2
-rw-r--r--math/blitz++/Makefile2
-rw-r--r--math/cln/Makefile2
-rw-r--r--math/dieharder/Makefile2
-rw-r--r--math/fftw/Makefile2
-rw-r--r--math/fityk/Makefile2
-rw-r--r--math/freefem/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/gambit/Makefile2
-rw-r--r--math/gcalctool/Makefile2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/gnuplot+/Makefile2
-rw-r--r--math/gretl/Makefile2
-rw-r--r--math/guppi/Makefile2
-rw-r--r--math/koctave/Makefile2
-rw-r--r--math/labplot/Makefile2
-rw-r--r--math/liblbfgs/Makefile2
-rw-r--r--math/libmath++/Makefile4
-rw-r--r--math/libneural/Makefile2
-rw-r--r--math/libqalculate/Makefile2
-rw-r--r--math/ltl/Makefile2
-rw-r--r--math/maxima/Makefile2
-rw-r--r--math/octave-devel/Makefile2
-rw-r--r--math/octave/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--math/pgcalc/Makefile2
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/pspp/Makefile2
-rw-r--r--math/qhull/Makefile2
-rw-r--r--math/qhull5/Makefile2
-rw-r--r--math/rkward/Makefile2
-rw-r--r--math/saga/Makefile2
-rw-r--r--math/spar/Makefile2
-rw-r--r--math/tvmet/Makefile2
-rw-r--r--math/yacas/Makefile2
-rw-r--r--mbone/rat/Makefile2
-rw-r--r--mbone/vat/Makefile2
-rw-r--r--mbone/vic/Makefile2
-rw-r--r--misc/amanda25-server/Makefile2
-rw-r--r--misc/kaddressbook-plugins/Makefile2
-rw-r--r--misc/kdeedu3/Makefile2
-rw-r--r--misc/kdeutils3/Makefile2
-rw-r--r--misc/kfile-plugins/Makefile2
-rw-r--r--misc/kicker-applets/Makefile2
-rw-r--r--misc/knewsticker-scripts/Makefile2
-rw-r--r--misc/konq-plugins/Makefile2
-rw-r--r--misc/krecipes-kde4/Makefile2
-rw-r--r--misc/krecipes/Makefile2
-rw-r--r--misc/ksig/Makefile2
-rw-r--r--misc/kwatch/Makefile2
-rw-r--r--misc/libmcal/Makefile2
-rw-r--r--misc/linm/Makefile2
-rw-r--r--misc/renamedlgplugins/Makefile2
-rw-r--r--misc/skyutils/Makefile2
-rw-r--r--misc/sword/Makefile2
-rw-r--r--misc/tellico/Makefile2
-rw-r--r--misc/xdelta/Makefile2
-rw-r--r--misc/xosd/Makefile2
-rw-r--r--multimedia/avifile/Makefile2
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/camserv/Makefile2
-rw-r--r--multimedia/clutter-gst/Makefile2
-rw-r--r--multimedia/dirac/Makefile2
-rw-r--r--multimedia/dvts/Makefile2
-rw-r--r--multimedia/grpplaylist/Makefile2
-rw-r--r--multimedia/gstreamer-plugins-buzztard/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer/Makefile2
-rw-r--r--multimedia/gxine/Makefile2
-rw-r--r--multimedia/handbrake/Makefile2
-rw-r--r--multimedia/hayes/Makefile2
-rw-r--r--multimedia/k9copy/Makefile2
-rw-r--r--multimedia/kaffeine-mozilla/Makefile2
-rw-r--r--multimedia/kdemultimedia3/Makefile2
-rw-r--r--multimedia/kino/Makefile2
-rw-r--r--multimedia/kmplayer/Makefile2
-rw-r--r--multimedia/konverter/Makefile2
-rw-r--r--multimedia/kplayer/Makefile2
-rw-r--r--multimedia/ksubeditor/Makefile2
-rw-r--r--multimedia/libdvbpsi/Makefile2
-rw-r--r--multimedia/libdvdcss/Makefile2
-rw-r--r--multimedia/libdvdplay/Makefile2
-rw-r--r--multimedia/libfame/Makefile2
-rw-r--r--multimedia/libmpeg2/Makefile2
-rw-r--r--multimedia/libquicktime/Makefile2
-rw-r--r--multimedia/libtheora/Makefile2
-rw-r--r--multimedia/libxspf/Makefile2
-rw-r--r--multimedia/mediainfo/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/motion/Makefile2
-rw-r--r--multimedia/noatun-plugins/Makefile2
-rw-r--r--multimedia/ogle-gui/Makefile2
-rw-r--r--multimedia/ogle/Makefile2
-rw-r--r--multimedia/ogmrip/Makefile2
-rw-r--r--multimedia/okle/Makefile2
-rw-r--r--multimedia/smpeg-xmms/Makefile2
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/spook/Makefile2
-rw-r--r--multimedia/subtitlecomposer/Makefile2
-rw-r--r--multimedia/totem-pl-parser/Makefile2
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/transkode/Makefile2
-rw-r--r--multimedia/vcdimager/Makefile2
-rw-r--r--multimedia/vic/Makefile2
-rw-r--r--multimedia/xdvshow/Makefile2
-rw-r--r--multimedia/xine_artsplugin/Makefile2
-rw-r--r--multimedia/xmms-status-plugin/Makefile2
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--multimedia/xtheater/Makefile2
-rw-r--r--net-im/ari-yahoo/Makefile2
-rw-r--r--net-im/ayttm/Makefile2
-rw-r--r--net-im/empathy/Makefile2
-rw-r--r--net-im/eva/Makefile2
-rw-r--r--net-im/farsight2/Makefile2
-rw-r--r--net-im/fugu/Makefile2
-rw-r--r--net-im/gale/Makefile2
-rw-r--r--net-im/gloox/Makefile2
-rw-r--r--net-im/gnome-jabber/Makefile2
-rw-r--r--net-im/ickle/Makefile2
-rw-r--r--net-im/icqlib/Makefile2
-rw-r--r--net-im/jabber/Makefile2
-rw-r--r--net-im/kmerlin/Makefile2
-rw-r--r--net-im/kmess/Makefile2
-rw-r--r--net-im/konverse/Makefile2
-rw-r--r--net-im/kopete/Makefile2
-rw-r--r--net-im/kpopup/Makefile2
-rw-r--r--net-im/libicq/Makefile2
-rw-r--r--net-im/libicq2000/Makefile2
-rw-r--r--net-im/libjingle/Makefile2
-rw-r--r--net-im/libnice/Makefile2
-rw-r--r--net-im/libtelepathy/Makefile2
-rw-r--r--net-im/libyahoo2/Makefile2
-rw-r--r--net-im/loudmouth/Makefile2
-rw-r--r--net-im/meanwhile/Makefile2
-rw-r--r--net-im/sim-im-devel/Makefile2
-rw-r--r--net-im/sim-im/Makefile2
-rw-r--r--net-im/telepathy-farsight/Makefile2
-rw-r--r--net-im/telepathy-glib/Makefile2
-rw-r--r--net-im/telepathy-logger/Makefile2
-rw-r--r--net-im/telepathy-mission-control/Makefile2
-rw-r--r--net-mgmt/bsnmp-ucd/Makefile2
-rw-r--r--net-mgmt/cacti-spine/Makefile2
-rw-r--r--net-mgmt/cflowd/Makefile2
-rw-r--r--net-mgmt/collectd/Makefile2
-rw-r--r--net-mgmt/collectd5/Makefile2
-rw-r--r--net-mgmt/ettercap/Makefile2
-rw-r--r--net-mgmt/irrtoolset/Makefile2
-rw-r--r--net-mgmt/libsmi/Makefile2
-rw-r--r--net-mgmt/nagios-devel/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/Makefile2
-rw-r--r--net-mgmt/nagios-snmp-plugins/Makefile2
-rw-r--r--net-mgmt/nagios/Makefile2
-rw-r--r--net-mgmt/nagios2/Makefile2
-rw-r--r--net-mgmt/nagiosgrapher/Makefile2
-rw-r--r--net-mgmt/pixilate/Makefile2
-rw-r--r--net-mgmt/py-yapsnmp/Makefile2
-rw-r--r--net-mgmt/tork/Makefile2
-rw-r--r--net-p2p/apollon/Makefile2
-rw-r--r--net-p2p/btpd/Makefile2
-rw-r--r--net-p2p/cdonkey/Makefile2
-rw-r--r--net-p2p/gift-fasttrack/Makefile2
-rw-r--r--net-p2p/gift-openft/Makefile2
-rw-r--r--net-p2p/gift/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/kmldonkey/Makefile2
-rw-r--r--net-p2p/ktorrent2/Makefile2
-rw-r--r--net-p2p/libtorrent-rasterbar-14/Makefile2
-rw-r--r--net-p2p/libtorrent/Makefile2
-rw-r--r--net-p2p/mldonkey/Makefile2
-rw-r--r--net-p2p/verlihub/Makefile2
-rw-r--r--net/6tunnel/Makefile2
-rw-r--r--net/GeoIP/Makefile2
-rw-r--r--net/asterisk-addons/Makefile2
-rw-r--r--net/asterisk14-addons/Makefile2
-rw-r--r--net/asterisk16-addons/Makefile2
-rw-r--r--net/atmsupport/Makefile2
-rw-r--r--net/avahi-app/Makefile2
-rw-r--r--net/beacon/Makefile2
-rw-r--r--net/dictd/Makefile2
-rw-r--r--net/dosdetector/Makefile2
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/freeradius-client/Makefile2
-rw-r--r--net/freeradius/Makefile4
-rw-r--r--net/freeradius2/Makefile4
-rw-r--r--net/freeswitch-core/Makefile2
-rw-r--r--net/gatekeeper/Makefile2
-rw-r--r--net/gnet/Makefile2
-rw-r--r--net/gnet2/Makefile2
-rw-r--r--net/gnu-dico/Makefile2
-rw-r--r--net/gnu-radius/Makefile2
-rw-r--r--net/gsambad/Makefile2
-rw-r--r--net/gsk/Makefile2
-rw-r--r--net/honeyd/Makefile2
-rw-r--r--net/howl/Makefile2
-rw-r--r--net/ilbc/Makefile2
-rw-r--r--net/isc-dhcp41-server/Makefile2
-rw-r--r--net/kdenetwork3/Makefile2
-rw-r--r--net/kmuddy/Makefile2
-rw-r--r--net/knemo/Makefile2
-rw-r--r--net/lanbrowsing/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libgweather/Makefile2
-rw-r--r--net/libnet-devel/Makefile2
-rw-r--r--net/libnet10/Makefile2
-rw-r--r--net/libnetdude/Makefile2
-rw-r--r--net/libnss-mysql/Makefile2
-rw-r--r--net/libosip/Makefile2
-rw-r--r--net/libpcapnav/Makefile2
-rw-r--r--net/librsync/Makefile2
-rw-r--r--net/libsocket++/Makefile2
-rw-r--r--net/libsocketcpp/Makefile2
-rw-r--r--net/liferea/Makefile2
-rw-r--r--net/linc/Makefile2
-rw-r--r--net/linphone-base/Makefile2
-rw-r--r--net/mcast-tools/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/nss_ldap/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/ntp-devel/Makefile2
-rw-r--r--net/ntp-rc/Makefile2
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/openh323/Makefile2
-rw-r--r--net/openldap23-server/Makefile4
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/openslp/Makefile2
-rw-r--r--net/proxy-suite/Makefile2
-rw-r--r--net/pvm++/Makefile2
-rw-r--r--net/quagga/Makefile2
-rw-r--r--net/rabbitmq-c-devel/Makefile2
-rw-r--r--net/rabbitmq-c/Makefile2
-rw-r--r--net/roadrunner/Makefile2
-rw-r--r--net/samba-pdbsql/Makefile2
-rw-r--r--net/samba34/Makefile2
-rw-r--r--net/samba35/Makefile2
-rw-r--r--net/samba4-devel/Makefile2
-rw-r--r--net/samba4wins/Makefile2
-rw-r--r--net/scribe/Makefile2
-rw-r--r--net/sdl_net/Makefile2
-rw-r--r--net/serveez/Makefile2
-rw-r--r--net/smb4k/Makefile2
-rw-r--r--net/tapidbus/Makefile2
-rw-r--r--net/tcpflow/Makefile2
-rw-r--r--net/tn5250/Makefile2
-rw-r--r--net/torsocks/Makefile2
-rw-r--r--net/tramp/Makefile2
-rw-r--r--net/trickle/Makefile2
-rw-r--r--net/tsclient/Makefile2
-rw-r--r--net/twinkle/Makefile2
-rw-r--r--net/ulxmlrpcpp/Makefile2
-rw-r--r--net/unfs3/Makefile2
-rw-r--r--net/uriparser/Makefile2
-rw-r--r--net/xmlrpc-c-devel/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
-rw-r--r--net/xmlrpc-epi/Makefile2
-rw-r--r--net/xrdp/Makefile2
-rw-r--r--news/fidogate-ds/Makefile2
-rw-r--r--news/klibido/Makefile2
-rw-r--r--news/newscache/Makefile2
-rw-r--r--news/newsstar/Makefile2
-rw-r--r--news/nntpcache/Makefile2
-rw-r--r--palm/gnome-pilot/Makefile2
-rw-r--r--palm/synce-librapi2/Makefile2
-rw-r--r--palm/synce-librra/Makefile2
-rw-r--r--palm/synce-libsynce/Makefile2
-rw-r--r--ports-mgmt/kports/Makefile2
-rw-r--r--ports-mgmt/portlint/src/portlint.pl22
-rw-r--r--print/cups-magicolor/Makefile2
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/foomatic-db/Makefile2
-rw-r--r--print/foomatic-filters/Makefile2
-rw-r--r--print/freetype-tools/Makefile2
-rw-r--r--print/freetype/Makefile2
-rw-r--r--print/freetype2/Makefile2
-rw-r--r--print/ft2demos/Makefile2
-rw-r--r--print/ghostscript8/Makefile2
-rw-r--r--print/gnome-cups-manager/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnome-specimen/Makefile2
-rw-r--r--print/gtklp/Makefile2
-rw-r--r--print/kaspaliste/Makefile2
-rw-r--r--print/kcdlabel/Makefile2
-rw-r--r--print/kover/Makefile2
-rw-r--r--print/libgnomecups/Makefile2
-rw-r--r--print/libgnomeprint/Makefile2
-rw-r--r--print/libgnomeprintmm/Makefile2
-rw-r--r--print/libijs/Makefile2
-rw-r--r--print/libpaper/Makefile2
-rw-r--r--print/libppd/Makefile2
-rw-r--r--print/libspectre/Makefile2
-rw-r--r--print/lilypond/Makefile2
-rw-r--r--print/openprinting/Makefile2
-rw-r--r--print/panda/Makefile2
-rw-r--r--print/pdflib/Makefile2
-rw-r--r--print/pips800/Makefile.pips2
-rw-r--r--print/pslib/Makefile2
-rw-r--r--russian/ksocrat/Makefile2
-rw-r--r--science/abinit/Makefile2
-rw-r--r--science/buddy/Makefile2
-rw-r--r--science/chemtool-devel/Makefile2
-rw-r--r--science/crf++/Makefile2
-rw-r--r--science/elmer-fem/Makefile2
-rw-r--r--science/elmer-hutiter/Makefile2
-rw-r--r--science/ghmm/Makefile2
-rw-r--r--science/gromacs/Makefile2
-rw-r--r--science/gsmc/Makefile2
-rw-r--r--science/hdf5/Makefile2
-rw-r--r--science/kst/Makefile2
-rw-r--r--science/libctl/Makefile2
-rw-r--r--science/libquantum/Makefile2
-rw-r--r--science/minc/Makefile2
-rw-r--r--science/minc2/Makefile2
-rw-r--r--science/mpqc/Makefile2
-rw-r--r--science/openbabel/Makefile2
-rw-r--r--science/silo/Makefile2
-rw-r--r--science/szip/Makefile2
-rw-r--r--science/udunits/Makefile2
-rw-r--r--science/vis5d+/Makefile2
-rw-r--r--security/aide/Makefile2
-rw-r--r--security/apache-xml-security-c/Makefile2
-rw-r--r--security/barnyard/Makefile2
-rw-r--r--security/beecrypt/Makefile2
-rw-r--r--security/bioapi/Makefile2
-rw-r--r--security/bjorb/Makefile2
-rw-r--r--security/borzoi/Makefile2
-rw-r--r--security/clamav-devel/Makefile2
-rw-r--r--security/clamav/Makefile2
-rw-r--r--security/courier-authlib/Makefile2
-rw-r--r--security/cryptplug/Makefile2
-rw-r--r--security/cvm/Makefile2
-rw-r--r--security/cyrus-sasl2-ldapdb/Makefile2
-rw-r--r--security/cyrus-sasl2/Makefile2
-rw-r--r--security/distcache-devel/Makefile2
-rw-r--r--security/distcache/Makefile2
-rw-r--r--security/engine_pkcs11/Makefile2
-rw-r--r--security/fakeroot/Makefile2
-rw-r--r--security/fwbuilder-devel/Makefile2
-rw-r--r--security/fwbuilder/Makefile2
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/gnutls-devel/Makefile2
-rw-r--r--security/gnutls/Makefile2
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme03/Makefile2
-rw-r--r--security/gtkpasman/Makefile2
-rw-r--r--security/heimdal/Makefile2
-rw-r--r--security/ipsec-tools/Makefile2
-rw-r--r--security/kgpg/Makefile2
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/kopete-otr/Makefile2
-rw-r--r--security/kovpn/Makefile2
-rw-r--r--security/krb5-appl/Makefile2
-rw-r--r--security/krb5/Makefile2
-rw-r--r--security/kssh/Makefile2
-rw-r--r--security/libfwbuilder-devel/Makefile2
-rw-r--r--security/libfwbuilder/Makefile2
-rw-r--r--security/libgcrypt/Makefile2
-rw-r--r--security/libgnome-keyring/Makefile2
-rw-r--r--security/libgnomesu/Makefile2
-rw-r--r--security/libgpg-error/Makefile2
-rw-r--r--security/libgringotts/Makefile2
-rw-r--r--security/libident/Makefile2
-rw-r--r--security/libmcrypt/Makefile2
-rw-r--r--security/libntlm/Makefile2
-rw-r--r--security/libotr/Makefile2
-rw-r--r--security/libp11/Makefile2
-rw-r--r--security/nessus-libnasl/Makefile2
-rw-r--r--security/nessus-libraries/Makefile2
-rw-r--r--security/opencdk/Makefile2
-rw-r--r--security/opencryptoki/Makefile2
-rw-r--r--security/openct/Makefile2
-rw-r--r--security/opensaml/Makefile2
-rw-r--r--security/opensc/Makefile2
-rw-r--r--security/openscep/Makefile2
-rw-r--r--security/openssl_tpm_engine/Makefile2
-rw-r--r--security/pam-mysql/Makefile2
-rw-r--r--security/pam_authsrv/Makefile2
-rw-r--r--security/pam_p11/Makefile2
-rw-r--r--security/pam_per_user/Makefile2
-rw-r--r--security/pam_pseudo/Makefile2
-rw-r--r--security/prelude-manager/Makefile2
-rw-r--r--security/racoon2/Makefile2
-rw-r--r--security/shibboleth2-sp/Makefile2
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/snort/Makefile4
-rw-r--r--security/ssh/Makefile2
-rw-r--r--security/steghide/Makefile2
-rw-r--r--security/strongswan/Makefile2
-rw-r--r--security/stunnel/Makefile2
-rw-r--r--security/suricata/Makefile2
-rw-r--r--security/tpm-tools/Makefile2
-rw-r--r--security/trousers/Makefile2
-rw-r--r--security/xca/Makefile2
-rw-r--r--security/xmlsec1/Makefile2
-rw-r--r--security/yassl/Makefile2
-rw-r--r--shells/fish/Makefile2
-rw-r--r--shells/zsh/Makefile2
-rw-r--r--sysutils/adtool/Makefile2
-rw-r--r--sysutils/afflib/Makefile2
-rw-r--r--sysutils/am-utils/Makefile2
-rw-r--r--sysutils/boxbackup-devel/Makefile2
-rw-r--r--sysutils/boxbackup/Makefile2
-rw-r--r--sysutils/condor/Makefile2
-rw-r--r--sysutils/dar/Makefile2
-rw-r--r--sysutils/eiciel/Makefile2
-rw-r--r--sysutils/file/Makefile2
-rw-r--r--sysutils/filelight/Makefile2
-rw-r--r--sysutils/freeipmi/Makefile2
-rw-r--r--sysutils/ftwin/Makefile2
-rw-r--r--sysutils/fusefs-encfs/Makefile2
-rw-r--r--sysutils/fusefs-fusexmp_fh/Makefile2
-rw-r--r--sysutils/fusefs-ntfs/Makefile2
-rw-r--r--sysutils/ganglia-monitor-core/Makefile2
-rw-r--r--sysutils/geomgui/Makefile2
-rw-r--r--sysutils/gfslicer/Makefile2
-rw-r--r--sysutils/gkleds2/Makefile2
-rw-r--r--sysutils/gnome-device-manager/Makefile2
-rw-r--r--sysutils/gnome-power-manager/Makefile2
-rw-r--r--sysutils/gnome-system-tools/Makefile2
-rw-r--r--sysutils/gpkgdep/Makefile2
-rw-r--r--sysutils/grub/Makefile2
-rw-r--r--sysutils/gsmartcontrol/Makefile2
-rw-r--r--sysutils/hal/Makefile2
-rw-r--r--sysutils/hdup/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile3
-rw-r--r--sysutils/htop/Makefile2
-rw-r--r--sysutils/k3b/Makefile2
-rw-r--r--sysutils/kcpuload/Makefile2
-rw-r--r--sysutils/kcube/Makefile2
-rw-r--r--sysutils/kdeadmin3/Makefile2
-rw-r--r--sysutils/kdirstat/Makefile2
-rw-r--r--sysutils/keep/Makefile2
-rw-r--r--sysutils/kkbswitch/Makefile2
-rw-r--r--sysutils/kkeyled/Makefile2
-rw-r--r--sysutils/klaptopdaemon/Makefile2
-rw-r--r--sysutils/klineakconfig/Makefile2
-rw-r--r--sysutils/kmilo/Makefile2
-rw-r--r--sysutils/knutclient/Makefile2
-rw-r--r--sysutils/komparator/Makefile2
-rw-r--r--sysutils/krename/Makefile2
-rw-r--r--sysutils/kshutdown-kde4/Makefile2
-rw-r--r--sysutils/kshutdown/Makefile2
-rw-r--r--sysutils/ksynaptics/Makefile2
-rw-r--r--sysutils/lcdproc/Makefile2
-rw-r--r--sysutils/lineak-defaultplugin/Makefile2
-rw-r--r--sysutils/lineak-kdeplugins/Makefile2
-rw-r--r--sysutils/lineakd/Makefile2
-rw-r--r--sysutils/nautilus-cd-burner/Makefile2
-rw-r--r--sysutils/nut/Makefile2
-rw-r--r--sysutils/nut22/Makefile2
-rw-r--r--sysutils/openipmi/Makefile2
-rw-r--r--sysutils/progsreiserfs/Makefile2
-rw-r--r--sysutils/pwg/Makefile2
-rw-r--r--sysutils/rdup/Makefile2
-rw-r--r--sysutils/torque/Makefile2
-rw-r--r--sysutils/tracker-client/Makefile2
-rw-r--r--sysutils/upower/Makefile2
-rw-r--r--sysutils/uptimed/Makefile2
-rw-r--r--sysutils/userinfo/Makefile2
-rw-r--r--sysutils/wmupmon/Makefile2
-rw-r--r--sysutils/xfce4-settings/Makefile2
-rw-r--r--sysutils/xfsprogs/Makefile2
-rw-r--r--sysutils/zetaback/Makefile2
-rw-r--r--sysutils/zisofs-tools/Makefile2
-rw-r--r--textproc/aiksaurus/Makefile2
-rw-r--r--textproc/augeas/Makefile2
-rw-r--r--textproc/c2html/Makefile2
-rw-r--r--textproc/clucene-contrib/Makefile2
-rw-r--r--textproc/clucene/Makefile2
-rw-r--r--textproc/cole/Makefile2
-rw-r--r--textproc/dict/Makefile2
-rw-r--r--textproc/dictfmt/Makefile2
-rw-r--r--textproc/ekhtml/Makefile2
-rw-r--r--textproc/enchant/Makefile2
-rw-r--r--textproc/exempi/Makefile2
-rw-r--r--textproc/gdome2/Makefile2
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/iiimf-client-lib/Makefile2
-rw-r--r--textproc/iiimf-csconv/Makefile2
-rw-r--r--textproc/iiimf-le-unit/Makefile2
-rw-r--r--textproc/iiimf-protocol-lib/Makefile2
-rw-r--r--textproc/iiimf-server/Makefile2
-rw-r--r--textproc/iiimf-x-lib/Makefile2
-rw-r--r--textproc/iiimf-x/Makefile2
-rw-r--r--textproc/iksemel/Makefile2
-rw-r--r--textproc/jade/Makefile2
-rw-r--r--textproc/java2html/Makefile2
-rw-r--r--textproc/kbedic/Makefile2
-rw-r--r--textproc/libcroco/Makefile2
-rw-r--r--textproc/libextractor/Makefile4
-rw-r--r--textproc/liblingoteach/Makefile2
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libmrss/Makefile2
-rw-r--r--textproc/libparsifal/Makefile2
-rw-r--r--textproc/libstree/Makefile2
-rw-r--r--textproc/libtextcat/Makefile2
-rw-r--r--textproc/libtre/Makefile2
-rw-r--r--textproc/libuninameslist/Makefile2
-rw-r--r--textproc/libwps/Makefile2
-rw-r--r--textproc/libxdiff/Makefile2
-rw-r--r--textproc/libxml++/Makefile2
-rw-r--r--textproc/libxml/Makefile2
-rw-r--r--textproc/libxode/Makefile2
-rw-r--r--textproc/link-grammar/Makefile2
-rw-r--r--textproc/m17n-im-config/Makefile2
-rw-r--r--textproc/mifluz/Makefile2
-rw-r--r--textproc/minidom/Makefile2
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/mxml/Makefile2
-rw-r--r--textproc/openvanilla-modules/Makefile2
-rw-r--r--textproc/ots/Makefile2
-rw-r--r--textproc/perl2html/Makefile2
-rw-r--r--textproc/py-libxslt/Makefile2
-rw-r--r--textproc/rast/Makefile2
-rw-r--r--textproc/redland/Makefile2
-rw-r--r--textproc/sablotron/Makefile2
-rw-r--r--textproc/sary/Makefile2
-rw-r--r--textproc/scew/Makefile2
-rw-r--r--textproc/scim-kmfl-imengine/Makefile2
-rw-r--r--textproc/scim-openvanilla/Makefile2
-rw-r--r--textproc/scim-table-imengine/Makefile4
-rw-r--r--textproc/scim/Makefile2
-rw-r--r--textproc/scrollkeeper/Makefile2
-rw-r--r--textproc/sdcv/Makefile2
-rw-r--r--textproc/skim/Makefile2
-rw-r--r--textproc/soothsayer/Makefile2
-rw-r--r--textproc/ssddiff/Makefile2
-rw-r--r--textproc/teckit/Makefile2
-rw-r--r--textproc/uim-kde/Makefile2
-rw-r--r--textproc/uim-kde4/Makefile2
-rw-r--r--textproc/uim-qt/Makefile2
-rw-r--r--textproc/uim-qt4/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/wv/Makefile2
-rw-r--r--textproc/xaira/Makefile2
-rw-r--r--textproc/xlhtml/Makefile2
-rw-r--r--textproc/xls2xml/Makefile2
-rw-r--r--textproc/xmlpp/Makefile2
-rw-r--r--textproc/xmlroff/Makefile2
-rw-r--r--textproc/yamcha/Makefile2
-rw-r--r--www/apache20/Makefile2
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/asterisk-gui/Makefile2
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/c-icap/Makefile2
-rw-r--r--www/cgicc/Makefile2
-rw-r--r--www/comclear/Makefile2
-rw-r--r--www/emacs-w3m/Makefile2
-rw-r--r--www/fcgi/Makefile2
-rw-r--r--www/fcgiwrap/Makefile2
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox/Makefile2
-rw-r--r--www/firefox35/Makefile6
-rw-r--r--www/firefox36/Makefile2
-rw-r--r--www/flickcurl/Makefile2
-rw-r--r--www/flood/Makefile2
-rw-r--r--www/gforge/Makefile2
-rw-r--r--www/glibwww/Makefile2
-rw-r--r--www/gtkhtml/Makefile2
-rw-r--r--www/gtkhtml3/Makefile2
-rw-r--r--www/harvest/Makefile2
-rw-r--r--www/httrack/Makefile2
-rw-r--r--www/kdewebdev/Makefile2
-rw-r--r--www/libapreq2/Makefile2
-rw-r--r--www/libghttp/Makefile2
-rw-r--r--www/libgtkhtml/Makefile2
-rw-r--r--www/libwww/Makefile2
-rw-r--r--www/libxul/Makefile2
-rw-r--r--www/lighttpd/Makefile4
-rw-r--r--www/links/Makefile2
-rw-r--r--www/mnogosearch/Makefile2
-rw-r--r--www/mod_clamav/Makefile2
-rw-r--r--www/mod_cplusplus/Makefile2
-rw-r--r--www/mod_mono/Makefile2
-rw-r--r--www/mod_rivet/Makefile2
-rw-r--r--www/mod_transform/Makefile2
-rw-r--r--www/moonshine/Makefile2
-rw-r--r--www/neon29/Makefile2
-rw-r--r--www/oops/Makefile2
-rw-r--r--www/osb-browser/Makefile2
-rw-r--r--www/osb-nrcit/Makefile2
-rw-r--r--www/osb-nrcore/Makefile2
-rw-r--r--www/php-dyn/Makefile2
-rw-r--r--www/php-screw/Makefile2
-rw-r--r--www/privoxy+ipv6/Makefile2
-rw-r--r--www/privoxy/Makefile2
-rw-r--r--www/resin3/Makefile2
-rw-r--r--www/rt38/Makefile2
-rw-r--r--www/rt40/Makefile2
-rw-r--r--www/suphp/Makefile2
-rw-r--r--www/swfdec-plugin/Makefile2
-rw-r--r--www/swish-e/Makefile2
-rw-r--r--www/tidy-devel/Makefile4
-rw-r--r--www/trafficserver/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile2
-rw-r--r--www/websh/Makefile2
-rw-r--r--www/webstone-ssl/Makefile2
-rw-r--r--www/wsdlpull/Makefile2
-rw-r--r--x11-clocks/bmp-alarm/Makefile2
-rw-r--r--x11-clocks/kdetoys3/Makefile2
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile2
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile2
-rw-r--r--x11-fm/dolphin/Makefile2
-rw-r--r--x11-fm/gnome-commander2/Makefile2
-rw-r--r--x11-fm/krusader/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/pcmanfm/Makefile2
-rw-r--r--x11-fm/rox-filer/Makefile2
-rw-r--r--x11-fonts/fontconfig/Makefile2
-rw-r--r--x11-fonts/gnome-font-sampler/Makefile2
-rw-r--r--x11-fonts/libFS/Makefile2
-rw-r--r--x11-servers/driglide/Makefile2
-rw-r--r--x11-themes/baghira/Makefile2
-rw-r--r--x11-themes/colorstep/Makefile2
-rw-r--r--x11-themes/gnome-look/Makefile2
-rw-r--r--x11-themes/gnome-themes-extras/Makefile2
-rw-r--r--x11-themes/gnome-themes/Makefile2
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-themes/kde-style-comix/Makefile2
-rw-r--r--x11-themes/kde-style-lipstik/Makefile2
-rw-r--r--x11-themes/kde-style-polyester/Makefile2
-rw-r--r--x11-themes/kde-style-tiblit/Makefile2
-rw-r--r--x11-themes/kde-windeco-activeheart/Makefile2
-rw-r--r--x11-themes/kde-windeco-crystal/Makefile2
-rw-r--r--x11-themes/kde-windeco-knifty/Makefile2
-rw-r--r--x11-themes/kde-windeco-neos/Makefile2
-rw-r--r--x11-themes/kde-windeco-smoothblend/Makefile2
-rw-r--r--x11-themes/kdeartwork3/Makefile2
-rw-r--r--x11-themes/kdmtheme/Makefile2
-rw-r--r--x11-themes/moodin/Makefile2
-rw-r--r--x11-themes/notif2/Makefile2
-rw-r--r--x11-themes/phase/Makefile2
-rw-r--r--x11-themes/polymer/Makefile2
-rw-r--r--x11-themes/qinx/Makefile2
-rw-r--r--x11-themes/qnxstyle/Makefile2
-rw-r--r--x11-themes/thinice/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile2
-rw-r--r--x11-toolkits/blt/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile2
-rw-r--r--x11-toolkits/efltk/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile2
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal2/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkdatabox/Makefile2
-rw-r--r--x11-toolkits/gtkextra/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkglarea--/Makefile2
-rw-r--r--x11-toolkits/gtkglarea/Makefile2
-rw-r--r--x11-toolkits/gtkglarea2/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile2
-rw-r--r--x11-toolkits/gtkglextmm/Makefile2
-rw-r--r--x11-toolkits/gtkmathview/Makefile2
-rw-r--r--x11-toolkits/gtkmm12/Makefile2
-rw-r--r--x11-toolkits/gtkmm20/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile2
-rw-r--r--x11-toolkits/gtkmm30/Makefile2
-rw-r--r--x11-toolkits/gtksourceview-sharp/Makefile2
-rw-r--r--x11-toolkits/gtksourceview/Makefile2
-rw-r--r--x11-toolkits/gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/gtkunique/Makefile2
-rw-r--r--x11-toolkits/guile-gtk/Makefile2
-rw-r--r--x11-toolkits/lesstif/Makefile2
-rw-r--r--x11-toolkits/libbonobouimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile2
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
-rw-r--r--x11-toolkits/libsexy/Makefile2
-rw-r--r--x11-toolkits/libsexymm/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile2
-rw-r--r--x11-toolkits/libxfce4gui/Makefile2
-rw-r--r--x11-toolkits/libzvt/Makefile2
-rw-r--r--x11-toolkits/movingmotif/Makefile2
-rw-r--r--x11-toolkits/mowitz/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile2
-rw-r--r--x11-toolkits/open-motif/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/pangoxsl/Makefile2
-rw-r--r--x11-toolkits/paragui-devel/Makefile2
-rw-r--r--x11-toolkits/paragui/Makefile2
-rw-r--r--x11-toolkits/php-gtk/Makefile2
-rw-r--r--x11-toolkits/php-gtk2/Makefile2
-rw-r--r--x11-toolkits/py-sexy/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-toolkits/sdl_gui/Makefile2
-rw-r--r--x11-toolkits/sdl_pango/Makefile2
-rw-r--r--x11-toolkits/soqt/Makefile2
-rw-r--r--x11-toolkits/tile/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile2
-rw-r--r--x11-toolkits/vdk/Makefile2
-rw-r--r--x11-toolkits/vdkbuilder/Makefile2
-rw-r--r--x11-toolkits/viewkit/Makefile2
-rw-r--r--x11-toolkits/vte/Makefile2
-rw-r--r--x11-toolkits/xbae/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile2
-rw-r--r--x11-wm/compiz-plugins-main/Makefile2
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile2
-rw-r--r--x11-wm/compiz/Makefile2
-rw-r--r--x11-wm/compizconfig-backend-gconf/Makefile2
-rw-r--r--x11-wm/compizconfig-python/Makefile2
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/emerald/Makefile2
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/gcompmgr/Makefile2
-rw-r--r--x11-wm/kappdock/Makefile2
-rw-r--r--x11-wm/libcompizconfig/Makefile2
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11-wm/libwraster/Makefile2
-rw-r--r--x11-wm/lxsession-lite/Makefile2
-rw-r--r--x11-wm/metacity/Makefile2
-rw-r--r--x11-wm/mutter/Makefile2
-rw-r--r--x11-wm/openbox/Makefile2
-rw-r--r--x11-wm/waimea-devel/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/xfce4-panel/Makefile2
-rw-r--r--x11-wm/xfce4-session/Makefile2
-rw-r--r--x11/Terminal/Makefile2
-rw-r--r--x11/babl/Makefile2
-rw-r--r--x11/dgs/Makefile2
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gnome-menus/Makefile2
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-shell/Makefile2
-rw-r--r--x11/gtk-themepreview/Makefile2
-rw-r--r--x11/gtkterm2/Makefile2
-rw-r--r--x11/idesk/Makefile2
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libXTrap/Makefile2
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXp/Makefile2
-rw-r--r--x11/libXprintAppUtil/Makefile2
-rw-r--r--x11/libXprintUtil/Makefile2
-rw-r--r--x11/libXtst/Makefile2
-rw-r--r--x11/libfm/Makefile2
-rw-r--r--x11/libgnome/Makefile2
-rw-r--r--x11/libgnomekbd/Makefile2
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/liboldX/Makefile2
-rw-r--r--x11/libxfce4menu/Makefile2
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/lxmenu-data/Makefile2
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/menu-cache/Makefile2
-rw-r--r--x11/mgapdesk/Makefile2
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/oooqs/Makefile2
-rw-r--r--x11/oooqs2/Makefile2
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/portoseguro/Makefile2
-rw-r--r--x11/powershell/Makefile2
-rw-r--r--x11/rsibreak/Makefile2
-rw-r--r--x11/rxvt-devel/Makefile2
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/startup-notification/Makefile2
-rw-r--r--x11/vdesk/Makefile2
-rw-r--r--x11/xcb-util/Makefile2
-rw-r--r--x11/xclip/Makefile2
-rw-r--r--x11/xfce4-conf/Makefile2
-rw-r--r--x11/xrx/Makefile2
-rw-r--r--x11/xscreensaver-kde/Makefile2
-rw-r--r--x11/yakuake/Makefile2
1763 files changed, 1819 insertions, 1822 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index a2fd0dc18ef6..7743670c125a 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -690,7 +690,7 @@ PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \
# Then handle the ltverhack component (it has to be done here, because
# we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is
# included in the post-makefile section).
-.if defined(AUTOTOOL_libtool)
+.if defined(_AUTOTOOL_libtool)
lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH=
lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index 23af67bee240..db3cd6254bec 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -157,7 +157,7 @@ SUB_LIST+= PHP_EXT_DIR=${PHP_EXT_DIR}
.if defined(USE_PHPIZE) || defined(USE_PHPEXT)
BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PORTSDIR}/${PHP_PORT}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS+= autoconf:268:env
+USE_AUTOTOOLS+= autoconf:env
CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config
configure-message: phpize-message do-phpize
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index c25e695a157f..ff7d73cc7953 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3748,6 +3748,11 @@ do-patch:
fi
.endif
+.if !target(patch-autotools)
+patch-autotools:
+ @${DO_NADA}
+.endif
+
.if !target(run-autotools)
run-autotools:
@${DO_NADA}
@@ -4412,7 +4417,7 @@ _EXTRACT_SEQ= check-build-conflicts extract-message checksum extract-depends \
post-extract post-extract-script
_PATCH_DEP= extract
_PATCH_SEQ= ask-license patch-message patch-depends patch-dos2unix pre-patch \
- pre-patch-script do-patch post-patch post-patch-script
+ pre-patch-script do-patch patch-autotools post-patch post-patch-script
_CONFIGURE_DEP= patch
_CONFIGURE_SEQ= build-depends lib-depends configure-message \
pre-configure pre-configure-script \
diff --git a/UPDATING b/UPDATING
index c2f643e5493c..cc5b25ce4512 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,22 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20101204:
+ AFFECTS: autotools
+ AUTHOR: autotools@FreeBSD.org
+
+ The next stage in the ongoing cleanup of autotools-using ports is
+ a refactoring of bsd.autotools.mk so that version numbers are no longer
+ needed within the USE_AUTOTOOLS stanza. There is either
+ autoconf213/autoconf or automake14/automake (for the legacy versions,
+ and the currently available versions). This will considerably reduce
+ the amount of tree-wide patching in future on an update.
+
+ IMPORTANT: if you have either devel/autoconf-wrapper or
+ devel/automake-wrapper installed on your system (and you most likely do)
+ PLEASE update these ports to their new versions before updating anything
+ else -- Bad Things[tm] are likely to happen otherwise.
+
20101202:
AFFECTS: users of multmidia/gstreamer-plugins
AUTHOR: multimedia@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 23544f052d28..1906ac051c15 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20 ltverhack referencehack
CONFIGURE_ARGS= --enable-static \
--disable-gtk-doc \
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 4ac0cefc19e5..0351c4822859 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -20,7 +20,7 @@ USE_XORG= xfixes xdamage ice xcomposite sm
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
USE_GMAKE= yes
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/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
index 954dad944685..7e9092abd3f0 100644
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@@ -21,7 +21,7 @@ PREFIX= ${KDE_PREFIX}
USE_XORG= xtst
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 3ad673d7541f..81c5b9d11d0f 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022
MAINTAINER= garga@FreeBSD.org
COMMENT= Open-source ARJ
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
CONFIGURE_WRKSRC= ${WRKSRC}/gnu
diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index 9f559cc86fe4..e0214e2bfa58 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -17,7 +17,7 @@ COMMENT= A program for back up of directories or files
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
USE_KDELIBS_VER=3
diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile
index b7d7569aacd9..85531f484102 100644
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_QT_VER= 3
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index c0e2597dd3f5..5a43bfba3f77 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -18,7 +18,7 @@ COMMENT= Transparently handles automatic compression and decompression of files
#LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index ddc9c70c7e79..243fd24419a9 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -15,7 +15,7 @@ COMMENT= Decompress data compressed with PKWARE Data Compression Library
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index 4b14c5ef5688..455b289afe45 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}alpha
MAINTAINER= fjoe@FreeBSD.org
COMMENT= A library for Microsoft compression formats
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index b3a85af31abd..d2c2553a4a94 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -25,7 +25,7 @@ OPTIONS= LIBSYNCE "Build with libsynce support" on \
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_ICONV= yes
diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index 12682f44d4dd..5f4283be7b36 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -15,7 +15,7 @@ COMMENT?= LZRTF compression library
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index ca7adf4b1c3f..f0d7abbe9c36 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libs/compression
MAINTAINER= mandree@FreeBSD.org
COMMENT= Portable speedy, lossless data compression library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LDCONFIG= yes
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 9f11f6777a70..46451da4afaf 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -16,7 +16,7 @@ DISTNAME= lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= mandree@FreeBSD.org
COMMENT= Portable speedy, lossless data compression library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LDCONFIG= yes
diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index 5dc90a256c3b..277a34581c76 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 amd64 ia64
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
USE_GCC= 4.2+
PORTDOCS= README
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index d3058668e613..4889e588dfa5 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= rpm-[45].*
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= automake:14 autoconf:213 libtool:22
+USE_AUTOTOOLS= automake14 autoconf213 libtool
CONFIGURE_ARGS= --with-glob
USE_LDCONFIG= yes
MAKE_ENV= OLD_PO_FILE_INPUT=1
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 8964379570c8..e69c619f0c52 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
OPTIONS= PYTHON "Build Python rpm module" Off
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_LUA= 5.1+
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index d6d386e54324..9cba0ddf3674 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -35,7 +35,7 @@ OPTIONS= PERL "Build Perl RPM module" Off \
DB_VERSION?= 47
USE_BDB= ${DB_VERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure db3/configure db/dist/configure \
file/configure xar/configure
CONFIGURE_ARGS= --without-js
diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile
index 144832ae4ad5..acea2982ce90 100644
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@@ -15,7 +15,7 @@ DISTNAME= trrntzip_v${PORTVERSION:S/.//}_src
MAINTAINER= swhetzel@gmail.com
COMMENT= Efficient way to prepare zipfiles for BitTorrent
-USE_AUTOTOOLS= aclocal:111 automake:111 autoheader:268
+USE_AUTOTOOLS= aclocal automake autoheader
AUTOMAKE_ARGS= -a
WRKSRC= ${WRKDIR}/trrntzip
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 7bf02269ced6..3277cbb8175c 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.oberhumer.com/opensource/ucl/download/
MAINTAINER= sylvio@FreeBSD.org
COMMENT= A data compression library with low memory usage
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index cfd9bf1a334b..b69b911145d9 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/synce/Unshield/${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Extract data from InstallShield CAB files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnometarget
USE_LDCONFIG= yes
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 8de486d85138..9a8257207ace 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://vesuri.jormas.com/xpk/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= The eXternal PacKer (XPK) library system
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/archivers/zipios++/Makefile b/archivers/zipios++/Makefile
index 395b2959c342..3f17f391fe85 100644
--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@@ -18,7 +18,7 @@ COMMENT= A java.util.zip-like C++ library for reading and writing Zip files
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
CONFIGURE_ARGS+=--disable-static
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}+cvs.2004.02.07
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index a0ee49a69974..2bdf42bbbf20 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client
LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 670082e59b58..67c5ca9449b7 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -18,7 +18,7 @@ COMMENT= Scriptable space flight simulator for X
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GL= gl
USE_XORG= x11 xt xext xmu xi
diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
index bb9b41bc1ca1..388ba33e0da5 100644
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@@ -15,7 +15,7 @@ COMMENT= A gps file translating tool
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-expathdr=${LOCALBASE}/include \
--with-libexpat=${LOCALBASE}/lib
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index cf483650586a..fad178137909 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
xsltproc:${PORTSDIR}/textproc/libxslt
USE_RC_SUBR= gpsd
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig
USE_LDCONFIG= yes
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index d2590c733e4e..3284c66b891f 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_UNSAFE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index f641f00c80b5..9313bcaaf26c 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Astronomical julian date calculator
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 03d9f7eb949b..86e959ca7cba 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V%20${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Astronomical Calculation Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index 9b0ac1c60b3c..d07555af97c8 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
nova:${PORTSDIR}/astro/libnova
RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --datadir=${DATADIR}
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 2583f1e3f4c0..d8845ea33ea0 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gsl.15:${PORTSDIR}/math/gsl \
USE_QT_VER= 3
USE_GL= gl
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I macros -I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV= ac_cv_c_inline=no
USE_LDCONFIG= yes
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 7a2d75973aed..79898ecddbe2 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= saper@saper.info
COMMENT= MPEG audio analysis toolkit
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile
index cdb09f66201b..b20bebff0a8d 100644
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@@ -27,7 +27,7 @@ PLUGIN= ffmpeg_decoder
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index e489db73a32c..b791a4268716 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -25,7 +25,7 @@ PLUGIN= jack_sink
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile
index 73c242beac93..6a96c0ed6600 100644
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@@ -23,7 +23,7 @@ PLUGIN= mpc_decoder
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile
index ea2c3fe582f3..30d81296032f 100644
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@@ -25,7 +25,7 @@ PLUGIN= mpeg_decoder
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile
index fbee68cfc652..ad5dfaae1a6f 100644
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@@ -23,7 +23,7 @@ PLUGIN= oss_sink
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile
index 357184215764..3ffd2b63d3db 100644
--- a/audio/akode-plugins-pulseaudio/Makefile
+++ b/audio/akode-plugins-pulseaudio/Makefile
@@ -25,7 +25,7 @@ PLUGIN= polyp_sink
PORTNAMESUFX= pulseaudio
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile
index 89b8d3902b2e..c5b17ee57a73 100644
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@@ -25,7 +25,7 @@ PLUGIN= src_resampler
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index 60fcd5f5489d..e8bc39bc3e45 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -29,7 +29,7 @@ PLUGIN= xiph_decoder
PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
USE_AUTOTOOLS= libltdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index 8c6198bce447..c3f26ed07d6a 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -27,7 +27,7 @@ OPTIONS= FFMPEG "FFMPEG decoder plugin" off \
RESAMPLER "Resampler processing plugin" on \
XIPH "FLAC/Speex/Vorbis decoder plugin" on
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index f49ac47408be..ac7dd2b7d2c7 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -25,7 +25,7 @@ MIN_OPTIONS_VER= ${PORTNAME}-1.4.1
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_SDL= sdl
USE_RUBY= yes
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index f9967127901a..125ae4264d8b 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -28,7 +28,7 @@ PREFIX= ${KDE_PREFIX}
WANT_GNOME= yes
USE_QT_VER= 3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
QTCPPFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/aube/Makefile b/audio/aube/Makefile
index 5e1e9f15a6c4..cda08c6ff227 100644
--- a/audio/aube/Makefile
+++ b/audio/aube/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
USE_GNOME= imlib
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index af94a9d3484c..2ec42712fa58 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= audacity-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}-beta
-USE_AUTOTOOLS= aclocal:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GCC= 4.2+
diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile
index 4d5ad0e1ade4..3e2aaea91eb2 100644
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@@ -17,7 +17,7 @@ COMMENT= High-level audio API
GNU_CONFIGURE= yes
USE_GMAKE= yes
WANT_WX= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index b2953b1cd57e..0e880b925d59 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
CPPFLAGS+= "-I${LOCALBASE}/include"
PLUGDIR= lib/bmp/Input
PLUGFILE= lib${PKGNAMEPREFIX}${PORTNAME}.so
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 6d9191d1e4fc..42fbb23b172f 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -23,7 +23,7 @@ COMMENT= A modplug-based plugin for beep-media-player
LIB_DEPENDS?= beep.2:${PORTSDIR}/multimedia/beep-media-player
LIB_DEPENDS+= modplug.1:${PORTSDIR}/audio/libmodplug
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
HAS_CONFIGURE= yes
PLUGDIR?= lib/bmp/Input
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 034b8d1a5604..2dc3da821b4e 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
PLUGDIR= lib/bmp/Input
PLUGFILE= libbmp-mpc.so
PLIST_FILES= ${PLUGDIR}/${PLUGFILE}
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index 230476200e34..f13cf0675a07 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES= lib/bmp/Input/libwma.so \
lib/bmp/Input/libwma.a
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 3721afb41e02..036fe6a2ba86 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= ccgnu2:${PORTSDIR}/devel/commoncpp
CONFLICTS= ccaudio-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 68ea365871e2..a005d572cfeb 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -17,7 +17,7 @@ COMMENT= A real-time sound processor
LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_KDELIBS_VER= 3
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index ce2494d301e6..c4ed8055fdca 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -24,7 +24,7 @@ OPTIONS= ARTS "Enable aRts support" off \
SAMPLERATE "Enable libsamplerate support" off
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-pyecasound \
--disable-rubyecasound \
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 07a9e3432358..019bb57158a6 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -17,7 +17,7 @@ COMMENT= A sound library for enlightenment package
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnometarget gnomehack
USE_LDCONFIG= yes
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 37e3947ea34d..822a90289b59 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_DOS2UNIX= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --with-mp4v2
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 73f5fb349401..c685df2cc7e7 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_DOS2UNIX= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 3162ca5efaaf..e719d1ca9b10 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -18,7 +18,7 @@ COMMENT?= A command line player for .nsf and .hes audio files
LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index ba2e9027efbe..231fda490bfe 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -16,7 +16,7 @@ COMMENT= Free lossless audio codec
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sse \
--with-ogg="${LOCALBASE}" \
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 2f107b74ea1b..a3858963a893 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -21,7 +21,7 @@ OPTIONS= JACK "Enable Jack audio support" On \
USE_GNOME= glib20 gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-alsa-support --disable-midishare \
--disable-coreaudio --disable-coremidi \
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index e77177113832..05b78001a3cb 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://connect.creativelabs.com/openal/Downloads/ALUT/
MAINTAINER= oliver@FreeBSD.org
COMMENT= The OpenAL Utility Toolkit
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 0473ade549b7..ac93f03c40ce 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -24,7 +24,7 @@ USE_XORG= xbitmaps x11
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 92637e2ecd7d..138b9e720421 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
ao:${PORTSDIR}/audio/libao
USE_GNOME= gnomehack gnomeprefix
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
LIBTOOLFLAGS= --tag=CXX
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 97c71b072b4f..619ceae8b75a 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
-USE_AUTOTOOLS= autoconf:213 libtool:22
+USE_AUTOTOOLS= autoconf213 libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 5d811a72bbb6..7e01ad9abb73 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
USE_XORG= x11
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index cd9fa875ad3f..284d15a5f192 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GNOME= gnomeprefix gnometarget libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index 1065a8d0e24e..35b7987db817 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \
CFLAGS:= ${CFLAGS} -O2
USE_GSTREAMER= yes good
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
OPTIONS= MP3 "mp3 files support" on \
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 63dc4078538f..22eaa979cee2 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= kaeru@inigo-tech.com
COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index b07c8c754f6c..cb841f5c8009 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -31,7 +31,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index 3a6a33f9d130..246bd6885917 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= k3b:${PORTSDIR}/sysutils/k3b
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/kde3
post-patch:
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index ecb07a8eef14..dd26abc94514 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/audio/kirocker/Makefile b/audio/kirocker/Makefile
index 392db9b3b144..4fa37868ea97 100644
--- a/audio/kirocker/Makefile
+++ b/audio/kirocker/Makefile
@@ -20,7 +20,7 @@ COMMENT= Kicker applet for displaying Amarok info
RUN_DEPENDS= amarok:${PORTSDIR}/audio/amarok
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER=3
INSTALLS_ICONS= yes
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 4d1a9c121237..a8dbc284c030 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF \
MAINTAINER= netchild@FreeBSD.org
COMMENT= Fast MP3 encoder kit
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 4d0fa8e08e15..c9bec52c1a04 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -18,7 +18,7 @@ COMMENT= A free library for decoding ATSC A/52 streams, aka AC-3
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 13f0e7dc1c8e..cf57928b2b47 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -28,7 +28,7 @@ CONFLICTS= aacplusenc-0*
USE_GNOME= pkgconfig
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22 libtoolize aclocal:111 autoheader:268 automake:111
+USE_AUTOTOOLS= libtool libtoolize aclocal autoheader automake
GNU_CONFIGURE= yes
AUTOMAKE_ARGS= --add-missing
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 5f1651da6cfc..290d106f17fd 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -16,7 +16,7 @@ COMMENT= AdLib emulator library supporting many formats
LIB_DEPENDS= binio.1:${PORTSDIR}/devel/libbinio
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 7edc185d122b..38f886801396 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -24,7 +24,7 @@ RESTRICTED= license prohibits redistribution
RESTRICTED_FILES= ${SRC3GPP}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index a29660310d2f..78a87985dadd 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -23,7 +23,7 @@ RESTRICTED= license prohibits redistribution
RESTRICTED_FILES= ${SRC3GPP}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 7300c58533bb..9b3d9d5f37a7 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ao/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Portable audio output library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index fc4672f067df..53092acc6204 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -16,7 +16,7 @@ DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A sound library for SGI audio file
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 149297a853e0..f8ff95d363ef 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LGPL
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-gtk3
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index bbb2d1b8bb64..212334a550f9 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= novel@FreeBSD.org
COMMENT= A library for playing audio CDs
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/libdssialsacompat/Makefile b/audio/libdssialsacompat/Makefile
index 3c7f1b4620c8..e5c34bbdf07a 100644
--- a/audio/libdssialsacompat/Makefile
+++ b/audio/libdssialsacompat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.smbolton.com/linux/
MAINTAINER= freebsd-ports@coreland.ath.cx
COMMENT= Alsa compatibility library to build DSSI
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 41c57208184a..6a73f7984bcf 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} \
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Libmad library (part of MAD project)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index aebb7b0edeb8..fbb5a35c0a35 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
COMMENT= MikMod Sound Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_GNOME= gnometarget lthack
USE_GMAKE= yes
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index a1795e9ccf06..9cf1c656d653 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
MAINTAINER= miwi@FreeBSD.org
COMMENT= Abstraction around libmpdclient
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig glib20 gnomehack
USE_LDCONFIG= yes
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index b5d5646b1643..eefb553d70ee 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= C library, API for communicating with Creative and Dell audio players
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index 9e727baa08ff..d9dd761a6699 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -16,7 +16,7 @@ COMMENT= Generates three-dimensional coherent noise
USE_ZIP= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_LDCONFIG= yes
CXXFLAGS+= -O3 -fomit-frame-pointer
WRKSRC= ${WRKDIR}/noise
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index 612edc17dd9b..c21a43ba4b95 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \
expat.6:${PORTSDIR}/textproc/expat2 \
curl.6:${PORTSDIR}/ftp/curl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index fb178166fdb1..2e3064ea20b1 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ogg/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Ogg bitstream library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile
index 6da3a49f142d..176825f30d3a 100644
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@@ -17,7 +17,7 @@ COMMENT= Simple Ogg API
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 0559b216bd99..7ecd4eaaaa32 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
fftw3.5:${PORTSDIR}/math/fftw3
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-gcc-pipe
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index f49603f0e673..29957eef8799 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -15,7 +15,7 @@ COMMENT= Connect and transmit data to an Icecast media streaming server
CONFLICTS= libshout2-*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index efdcc56daba7..493ebb2c5825 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sec@42.org
COMMENT= A Commodore SID-chip emulator library to play SID music files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index a389d63c8d79..566de28aa671 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library to play Commodore 64 SID-tunes cycle accurate
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= builders/hardsid-builder/configure \
builders/resid-builder/configure \
libsidplay/configure \
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index 1f267d354341..72d61580ef2a 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -18,7 +18,7 @@ COMMENT= Integer-only fully Ogg Vorbis compliant decoder library
SNAP_DATE= 02132004
WRKSRC= ${WRKDIR}/Tremor
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index b1c024f624c2..96424b7da08b 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
CONFLICTS= trm-0*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 71b302ab944f..5909e540a09f 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
CONFLICTS= trm-0*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
USE_LDCONFIG= yes
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index c603799ef0f3..75b57374cb06 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -16,7 +16,7 @@ COMMENT= Audio compression codec library
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index b4e7af26cd3a..48ad544085e3 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -52,7 +52,7 @@ USE_RC_SUBR= liquidsoap.sh
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index d245cb1d35ec..0aa34ded20f7 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-3.99-u4-b5
MAINTAINER= danfe@FreeBSD.org
COMMENT= Monkey's Audio lossless codec
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index 96ae1c212e28..c0cde6867720 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -27,7 +27,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 7cce8cbbe89f..3b3e7a09a781 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -19,7 +19,7 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index f20c99ac1fae..c21881dd587c 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-id3tag=${PREFIX} --with-gdbm-includes=${LOCALBASE}/include
-USE_AUTOTOOLS= autoheader:268 autoconf:268:env
+USE_AUTOTOOLS= autoheader autoconf:env
USE_ICONV= yes
PATCH_SITES+= http://www.apionet.or.jp/~tomi/
diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index 925833bac9a3..84cf9c9bf7b6 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -18,7 +18,7 @@ COMMENT= Decoder, encoder and replaygain for musepack (mpc)
CONFLICTS= libmpcdec-[0-9]*
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 libtoolize automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf libtool
ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index f9b75fb3bd14..536ab5b77546 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GNOME= glib20
-USE_AUTOTOOLS= automake:111 aclocal:111 libtool:22
+USE_AUTOTOOLS= automake aclocal libtool
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lpthread"
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index 49c3fd57b0c9..756daf6dbbe6 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 38ba79b2071e..1988cceccaef 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -17,7 +17,7 @@ COMMENT= A 3D positional spatialized sound library
CONFLICTS= openal-soft-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-capture
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index 14fdd929b226..db896e6150c2 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -18,7 +18,7 @@ COMMENT= A command line player for .spc and .zst files
ONLY_FOR_ARCHS= i386 # contains x86 asm code
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
PORTDOCS= README
diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile
index 69ade8603b6c..3aabe2c78ae4 100644
--- a/audio/orpheus/Makefile
+++ b/audio/orpheus/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321
USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 9b922e8cd9f4..621e1d6a241f 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= sphinxfe.0:${PORTSDIR}/audio/sphinxbase
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index ebc0065f567d..c8d240134396 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -30,7 +30,7 @@ USE_XORG= x11 sm xtst ice
USE_LDCONFIG= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile
index dfaa74e6ccc9..1304d65f31eb 100644
--- a/audio/py-taglib/Makefile
+++ b/audio/py-taglib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib
WRKSRC= ${WRKDIR}/python-taglib-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= -2.4
USE_PYTHON_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 1866845775d5..00cfd4535a75 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -17,7 +17,7 @@ COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool
USE_TK= yes
USE_XORG= x11 xext sm ice
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-ipv6
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index 8cec4e720aa1..fb5d6361a641 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Cycle-based SID emulator engine
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 2bd4be2bc162..f7070d79c8e9 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -34,7 +34,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 nautilus2
WANT_GNOME= yes
USE_GSTREAMER= flac mp3 gnomevfs gconf jpeg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \
--without-libnautilus-burn
INSTALLS_ICONS= yes
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 069a3e32d0e2..e6a902843b15 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A program to inferface with the Rio600, Rio800, and psa[play devices
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -31,7 +31,7 @@ LDFLAGS= -L${LOCALBASE}/lib
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.ac
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
.endif
post-extract:
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index ba716393cb16..ec6fc20f9e92 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm \
audio:${PORTSDIR}/audio/nas
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
pre-configure:
@${CP} ${FILESDIR}/freebsdplay.c ${WRKSRC}/config/freebsdplay.c
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 980f6d80b971..cf038c99130a 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -15,7 +15,7 @@ DISTNAME= SDL_mixer-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= A sample multi-channel audio mixer library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 344da1d05e63..de26ec62d0ac 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -16,7 +16,7 @@ DISTNAME= SDL_sound-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= A SDL audio library and player for some popular sound file formats
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_SDL= sdl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index de87757cc42f..485f98ced289 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= speex-devel-[0-9]*
USE_GNOME= gnomehack gnometarget ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE}
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 360c5b5fe8b1..81851166e027 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -19,7 +19,7 @@ DEST= ${WRKSRC}/src/libsphinx2/
USE_LDCONFIG= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
-USE_AUTOTOOLS=libtool:22
+USE_AUTOTOOLS=libtool
# contains i386 sound code
ONLY_FOR_ARCHS= i386
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index 659a1cfc9ecd..2a293443d7bf 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= sphinxfe.0:${PORTSDIR}/audio/sphinxbase
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_AUTOTOOLS=libtool:22
+USE_AUTOTOOLS=libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 473067c4b976..1fa33b31ede9 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -18,7 +18,7 @@ USE_LDCONFIG= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_GMAKE= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index d937d347938d..38a8ba2ffbc9 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 8c1abcd088ea..2326b384cd83 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= fftw3f.5:${PORTSDIR}/math/fftw3-float
# includes assembler code
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 8fe9e0a41d4c..fa95073c571b 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -27,7 +27,7 @@ USE_XORG= x11 xext xi xxf86dga ice sm
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-alsa \
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index d9b40c75393a..c909988f3247 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -24,6 +24,6 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget gnomehack gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libexo thunar
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index 851eed99c5f9..b9872371d7c6 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A MIDI library
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-doc-install
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index d1d8c616f656..d0200638bdca 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
gsm.1:${GSM_DIR}
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
MAN1= vat.1
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 803ed06c4763..b9178b482735 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -17,7 +17,7 @@ COMMENT= Utility for capturing audio streams from programs with OSS output
BUILD_DEPENDS= sox:${PORTSDIR}/audio/sox
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 4a32c6e94c5e..8b87555e940a 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
dockapp.2:${PORTSDIR}/x11-wm/libdockapp
RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 86be6ea49760..982e9f8e1d4a 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_MOTIF= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= xanalyser.1
PLIST_FILES= bin/xanalyser \
lib/X11/app-defaults/XAnalyser
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 3f8981392242..fc16740e9b32 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
artsc.0:${PORTSDIR}/audio/arts
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
PLIST_FILES= lib/xmms/Output/libarts.a \
lib/xmms/Output/libarts.la \
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 3203a093fc00..32d33b8f9f50 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
ogg.7:${PORTSDIR}/audio/libogg \
xcb.2:${PORTSDIR}/x11/libxcb
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME= gtk12
USE_ICONV= yes
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 5d6046828d24..e462117a49b7 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 9429539c820e..6b3a5ec06d70 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
USE_KDELIBS_VER= 3
USE_GNOME= gtk12 gnometarget
USE_SDL= sdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-xmms-prefix=${LOCALBASE} \
--with-smpeg-prefix=${LOCALBASE} \
--with-vorbis-prefix=${LOCALBASE} \
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 45012be0117e..bc6865893cf1 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CPPFLAGS+= "-I${LOCALBASE}/include"
USE_LDCONFIG= yes
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 40192ece52d6..f52a1d2f957c 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
PLIST_FILES= lib/xmms/Input/libmid.a \
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index 334e14eb499c..8aa078a6152c 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES= lib/xmms/Input/libxmms_sndfile.so \
lib/xmms/Input/libxmms_sndfile.la
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_XORG= x11 xext xmu xi
USE_LDCONFIG= yes
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index 83b67795533c..637265c825ca 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_GNOME= gnometarget gtk12 lthack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PLIST_FILES= lib/xmms/Input/libtfmx.so
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index 37b584c0ac64..92c17449c3aa 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -23,6 +23,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk20
CFLAGS+= -I${LOCALBASE}/include/dssi
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 13fc7d0ec5ce..aa425de1c8c4 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -21,7 +21,7 @@ OPTIONS= XMMS "XMMS backend support" off
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env automake:env libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gstreamer
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 76353bd9de59..a19c801e0ea0 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
LICENSE= GPLv3
CFLAGS+= -I${LOCALBASE}/include
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--datadir=${DATADIR}
diff --git a/benchmarks/dkftpbench/Makefile b/benchmarks/dkftpbench/Makefile
index 4e59b8625f4b..8723e5eb8181 100644
--- a/benchmarks/dkftpbench/Makefile
+++ b/benchmarks/dkftpbench/Makefile
@@ -18,6 +18,6 @@ PLIST_FILES= bin/dkftpbench
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
.include <bsd.port.mk>
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index e650d433a5f7..f0a5779fc478 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= kris@FreeBSD.org
COMMENT= A modular, cross-platform and multi-threaded benchmark tool
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
OPTIONS= LARGEFILE "Enable Largefile support" on \
MYSQL "Enable MySQL support" on \
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 2df4733f8a2e..2e7181a6d4a9 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -28,7 +28,7 @@ NO_MTREE= yes
USE_SUBMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_MOTIF= yes
SUB_FILES= pkg-message
diff --git a/biology/iolib/Makefile b/biology/iolib/Makefile
index 56dc56df972c..ad81eb772efa 100644
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index 3258fd92d482..5b046ba12094 100644
--- a/biology/libgenome/Makefile
+++ b/biology/libgenome/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libGenome-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Toolkit for developing bioinformatic related software in C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 19f7529c6001..b51e1710f55c 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -19,7 +19,7 @@ COMMENT= Semi-empirical (MNDO, etc.) molecular orbital calculation
LIB_DEPENDS= f2c:${PORTSDIR}/lang/f2c
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile
index 01876f1d0c4e..bab1fdbda81b 100644
--- a/biology/phyml/Makefile
+++ b/biology/phyml/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple, fast, and accurate algorithm to estimate large phylogenies
WRKSRC= ${WRKDIR}/${PORTNAME}/src
GNU_CONFIGURE= yes
PLIST_FILES= bin/phyml
-USE_AUTOTOOLS= automake:111 aclocal:111
+USE_AUTOTOOLS= automake aclocal
AUTOMAKE_ARGS= --add-missing
.include <bsd.port.pre.mk>
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index a33b5f307169..81892771037c 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama \
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
rle.1:${PORTSDIR}/graphics/urt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GL= gl
USE_XORG= x11 xt xi xproto xext inputproto
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 7617381be596..4f2754d4870b 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -18,7 +18,7 @@ USE_LDCONFIG= yes
USE_PERL5= yes
USE_GNOME= gnomehack \
pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
HAS_CONFIGURE= yes
MAN1= freehdl-config.1 \
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 5749d98f6778..ae0920517821 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Free Gerber Viewer
USE_GNOME= desktopfileutils gnomehack gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 6ab7ebf566be..cef55f9550b3 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -19,7 +19,7 @@ COMMENT= Electronic Waveform Viewer
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/gtkwave
diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 9cc36ebb9cdc..e06ea9c9342e 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ng-spice-rework-${PORTVERSION}
MAINTAINER= amakawa@jp.FreeBSD.org
COMMENT= A circuit simulator derived from spice3f5
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
#XSPICE doesn't build
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 5f4c794f695c..aa486d118846 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= m4>=1.4.11:${PORTSDIR}/devel/m4 \
BUILD_DEPENDS= ${RUN_DEPENDS}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_TK_RUN= 83
INSTALLS_ICONS= yes
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index 084024b90d36..29206e35f07b 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -94,13 +94,13 @@ RUN_DEPENDS+= ${RESOURCEDIR}/visu:${PORTSDIR}/cad/salome-visu \
#Dependency from other ports
###########################################################################
#Dependency from autotools
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22 aclocal:111
+USE_AUTOTOOLS= autoconf automake libtool aclocal
.if ${SAL_MODULE} == "kernel"
ACLOCAL_ARGS= -I salome_adm/unix/config_files
.else
. if ${SAL_MODULE} == "yacs"
ACLOCAL_ARGS= -I adm/unix/config_files
- USE_AUTOTOOLS+= autoheader:268
+ USE_AUTOTOOLS+= autoheader
AUTOHEADER_ARGS= -I adm/unix/config_files
. else
ACLOCAL_ARGS= -I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files
@@ -336,7 +336,7 @@ run-autotools-autoheader:
echo "End of autoheader"
.endif
-patch-autotools:
+patch-autotools-libtool:
@(cd ${PATCH_WRKSRC}; ${LIBTOOLIZE} --force;)
pre-configure:
diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile
index d893d5ecc121..c6f001463952 100644
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= bltwish:${PORTSDIR}/x11-toolkits/blt \
BROKEN= does not compile
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
AUTOMAKE_ARGS= -c -a
USE_GMAKE= yes
ALL_TARGET= tcl
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index facb4594d91b..be97c7b6b751 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index cf80407e9752..f3ce2a55a031 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index a6c9ff50eb24..9f242317234e 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomehack lthack
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index ba97af55611d..7c811827e510 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of writing tools in Chinese
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20
USE_LDCONFIG= yes
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 59fd9a90a626..a2e8214fdf4f 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= ao:${PORTSDIR}/audio/libao
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
USE_GMAKE= yes
diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index 3b272bcd17ee..6c8b187a6a17 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -16,7 +16,7 @@ COMMENT= Device firmware update (DFU) USB programmer
MAN1= dfu-util.1
PLIST_FILES= bin/dfu-util
-USE_AUTOTOOLS= aclocal:111 automake:111 autoheader:268
+USE_AUTOTOOLS= aclocal automake autoheader
AUTOMAKE_ARGS= --add-missing --foreign --copy
SNAPDATE= 20090212
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 2a0de3867977..6b304e91249c 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gconf gnomeprint
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index be7474c751cb..bf480b23b2b5 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -33,7 +33,7 @@ USE_PYTHON= 2.4+
USE_WX= 2.6+
WX_COMPS= wx wx:build wx:run python:build python:run
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 32fbf8cb350f..4ad9282eaca9 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library to access GSM mobile phones through GSM modems
USE_GNOME= gnometarget lthack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index b0475fa735ca..e26899a5fed8 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= pkgconfig gnomehack libxml2
USE_PERL5= yes
USE_TCL= yes
USE_PYTHON= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-perl-binding --with-python=${PYTHON_CMD} \
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index 600acce5bff2..43716ef14a8b 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|@CXXFLAGS@|@CXXFLAGS@ -fPIC|' \
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 483fe5dabda8..7fb110f8dff6 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= hamlib.2:${PORTSDIR}/comms/hamlib
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile
index 3f4f2009a19f..008e918c75a8 100644
--- a/comms/kmobiletools/Makefile
+++ b/comms/kmobiletools/Makefile
@@ -18,7 +18,7 @@ COMMENT= Control mobile phones with your PC
USE_KDELIBS_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index c503a2154831..df406228ff0c 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \
USER_LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-debug=full
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index 871a7aff3964..888bcb0b82cf 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -25,7 +25,7 @@ USE_KDEBASE_VER=3
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
post-patch:
diff --git a/comms/libsyncml/Makefile b/comms/libsyncml/Makefile
index c7544d69d74f..15e0859256e9 100644
--- a/comms/libsyncml/Makefile
+++ b/comms/libsyncml/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= wbxml2:${PORTSDIR}/textproc/wbxml2 \
openobex:${PORTSDIR}/comms/openobex \
soup-2.2.8:${PORTSDIR}/devel/libsoup22
-USE_AUTOTOOLS= autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoheader automake libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= glib20 libxml2
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index e5f668b61d26..f01ea81289ec 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator link cables library
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index d251d0b69072..f88b8d4f3f52 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://tijl.fastmail.fm/mirror/
MAINTAINER= tijl@coosemans.org
COMMENT= TI calculator link cables library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack pkgconfig
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 990112002773..45367e82c14d 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= ticables2.4:${PORTSDIR}/comms/libticables2 \
ticonv.4:${PORTSDIR}/converters/libticonv \
tifiles2.6:${PORTSDIR}/devel/libtifiles2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack pkgconfig
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 325b8377a58c..ff22afa01f4d 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}
MAINTAINER= doconnor@gsoft.com.au
COMMENT= Linux Infared Remote Control
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index 4c72c9e800be..4ac1a595cfd3 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -19,7 +19,7 @@ COMMENT= A DSP library and software FAX machine
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 98e997fdce20..5642bbc1b19e 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -18,7 +18,7 @@ COMMENT= A DSP library and software FAX machine
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 1297549922e8..eb3e1cf4ff03 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ticables2.4:${PORTSDIR}/comms/libticables2 \
ticalcs2.8:${PORTSDIR}/comms/libticalcs2 \
ticonv.4:${PORTSDIR}/converters/libticonv
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index aaaf8bcc2c74..95129f809f05 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio curses based logging program
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS= autoconf:268 libtool:22 aclocal:111 automake:111
+USE_AUTOTOOLS= autoconf libtool aclocal automake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile
index 4ba95cdea19e..2d87e2d81354 100644
--- a/comms/unixcw/Makefile
+++ b/comms/unixcw/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+= XCWCP="@comment "
.endif
MAN7= cw.7 CW.7
MANCOMPRESSED= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index dc31aebe0670..a7fb9f130a08 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS= --enable-gfortran --prefix=${LOCALBASE} \
CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
USE_PYTHON= 2.4+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
PORTVERSION=${PORTVERSION}
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index bd037ebac79a..83a279ae94e3 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS= --enable-gfortran --prefix=${LOCALBASE} \
CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
USE_PYTHON= 2.4+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
PORTVERSION=${PORTVERSION}
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index b51d0f8e9d74..d37c5af4e82e 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -19,7 +19,7 @@ COMMENT= X version of who is on the air
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-install:
.if !defined(NOPORTDOCS)
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index bb4b059ff8ee..05541991eb8a 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://trific.ath.cx/Ftp/enca/ \
MAINTAINER= never@nevermind.kiev.ua
COMMENT= A package for detecting encoding of text files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
USE_ICONV= yes
USE_BZIP2= yes
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile
index 032d64c5047b..c7fc06623784 100644
--- a/converters/ktextdecode/Makefile
+++ b/converters/ktextdecode/Makefile
@@ -15,7 +15,7 @@ COMMENT= The simple text conversion utility for KDE 3
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 1dffa31e8220..b57c6b7c6904 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A character set conversion library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_CSTD= gnu89
USE_GNOME= gnometarget
diff --git a/converters/libticonv/Makefile b/converters/libticonv/Makefile
index 404b57d0cf14..2b1fcc9a688a 100644
--- a/converters/libticonv/Makefile
+++ b/converters/libticonv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://lpg.ticalc.org/prj_tilp/download/ \
MAINTAINER= tijl@coosemans.org
COMMENT= TI calculator character set library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack pkgconfig
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index e8ea8f327a83..27c155fc69f0 100644
--- a/converters/mimelib/Makefile
+++ b/converters/mimelib/Makefile
@@ -16,7 +16,7 @@ COMMENT= C++ class library for manipulating messages in MIME format
CONFLICTS= kdenetwork-3.1.*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 921d506c19ba..b1a31bb975a7 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://software.frodo.looijaard.name/psiconv/files/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A conversion utility to convert Psion 5(MX) files into other formats
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 6cc47f03a543..18a205d72d6a 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= Converts files between character sets and usages
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-included-gettext
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index e1e5351a1ca3..b473fe44956a 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -20,6 +20,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/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 43543b716eac..7cb7eab2e27d 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -31,7 +31,7 @@ COUCH_USER?= couchdb
USE_RC_SUBR= couchdb
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \
--localstatedir=/var \
diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index 2d41b5a1ae73..7d77b8dacfd3 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -8,7 +8,7 @@ PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
BDBVER= ${PORTVERSION:R}
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 0386778918e5..3672672547e0 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -17,7 +17,7 @@ COMMENT= Use C++ object API to allow applications to connect to databases
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 775273d8f816..bd02c82c8906 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -17,7 +17,7 @@ COMMENT= Disk Based Hashtables
CONFLICTS= dbh-[2-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 45d60670b64d..cc9ee0b679bc 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -32,7 +32,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \
libxml2
GNOME_DESKTOP_VERSION=2
USE_OPENLDAP= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BDB= 41+
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static \
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 62382b89bd98..d6e40709e82d 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -22,7 +22,7 @@ USE_BISON= build
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal libtool
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
-I ${WRKSRC}/m4
MAKE_JOBS_UNSAFE= yes
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 70f6740a50a4..8fbea27e5644 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -23,7 +23,7 @@ TDS_VER?= 5.0
USE_ICONV= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env libtool:22
+USE_AUTOTOOLS= autoconf:env libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-tdsver=${TDS_VER}
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 6c04a961de8d..4d6db7fffcb8 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -20,7 +20,7 @@ TDS_VER?= 5.0
USE_ICONV= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env libtool:22
+USE_AUTOTOOLS= autoconf:env libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-tdsver=${TDS_VER}
diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile
index cfaa5409d2cf..ed8599b11bdb 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Editor/browser for BibTeX bibliographic databases
USE_GNOME= gnomelibs
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index a712d9ef3612..2dfa5f4d6567 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gabor@FreeBSD.org
COMMENT= The GNU database manager
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 30cf90e010f1..a750f6a295ea 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gnometarget
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 571b2bd3268b..533f999353e1 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix gnomehier libgda
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 13894865b5b7..63b59992b653 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
USE_GETTEXT= yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
--with-python-incdir=${PYTHON_INCLUDEDIR} \
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 2416ed6e8a24..d62445e4e8c3 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= yaz.4:${PORTSDIR}/net/yaz
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= kbibtex.1
diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile
index 2d21beb970d8..b2f19bbe7cdd 100644
--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= kexicore:${PORTSDIR}/editors/koffice-kde3
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index c3c9db2b850c..19863ddbc50d 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphical frontend for administration of mysql servers
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_QT_VER= 3
USE_KDELIBS_VER=3
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 375aaab6537b..ad461ec4b42b 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_PYTHON= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \
--with-hk_classes-incdir=${LOCALBASE}/include/hk_classes
diff --git a/databases/kpogre/Makefile b/databases/kpogre/Makefile
index e6814ddba862..3880333730e8 100644
--- a/databases/kpogre/Makefile
+++ b/databases/kpogre/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpq
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
USE_KDELIBS_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PGSQL= yes
diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile
index 8905d7073d05..a0d19bb927d9 100644
--- a/databases/ksqlanalyzer/Makefile
+++ b/databases/ksqlanalyzer/Makefile
@@ -16,7 +16,7 @@ COMMENT= MSSQL database client for KDE
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile
index f25d3d9614a9..2e344fa60eb9 100644
--- a/databases/ksqlshell/Makefile
+++ b/databases/ksqlshell/Makefile
@@ -16,7 +16,7 @@ COMMENT= MySQL and PostgreSQL client for KDE
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_MYSQL= yes
USE_PGSQL= yes
diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index e9203c0351f9..51be034a1cb7 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= msgpack:${PORTSDIR}/devel/msgpack \
RUN_DEPENDS= rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
LICENSE= ASL
-USE_AUTOTOOLS= libtool:22 autoheader:268 autoconf:268 automake:111 aclocal:111
+USE_AUTOTOOLS= libtool autoheader autoconf automake aclocal
ACLOCAL_ARGS= # empty
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ARGS= --with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 952a6372c4e5..136d18ba3dd1 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -17,7 +17,7 @@ COMMENT= Drivers for libdbi
LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi
USE_GNOME= gnometarget lthack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-static \
--with-dbi-incdir=${LOCALBASE}/include/dbi
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index da0c3e27666a..b1adcfa114b5 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Database Independent Abstraction Layer for C
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 02edf07c3127..ec0bcb9f5596 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index a4a27d760812..2c5017a1548f 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -25,7 +25,7 @@ LIBGDA3_SLAVE?= no
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 026970312bea..d8b986925b26 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
json-glib-1.0.0:${PORTSDIR}/devel/json-glib
RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 4c35e462b95a..ba0a10d7c044 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for libgda4 library
LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgda4
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 925396a13120..528e2e208cb7 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
intlhack referencehack
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 8a28e29aaed5..46fb93d8f58e 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= unixODBC-[0-9]*
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR}
USE_LDCONFIG= yes
diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 83b5b3c9d818..bb8f4a4ea9df 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -16,7 +16,7 @@ COMMENT= The C library for accessing a memcache cluster
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 43b3921b601f..b870f01c4205 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= fjoe@FreeBSD.org
COMMENT= A C++ class library and toolset for ODBC access to data sources
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-isqlxx
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index b655515f50ca..5c8c4a47f90d 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -22,7 +22,7 @@ OPTIONS= MYSQL "Add MySQL support" on \
USE_GNOME= gnomehack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/ludia/Makefile b/databases/ludia/Makefile
index 9593b42499e3..e01b6fef4a70 100644
--- a/databases/ludia/Makefile
+++ b/databases/ludia/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \
senna-cfg:${PORTSDIR}/textproc/senna
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PGSQL= yes
.include <bsd.port.pre.mk>
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index ac96f0658ad6..a1339a252351 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -17,7 +17,7 @@ COMMENT= Utilities and libraries to export data from MS Access databases (.mdb)
# To build man-pages
BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
USE_GNOME= glib20
WANT_GNOME= yes
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 047ed64c6896..a14daf8cd05a 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
CONFLICTS= memcached-1.2*
-USE_AUTOTOOLS= autoconf:268 aclocal:111 automake:111
+USE_AUTOTOOLS= autoconf aclocal automake
AUTOMAKE_ARGS+= --add-missing
USE_RC_SUBR= memcached
GNU_CONFIGURE= YES
diff --git a/databases/mird/Makefile b/databases/mird/Makefile
index 0e07aa7cb48e..5fc713315a0d 100644
--- a/databases/mird/Makefile
+++ b/databases/mird/Makefile
@@ -19,7 +19,7 @@ COMMENT= A free database library with transaction support
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-debug
diff --git a/databases/my2cego/Makefile b/databases/my2cego/Makefile
index 15269e20922d..96914b0e273d 100644
--- a/databases/my2cego/Makefile
+++ b/databases/my2cego/Makefile
@@ -21,7 +21,7 @@ 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
PLIST_FILES= bin/my2cego
.include <bsd.port.mk>
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index d043f4c39acc..3c3bcfadf100 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -23,7 +23,7 @@ NOT_FOR_ARCHS_REASON_sparc64= Fails to compile
USE_MYSQL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-mysql=${LOCALBASE}
USE_LDCONFIG= yes
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index f6480ce4479f..900d2f632882 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= sergey@network-asp.biz
COMMENT= Complex C++ API for MySQL${MYSQL_VER}
USE_MYSQL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \
--includedir=${PREFIX}/include/mysql++ \
--disable-examples
diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile
index 1cbefe279468..fb265d3a54b9 100644
--- a/databases/mysql++3/Makefile
+++ b/databases/mysql++3/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= dudu@dudu.ro
COMMENT= Complex C++ API for MySQL${MYSQL_VER}
USE_MYSQL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 4d2470f23508..bf385afb5a9f 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -21,7 +21,7 @@ USE_MYSQL= yes
IGNORE_WITH_MYSQL= 323
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
USE_LDCONFIG= yes
CFLAGS+= -L${LOCALBASE}/lib
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile
index 5c38ab68cced..4171ca4d3149 100644
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@@ -25,7 +25,7 @@ BROKEN= does not build
OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \
ADMINISTRATOR "Build the MySQL Administrator" on
-USE_AUTOTOOLS= autoconf:268 libtool:22 automake:111
+USE_AUTOTOOLS= autoconf libtool automake
USE_GNOME= libgnome libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
USE_GL= gl glut
USE_GMAKE= yes
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index b7ea1a66b2a9..39fb2118b73d 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -20,7 +20,7 @@ USE_MYSQL= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
--with-mysql-libraries=${LOCALBASE}/lib/mysql
MAKE_ENV+= MOC="${MOC}" QTDIR="${QT_PREFIX}"
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index bbc39f2ee1c3..23527835dc7f 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/databases/mysql${MYSQL_VER}-server:bui
RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
WANT_MYSQL_VER?= 51
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 9cf7b063a191..2292052d2047 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE= yes
OPTIONS= PYTHON "Enable Python scripting and modules" off
-USE_AUTOTOOLS= autoheader:268 autoconf:268 automake:111 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoheader autoconf automake aclocal libtool
AUTOMAKE_ARGS= --add-missing --foreign
ACLOCAL_ARGS=
AUTOCONF_ARGS=
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index cb7bb32aa5df..277add22525e 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS= --with-iodbc
CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.post.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 865ff23e55f0..134f65b37d8c 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql323-client
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index e135e0c5ba12..8a114e95e159 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 2f083d75b780..b49fe8b51782 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql41-client
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index c1b867475ec6..213a81bfce6f 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fork of mysql++ C++ API for MySQL
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 734d6888a12b..4991b02cfca6 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -23,7 +23,7 @@ PM_BASE= ${SITE_PERL}
USE_PERL5= yes
USE_ICONV= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-perl5="${PERL}" \
--with-libintl-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE}
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 53b156dbdd34..a57eba9e1935 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= tremere@cainites.net
COMMENT= A C library for accessing databases with a single API
USE_GMAKE= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index 3ae0e41e486a..5095851ad151 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" \
LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\
AUTOHEADER=true
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index d77467f7df61..2f56d37f77bc 100644
--- a/databases/pgcluster/Makefile
+++ b/databases/pgcluster/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
WRKSRC?= ${WRKDIR}/postgresql-${BASEPGSQL}
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_FLAGS= # empty
MAKEFILE= # empty
CONFLICTS= postgresql-*
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index d2a7330a76e0..3dfd11269f03 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= postgresql
MAINTAINER= girgen@FreeBSD.org
COMMENT= An easy-to-use C interface to PostgreSQL
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PGSQL= YES
USE_GMAKE= YES
USE_LDCONFIG= YES
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index ff9df297d500..2063d0344bf1 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -104,7 +104,7 @@ USE_BISON= build
. endif
. if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 43a1054e0e43..912902d4da58 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -105,7 +105,7 @@ USE_BISON= build
. endif
. if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 88390558e91c..1ecbe7ffc3f9 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -97,7 +97,7 @@ OPTIONS+= DEBUG "Builds with debugging symbols" off
OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
# . if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-# USE_AUTOTOOLS= autoconf:268
+# USE_AUTOTOOLS= autoconf
# CONFIGURE_ARGS+=--with-icu
# LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
# PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 4607ca0864b5..88faf6a0752e 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -103,7 +103,7 @@ OPTIONS+= ICU "Use ICU for unicode collation (server)" off
OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index a8da04f71cda..cee186c67f01 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -109,7 +109,7 @@ IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive
. endif
. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= pg-840-icu-2009-09-15.diff.gz:icu
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 1fed9577cb83..90613a25183f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -109,7 +109,7 @@ IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive
. endif
. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 1fed9577cb83..90613a25183f 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -109,7 +109,7 @@ IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive
. endif
. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 1fed9577cb83..90613a25183f 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -109,7 +109,7 @@ IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive
. endif
. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index d74d10db121a..aa01a80b876f 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -15,7 +15,7 @@ DISTNAME= pure-db-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of libraries for creating and reading constant databases
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index ea534a91a614..5ee5c0ff3713 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -17,7 +17,7 @@ COMMENT= C library to read various Paradox files
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GETTEXT= yes
USE_PERL5= yes
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 3b1d6c62c3e9..bd36ba88c47b 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
CONFLICTS= rrdtool-1.0* rrdtool-1.2*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 73b0364c7885..cde118932cd0 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV= PERL=${PERL}
CONFLICTS= rrdtool-1.2*
LATEST_LINK= rrdtool10
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib \
--program-transform-name=''
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index d8b50deaceca..cf5d21dda3c6 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK= ${PORTNAME}12
CONFLICTS= rrdtool-1.0* rrdtool-1.3*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index d9c0d629c0c8..ec14a0acfe05 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -17,7 +17,7 @@ COMMENT= An SQL database engine in a C library
USE_GMAKE= YES
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index 3ccb41282dc3..6eaac7c19a52 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= sqlite3-[0-9]*
USE_GMAKE= YES
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_DOS2UNIX= *.pc.in
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 948d3dfc705d..7fc93ea3d3bd 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= rudiments.1:${PORTSDIR}/devel/rudiments
WANT_GNOME= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \
CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 49cf7a9fb58a..60688155d185 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
LICENSE= GPLv3
MAKE_JOBS_SAFE= yes
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 6d217b7db138..b11997270391 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -22,7 +22,7 @@ OPTIONS= ORACLE "Build with Oracle support (i386 only)" off \
PGSQL "Build with PostgreSQL support" on \
MYSQL "Build with MySQL support" on
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 autoheader:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf autoheader libtool
USE_QT_VER= 4
QT_COMPONENTS= gui corelib sql xml network linguist moc_build uic_build rcc_build
USE_GMAKE= yes
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 2930de9219df..0a749a15b486 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk\
htmldoc:${PORTSDIR}/textproc/htmldoc
LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-readline\
--without-jdk2\
--without-jdk3\
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index 0094c80543a9..86561f6f5f8f 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= lthack
USE_LDCONFIG= yes
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index b25db8fdc424..0811b74d106c 100644
--- a/databases/xbsql/Makefile
+++ b/databases/xbsql/Makefile
@@ -16,7 +16,7 @@ COMMENT= An SQL wrapper for the XBase DBMS library
LIB_DEPENDS= xbase-2.0.0:${PORTSDIR}/databases/xbase
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index e4e4640b9506..4e3321e117cb 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -15,7 +15,7 @@ COMMENT= Desktop organization tool
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
OPTIONS= KONTACT "Kontact plugin" on \
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 94934f889614..91e049b7ebc6 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -19,7 +19,7 @@ COMMENT= System tray controller for beep-media-player
BUILD_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player
RUN_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/deskutils/bookreader/Makefile b/deskutils/bookreader/Makefile
index eec4bee3ad0f..f7cef3085c54 100644
--- a/deskutils/bookreader/Makefile
+++ b/deskutils/bookreader/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index eecd9d354589..c0fb01aae08e 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
USE_GMAKE= yes
USE_GNOME= gtk20 gnomehier evolutiondataserver gnomevfs2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GCONF_SCHEMAS= contacts.schemas
MAN1= ${PORTNAME}.1
# CFLAGS+= -g
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index a87c7b67b50a..4c7adf53001c 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= markus@FreeBSD.org
COMMENT= Drop stack applet for KDE
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDEBASE_VER= 3
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 05c0bec3ff63..88647584363a 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_AUTOTOOLS= libtool:22 autoconf:268:env automake:111:env
+USE_AUTOTOOLS= libtool autoconf:env automake:env
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index c1c575b0c808..9bf07bfca3d5 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-extra-gcc-optimization
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index d1bea50507ec..c8919c9c604d 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 4499763dee09..08030a5fbce7 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 automake:111:env autoheader:268:env
+USE_AUTOTOOLS= libtool automake:env autoheader:env
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index fbde3bf2af90..1aa2282d76c9 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-maintainer-flags=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 29f42943be62..dd84b7514a1c 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
USE_GETTEXT= yes
INSTALLS_OMF= yes
GCONF_SCHEMAS= gnote.schemas
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 5fdaa2c0e967..9a040d4b1aca 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -24,7 +24,7 @@ USE_XORG= xscrnsaver
USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgnomeui
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
LIBTOOLFILES= configure ../${QOF_DISTNAME}/configure
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index d3b2e7db50b2..aca38cba12a9 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -38,7 +38,7 @@ USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
-USE_AUTOTOOLS= libtool:22:env autoconf:268:env automake:111:env aclocal:111:env libltdl:22
+USE_AUTOTOOLS= libtool:env autoconf:env automake:env aclocal:env libltdl
WANT_GNOME= yes
USE_GNOME= gnomehack
INSTALLS_ICONS= yes
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 4e83726bb445..915b279593c5 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= smyru@heron.pl
COMMENT= A simple customizable GTK screen ruler
USE_GNOME= gnomeprefix gnomehack libgnomeui libglade2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 7cfc9aac519a..f920a45ca276 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
PLIST_FILES= bin/gtkjournal lib/libsqlitemm.a lib/libsqlitemm.la \
lib/libsqlitemm.so lib/libsqlitemm.so.0
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile
index 1361cad555b1..aaff4f5c666a 100644
--- a/deskutils/karamba/Makefile
+++ b/deskutils/karamba/Makefile
@@ -16,7 +16,7 @@ COMMENT= Display various information right on your desktop
EXTRA_PATCHES= ${.CURDIR}/../../comms/kallers/files/patch-configure
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 9a52f506bbfe..12aa714eda65 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -17,7 +17,7 @@ COMMENT= Fast, extensible launcher for KDE similar to Quicksilver on OSX
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/ ${PREFIX}/lib/kde3/
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index f6ccbf5fe627..942a1c69e5df 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.gfai.de/~jaham/download/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE kicker-applet that reminds you of birthdays and anniversaries
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_LDCONFIG= yes
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index 5f2aaeeefec5..40696a7daedd 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= KDE bloglines notifier
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER= 3
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index a78e3cde4777..79304d994b07 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -20,6 +20,6 @@ LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 9002916514dc..df4dabf6f3df 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+= chm:${PORTSDIR}/misc/chmlib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
DO_NOT_COMPILE+=chmlib
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 9252080b385f..15dad4a4eea7 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -29,7 +29,7 @@ _NO_KDE_FINAL= yes
USE_BZIP2= yes
USE_BISON= build
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 1984b7a501b7..80a11758c1a0 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -16,7 +16,7 @@ COMMENT= Panel applet for editing and accessing the KDE addressbook
USE_KDEBASE_VER= 3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
MAKE_JOBS_UNSAFE= yes
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
index 5f7ebb366ee7..ba7fddd1a044 100644
--- a/deskutils/klipoquery/Makefile
+++ b/deskutils/klipoquery/Makefile
@@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index 624aa9ace0d3..f2f5a4911592 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -16,7 +16,7 @@ COMMENT= A KDE client for the popular online journal site LiveJournal
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g ; \
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 61a54aa5356c..2e97b169cb9d 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GL= glut
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 automake:111:env autoheader:268:env
+USE_AUTOTOOLS= libtool automake:env autoheader:env
USE_KDELIBS_VER= 3
USE_BZIP2= yes
USE_PERL5_BUILD= yes
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 809210d062dd..dc09798eee96 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 88135e236cb5..93c70f0c8501 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES= ${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_EFL= imlib2
INSTALLS_ICONS= yes
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 56ef0785ff48..1ed0a4e017c3 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/kooldock
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_KDELIBS_VER= 3
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index fab59d29ecc3..c905bd3d7a81 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -16,7 +16,7 @@ COMMENT= Quick Reference sheets for KDE
USE_KDELIBS_VER=3
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
DOCSDIR= share/doc/HTML
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 587bf667b0a3..1097c1234f94 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -17,7 +17,7 @@ COMMENT= KDE Rich Site Summary viewer
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
MAKE_ENV= LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index e49be900db35..0e47fb08b90c 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env automake:env libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_PERL5_BUILD=yes
diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile
index 7313424cefbd..fa5208aa7629 100644
--- a/deskutils/ktagebuch/Makefile
+++ b/deskutils/ktagebuch/Makefile
@@ -20,7 +20,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_KDELIBS_VER= 3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile
index 0c6a58c00baf..49fb29f77e5d 100644
--- a/deskutils/kuake/Makefile
+++ b/deskutils/kuake/Makefile
@@ -15,7 +15,7 @@ COMMENT= KDE konsole application acting like the Quake-console
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 525477d2537b..2ef8611376bf 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -19,7 +19,7 @@ COMMENT= An integrated calendar for Thunderbird 3.1
RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
CONFLICTS= spidermonkey-1.[0-7]*
-USE_AUTOTOOLS= autoconf:213 libtool:22
+USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 65f54178a6e4..16bc408dcc21 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -19,7 +19,7 @@ OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
SEAMONKEY "Install SeaMonkey 2.0" off
CONFLICTS= spidermonkey-1.[0-7]*
-USE_AUTOTOOLS= autoconf:213 libtool:22
+USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index c1d21cb1c63f..9ffd02b5fe6e 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -16,7 +16,7 @@ COMMENT= Sidebar plugin for Konqueror
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 084a23c99488..eb693c6c904a 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -19,7 +19,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env libtool:22
+USE_AUTOTOOLS= automake:env libtool
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index efa3aae855eb..0cfeddfc5a44 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= pav
MAINTAINER= gnome@FreeBSD.org
COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= nautilus2 eel2 libgnomeui
PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index c538dc36532b..a61624b9e103 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= gconf2 gnomehack gnomeprefix libglade2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GCONF_SCHEMAS= rubrica2.schemas
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 7b85d318228d..e91b9cdd0be1 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2= yes
USE_QT_VER= 3
USE_PERL5_RUN= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env automake:env libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
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
diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile
index 971c48f47470..6ac97cb27240 100644
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A daemon that filters out private IP addresses in DNS responses
PROJECTHOST= google-dnswall
-USE_AUTOTOOLS= automake:111
+USE_AUTOTOOLS= automake
USE_DOS2UNIX= yes
MAKE_JOBS_SAFE= yes
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index b3d61770b18a..43ce45a10e37 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
PERL=${PERL}
-USE_AUTOTOOLS= aclocal:14 automake:14 autoconf:213
+USE_AUTOTOOLS= aclocal14 automake14 autoconf213
USE_BDB= yes
CONFIGURE_ARGS= --with-bdb-lib=-l${BDB_LIB_CXX_NAME} --with-bdb-incdir=${BDB_INCLUDE_DIR}
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index 84662a9e9d28..78e19581a50b 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -22,7 +22,7 @@ MAN3= hesiod.3 hesiod_end.3 hesiod_free_list.3 \
hesiod_free_string.3 hesiod_parse_result.3
MAN5= hesiod.conf.5
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index 28c6eee1910d..b2c621c8a3ef 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= A library to handle internationalized domain names
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index b1f0029b3a20..50981d786fd4 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for programs conforming to DNS RFCs and drafts
LICENSE= BSD
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 44028747f5a2..0d4665ae874b 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -15,7 +15,7 @@ DISTNAME= nss-mdns-${PORTVERSION}
MAINTAINER= ashish@FreeBSD.org
COMMENT= NSS module implementing multicast DNS name resolution
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 4fe284c48ba4..9418010ff914 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -16,7 +16,7 @@ COMMENT= Domain Name Server (DNS) implementation
LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib
-USE_AUTOTOOLS= autoconf:268 libltdl:22 libtool:22
+USE_AUTOTOOLS= autoconf libltdl libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 1199389bcbf3..baa49cbc2b68 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= powerdns-[0-2]*
USE_GMAKE= YES
USE_SUBMAKE= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index af912dd456d1..98fabec6c8ce 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= powerdns-devel-[0-9]*
USE_GMAKE= YES
USE_SUBMAKE= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index c996adee929a..f3642ee8962d 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/editors/X/cooledit
MAINTAINER= ports@FreeBSD.org
COMMENT= Suite of utilities, including a GUI editor
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 8a3d0a73d173..dbd151fbe609 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -34,7 +34,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
USE_XORG= xpm
.endif
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GMAKE= yes
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 6df7425aea31..80124e3652a9 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnomeprefix intlhack gnomevfs2
WANT_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 63ad38a1f62b..3758401e6d7d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
desktopfileutils gnomedocutils ltasneededhack
GNOME_DESKTOP_VERSION=2
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index f12767040d5b..f2327c143c6a 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -18,7 +18,7 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
diff --git a/editors/kate-plugins/Makefile b/editors/kate-plugins/Makefile
index fd5c2ddae04e..ac6f3ad5b275 100644
--- a/editors/kate-plugins/Makefile
+++ b/editors/kate-plugins/Makefile
@@ -23,7 +23,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 6e30d8519a3b..b1af41ff4870 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= kile-i18n-[0-9]*
USE_KDELIBS_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
OPTIONS= KPDF "Use KPDF and KDVI for viewing" on
diff --git a/editors/klat/Makefile b/editors/klat/Makefile
index b1c9f337883a..095823486064 100644
--- a/editors/klat/Makefile
+++ b/editors/klat/Makefile
@@ -17,7 +17,7 @@ COMMENT= A LaTeX source editor for KDE
GNU_CONFIGURE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index f14a5523f602..0fb73d4068b4 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
wv2.4:${PORTSDIR}/textproc/wv2
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index c84bc021843c..31896b801140 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= XML editor for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 58c7e21e2c71..60bf8e962901 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 18d67edf3048..ab88d84b1b4b 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tree oriented XML editor for Gnome
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview libgnomeui
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index a2a4b3df0004..c6dee1dcde67 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -20,7 +20,7 @@ OPTIONS= WIDECHAR "Enable wide-character support (UTF-8)" On
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_ICONV= yes
USE_BDB= 3
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index ea432ef23c89..9809178d0dc4 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -53,7 +53,7 @@ XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
STRIP=
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_TARGET=${XEMACS_ARCH}
CONFIGURE_ARGS+= --enable-mule \
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 356f9b77021e..62f5db5a6cf4 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -39,7 +39,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
STRIP=
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--enable-clash-detection \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 10e6eda4e3bc..257d7c1a5a8d 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -30,7 +30,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_BZIP2= yes
WANT_GNOME= yes
STRIP=
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--with-clash-detection \
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index abf6fe8d72e8..a9f61d3ab6d6 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -50,7 +50,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_XORG= xpm
STRIP=
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS= --with-x11 \
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index c604bfdd9143..05f7577cbecc 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 44c1f82f3c4d..8361f6e2c5f7 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= build
USE_GNOME= gnomehack libglade
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/editors/yui/Makefile b/editors/yui/Makefile
index fbf9c2ae2633..5b39cc4ce35f 100644
--- a/editors/yui/Makefile
+++ b/editors/yui/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= citycat4@ngs.ru
COMMENT= Rich-featured multi-windows console text editor
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAN1= y.1
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index b57e1d6a4c02..24382cb2c286 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-docbook
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index b2e40dc36552..0626b86d993c 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= GMSGFMT=msgfmt DATADIRNAME=share
-USE_AUTOTOOLS= aclocal:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoconf
ACLOCAL_ARGS=
AUTOCONF_ARGS=
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index dc2a9d3e1cad..b3564747d33f 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
USE_SDL= sdl
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --with-sdl
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index a8351285c39b..d3cd98541de9 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -18,7 +18,7 @@ OPTIONS= PTHREADS "Build with pthreads instead of fthreads." on \
NLS "Build with native language support." on \
DEBUG "Enable for debugging hercules itself." off
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile
index d3780224fd66..1e707804d094 100644
--- a/emulators/lib765/Makefile
+++ b/emulators/lib765/Makefile
@@ -15,7 +15,7 @@ COMMENT= Emulation of uPD765a Floppy Disc Controller
LICENSE= LGPL20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
OPTIONS= LIBDSK "With LIBDSK support (recommended)" on
diff --git a/emulators/libdsk/Makefile b/emulators/libdsk/Makefile
index d8bdc887ba29..f75c193ba927 100644
--- a/emulators/libdsk/Makefile
+++ b/emulators/libdsk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.seasip.info/Unix/LibDsk/ \
MAINTAINER= pixel@hugbox.org
COMMENT= Enables access to disks and disk images; also via serial line
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= apriboot.1 dskdump.1 dskform.1 dskid.1 dskscan.1 dsktrans.1\
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 4a3302202be7..6678f2ae0180 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -28,7 +28,7 @@ LICENSE= GPLv2
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268:env aclocal:111:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env aclocal:env automake:env libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index aca0f7b06c7d..4eeacf065b62 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= ticalcs2.8:${PORTSDIR}/comms/libticalcs2 \
ticables2.4:${PORTSDIR}/comms/libticables2 \
tifiles2.6:${PORTSDIR}/devel/libtifiles2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
USE_SDL= sdl
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 04a5a707397d..164984c80448 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 alpha powerpc
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 024c9e4a14bf..1a61c25815f9 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= e-uae-[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --enable-sound
USE_GNOME= gtk20
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 82c0c1c20866..b414c7a7b60e 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -17,7 +17,7 @@ COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
jpeg.11:${PORTSDIR}/graphics/jpeg
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index ddab8a01aa29..2e3b17d5adaf 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= yes
-USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:268
+USE_AUTOTOOLS= automake aclocal autoconf
SUB_FILES= pkg-message
MAN1= yabause.1
diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile
index bf39ac463d3c..ed763963bed1 100644
--- a/finance/eqonomize-kde3/Makefile
+++ b/finance/eqonomize-kde3/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT= yes
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
DATADIR= ${PREFIX}/share/apps/${PORTNAME}
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index e156c8e0fb22..354ab482debc 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Light-weight GNOME based financial management program
USE_XORG= xpm sm
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index 6e04de973ee4..03b6002fcdc7 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE currency converter
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index a8343b201159..d8f886cb278b 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_KDELIBS_VER=3
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libtool
CONFIGURE_ARGS= --with-qhacc-config=${LOCALBASE}/bin
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 5d5b80ef93a9..f8750190e69c 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+= ofx.4:${PORTSDIR}/finance/libofx
USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index efb5900f8da9..ec5c0c8bfa4b 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -15,7 +15,7 @@ COMMENT= Check bank codes of German banks
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index fadf403a9bff..e7f4534a0326 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I m4
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 2409b382d950..299efd813ac8 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -13,7 +13,7 @@ DISTNAME= openhbci-0.9.17-2
MAINTAINER= ports@FreeBSD.org
COMMENT= HBCI is a bank-independent homebanking standard
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.17
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 36b1b9330f9e..3efa3177ff4c 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -16,7 +16,7 @@ COMMENT= Simple QT-based financial manager
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile
index 9339927cf015..ead85b0e4203 100644
--- a/finance/quantlib/Makefile
+++ b/finance/quantlib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/french/dico/Makefile b/french/dico/Makefile
index f4a4f9ab58bd..76d8262a3766 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -21,7 +21,7 @@ BROKEN_WWW= http://www.montefiore.ulg.ac.be/cgi-bin-ulg/DICO.html
#
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
CONFIGURE_ARGS= --mandir=${PREFIX}/man
USE_GMAKE= true
AUTOMAKE_ARGS= --add-missing --foreign --include-deps
diff --git a/french/med/Makefile b/french/med/Makefile
index c2b6940993ca..7119401fee15 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ENV= HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}" \
CONFIGURE_ARGS= --with-f90=${FC} --docdir=${DOCSDIR}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
DOC2FIX= . gif html jpg png tests
diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 4fcf7231b779..3bfa59201b3d 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -19,7 +19,7 @@ OPTIONS= GNOMEGUI "With gnome gui" no
USE_GETTEXT= yes
USE_GNOME= gnomehack ltverhack libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/ftp/gproftpd/Makefile b/ftp/gproftpd/Makefile
index d9124377abd4..9217c911b8d4 100644
--- a/ftp/gproftpd/Makefile
+++ b/ftp/gproftpd/Makefile
@@ -17,7 +17,7 @@ COMMENT= Gtk2 Frontend for proftpd daemon
RUN_DEPENDS= proftpd:${PORTSDIR}/ftp/proftpd
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GNOME= gtk20 pkgconfig
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index eac8062346d5..928900d0468d 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gnet.7:${PORTSDIR}/net/gnet
USE_GNOME= gnomehack gnomeprefix libglade
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gnome=yes --enable-debug=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
index 338713f6ae9a..e2ccfd8d3fe7 100644
--- a/ftp/kasablanca/Makefile
+++ b/ftp/kasablanca/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 227bba12a9b2..d2ad4ea0d305 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -23,7 +23,7 @@ USE_LDCONFIG= yes
USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}"
post-patch:
diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile
index 8d34db8f7e4e..5788f4a3269f 100644
--- a/ftp/kftpgrabber/Makefile
+++ b/ftp/kftpgrabber/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile
index ab67a31be554..b46eb8c83d52 100644
--- a/ftp/kpum/Makefile
+++ b/ftp/kpum/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 8b080e1f5ee9..e6c268c895fe 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -53,7 +53,7 @@ PORTEXAMPLES= ASCII.html CreateHome.html Filters.html SQL.html Umask.html \
FXP.html Regex.html Tracing.html
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFLICTS= proftpd-1.[0-9].*
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index c29c2b29c54f..722dffacc567 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -34,7 +34,7 @@ PORTDOCS= *
USE_GMAKE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFLICTS= proftpd-devel-1.[0-9].*
diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index 8a3548b45d3d..97a5a8bf2612 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
MAINTAINER= cejkar@fit.vutbr.cz
COMMENT= Enhanced ftp server from NetBSD
-USE_AUTOTOOLS= aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal automake libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
.include <bsd.port.pre.mk>
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index 24839b97ded3..e3376c9f3dc6 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
USE_GNOME= gtk20 lthack
WANT_GNOME= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index d10554743136..8428bde0b7f0 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -23,7 +23,7 @@ COMMENT= A replacement ftp server for Un*x systems
CONFLICTS= wu-ftpd-[0-9]* heimdal-[0-9]*
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip \
--enable-noop --disable-numericuid --enable-nlst-dirs \
--enable-ipv6 \
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 19f9a8a4bfd1..0c254d3d83d5 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -20,7 +20,7 @@ COMMENT= A replacement ftp server for Un*x systems
CONFLICTS= wu-ftpd+ipv6-[0-9]* heimdal-[0-9]*
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip \
--enable-noop --disable-numericuid --enable-nlst-dirs \
--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 9c5858a1c75c..5c7d6ea9173c 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-0.8
MAINTAINER= novel@FreeBSD.org
COMMENT= Modular FTP server configurable online using SITE commands
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_RC_SUBR= wzdftpd.sh
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 5cdd83e3b171..92d5c3e9a226 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2 \
execinfo.1:${PORTSDIR}/devel/libexecinfo
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_SDL= sdl
USE_XORG= xpm
diff --git a/games/antrix/Makefile b/games/antrix/Makefile
index 87c69e417e4d..d0fe40f7ead3 100644
--- a/games/antrix/Makefile
+++ b/games/antrix/Makefile
@@ -18,7 +18,7 @@ COMMENT= Free stable dedicated-server for World of Warcraft
BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion
-USE_AUTOTOOLS= aclocal:111 libtoolize autoconf:268 autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal libtoolize autoconf autoheader automake libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
USE_MYSQL= yes
diff --git a/games/apricots/Makefile b/games/apricots/Makefile
index 1f9c9f5902de..fbd3bf5d6afd 100644
--- a/games/apricots/Makefile
+++ b/games/apricots/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.fishies.org.uk/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Fly a little plane around and shoot things and drop bombs
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
diff --git a/games/atlantikdesigner/Makefile b/games/atlantikdesigner/Makefile
index d8de774f5992..6e19642efc7c 100644
--- a/games/atlantikdesigner/Makefile
+++ b/games/atlantikdesigner/Makefile
@@ -24,7 +24,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 57b3d68f8049..3f863cd4f266 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sound
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index ad499ad48702..fab19d38d29f 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11 xext xt xmu xi
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= yes
USE_SDL= sdl image
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index 3f23d4d58c2e..a7d468c52a46 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
DESKTOP_ENTRIES= "cheech" \
"A networked Chinese Checkers Game" \
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index e75985cefa2f..65a64dfb2b04 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env aclocal:111:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env aclocal:env automake:env libtool
USE_SDL= sdl
USE_GL= gl
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 475306609d57..23e7dab955ca 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -26,7 +26,7 @@ USE_SQLITE= 3
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-check=no
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index f26473608e5d..e3a67f4167f2 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS= --disable-debug --enable-release=yes \
--with-sharepath=${PREFIX}/share/d2x-xl
USE_SDL= sdl mixer image
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
USE_MOTIF= yes
MAKE_JOBS_SAFE= yes
AUTOMAKE_ARGS= --add-missing --copy
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index b10cefe48c57..c34a5f64d89d 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -23,7 +23,7 @@ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-simplelayout --enable-getaddrinfo
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_SDL= mixer image
SUB_FILES= daimonin.sh
SUB_LIST= PORTVERSION=${PORTVERSION}
diff --git a/games/duel/Makefile b/games/duel/Makefile
index d482e3184e91..f928d580bde3 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -19,7 +19,7 @@ COMMENT= An overhead, OpenGL space shooter
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
ftgl.2:${PORTSDIR}/graphics/ftgl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GL= gl
USE_SDL= sdl
diff --git a/games/easysok/Makefile b/games/easysok/Makefile
index 85a7fdaa780d..39e139754cff 100644
--- a/games/easysok/Makefile
+++ b/games/easysok/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index 1ea0c174c171..d5ef23e5ce0f 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Very popular card game with variable skill levels
PLIST_FILES= bin/euchre
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake14 autoconf213
USE_GNOME= gtk12
CFLAGS+= -include "${FILESDIR}/std-namespace.h" -Werror
MAKE_JOBS_SAFE= yes
diff --git a/games/exult/Makefile b/games/exult/Makefile
index fd8e2e293351..9a7dfff43934 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_SDL= sdl mixer
USE_XORG= x11
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index f0ecb2229a20..6bda3ae9916d 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
LICENSE= GPLv2
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
AUTOMAKE_ARGS= --add-missing
GNU_CONFIGURE= yes
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index c2cff7e772ad..a92dfbdbb4b5 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -16,7 +16,7 @@ COMMENT= The GGZ Gaming Zone - Core Client Libraries
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index b342542f1957..07c95a0c6dae 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -14,7 +14,7 @@ CATEGORIES= games
MAINTAINER= kde@FreeBSD.org
COMMENT= The GGZ Gaming Zone - GTK+ Frontend
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 94d6168071a7..ab8f183535e0 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
-USE_AUTOTOOLS= automake:111:env autoconf:268:env
+USE_AUTOTOOLS= automake:env autoconf:env
USE_ZIP= yes
USE_OPENAL= al alut
USE_DOS2UNIX= yes
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e1322acf678b..82f800cb50ab 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -19,7 +19,7 @@ EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2
USE_GMAKE= yes
-USE_AUTOTOOLS= autoheader:268 automake:111 aclocal:111 autoconf:268
+USE_AUTOTOOLS= autoheader automake aclocal autoconf
ACLOCAL_ARGS= -I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a -c -f
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index ab60582d3513..9c804e12b37b 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -17,7 +17,7 @@ COMMENT= Memory Blocks game for GNOME
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 583eb371699a..5fd48ae4bb51 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
USE_GNOME= gnomehack gnometarget libxml2
USE_GMAKE= yes
USE_PYTHON= 2.0+
-USE_AUTOTOOLS= libtool:22 automake:111
+USE_AUTOTOOLS= libtool automake
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 239d395272e1..583477ebfafa 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
USE_GL= glut
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/tcl8.4 \
-I${LOCALBASE}/include" \
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 22719428929e..e89cf4cd8acf 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple turing machine simulator for GNOME 2
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
INSTALLS_OMF= yes
diff --git a/games/kamikaze/Makefile b/games/kamikaze/Makefile
index 8663c59b3997..fcdb949774c4 100644
--- a/games/kamikaze/Makefile
+++ b/games/kamikaze/Makefile
@@ -15,7 +15,7 @@ COMMENT= Multiplayer bomberman-style game for KDE
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-server
.include <bsd.port.mk>
diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index 9e239a603e20..1f73eeb02caf 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -22,7 +22,7 @@ USE_GETTEXT= yes
USE_KDELIBS_VER=3
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CFLAGS+= -Dsqrtl=sqrt
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index cd494a868722..2eac1c78f25f 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -21,7 +21,7 @@ PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile
index ec03a46da015..e35d3f35868f 100644
--- a/games/kfreerings/Makefile
+++ b/games/kfreerings/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= kdegames.3:${PORTSDIR}/games/kdegames3
USE_KDELIBS_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile
index a53d04ff1ffb..a6c0ab065099 100644
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11/kdelibs3:extract
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libtool
USE_PERL5_BUILD= yes
USE_KDELIBS_VER= 3
USE_BZIP2= yes
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 933054de77e1..ee5d12c6747d 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty
USE_GETTEXT= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE}
post-patch:
diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile
index 3e2182b00839..980566fff42a 100644
--- a/games/kpicframer/Makefile
+++ b/games/kpicframer/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_KDELIBS_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
pre-build:
diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile
index 0da141c6ca73..49a2789917ec 100644
--- a/games/kpictorial/Makefile
+++ b/games/kpictorial/Makefile
@@ -17,7 +17,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_KDELIBS_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile
index c4e98854564d..0e1aec9706e0 100644
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@@ -17,7 +17,7 @@ COMMENT= Jigsaw puzzle game for KDE
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
USE_KDELIBS_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
${REINPLACE_CMD} -e "s,malloc.h,stdlib.h," \
diff --git a/games/krosswordplayer/Makefile b/games/krosswordplayer/Makefile
index a381cd09d9d2..cf722cbe0e1c 100644
--- a/games/krosswordplayer/Makefile
+++ b/games/krosswordplayer/Makefile
@@ -15,6 +15,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE crossword puzzle game
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/games/kslide/Makefile b/games/kslide/Makefile
index 785915c84d6f..bc9b8ae56dcf 100644
--- a/games/kslide/Makefile
+++ b/games/kslide/Makefile
@@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
post-patch:
diff --git a/games/ktritoc/Makefile b/games/ktritoc/Makefile
index cda626e53521..652da9a5ea15 100644
--- a/games/ktritoc/Makefile
+++ b/games/ktritoc/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Tic-tac-toe like boardgame
LIB_DEPENDS= kdegames.3:${PORTSDIR}/games/kdegames3
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
${RM} -r ${WRKSRC}/ktritoc/doc/ktritoc/dtd
diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile
index c4700e508e55..a7b0a44bbdd8 100644
--- a/games/kwappen/Makefile
+++ b/games/kwappen/Makefile
@@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_GETTEXT= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index cc47eced7411..0088275d54f9 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -15,7 +15,7 @@ DISTNAME= llk_linux-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scarce recreation game
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
USE_GNOME= gtk20 esound
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/games/libfov/Makefile b/games/libfov/Makefile
index 46f3f4e73134..43b0aa4183d2 100644
--- a/games/libfov/Makefile
+++ b/games/libfov/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C library for calculating fields of view on low resolution rasters
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= ac_cv_prog_doxygen=no ac_cv_path_SDL_CONFIG=no
USE_LDCONFIG= yes
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index bdff1deb3e8c..1ce5cbbe25f6 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -16,7 +16,7 @@ COMMENT= The GGZ Gaming Zone - Base Library
LIB_DEPENDS= gcrypt.17:${PORTSDIR}/security/libgcrypt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 46b363545be8..5f8f51e905c0 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Core library of MaitreTarot, a Tarot card game
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20 libxml2 lthack
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index 4b66f26c322a..883e8c0a441c 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -17,7 +17,7 @@ COMMENT= Client-side library of MaitreTarot, a Tarot card game
LIB_DEPENDS= maitretarot.0:${PORTSDIR}/games/libmaitretarot
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20 libxml2 lthack
diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index 08e56d94c32c..748a9b0ef11f 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -23,7 +23,7 @@ OPTIONS= SCRIPTDEV2 "ScriptDev2" on \
RA "Remote Administration support" off \
DBC "Install DBC files" on
-USE_AUTOTOOLS= aclocal:111 libtoolize autoconf:268 autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal libtoolize autoconf autoheader automake libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
USE_MYSQL= yes
diff --git a/games/moon-buggy/Makefile b/games/moon-buggy/Makefile
index 2939c97d65e8..6fcc6f68e882 100644
--- a/games/moon-buggy/Makefile
+++ b/games/moon-buggy/Makefile
@@ -27,7 +27,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= esd:${PORTSDIR}/audio/esound:install
.endif
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sharedstatedir=/var/games\
--with-setgid=games
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 1099a959ea3e..e3aeeaed83ad 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data
-USE_AUTOTOOLS= automake:111:env aclocal:111:env autoconf:268:env
+USE_AUTOTOOLS= automake:env aclocal:env autoconf:env
USE_BZIP2= yes
USE_DOS2UNIX= conf.example
GNU_CONFIGURE= yes
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 53b2ec62230a..82d04f4209c4 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
# Necessary to find pkg.m4 (PKG_CHECK_MODULES)
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 5c13e321ae21..4279035f4695 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
USE_SDL= image mixer sdl
USE_GMAKE= yes
USE_GL= gl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index cc74c6b6ba9e..3501d58ef6c3 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -15,7 +15,7 @@ DISTNAME= quake2-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= First Person Shooter with many addons available
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_BZIP2= yes
CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/${PORTNAME}/' \
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index d8fbc3bdb386..cf58756269c1 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -19,7 +19,7 @@ COMMENT= Cleaned up copy of the GPLd Quake 1 source code
NOT_FOR_ARCHS= sparc64
NOT_FOR_ARCHS_REASON= generated Quake C compiler (qfcc) does not work
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_BISON= build
USE_GMAKE= yes
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 7be34420d0cf..511e0d11b6a3 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -32,7 +32,7 @@ USE_SDL= mixer net sdl
GNU_CONFIGURE= yes
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_PERL5= yes
USE_WX= 2.4+
WX_CONF_ARGS= absolute
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 349dccc01118..600210ad32f8 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -19,7 +19,7 @@ COMMENT= S.C.O.U.R.G.E. is a rogue-like game
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
USE_GL= gl
USE_SDL= sdl image mixer net ttf
USE_GMAKE= yes
diff --git a/games/sdlCC/Makefile b/games/sdlCC/Makefile
index 832ab1c9de7a..f2cc3ab3fc9f 100644
--- a/games/sdlCC/Makefile
+++ b/games/sdlCC/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://chinesecheckers.vegard2.no/ \
MAINTAINER= frank@dynamical-systems.org
COMMENT= An extensible chinese checkers game using SDL
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= image mixer sdl
GNU_CONFIGURE= yes
diff --git a/games/six/Makefile b/games/six/Makefile
index 5c60380596e6..062af2adbaa3 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE HEX clone
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index 310394c76640..4325be8475b2 100644
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A video game about traveling in 2D planetary systems
USE_SDL= sdl mixer image
-USE_AUTOTOOLS= automake:111
+USE_AUTOTOOLS= automake
AUTOMAKE_ARGS= -i --add-missing
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index d24539871158..62fcfa28370a 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= artsmodules.0:${PORTSDIR}/multimedia/kdemultimedia3
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index 7c1909017cbc..f51c547151e2 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \
ogg.7:${PORTSDIR}/audio/libogg \
smpeg.1:${PORTSDIR}/multimedia/smpeg
-USE_AUTOTOOLS= automake:111 aclocal:111
+USE_AUTOTOOLS= automake aclocal
USE_SDL= sdl mixer image
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/teg/Makefile b/games/teg/Makefile
index a36f226ce474..d9d0ac0335fe 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -16,7 +16,7 @@ COMMENT= A turn-based strategy game for GNOME
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-ggz
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index b87fc8c2d82b..5667c2d68aa3 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -14,7 +14,7 @@ DISTNAME= valley-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
COMMENT= The Valley is a rewrite of an old RPG from the early 1980s
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_SDL= sdl
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index f7e7e2630924..19e5794d63a5 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -22,7 +22,7 @@ USE_SDL= mixer sdl
USE_GL= gl
USE_XORG= x11 xt xmu xi
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 3d8780be48f0..01d6ebee3494 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
xvidcore.4:${PORTSDIR}/multimedia/xvid
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data
-USE_AUTOTOOLS= aclocal:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoconf
USE_BZIP2= yes
USE_GL= yes
USE_SDL= sdl image mixer ttf
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 64a7c8645747..59bf4341b2c9 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -19,7 +19,7 @@ USE_OPENAL= al alut
USE_GL= glut
USE_SDL= sdl
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no \
ac_cv_lib_freeglut_glutGetModifiers=no
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 0ee39b2bfbd7..566730962065 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnometarget pango
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -Im4
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 7d8d8e7f949e..c275ad82adf9 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_LUA= 5.1
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -Im4
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 29fdf090fd3e..e07c6e68f3cc 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -21,7 +21,7 @@ NO_CDROM= "don't sell for profit"
USE_GETTEXT= yes
USE_XORG= x11 xmu xaw xt
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake14 autoconf213
AUTOMAKE_ARGS= --include-deps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index fa1f340a2439..9ee13ab917da 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -16,7 +16,7 @@ COMMENT= A puzzle game, somewhat like Tetris
USE_GMAKE= yes
USE_XORG= xpm
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 34e70bf6abb4..efe1ff907465 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -23,7 +23,7 @@ EXPIRATION_DATE=2011-04-11
USE_GL= glut
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake14 autoconf213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index e7deb2fe79b3..ca8564614f7a 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Zangband (Zelazny Angband) with color, X11 support
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --datadir=${PREFIX}/lib --mandir=${PREFIX}/man \
--with-setgid=${SHAREGRP}
diff --git a/german/kheisereg/Makefile b/german/kheisereg/Makefile
index 93964e664e32..e2183b05d932 100644
--- a/german/kheisereg/Makefile
+++ b/german/kheisereg/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
USE_BZIP2= yes
USE_KDEBASE_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index 0faa81c82f18..ff563646395a 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= steak:${PORTSDIR}/german/steak
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 910b5fd3befc..5f86da014a3e 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -32,7 +32,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
TESTS "Run bundled self-tests after build" on
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 0fce08b1589d..b60f152d11cd 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -34,7 +34,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
TESTS "Run bundled self-tests after build" on
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index aaf88276b0bb..5e8a30774707 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -36,7 +36,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
TESTS "Run bundled self-tests after build" on
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index b60fb1d6ab7f..12a1d66d6751 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast pixel formats conversion library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index cef6db3a2f94..66a380e74a00 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_XZ= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
# For some reason, using our libtool breaks the build into pieces:
-#USE_AUTOTOOLS+= libtool:22
+#USE_AUTOTOOLS+= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared --without-dps
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index fd2f43a80902..65a055d8dddc 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-imfexamples
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index a0911d7287f3..4df97e9a8775 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= ports@FreeBSD.org
COMMENT= An ascii art library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index 3799bb7f8947..3b232813c9b4 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jasper:${PORTSDIR}/graphics/jasper \
LICENSE= GPLv3
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 1ba75772a76c..2265d30d2311 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
USE_LDCONFIG= yes
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
MAKE_ENV= C="${CC}" AGGCXXFLAGS="${CXXFLAGS}"
CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index a8d7c2f8761f..341a106f96ac 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
test check: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index c0a7c7a5440f..ad9a07c1918d 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -17,7 +17,7 @@ COMMENT= Convert bitmap to vector graphics
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
MagickWand.4:${PORTSDIR}/graphics/ImageMagick
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 3b5b05f2816e..2a7e2521a557 100644
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@@ -23,6 +23,6 @@ PLIST_FILES= lib/bmp/Visualization/librootvis.so \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index 1c0d6807b8f9..5f43bb698ac1 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -21,7 +21,7 @@ OPTIONS+= THREADS "With threading support" off
GNU_CONFIGURE= yes
USE_GL= gl
USE_PERL5= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
CONFIGURE_ARGS=--enable-ltdl-install=no
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 8ca724496e08..29cfe9a8c2e5 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
--enable-gobject
USE_GNOME= glib20 gnomehack ltverhack referencehack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= ${PTHREAD_CFLAGS}
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index bf8813740064..e053a4418c53 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget ltverhack
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 130951126562..cb667fc2dff3 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= cal3d-[0-9]*
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:111 autoheader:268 libtool:22
+USE_AUTOTOOLS= automake autoheader libtool
AUTOMAKE_ARGS= --add-missing
MAN1= cal3d_converter.1
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 89fa7b165cb0..45a44bb8c598 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= cal3d-devel-[0-9]*
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoheader:268 libtool:22
+USE_AUTOTOOLS= automake autoheader libtool
USE_LDCONFIG= yes
MAN1= cal3d_converter.1
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index aab9f0a5a0ea..340d57e22d94 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
ftgl.2:${PORTSDIR}/graphics/ftgl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GNOME= gtk12
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 34744c624048..473df1fa8f84 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -17,7 +17,7 @@ COMMENT= Clutter Box2D integration library
LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack ltverhack gnomeprefix
USE_XORG= xp x11
USE_LDCONFIG= yes
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 1ed07187a3ce..03657899a533 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix
USE_XORG= xp x11
USE_LDCONFIG= yes
diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
index f20c1fa2cfea..e2a80eeebda7 100644
--- a/graphics/clutter-qt/Makefile
+++ b/graphics/clutter-qt/Makefile
@@ -20,7 +20,7 @@ BROKEN= Doesn't build with Glib-2.26
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_QT_VER= 4
QT_COMPONENTS= corelib gui moc_build
USE_GNOME= gnomehack
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 1cd758a06b73..91df243f53c2 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -22,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index a4fa68612f0d..9e6c40bfd64f 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
ungif.5:${PORTSDIR}/graphics/libungif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 717551347a2c..85d0521a6a7f 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -30,7 +30,7 @@ OPTIONS= JPEG "Enable JPEG support" on \
WRKSRC= ${WRKDIR}/${DISTNAME:L}
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy --force-missing
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index d27826c64e95..33916d4947dc 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -19,7 +19,7 @@ COMMENT= A general drawing canvas from dia dialog editor
USE_GNOME= gnomehack gnometarget pygnome2
USE_PYTHON= 2.2+
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index b07303bc0ef6..c2822fb780c7 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
PORTSCOUT= limit:^0\.9\.
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_GETTEXT= yes
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 2517be8b047f..a09dc2c33d6b 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -19,7 +19,7 @@ USE_XORG= x11 ice xext
USE_BZIP2= yes
USE_QT_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env
+USE_AUTOTOOLS= automake:env autoconf:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 03de0c01ec22..993a661b7901 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
USE_BZIP2= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env
+USE_AUTOTOOLS= automake:env autoconf:env
# GCC 4.2 has some problems, see
# http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 164f1f60fdd4..99d6ffd4f6e8 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -33,7 +33,7 @@ USE_XORG= ice x11 xext xv
USE_GNOME= esound
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_cv_header_mpeg_h=no \
ac_cv_header_libmpeg3_h=no \
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index a5c5cc5346dd..6128929ce3fb 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index e4ea10590d93..c7d06aa708a6 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/enlightenment/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Fonts and font libraries necessary for Enlightenment
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= imlib
GNU_CONFIGURE= yes
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 11170f18054b..56240cc464f3 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -16,7 +16,7 @@ COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
CONFLICTS= libglut-[0-9].*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_XORG= ice xi
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 62d320eebf29..f5843ff6e946 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \
MAINTAINER= glebius@FreeBSD.ORG
COMMENT= A translator library for geospatial data formats
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 6fa18c02cecc..63b16093c009 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -26,7 +26,7 @@ LATEST_LINK= gdk-pixbuf2
USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= xt xi x11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME+= gnomehack glib20 ltverhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 75f4f49a9b22..8d98e92a0d8c 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -22,7 +22,7 @@ OPTIONS= MOTION_AVG "Use experimental motion averaging code" off
USE_BZIP2= yes
USE_MOTIF= yes
USE_GL= glu
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-motif=${LOCALBASE} --with-opengl=${LOCALBASE}
USE_LDCONFIG= yes
diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 375264a45f2a..7b19e371ce70 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -15,7 +15,7 @@ COMMENT= GEOS implements all the OpenGIS "Simple Features for SQL"
LICENSE= LGPL21
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= YES
USE_GMAKE= YES
USE_LDCONFIG= YES
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 1c342c2e1f4f..47a686890ce0 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility library that includes a wrapper for imlib2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig
USE_EFL= imlib2
GNU_CONFIGURE= yes
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 6a05f0de5630..a48da5ae678f 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Tools and library routines for working with GIF images
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 03dd02b29b47..b9454de7d34a 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_XORG= xpm xmu xext
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \
desktopfileutils
USE_LDCONFIG= yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index bea4d25bfc7a..5f7063a57b70 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_PERL5_BUILD=yes
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index cb8fb6bac871..64e65fe8e96a 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@dclg.ca
COMMENT= A GL Tubing and Extrusion Library
USE_GL= glut
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= "LIBS=-L${LOCALBASE}/lib -lXext ${PTHREAD_LIBS}"
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index dce2320dd722..8329aa5dda74 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11 xxf86dga xxf86vm
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:14 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake14 autoconf libtool
AUTOMAKE_ARGS= -a
MAKEFILE= makefile.autoconf
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 7ff231ae5f38..86434c32ca5d 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://gltt.sourceforge.net/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= TrueType fonts rendering using OpenGL
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= gl glut
USE_FREETYPE= yes
USE_GMAKE= yes
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index 584e0ea5c54f..8506b5e4a710 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -34,7 +34,7 @@ USE_GCC= 4.2+ # triggers compiler error on gcc 3.4
WANT_GSTREAMER= yes
USE_GNOME= pkgconfig libxml2
USE_XORG= x11 xau xdmcp xext xi xinerama ice sm
-USE_AUTOTOOLS= libltdl:22 libtool:22:env autoconf:268:env automake:111:env
+USE_AUTOTOOLS= libltdl libtool:env autoconf:env automake:env
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 323361123823..de7d152f5c48 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -31,7 +31,7 @@ USE_GCC= 4.2+ # triggers compiler error on gcc 3.4
WANT_GSTREAMER= yes
USE_GNOME= pkgconfig libxml2
USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
MAKE_JOBS_SAFE= yes
# jemalloc leads to infinite recursion on FreeBSD
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 9cc342b7c41d..66d5e97355cb 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= kwm@FreeBSD.org
COMMENT= Canvas widget for GTK+
USE_GNOME= gtk20 gnomehack ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_BZIP2= yes
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index 3cdd9f97c7e6..fe7c35ac8da7 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
goocanvas.3:${PORTSDIR}/graphics/goocanvas
USE_GNOME= gnomehack ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-documentation
USE_BZIP2= yes
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index b068e051dcd3..fcf1610d7325 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S|.|-|}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Visual effects library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index c181202a5e85..58337e6e3338 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_BISON= build
USE_GMAKE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
WANT_GNOME= yes
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 75ab8d124f94..7ee8e56d2a6e 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A gtk+ based screen capture
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
USE_GNOME= pkgconfig gtk20 libwnck libxml2
USE_XORG= x11 xmu
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index e1400b276007..78aa7c8fd7f4 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= dpstk.0:${PORTSDIR}/x11/dgs
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-dps-includes=${LOCALBASE}/include \
--with-dps-libraries=${LOCALBASE}/lib
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 25f09974f167..a40c76d818d0 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -19,7 +19,7 @@ USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111:env
+USE_AUTOTOOLS= aclocal:env
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 2686b556e120..7f9c232cd487 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--enable-kipi
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 2686b556e120..7f9c232cd487 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--enable-kipi
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 90afd8d21105..b53843798088 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -22,7 +22,7 @@ OPTIONS= THREAD "Enable multithreaded file I/O support" on
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
regression test check: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 7160e310f59e..385c9ecc0438 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_XORG= sm xext x11
USE_GMAKE= yes
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 74ad2a103cfc..12cd9be9625d 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -24,7 +24,7 @@ OPTIONS= SDL "Enable SDL for graphical debugging" off \
MAKE_JOBS_SAFE= yes
USE_PYTHON_BUILD= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= libtool aclocal automake autoconf
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= yes
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 800f64a76351..a380b4864236 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --with-tiff=${PREFIX}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
MAKE_ARGS= ARCH=FREEBSD
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index b0a949eaaf0a..c1a8f2c6e2d8 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
LICENSE= MIT
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ZIP= yes
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index f2297cd5e1ae..338e13dc57c1 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -24,7 +24,7 @@ COMMENT= IJG's jpeg compression utilities
CONFLICTS= libjpeg-turbo-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/kalbum/Makefile b/graphics/kalbum/Makefile
index ca09ea68a358..02266f9c1a3a 100644
--- a/graphics/kalbum/Makefile
+++ b/graphics/kalbum/Makefile
@@ -16,7 +16,7 @@ COMMENT= Create albums from a collection of images
USE_KDELIBS_VER= 3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile
index bab260736265..ebd2ed186483 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= MagickCore.4:${PORTSDIR}/graphics/ImageMagick
USE_KDELIBS_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
INSTALLS_ICONS= yes
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 2f5e78b3f18a..64dd806f3f2c 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION}
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
index 2f5e78b3f18a..64dd806f3f2c 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION}
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 41cd394d71ed..14364459b7d6 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 844f0efe3413..eb2c209bef09 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -33,7 +33,7 @@ PREFIX= ${KDE_PREFIX}
USE_GL= glut
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WANT_GNOME= yes
USE_GHOSTSCRIPT=yes
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 3ab6577fa6f1..a5d6b5f5982b 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -45,7 +45,7 @@ OPTIONS= ACQUIREIMAGES "scanner/screenshot plugin" on \
PORTSCOUT= limit:^0\.1\.
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_GETTEXT= yes
diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile
index 524d45f65c5c..f97136248cc5 100644
--- a/graphics/kooka/Makefile
+++ b/graphics/kooka/Makefile
@@ -27,7 +27,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 6d2af428bf95..8cbf54543f73 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
USE_KDELIBS_VER= 3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/graphics/kradview/Makefile b/graphics/kradview/Makefile
index 02170a582556..2d1d8f2e0f23 100644
--- a/graphics/kradview/Makefile
+++ b/graphics/kradview/Makefile
@@ -16,6 +16,6 @@ MAINTAINER= ale@FreeBSD.org
COMMENT= A free DICOM viewer for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
index 9d0dee0a719c..9580ef0836d3 100644
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@@ -24,7 +24,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index c9a39382aee8..7a91cf3adff7 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
PROJECTHOST= leptonica
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= libtool aclocal automake autoconf
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/leptonlib/Makefile b/graphics/leptonlib/Makefile
index c9a39382aee8..7a91cf3adff7 100644
--- a/graphics/leptonlib/Makefile
+++ b/graphics/leptonlib/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
PROJECTHOST= leptonica
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= libtool aclocal automake autoconf
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/libart/Makefile b/graphics/libart/Makefile
index f3295fb884f4..5eb90979831d 100644
--- a/graphics/libart/Makefile
+++ b/graphics/libart/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://tiger.bioinf.cs.uni-potsdam.de/free/Graphics/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for high-performance 2D graphics
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}_lgpl-${PORTVERSION}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 3c5ea5c5392b..d0721bc3218f 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library for high-performance 2D graphics
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget pkgconfig
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 58d10f5f6102..7437665d06f6 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -16,7 +16,7 @@ COMMENT= Graphics library that outputs text instead of pixels
USE_GNOME= gnomehack gnometarget ltverhack pkgconfig
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-doc \
--enable-ncurses \
--disable-java \
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 400ce39fed82..f1aa00932c1e 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
USE_BZIP2= yes
USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libecwj2/Makefile b/graphics/libecwj2/Makefile
index 89262dda2709..a6c08ff4b653 100644
--- a/graphics/libecwj2/Makefile
+++ b/graphics/libecwj2/Makefile
@@ -22,7 +22,7 @@ NO_PACKAGE= ${RESTRICTED}
NO_CDROM= ${RESTRICTED}
USE_ZIP= yes
-USE_AUTOTOOLS= libtool:22 autoconf:268
+USE_AUTOTOOLS= libtool autoconf
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/libemf/Makefile b/graphics/libemf/Makefile
index 5f88d1ecad4c..907eda1c60ba 100644
--- a/graphics/libemf/Makefile
+++ b/graphics/libemf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= maho@FreeBSD.org
COMMENT= Enhanced Metafile Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 0aa70f9df3aa..49bf11101418 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -17,7 +17,7 @@ COMMENT= GTK+ widgets to display/edit EXIF tags
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
USE_GNOME= gnomehack gnometarget gtk20
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index b0a4a4afb2b1..c0cfcc0153c6 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library to read digital camera file meta-data
USE_BZIP2= yes
USE_GNOME= gnomehack ltverhack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-docs
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index aca1a5cbc234..e05ff4429c0b 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
USE_XORG= x11 xext xkbfile xt
WRKSRC= ${WRKDIR}/${DISTNAME}/lib
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index cdf02f9a598b..25e672e0ce47 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -17,7 +17,7 @@ COMMENT= Portable font rendering library for C++
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= glu
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index dcfd964398c5..c48c3ca9036c 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/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 libglade2 libartlgpl2 ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--enable-glade \
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index b3b85fdbd241..7b1defbcb373 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomecanvas
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 3b0aced0de48..4b4a4eea1533 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
USE_BZIP2= yes
USE_GNOME= gnometarget pkgconfig ltverhack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
LIBTOOLFILES= configure libgphoto2_port/configure
USE_LDCONFIG= yes
CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" LIBLTDL="-L${LOCALBASE}/lib -lltdl"
diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile
index 7e9e3a46030f..f9311795bed7 100644
--- a/graphics/libiptcdata/Makefile
+++ b/graphics/libiptcdata/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= Library for manipulating IPTC metadata stored in image files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile
index 521ccb71a4fa..5cbcd826590a 100644
--- a/graphics/libjpeg-turbo/Makefile
+++ b/graphics/libjpeg-turbo/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
CONFLICTS= jpeg-[0-9]*
ONLY_FOR_ARCHS= amd64 i386
-USE_AUTOTOOLS= autoconf:268 autoheader:268 aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf autoheader aclocal automake libtool
ACLOCAL_ARGS= -I.
USE_LDCONFIG= yes
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index d311fe99d0e8..49a5de7e75e6 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index d311fe99d0e8..49a5de7e75e6 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index a14a06d8adfc..688cd8f05bdc 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GETTEXT= yes
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index b85cd7a52766..2f82643034cd 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index b85cd7a52766..2f82643034cd 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index 0fe8a0829e25..48d38830ba4e 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 0fe8a0829e25..48d38830ba4e 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index 95c90f9a028d..6429e4bd8eee 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library for loading (and saving) 3d modeller object files
CONFLICTS= xmorph*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index d15fb5a65a5b..56a674be8e0a 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
USE_GNOME= gtk20 glib20 pango atk
-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
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 1082f9655d0d..79f50292557c 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gtk20 glib20 pango atk
-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
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index bae4f1bb292f..9f63c230adb1 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomelibs gdkpixbuf
USE_LDCONFIG= yes
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0bdb1b0523d9..4eb85f535117 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnomeprefix libgsf ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile
index de86460e2e93..d2f497121118 100644
--- a/graphics/libsvg-cairo/Makefile
+++ b/graphics/libsvg-cairo/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
svg.1:${PORTSDIR}/graphics/libsvg \
cairo.2:${PORTSDIR}/graphics/cairo
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnometarget gnomehack
USE_LDCONFIG= yes
diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile
index 1329b5d891f5..015cc1be73ff 100644
--- a/graphics/libsvg/Makefile
+++ b/graphics/libsvg/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
png.6:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= libxml2 gnomehack gnometarget
USE_ICONV= yes
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 4a4f1b637c25..5550a6cfefee 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Tools and library routines for working with GIF images
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index 5c6972941e69..a4dda45e184e 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction library that sits between apps and visual plugin
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index 378a1438550e..99c04046c8b0 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX= 04
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction library that sits between apps and visual plugin
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 33ac9b3954cb..a907f0eba982 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sys-gd=no \
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index 18d362386b59..a59597b2b71b 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics ima
LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack ltverhack
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile
index 18d362386b59..a59597b2b71b 100644
--- a/graphics/libwpg01/Makefile
+++ b/graphics/libwpg01/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics ima
LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack ltverhack
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index b2401754b23d..984f69743c72 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk
MAN1= lodju-create.1 lodju-gallery.1 lodju.1
MANCOMPRESSED= yes
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
HAS_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gtk12 gdkpixbuf
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index db637f28e560..82c5a0521c59 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/libnurbs/nurbs%2B%2B/nurbs%2B%2B-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A C++ library for representing curves or surfaces
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name="s/x/x/"
USE_LDCONFIG= yes
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 7bf925981dd5..24b86b0351cd 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -22,7 +22,7 @@ COMMENT= Objective Caml image processing library
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ocaml.m4:${PORTSDIR}/lang/ocaml-autoconf
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_OCAML= yes
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 8a0789470246..7cc39f50d617 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -27,7 +27,7 @@ OPTIONS= SDL "Enable SDL for graphical debugging" off \
MAKE_JOBS_UNSAFE= yes
USE_PYTHON_BUILD= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
USE_GMAKE= yes
CONFIGURE_ARGS= --without-fst --without-tesseract --with-iulib=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 1c8a6f83c626..36a798755d60 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -30,7 +30,7 @@ OPTIONS= GTK "Use GTK instead of Xt gui" off \
DEMOS "Build OGRE demos" off
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GNOME= gnomehack
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 1b2ab138fb6b..28dd3f563505 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -24,7 +24,7 @@ USE_XORG= xinerama xext xpm xmu sm ice
USE_BISON= build
USE_GL= yes
USE_MOTIF= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV= ARCH="${OPSYS:L}" \
CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/graphics/openexr_ctl/Makefile b/graphics/openexr_ctl/Makefile
index dd65a3bb3071..c222d29ba809 100644
--- a/graphics/openexr_ctl/Makefile
+++ b/graphics/openexr_ctl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
test check: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile
index e95d8b24fe17..a5fdd33894de 100644
--- a/graphics/paintlib/Makefile
+++ b/graphics/paintlib/Makefile
@@ -24,7 +24,7 @@ DEPRECATED= does not compile with new tiff and no more maintained upstream
EXPIRATION_DATE= 2010-12-30
BROKEN= does not compile with new tiff
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-SDL --disable-dfb
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 9de9abf89d43..565184842951 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \
CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \
LDFLAGS="${PFS_LDFLAGS}" \
PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 7a10d29869cf..ba93f0b065f5 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/Pixie
USE_GNOME= gnomehack
USE_GL= glu
USE_BISON= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/pixie \
--libdir=${PREFIX}/lib/pixie \
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index d9ef262e6262..3a617fff8bd7 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_GNOME= gnometarget
USE_MOTIF= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-libplotter --enable-libxmi --with-motif
USE_LDCONFIG= yes
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 1928a9219b7a..ed5e8267078d 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -24,7 +24,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libxml2 ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-zlib \
diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index daa9afe379d6..c724ba5094d1 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
OPTIONS= POTRACE "potrace backend" on \
AUTOTRACE "Autotrace backend" on
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index e62c72d0477a..b4a1cf251c17 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -29,7 +29,7 @@ USE_XORG= x11
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LATEST_LINK= ${PORTNAME}36
.include <bsd.port.pre.mk>
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index e62c72d0477a..b4a1cf251c17 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -29,7 +29,7 @@ USE_XORG= x11
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LATEST_LINK= ${PORTNAME}36
.include <bsd.port.pre.mk>
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index e62c72d0477a..b4a1cf251c17 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -29,7 +29,7 @@ USE_XORG= x11
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LATEST_LINK= ${PORTNAME}36
.include <bsd.port.pre.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index b19fee549eca..98fe9b15a70d 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -23,7 +23,7 @@ OPTIONS= IMAGEMAGICK "Enable magick++ interface" on \
USE_GNOME= gnomehack pkgconfig
USE_GHOSTSCRIPT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
index ebe22b2cb727..bd46b9c21fe4 100644
--- a/graphics/py-clutter-gtk/Makefile
+++ b/graphics/py-clutter-gtk/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/
LIB_DEPENDS= clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pygnome2 pygtk2
USE_PYTHON= 2.5+
CONFIGURE_ARGS= --disable-docs
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 15f505239d5a..08787addeae1 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pygnome2 pygtk2
USE_PYTHON= 2.5+
CONFIGURE_ARGS= --disable-docs
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index 22df023c44a4..f54da5115aa3 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.gris.uni-tuebingen.de/grisalt/projects/qglviewer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Use OpenGL to play around with three dimensional scenes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index e2e8850ffc5e..d11ea1a47fc5 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -18,7 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= glut
USE_XORG= x11 ice xmu xi
.ifdef (WITH_EXAMPLES)
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 7aed03becd13..f1fa4f2e99bc 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= mva@FreeBSD.org
COMMENT= SDL graphics drawing primitives and other support functions
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index c650c7845799..3d00149f31d5 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 419b0a5074fb..e75d04385d6a 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library to use TrueType fonts to render text in SDL applications
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 46844a2af822..824dbf189d8c 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -20,7 +20,7 @@ COMMENT= A picture viewer designed to run under KDE 3.x
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDEBASE_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --disable-pgsql
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 38b0bbcf545d..bedfceff4738 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
ungif.5:${PORTSDIR}/graphics/libungif \
png.6:${PORTSDIR}/graphics/png
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-mpeg2enc
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index a5fbdd81c92b..c5e6342e346d 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-gnome-print \
--with-popt
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
diff --git a/graphics/solang/Makefile b/graphics/solang/Makefile
index d787abd4820a..17c254998ad3 100644
--- a/graphics/solang/Makefile
+++ b/graphics/solang/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS= gegl-0.1:${PORTSDIR}/graphics/gegl \
BROKEN= bad plist
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_GNOME= libgda4 intltool
INSTALLS_ICONS= yes
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index 747a701886de..f3b0fa33dcfe 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= pkgconfig
USE_BISON= build
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 2808d1d639a0..8211a88c5c27 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= oil-0.3.0:${PORTSDIR}/devel/liboil \
USE_LDCONFIG= yes
USE_GNOME= gnomehack gtk20 ltverhack
USE_GSTREAMER= core good mp3 ffmpeg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index ef3004d012e8..788206a49de9 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -16,7 +16,7 @@ COMMENT= xml2swf and swf2xml processor with import functionalities
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig libxml2 libxslt
GNU_CONFIGURE= YES
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index dac5f2a1152f..d1aba8a60320 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -24,7 +24,7 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \
--with-jpeg-lib-dir=${LOCALBASE}/lib
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 69f55391b14c..86ea24de6823 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -24,7 +24,7 @@ QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network \
USE_GL= glew glut
USE_GMAKE= yes
USE_GNOME= libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 65b5d699280d..c963aff4b959 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -19,7 +19,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= vd@FreeBSD.org
COMMENT= VIGRA stands for "Vision with Generic Algorithms"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --docdir=${DOCSDIR}
USE_GMAKE= yes
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 00c34b6d1f39..2c0c7af2c02d 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -34,7 +34,7 @@ PYPRESENT!= which python > /dev/null && echo on || echo off
USE_GMAKE= yes
USE_PERL5_BUILD= yes
USE_GNOME= gnomehack glib20 pkgconfig pango libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 428dfff11e98..b4b497534806 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -16,7 +16,7 @@ COMMENT= C++ library to create, manipulate, and render SVG files
LIB_DEPENDS+= avformat.1:${PORTSDIR}/multimedia/ffmpeg
USE_BZIP2= yes
-USE_AUTOTOOLS= automake:111
+USE_AUTOTOOLS= automake
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config
@@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
USE_GNOME= libartlgpl2
USE_GMAKE= yes
USE_WX= 2.8
-USE_AUTOTOOLS= automake:111
+USE_AUTOTOOLS= automake
post-patch:
@cd ${WRKSRC} && \
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index e6e6d3797aa1..e8611ef1b0b7 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -28,7 +28,7 @@ OPTIONS= X11 "With X11" on \
WANT_GNOME= yes
USE_SUBMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index ba88432af573..87208a63a8a3 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms \
nasm:${PORTSDIR}/devel/nasm
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_XORG= x11
USE_GNOME+= gdkpixbuf gnomehack pkgconfig
GNU_CONFIGURE= yes
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 76c8b828a032..460e51609407 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -24,7 +24,7 @@ CONFLICTS= libmorph*
WANT_GNOME= yes
USE_GNOME= gnometarget
USE_XORG= xbitmaps x11 xaw xext
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --without-waili
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 45bd6f00135e..5ff3077583e4 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \
RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-opi \
diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile
index a5347d5a5b66..d91eb9020de7 100644
--- a/irc/bopm/Makefile
+++ b/irc/bopm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Open proxy and DNSBL monitor, designed for use with ircds
LOGDIR= /var/log/${PORTNAME}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure src/libopm/configure
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --localstatedir=${LOGDIR}
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index 2dfd19c215ff..c31698657b75 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use IRC client for KDE
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER= 3
USE_GMAKE= yes
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index 3b3a0debd317..7fe01d32d283 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= markus@FreeBSD.org
COMMENT= A user friendly IRC client for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index a99a23de7256..3402f586badb 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= markus@FreeBSD.org
COMMENT= IRC client for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 840df2efd300..7f1270f89280 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ COMMENT?= A Japanese/Chinese/Korean input method (Japanese client libraries)
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
MAKE_ARGS= MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
LIBRARY_WNNMANDIR="3.libwnn" \
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index d37c860521aa..0c9fdda8da02 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -21,7 +21,7 @@ COMMENT?= A Japanese/Chinese/Korean input method (Japanese server)
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
USE_RC_SUBR= # defined below
MAKE_ARGS= MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 77d4e6f54f99..3c736011c6e3 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -24,7 +24,7 @@ COMMENT= A color vt102 terminal emulator with transparency support
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
USE_XORG= xpm xmu
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= \
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index b1c31cf71a8a..9d6effbcc5b4 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.nurs.or.jp/~kurati/celrw/
MAINTAINER= shuna@pop16.odn.ne.jp
COMMENT= Cellular phone-number read/write tool (in Japan only)
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
USE_BZIP2= yes
HAS_CONFIGURE= yes
ALL_TARGET=
diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
index b8a921b1be8b..d2e9a2cacd34 100644
--- a/japanese/chasen-base/Makefile
+++ b/japanese/chasen-base/Makefile
@@ -18,7 +18,7 @@ COMMENT= Japanese Morphological Analysis System
BUILD_DEPENDS= ${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
USE_ICONV= yes
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 385bc2c15040..c7fe9b621a29 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -53,7 +53,7 @@ APPENDIXFILES= appendix/cencro-1.0.tar.gz \
DIST_SUBDIR= eb
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GETTEXT= yes
USE_PERL5= yes
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index e489fc29cac2..ab3fe81888ed 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= ja-ebview-gtk2-*
USE_GNOME= imlib
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 1933d9e30fef..d626b1306568 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -35,7 +35,7 @@ CONFLICTS= emacs-19.* emacs-20.* emacs-22.* \
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GMAKE= YES
# Change these as you like.
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index 27cb3d230f3b..672b00a92c23 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
DISTFILE_HELP= ${PORTNAME}pre2-help.tar.gz
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index d28d6413cbe6..a6cbc0f43ce9 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU grep + multi-byte extension
-USE_AUTOTOOLS= autoconf:213 aclocal:14
+USE_AUTOTOOLS= autoconf213 aclocal14
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=j --disable-nls
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 7189b27bcb52..8e63e89dca9f 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index aa99a4856a9a..954d2bda376f 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 0aa15b4b3c33..c53efa322e82 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -20,7 +20,7 @@ COMMENT= A 2ch browser
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls \
gtkmm:${PORTSDIR}/x11-toolkits/gtkmm24
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index fa8f4c7fb530..f3dec622438a 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://kakasi.namazu.org/stable/
MAINTAINER= ota@j.email.ne.jp
COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
MANLANG= ja
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 75cf2d9c2f4d..41aeac5c0da5 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -23,7 +23,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 85f0700ece86..de38aa5229c9 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= clsung@FreeBSD.org
COMMENT= Yet Another Part-of-Speech and Morphological Analyzer
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_PERL5_BUILD= 5.8.0+
GNU_CONFIGURE= yes
diff --git a/japanese/mell/Makefile b/japanese/mell/Makefile
index abc0cb9ed361..0769ec172ee4 100644
--- a/japanese/mell/Makefile
+++ b/japanese/mell/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= otsuji@users.sourceforge.jp
COMMENT= Emacs Lisp for taiyaki-elisp, especially for the prime
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= -af
pre-configure:
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index db5a2148ea5d..e27823d653e5 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT?= Japanese incremental search tool
.if !defined(SLAVE_PORT)
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake14 autoconf213
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in
PLIST_SUB= MIGEMO="" ELISP="@comment "
.endif
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 8bd137f1d839..4f4b6ee46226 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -70,7 +70,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index d49ecce6af1f..7209d8bf3efe 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -34,7 +34,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 595e2505346e..0ae59c31b7a1 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= pkgconfig glib20 gtk20 libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
DESKTOP_ENTRIES="Ochusha" "A GUI BBS browser for 2ch.net" \
"${LOCALBASE}/share/ochusha/ochusha32.xpm" \
diff --git a/japanese/prime-dict/Makefile b/japanese/prime-dict/Makefile
index 6fd59f58d1f9..946999f331d8 100644
--- a/japanese/prime-dict/Makefile
+++ b/japanese/prime-dict/Makefile
@@ -20,7 +20,7 @@ USE_RUBY= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime-el/Makefile b/japanese/prime-el/Makefile
index cc3835cc7981..0ce977764857 100644
--- a/japanese/prime-el/Makefile
+++ b/japanese/prime-el/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japane
prime:${PORTSDIR}/japanese/prime
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile
index 1f5831972757..9fc3de5083e1 100644
--- a/japanese/prime/Makefile
+++ b/japanese/prime/Makefile
@@ -26,7 +26,7 @@ RUBY_WITH_PTHREAD= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
MAKE_JOBS_UNSAFE= yes
PLIST_SUB= LOCALBASE=${LOCALBASE}
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 495282fbe667..3191215f48f9 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
.endif
USE_RUBY= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GMAKE= yes
USE_RC_SUBR= rskkserv.sh
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 992d3885a057..d6cf17099aed 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= lthack
USE_ICONV= yes
USE_GMAKE= yes
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index d504125efc2b..86d5b9284d8e 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index a8bba70a7517..cb3fb5a1fe36 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index dbb1fc08c5a6..b0682cd6c354 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 5e8188be165a..307cce7c8984 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -18,7 +18,7 @@ COMMENT= SCIM IMEngine module like SKK
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/suikyo/Makefile b/japanese/suikyo/Makefile
index 7bf5677a4408..aad935a431dd 100644
--- a/japanese/suikyo/Makefile
+++ b/japanese/suikyo/Makefile
@@ -18,7 +18,7 @@ USE_RUBY= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 9edf78c2a7f7..56cc63ef46a4 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Japanized Tcl (Tool Command Language)
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index b28c1826144a..69dfe9eba53d 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -27,7 +27,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ARGS= --enable-shared
RANLIB= ranlib
PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg-install.tclsh
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 1507fe943cbe..5997d3c75384 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -32,7 +32,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_XORG= x11
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
--enable-xlibHack --enable-onTheSpot
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 011513e0133a..25313406730a 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -23,7 +23,7 @@ COMMENT= The Tk toolkit with a NeXTSTEP look and more
LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
USE_XORG= xpm
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gcc --enable-shared --enable-step \
--with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index fb5880930add..25723ec02c0e 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/font-sazanami/sazanami-mincho.ttf:${PORTSDIR}/ja
USE_XORG= x11 xext
USE_FREETYPE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-freetype \
--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index b556a27516aa..27dac7575c1e 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict
.endif
USE_RUBY= yes
-USE_AUTOTOOLS= autoconf:213 libtool:22
+USE_AUTOTOOLS= autoconf213 libtool
CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \
--with-ruby="${RUBY}"
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 59972ad3c207..3809972e7521 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -18,7 +18,7 @@ COMMENT= X11 terminal emulator based on rxvt/xterm that supports korean
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanyangfonts
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_XORG= x11 xext ice sm xt
USE_GNOME= imlib
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index 698b4d8d982d..ac61258b0055 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386
USE_XORG= x11
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index 5aed7fad571f..6708e4b600ae 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://kldp.net/frs/download.php/2808/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+-2.0 hangul input module
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 7053d71f088d..201ff466d45b 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/cim/
MAINTAINER= ports@FreeBSD.org
COMMENT= Compiler for the SIMULA programming language
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/elan/Makefile b/lang/elan/Makefile
index 0602aacff4f5..e7304445b662 100644
--- a/lang/elan/Makefile
+++ b/lang/elan/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
MAN1= elancc.1
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 7f1ddac72363..6eb332802644 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
USE_BZIP2= yes
USE_MOTIF= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 0609483eeca9..1458a77a4272 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= emacs
MAINTAINER= amakawa@jp.FreeBSD.org
COMMENT= An introduction to Emacs Lisp programming
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
INFO= emacs-lisp-intro
.include <bsd.port.mk>
diff --git a/lang/expect-devel/Makefile b/lang/expect-devel/Makefile
index 25fb2208defc..b4abae2f4e7a 100644
--- a/lang/expect-devel/Makefile
+++ b/lang/expect-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT= A sophisticated scripter based on tcl/tk
CONFLICTS= expect-5.43*
LATEST_LINK= expect-devel
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
EXPECT_VER= ${PORTVERSION}
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index cd66bd37dca4..1e5fd7d705ac 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -17,7 +17,7 @@ COMMENT= An embeddable scripting language
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
xml2.5:${PORTSDIR}/textproc/libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index a3eed4e48e25..7b2e0b885db9 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -16,7 +16,7 @@ COMMENT= Gambas Almost Means BASic
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
ml.0:${PORTSDIR}/math/ldouble
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_BZIP2= yes
diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index 38734083812e..38242265d262 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -19,7 +19,7 @@ COMMENT?= A basic language with object extensions
BUILD_DEPENDS= xdg-mime:${PORTSDIR}/devel/xdg-utils
LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 12a6bb75d3bf..7523746c881f 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -29,7 +29,7 @@ BOOT_HADDOCK_VERSION= ${HADDOCK_VERSION}
HSCOLOUR_VERSION= 1.15
GHCPATH_VERSION= 0.1.0.5
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
USE_BZIP2= yes
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 89de1fff4009..d5b5db3e53a9 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_PYTHON= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 0206f31943bd..ed9077642e7f 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -31,7 +31,7 @@ BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LICENSE_COMB= multi
LICENSE= GPLv3 LGPL3
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-procfs --disable-openssl --enable-tls \
--with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index bd103b73e4c6..ac20486f9f26 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --with-c-flags="${CFLAGS}"
CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index a2ffba74e2bd..d62245c2db6e 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
-USE_AUTOTOOLS= autoconf:268 libltdl:22
+USE_AUTOTOOLS= autoconf libltdl
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 424dabd1bc84..4f47f73f7ffa 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org
COMMENT= Java-based Scheme implementation
USE_JAVA= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-kawa-frontend \
--with-java-source=${JAVA_PORT_VERSION} \
diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile
index 5edb049ca17e..97b71ed34db1 100644
--- a/lang/klogoturtle/Makefile
+++ b/lang/klogoturtle/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= LOGO Interpreter for the KDE Desktop
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
post-patch:
diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile
index 957d4786419f..aff655773424 100644
--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@@ -29,7 +29,7 @@ USE_MYSQL= yes
USE_PYTHON= yes
USE_SDL= sdl sound
USE_GNOME= libxslt
-USE_AUTOTOOLS= autoconf:268:env automake:111:env
+USE_AUTOTOOLS= autoconf:env automake:env
USE_XORG= xmu xi
GNU_CONFIGURE= yes
diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile
index 39f85a5d229e..83d6dede6df9 100644
--- a/lang/libhx/Makefile
+++ b/lang/libhx/Makefile
@@ -19,7 +19,7 @@ LDFLAGS= -L${LOCALBASE}/lib
USE_XZ= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PORTDOCS= libHX_Documentation.pdf
diff --git a/lang/libjit/Makefile b/lang/libjit/Makefile
index 2eca719e3f7f..e945430a426c 100644
--- a/lang/libjit/Makefile
+++ b/lang/libjit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://download.savannah.gnu.org/releases/dotgnu-pnet/
MAINTAINER= ports@FreeBSD.org
COMMENT= Libjit implements Just-In-Time compilation functionality
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile
index 31fadd3f4416..c5468a2b27c9 100644
--- a/lang/libutils/Makefile
+++ b/lang/libutils/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Support lib for Tensile/NSL
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_ARGS= CFLAGS="${CFLAGS}"
USE_LDCONFIG= yes
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index 11263d248a6e..9a9b66164718 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -32,7 +32,7 @@ USE_BISON= build
USE_GMAKE= yes
HAS_CONFIGURE= yes
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
# magic wand: set INSTALL to some absurd value, or else
# mozart's configure will not find the right install
# when configuring as root.
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index dce063e71747..49b049b5fcfb 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gc-threaded.1:${PORTSDIR}/devel/boehm-gc-threaded
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_GMAKE= yes
OPTIONS= APACHE13 "Build with mod_neko for Apache 1.3.x" off \
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 07a1b484e87e..c2e95cf735c2 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -19,7 +19,7 @@ COMMENT= NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
CONFLICTS= js-1.5.*
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-shared
MAN1= js.1 jsdas.1
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index 7f5b744fb3ef..39f9e15892a5 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= sdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 1281227f1950..980380724bce 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
DOCSDIR= lib/${PORTNAME}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index eaadb78cb06c..7ea433e90c4a 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK= open-cobol-devel
USE_GNOME= gnometarget
USE_BDB= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index e73a280f5385..b96bf809ded6 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= open-cobol-1.[1]*
USE_GNOME= gnometarget
USE_BDB= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile
index 81f6c22291e2..4445b2808c70 100644
--- a/lang/osb-jscore/Makefile
+++ b/lang/osb-jscore/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+ WebCore JavaScript interpreter
USE_GNOME= gnomehack gnometarget gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 70584f87021a..94565836c8aa 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -22,7 +22,7 @@ USE_TK_NO_THREADS= yes
INVALID_TK_VER= 85 86
USE_XORG= xext
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
.if !defined(NOPORTDOCS)
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 501a9eb21f94..f55f2bb24412 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GCC= 4.2+
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= pfe/configure
MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index ed115dbdd02f..a48e5762c5ec 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -23,7 +23,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
.if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --enable-versioning \
--enable-memory-limit \
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index 60197ec88e9a..7e66ea5db375 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -180,7 +180,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
.endif
.if ${PHP_MODNAME} == "mcve"
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 4942b1cd620d..046e429e1800 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
.if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index a6c8f54be6bd..775eb2fdd504 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -176,7 +176,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
.endif
.if ${PHP_MODNAME} == "mssql"
diff --git a/lang/php52/Makefile b/lang/php52/Makefile
index ad2d00ab560b..d073964f6f81 100644
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
.if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= \
--with-layout=GNU \
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 4293d4eabdb4..1e23a4e174f4 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -182,7 +182,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
.endif
.if ${PHP_MODNAME} == "mhash"
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 4942b1cd620d..046e429e1800 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
MAKE_JOBS_SAFE= yes
.if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index a6c8f54be6bd..775eb2fdd504 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -176,7 +176,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
.endif
.if ${PHP_MODNAME} == "mssql"
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 05f3730ab004..6756a52efc69 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -23,7 +23,7 @@ USE_XLIB= yes
.endif
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index 799952d0bdfc..81b85286d44d 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -39,7 +39,7 @@ WRKSRC= ${WRKDIR}/racket-${PORTVERSION}/src/build
USE_ICONV= yes
USE_GL= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
MAN1= drracket.1 drscheme.1 gracket.1 \
mred.1 mzc.1 mzscheme.1 plt-help.1 \
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 799952d0bdfc..81b85286d44d 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -39,7 +39,7 @@ WRKSRC= ${WRKDIR}/racket-${PORTVERSION}/src/build
USE_ICONV= yes
USE_GL= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
MAN1= drracket.1 drscheme.1 gracket.1 \
mred.1 mzc.1 mzscheme.1 plt-help.1 \
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index bacf5b5ae440..7c3762fe3e33 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ENV= CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
USE_OPENSSL= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile
index 1279d5dde945..260512152323 100644
--- a/lang/ruby19/Makefile
+++ b/lang/ruby19/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
USE_OPENSSL= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
WRKSRC= ${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 4c3594666cfe..5cf9a231575c 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -52,7 +52,7 @@ USE_GCC= 4.4+
CONFIGURE_ARGS+= --disable-51
PLIST_SUB+= MCS51DS390="@comment "
.else
-USE_AUTOTOOLS+= autoconf:268
+USE_AUTOTOOLS+= autoconf
PLIST_SUB+= MCS51DS390=""
.endif
@@ -126,7 +126,7 @@ PLIST_SUB+= DEVLIB=""
CONFIGURE_ARGS+= --disable-ucsim
PLIST_SUB+= UCSIM="@comment "
.else
-USE_AUTOTOOLS+= libtool:22
+USE_AUTOTOOLS+= libtool
LIBTOOLFILES= sim/ucsim/configure
PLIST_SUB+= UCSIM=""
.endif
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index a2e293d99992..0097c7bc80ac 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -47,7 +47,7 @@ BROKEN= Does not compile on sparc64
CONFIGURE_ARGS+= --disable-51
PLIST_SUB+= MCS51DS390="@comment "
.else
-USE_AUTOTOOLS+= autoconf:268
+USE_AUTOTOOLS+= autoconf
PLIST_SUB+= MCS51DS390=""
.endif
@@ -121,7 +121,7 @@ PLIST_SUB+= DEVLIB=""
CONFIGURE_ARGS+= --disable-ucsim
PLIST_SUB+= UCSIM="@comment "
.else
-USE_AUTOTOOLS+= libtool:22
+USE_AUTOTOOLS+= libtool
LIBTOOLFILES= sim/ucsim/configure
PLIST_SUB+= UCSIM=""
.endif
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index a9ca802e1063..3ae364446162 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -25,7 +25,7 @@ OPTIONS= TCLTK "Enable Tcl/Tk binding" on \
PGSQL "PostgreSQL binding" on \
SDL "SDL binding" on
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget pkgconfig pango
USE_ICONV= yes
USE_SQLITE= yes
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index a8547efda3ac..47e136893a5d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -31,7 +31,7 @@ USE_OPENSSL= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \
libgnomeprintui
USE_GETTEXT= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
USE_ICONV= yes
CONFIGURE_ARGS= --enable-threads \
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 830001d665da..871720b54d9e 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_PERL5_RUN= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 autoheader:268
+USE_AUTOTOOLS= aclocal automake autoconf autoheader
ACLOCAL_ARGS= -Im4
.include <bsd.port.pre.mk>
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index 2e81816cbca0..9df395193299 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 482aae492cdc..95fe215d9088 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
PLIST_FILES= lib/claws-mail/plugins/att_remover.a \
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 0bd09bf3ae3d..4303114c41e5 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -22,7 +22,7 @@ LICENSE= GPLv3
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index d451237c16e6..62447e979ac1 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -22,7 +22,7 @@ LICENSE= GPLv3
USE_GMAKE= yes
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 2211bf6082f5..385a18fff245 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
PLIST_FILES= lib/claws-mail/plugins/cachesaver.a \
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 9a3fbcd6bf87..1e6f898ed589 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_ICONV= yes
USE_GNOME= gtk20
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 68d8e9656a71..b73bf521b858 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
PLIST_FILES= lib/claws-mail/plugins/fetchinfo_plugin.a \
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 510e5dcd401b..b51d78dfc2a1 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GNOME= gtk20
USE_ICONV= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 520daee188a1..a61a9b83e025 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
PLIST_FILES= lib/claws-mail/plugins/mailmbox.a \
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 25904f14cef3..db680300de41 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
PLIST_FILES= lib/claws-mail/plugins/newmail.a \
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 839013be08f5..2c4f3599cb66 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 72cc214f5367..91cf53b0509b 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_PERL5= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 439d1ada5fa0..a5a791521d13 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -23,7 +23,7 @@ LICENSE= GPLv3
USE_GNOME= pygtk2
USE_GMAKE= yes
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 634d85bed774..2d5c5a3088c4 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_ICONV= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 9c1259d1e0c4..e6a24dcc8a73 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -23,7 +23,7 @@ LICENSE= GPLv3
USE_GMAKE= yes
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 81d7d790017c..749b542b650b 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= claws-mail>=3.7.7:${PORTSDIR}/mail/claws-mail
LICENSE= GPLv3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-libsynce=${LOCALBASE} \
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 112846e07c30..e1e2da26142f 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -23,7 +23,7 @@ LICENSE= GPLv3
USE_GMAKE= yes
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 792f7cca75cf..bd381550482a 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -24,7 +24,7 @@ LICENSE= GPLv3
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index c9378087fe1a..f18f5e46351c 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -61,7 +61,7 @@ CALENDIR= /var/spool/calendar
MIMETYPES= ${LOCALBASE}/etc/mime.types
WITH_TRANSPORT= local esmtp dsn
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_FAM= yes
USE_GETTEXT= yes
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 42a6ebaf1135..5b13a623acb1 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -99,7 +99,7 @@ EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index f782c2a12945..5e1078c1d633 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -150,7 +150,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in \
.if ${OSVERSION} >= 800037
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4
.endif
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index d52c108169a0..0d38cf45b14e 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -143,7 +143,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in
.if ${OSVERSION} >= 800037
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4
.endif
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 4106e1d5bb60..4d09f9193dd4 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -23,7 +23,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \
SIEVE "Build w. support for Sieve mail sorting language" off \
LDAP "Build with support for LDAP authentication" off
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= YES
USE_LDCONFIG= ${PREFIX}/lib/dbmail
USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 3ca5fffab8b6..7559930208b5 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -22,7 +22,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \
SIEVE "Build w. support for Sieve mail sorting language" off \
LDAP "Build with support for LDAP authentication" off
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --prefix=${PREFIX}
USE_GMAKE= YES
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 4106e1d5bb60..4d09f9193dd4 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -23,7 +23,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \
SIEVE "Build w. support for Sieve mail sorting language" off \
LDAP "Build with support for LDAP authentication" off
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= YES
USE_LDCONFIG= ${PREFIX}/lib/dbmail
USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 124b8502358e..b8edbbe3d698 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -29,7 +29,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \
LDAP "Build with support for LDAP authentication" off \
MANPAGES "Install man pages" on
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= YES
USE_LDCONFIG= ${PREFIX}/lib/dbmail
USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index a770142888fa..0c45dccc6469 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -96,9 +96,9 @@ OPTIONS+= CGI "Install CGI (pulls in Apache or see below)" off
OPTIONS+= LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.ifdef(SNAP_DATE)
-USE_AUTOTOOLS+= autoconf:268:env automake:111
+USE_AUTOTOOLS+= autoconf:env automake
.endif
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 23a8a68c3b65..b7dcb3f67bef 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -77,7 +77,7 @@ OPTIONS+= WebUI "Install WebUI, pulls in Apache or see below" off
OPTIONS+= LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
#CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 2a62de92f565..379fb1678701 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_BDB= 41
USE_OPENLDAP= yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 912bf7572277..e93fbccc5c50 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
desktopfileutils gnomedocutils ltasneededhack gnomedesktop
GNOME_DESKTOP_VERSION=2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GSTREAMER= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index ebee57f010c2..9600b021f80a 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library (written in C) for parsing and creating messages using MIME
CONFLICTS= gmime-2.1.*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= YES
USE_GNOME= glib12
USE_ICONV= yes
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index cfe18852d52b..192002d24f73 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A JAM subroutine library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
NO_INSTALL_MANPAGES= yes
USE_LDCONFIG= yes
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index e6f37bfdff67..c148d3443b83 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mail notification utility for KDE with nice features
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-fast-perl
MAN1= kbiff.1
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index df102726a4ff..71d517fed36c 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Gmail Notifier for KDE
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER=3
INSTALLS_ICONS= yes
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index ae566040995e..12a22e249b57 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mimelib.1:${PORTSDIR}/deskutils/kdepim3
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 5aee533be143..9d839edb85a4 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= mnag@FreeBSD.org
COMMENT= A library for posting electronic mail
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index d2ef7170b083..eb3459196eb3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
sasl2.2:${PORTSDIR}/security/cyrus-sasl2
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22 autoconf:268
+USE_AUTOTOOLS= libtool autoconf
USE_LDCONFIG= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index f562f48c0525..8f428e60e2af 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mnag@FreeBSD.org
COMMENT= Sender Policy Framework (SPF) library and client
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile
index d4ec239c7fdb..03de336a36fd 100644
--- a/mail/libspf2-10/Makefile
+++ b/mail/libspf2-10/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= ${PORTNAME}-1.2.*
LATEST_LINK= ${PORTNAME}-${PORTVERSION:S/.//:R}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 0f16f13ccb0d..6a69c7fca72d 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Sender Rewriting Scheme 2 C Implementation
CONFLICTS= ${PORTNAME}-1.0.*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index 1fcb08d65054..4a52f9d41073 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= srs
MAINTAINER= ports@FreeBSD.org
COMMENT= Sender Rewriting Scheme 2 C Implementation
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile
index 428f91ddb2e9..95339e422354 100644
--- a/mail/libsrs_alt/Makefile
+++ b/mail/libsrs_alt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://srs.mirtol.com/
MAINTAINER= simond@irrelevant.org
COMMENT= Sender Rewriting Scheme C Implementation
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
SHLIB_MAJOR= 1
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e95cfca989fd..a39c4bfb6b13 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -165,7 +165,7 @@ CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
.if !defined (MUTT_LITE)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index bb85f4a7727e..d3c5fd63be4d 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface
DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index bb85f4a7727e..d3c5fd63be4d 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface
DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 623bb5a2d771..06ce621aaaff 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -63,7 +63,7 @@ COMMENT= A cleaned up MH mailer suite
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \
--sysconfdir=${PREFIX}/etc/nmh
.ifdef NMH_EDITOR
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 63c9ea11e998..66f3faeac9b1 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -24,7 +24,7 @@ MAN8= perdition.8
MANCOMPRESSED= no
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index d24a7dc60322..66c66156acf2 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= mnag@FreeBSD.org
COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index b7ae2445e7b8..bc5376c363fc 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible, modular RFC-compliant POP3 daemon
-USE_AUTOTOOLS= libtool:22 libltdl:22
+USE_AUTOTOOLS= libtool libltdl
USE_GNOME= glib12
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 88771f954941..da691cd4a42a 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= mbr@FreeBSD.org
COMMENT= POP3 Proxy Server derived from UP IMAP Proxy
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_RC_SUBR= pop3proxyd
SAMPLE_EXT= sample
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 9c4889c93093..7fd6438670ae 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -16,7 +16,7 @@ COMMENT= Suite of programs for setting up large POP3 server systems
BUILD_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 9c0fe4ddeca0..6094b82d8155 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -26,7 +26,7 @@ SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/release-${PORTVERSION}
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 2393d460134c..844bd18f2fed 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= bc979@lafn.org
COMMENT= Berkeley POP 3 server (now maintained by Qualcomm)
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_OPENSSL= yes
CONFIGURE_ENV= LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \
OS_DEFS="-DSETPROCTITLE ${OS_DEFS}"
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index e988edbc3fad..a1cbc12ee6a3 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -22,7 +22,7 @@ GROUPS= quickml
LICENSE= GPLv2
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_RUBY= yes
diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile
index d097a7f75b3c..e804d74ec148 100644
--- a/mail/sccmilter/Makefile
+++ b/mail/sccmilter/Makefile
@@ -21,7 +21,7 @@ IGNORE= requires Sendmail 8.12; upgrade the base system
USE_BZIP2= yes
USE_RC_SUBR= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=/var
diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile
index 4a8a1aabe29a..3b5a3b2a440f 100644
--- a/mail/smtp-gated/Makefile
+++ b/mail/smtp-gated/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= This software block SMTP sessions used by e-mail worms and viruses
HAS_CONFIGURE= yes
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
OPTIONS= NAT "NAT transparent proxy code" On \
CHUNKING "Enable support for SMTP CHUNKING extension" Off \
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index e87eec49f1df..10bb529dfbcb 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-3.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index e87eec49f1df..10bb529dfbcb 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-3.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 88260d3f7723..776c0c8760ae 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
LATEST_LINK= thunderbird3
USE_GECKO= gecko
CONFLICTS= thunderbird-3.1*
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 62475d01cc4d..c8713b6fcda9 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= mbr@FreeBSD.org
COMMENT= A caching IMAP proxy server
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
USE_RC_SUBR= imapproxyd.sh
DOCS= COPYING ChangeLog README README.debian \
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index 30b693efe9de..ff114ac29626 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -25,7 +25,7 @@ MAN8= vmailmgrd.8
# get python paths (PYTHON_SITELIBDIR) in case we install the python API
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268 automake:111 aclocal:111
+USE_AUTOTOOLS= autoconf autoheader automake aclocal
USE_PYTHON= yes
USE_PERL5_BUILD= yes
AUTOMAKE_ARGS+= --add-missing -Wno-portability
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index e3048fa587dd..fd1c0262162b 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= sem@FreeBSD.org
COMMENT= Implementation of `WHO iS ONline' protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-config=${PREFIX}/etc/whoson.conf
USE_LDCONFIG= yes
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index f10c107bbad1..d629d82214ba 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -20,7 +20,7 @@ COMMENT= An X Window System application for receiving electronic mail
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
gdbm.3:${PORTSDIR}/databases/gdbm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= glib12
USE_GMAKE= yes
diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile
index 9949e9918bf3..d2a329041aac 100644
--- a/math/GiNaC/Makefile
+++ b/math/GiNaC/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= cln.6:${PORTSDIR}/math/cln
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 3e6a9a9fc2f8..bb52f788dee0 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A programming language for numerical analysis
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
ALGAE_VERSION= ${PORTVERSION}
PLIST_SUB= ALGAE_VERSION=${ALGAE_VERSION}
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 059a5c684c32..30767ee54685 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= pari-gmp.2:${PORTSDIR}/math/pari
USE_XORG= x11 xaw xext xt
GNU_CONFIGURE= yes
-#XXX USE_AUTOTOOLS= automake:111 autoconf:268
+#XXX USE_AUTOTOOLS= automake autoconf
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari
ASIR_SRC_VERSION= ${PORTVERSION}
ASIR_DOC_VERSION= 20070718
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 27523fdbeaef..1517ddf77566 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -24,7 +24,7 @@ MAKE_ARGS= NOPORTDOCS=yes
.endif
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget gnomehack
CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen
MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 9ac05747f8cb..d56c03cbdcca 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -19,7 +19,7 @@ COMMENT= Class Library for Numbers
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 41510124910c..ea9acf0d45a9 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl
MAKE_JOBS_UNSAFE= yes
USE_DOS2UNIX= yes
-USE_AUTOTOOLS= aclocal:111 autoheader:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 25fb54caa35b..fb50d7f32a7e 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -22,7 +22,7 @@ COMMENT?= Fast C routines to compute the Discrete Fourier Transform
FFTW_FLAVOR?= default
FFTW_SUFIX=
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_FORTRAN= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 07cdc77019fa..031be912ea8b 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gtk20
USE_WX= 2.8+
WX_CONF_ARGS= absolute
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-doc --disable-xyconvert
USE_LDCONFIG= yes
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index ecb48d4b078e..0f71134741cf 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -16,7 +16,7 @@ COMMENT= A language for the Finite Element Method
USE_XORG= ice sm x11 xt
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= freefem.1
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 6a42edeb57fe..11ed784bbca4 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -17,7 +17,7 @@ USE_KDELIBS_VER=3
USE_GL= glut
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
pre-configure:
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 27a4363c7c16..2721004a2614 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library of tools for doing computation in game theory
USE_GNOME= gnometarget gtk20
WANT_UNICODE= yes
USE_WX= 2.6+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
USE_LDCONFIG= yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 82ce94a32a0d..874fe82d50f4 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_BISON= build
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/geg/Makefile b/math/geg/Makefile
index a9018f2fc019..a48e80035177 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= domi@saargate.de
COMMENT= Visualise multiple 2D-functions of one variable
USE_GNOME= gtk12
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= -a -i
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 736693d7972e..58562a6b6235 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
USE_XORG= x11
USE_FREETYPE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} \
--includedir=${LOCALBASE}/include/ \
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 980508e6c2a8..c59d4dc7f222 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehier gtk20 gtksourceview2 libxml2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake --without-gnome
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index ac2453e6601d..f6693b7ac246 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal gnometarget
USE_PYTHON= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gnumeric --enable-explicit-python-linking
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index c4df82f0deb6..b300fbdcc417 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= octave:${PORTSDIR}/math/octave
USE_QT_VER= 3
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
${REINPLACE_CMD} -e '/kde_appsdir/s|applnk||g' ${WRKSRC}/configure
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 4e08a03adee2..74a688294f10 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -27,7 +27,7 @@ USE_QT_VER= 3
USE_KDELIBS_VER=3
USE_GL= glu
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/math/liblbfgs/Makefile b/math/liblbfgs/Makefile
index b4a0c7beb97f..3c2311e3338a 100644
--- a/math/liblbfgs/Makefile
+++ b/math/liblbfgs/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= gaod@hychen.org
COMMENT= A library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:en
+USE_AUTOTOOLS= autoconf:env
OPTIONS= OPTIMIZED "Enable SSE2 optimization routines" Off
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index 19c5a1c0eb97..1a2291945d42 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/
MAINTAINER= jhb@FreeBSD.org
COMMENT= C++ Library for Symbolic and Numeric Calculus Applications
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index 702e98f4179e..3d140d8fe441 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ implementation of the classic 3-layer perceptron in library form
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 4a67ad4b8f8a..1d577e373613 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= cln.6:${PORTSDIR}/math/cln
USE_GNOME= glib20 gnomehack gnometarget intlhack libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
diff --git a/math/ltl/Makefile b/math/ltl/Makefile
index a040a8eedcc6..cd8b3f30202f 100644
--- a/math/ltl/Makefile
+++ b/math/ltl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen --prefix=${PREFIX} --includedir=${PREFIX}/include/LTL
MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX}
MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index c550a30561a4..3c52f575a6a2 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -24,7 +24,7 @@ LICENSE= GPLv2
USE_TK = 84+
USE_GMAKE= yes
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= aclocal:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoconf
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-posix-shell=${LOCALBASE}/bin/bash \
--with-wish=${WISH} \
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 56c75e480862..46a5f554cf49 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -35,7 +35,7 @@ USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
INFO= liboctave
MAN1= octave.1 octave-bug.1 mkoctfile.1 octave-config.1
diff --git a/math/octave/Makefile b/math/octave/Makefile
index a6a4757a6ca3..76afa312cd8d 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -37,7 +37,7 @@ USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
INFO= octave liboctave
MAN1= octave.1 octave-bug.1 mkoctfile.1 octave-config.1
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index b52fa541dfd7..46036b6c6093 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -17,7 +17,7 @@ COMMENT= The GNU spreadsheet for X11 and terminals
USE_PERL5_BUILD= yes
USE_BISON= build
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot
diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile
index 24befa1e83fd..d0cde38f0301 100644
--- a/math/pgcalc/Makefile
+++ b/math/pgcalc/Makefile
@@ -17,7 +17,7 @@ COMMENT= A powerful scientific skinnable calculator
USE_QT_VER= 3
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index f6e7b7595379..9f372008d74c 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_CMAKE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 0f9765188dbe..fd2be950e084 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= libxml2
USE_PERL5_BUILD=yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index 351379e9bd6b..f6a71a3bfa65 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -18,7 +18,7 @@ PATCH_SITES= http://www.qhull.org/download/
PATCHFILES= poly.c-qh_gethash.patch
PATCH_DIST_STRIP= -p2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index 351379e9bd6b..f6a71a3bfa65 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -18,7 +18,7 @@ PATCH_SITES= http://www.qhull.org/download/
PATCHFILES= poly.c-qh_gethash.patch
PATCH_DIST_STRIP= -p2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index ece90111e569..bb9dde071552 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -23,7 +23,7 @@ USE_KDELIBS_VER=3
USE_PHP= yes
WANT_PHP_CLI= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-fast-perl
diff --git a/math/saga/Makefile b/math/saga/Makefile
index fb77a9f9e3ce..366213d3e5e5 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= proj.6:${PORTSDIR}/graphics/proj \
USE_WX= 2.8
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_DOS2UNIX= dlg_about.cpp
diff --git a/math/spar/Makefile b/math/spar/Makefile
index fdf0fbb9dd96..f49b5501464a 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/${PORTNAME}/Spar/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A modular math parser
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 350daa8eb688..8c5a501f394d 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -16,7 +16,7 @@ COMMENT= Tiny Vector and Matrix template library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
MAN1= tvmet-config.1
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 403ff71201ca..239912ee8aa6 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://yacas.sourceforge.net/backups/
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet Another Computer Algebra System
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5_BUILD= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 1866845775d5..00cfd4535a75 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -17,7 +17,7 @@ COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool
USE_TK= yes
USE_XORG= x11 xext sm ice
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-ipv6
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index d1d8c616f656..d0200638bdca 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
gsm.1:${GSM_DIR}
USE_XORG= x11
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
MAN1= vat.1
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index d4573de7ed94..549c0661d49e 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase
USE_TK= 84
USE_TK_BUILD= 84
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_XORG= xext
CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \
-x-includes=${LOCALBASE}/include \
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 6137b11224e4..ea735e792e29 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda25-client
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_OPENSSL= yes
PATCH_STRIP=
diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile
index 362bc42e3069..3286b5d904ba 100644
--- a/misc/kaddressbook-plugins/Makefile
+++ b/misc/kaddressbook-plugins/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index e7b7c7269bf0..954c802e63f8 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -26,7 +26,7 @@ PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
USE_XORG= xpm
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} \
--disable-ocamlsolver
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 44da2b51aebf..b6681f680415 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -29,7 +29,7 @@ USE_KDEBASE_VER=3
USE_PYTHON= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
DO_NOT_COMPILE+=klaptopdaemon kmilo
CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile
index 84ac3231ffb8..6f985f8a7ba6 100644
--- a/misc/kfile-plugins/Makefile
+++ b/misc/kfile-plugins/Makefile
@@ -23,7 +23,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile
index e0ca638fdcf1..9b412d86f945 100644
--- a/misc/kicker-applets/Makefile
+++ b/misc/kicker-applets/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile
index d145d5f581e4..980c18c12a86 100644
--- a/misc/knewsticker-scripts/Makefile
+++ b/misc/knewsticker-scripts/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile
index c5e8c0d090bd..a955f211662d 100644
--- a/misc/konq-plugins/Makefile
+++ b/misc/konq-plugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index d1dbe335fa81..b6d14adb487f 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= hank@millerfarm.com
COMMENT= Recipe database for cooks
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
OPTIONS= SQLITE "Support for SQLite backend" on \
MYSQL "Support for MySQL backend" off \
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index d1dbe335fa81..b6d14adb487f 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= hank@millerfarm.com
COMMENT= Recipe database for cooks
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
OPTIONS= SQLITE "Support for SQLite backend" on \
MYSQL "Support for MySQL backend" off \
diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile
index 5c6f94620cc4..54aebb86d8e5 100644
--- a/misc/ksig/Makefile
+++ b/misc/ksig/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 766d434459d7..2e82c95fb43a 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -16,7 +16,7 @@ COMMENT= KDE/Qt log file viewer
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 87faeea98045..04755fbadca4 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
MAINTAINER= thierry@FreeBSD.org
COMMENT= Modular Calendar Access Library
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --with-mstore --with-icap \
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index a6288e237a45..0ff57e44a9c3 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -18,7 +18,7 @@ COMMENT= Clone of Mdir, mc-style terminal file manager
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile
index 80af42358e61..444aab0bf7e3 100644
--- a/misc/renamedlgplugins/Makefile
+++ b/misc/renamedlgplugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 9b63041a3947..dae4f954b190 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library required by smssend (same author)
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index f625dbc09fb9..749ac5265ca4 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
CONFIGURE_ARGS+= --without-conf --without-clucene --with-zlib --without-icu
USE_LDCONFIG= yes
SUB_FILES= pkg-message
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 1330f82c0a4f..0172c9177baf 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= yes
CONFIGURE_ARGS+= --disable-cdtext
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index d199f6501e5c..8581ed0cb31e 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= skv@FreeBSD.org
COMMENT= A diff/patch utility for binary files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= glib20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 5fe15d204199..3a9283d22126 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -17,7 +17,7 @@ COMMENT= X On-Screen-Display Library and XMMS plug-in
XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config
USE_GMAKE= yes
USE_XORG= x11 xext xt sm ice
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \
CFLAGS='${CFLAGS}' LOCALBASE='${LOCALBASE}' \
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index c4ab8cc6496a..025bb763cbf8 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
USE_SUBMAKE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 86054307b23c..405359dc7da1 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -19,7 +19,7 @@ COMMENT= GTK2 multimedia player
USE_GNOME= gtk20 libglade2 desktopfileutils
WANT_GNOME= yes
USE_XORG= x11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 72ab4da12019..907f3358b625 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
ONLY_FOR_ARCHS= i386 alpha
-USE_AUTOTOOLS= autoconf:268 libtool:22 libltdl:22
+USE_AUTOTOOLS= autoconf libtool libltdl
USE_EFL= imlib2
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index fd43380e7c64..5520a7934c5f 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_GMAKE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack ltverhack gnomeprefix
USE_GSTREAMER= yes
USE_XORG= xp x11
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index a4c58747eaca..46fa320316ae 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-codec/Dirac-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT?= Open source video codec from the BBC
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/dvts/Makefile b/multimedia/dvts/Makefile
index 05e18d7e6152..5b26639450e7 100644
--- a/multimedia/dvts/Makefile
+++ b/multimedia/dvts/Makefile
@@ -21,7 +21,7 @@ COMMENT= An implementation of Digital Video Transport System
CONFLICTS= gdvrecv-[0-9]*
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAN1= dvts.1 dvsend.1 dvrecv.1
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index ed2e86354cb4..1371d78c2f43 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -17,7 +17,7 @@ COMMENT= A playlist for Noatun
LIB_DEPENDS= noatun:${PORTSDIR}/multimedia/kdemultimedia3
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index a11bf95fed96..20820848bb8c 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -18,7 +18,7 @@ COMMENT= Buzztard gstreamer plugins
LIB_DEPENDS= fluidsynth.4:${PORTSDIR}/audio/fluidsynth
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GSTREAMER= yes
USE_GNOME= gnomehack ltverhack
USE_LDCONFIG= yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 7020cc17e164..98422797e6af 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -52,7 +52,7 @@ WANT_GSTREAMER= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack ltasneededhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GST_PLUGIN?= base
CONFIGURE_ARGS= --disable-option-checking
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 1a8479ac25ea..ee26168fc8f1 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE= yes
WANT_GNOME= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack ltasneededhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-failing-tests \
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 6b8a3f2190c6..fbdccd5f4936 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -17,7 +17,7 @@ COMMENT= An alternative GUI for the Xine media player
LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 gnomehier
USE_GMAKE= yes
USE_GCC= 4.2+
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 0f4894d4a1e9..7fc13d4d906b 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -38,7 +38,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111
+USE_AUTOTOOLS= libtool aclocal
LIBTOOLFILES= ${WRKSRC}/configure
diff --git a/multimedia/hayes/Makefile b/multimedia/hayes/Makefile
index 532bb25fcd07..8938bf3bcc3e 100644
--- a/multimedia/hayes/Makefile
+++ b/multimedia/hayes/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= noatun:${PORTSDIR}/multimedia/kdemultimedia3
USE_KDEBASE_VER= 3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
post-patch:
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 42168128a99d..20095603c819 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 31f817e49c66..2d412c7550aa 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -23,7 +23,7 @@ USE_WEBPLUGINS= native
WEBPLUGINS_FILES=kaffeineplugin.so
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 433b338bfe9f..27761fe10c1c 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -33,7 +33,7 @@ PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index c70554b22cce..47c7ab6a94a1 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -24,7 +24,7 @@ OPTIONS= QUICKTIME "With Quicktime support" off \
FFMPEG_KINO "With ffmpeg-kino" off
USE_XORG= x11 xv ice
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2 libxml2
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 6ddc3f5e390c..309cb0c07c7c 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= atk glib20 gtk20 libxml2 pango # See above
WANT_GSTREAMER= yes # Can't be set after bsd.port.pre.mk
diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile
index 83208681e91a..8ad613390109 100644
--- a/multimedia/konverter/Makefile
+++ b/multimedia/konverter/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= avimerge:${PORTSDIR}/multimedia/transcode \
LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index 748208c86c81..d3f0d67a54d9 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_GETTEXT= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libtool
pre-configure:
@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index f216246d1306..59a10f5029e0 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-extract:
@${TOUCH} ${WRKSRC}/stamp-h.in
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 08c9ab64fbb4..61f1945a64b3 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for MPEG TS and DVB PSI tables decoding and generation
USE_DOS2UNIX= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
.if defined(WITH_DEBUG)
CONFIGURE_ARGS= --enable-debug
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 8f0147dea0ff..045f50cd4979 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -18,7 +18,7 @@ COMMENT= Portable abstraction library for DVD decryption
NO_CDROM= CSS code may violate the DMCA
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 897632fd86e4..e568eda039a4 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -17,7 +17,7 @@ COMMENT= Portable abstraction library for DVD navigation
LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-dvdread-tree=${LOCALBASE}/include
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index caefe24ce86f..b21f00097992 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A video encoding library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index b757416a043f..00f7b397ec03 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams
USE_GNOME= gnometarget ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 89707c93306f..24698ea9f48d 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnometarget gnomehack pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 1ad1ab2894ee..e09d52540247 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
USE_BZIP2= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile
index f1f9ae051321..678b6b0a1f3a 100644
--- a/multimedia/libxspf/Makefile
+++ b/multimedia/libxspf/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test
USE_BZIP2= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 8f47878f0fd7..2e98fe3acdec 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES= bin/mediainfo
EXTRACT_CMD= 7z
EXTRACT_BEFORE_ARGS= x -o${WRKSRC}
EXTRACT_AFTER_ARGS= >/dev/null
-USE_AUTOTOOLS= aclocal:111:env automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= aclocal:env automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/MediaInfo${DISTVERSIONSUFFIX}
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index e067d6803f2b..0ba7cd4e5fd5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack
WANT_GNOME= yes
WANT_SDL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index de2b54379fe0..286efb8d548e 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
MAN1= motion.1
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
MANCOMPRESSED= no
diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile
index cb67271ca524..7158e0348a3d 100644
--- a/multimedia/noatun-plugins/Makefile
+++ b/multimedia/noatun-plugins/Makefile
@@ -24,7 +24,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_SDL= sdl
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index a7273c08f2e2..37db8239ec89 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack \
gtk20
WANT_GNOME= yes
USE_XORG= xpm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \
--with-dvdcontrol=${LOCALBASE} \
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index f5c3a9daa1f7..203810eea353 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
mad.2:${PORTSDIR}/audio/libmad \
xml2.5:${PORTSDIR}/textproc/libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_XORG= x11 xext sm
USE_SUBMAKE= yes
USE_GMAKE= yes
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index b22fbae6c77f..64ccd40df14c 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -38,7 +38,7 @@ OPTIONS= GUI "Build the GTK+ GUI" on \
USE_GNOME= glib20 gnomehack intlhack libxml2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index ba3eb03c797c..1507df7db35a 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -17,7 +17,7 @@ COMMENT= A KDE frontend to the Ogle DVD player
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_KDELIBS_VER=3
CONFIGURE_ARGS= --with-ogle-dir=${LOCALBASE}/bin \
--with-ogle-includes=${LOCALBASE}/include \
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 3cb245f50888..c9b659d9ff1a 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \
USE_GNOME= gnomehack gtk12
USE_SDL= sdl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index eb1ed595b1f2..b11e6a2d48ea 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= acm@FreeBSD.org
COMMENT= A free MPEG1 video player library with sound support
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index 9bd8fcb6ce3f..7df83afea2b2 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 automake:111
+USE_AUTOTOOLS= autoconf aclocal automake
AUTOMAKE_ARGS= --add-missing
NOMAN= defined
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index eeda3176baa5..f210c8eddf4e 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= Subtitle editor for KDE
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER=3
USE_XORG= xext
GNU_CONFIGURE= yes
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 31eb263da66c..8f0233d98485 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ab31bec18247..6c1601fc7fc8 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -34,7 +34,7 @@ GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_OMF= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index a39633d6ba6e..2d3f36179875 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
WANT_SDL= yes
WANT_GNOME= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-isystem /usr/include -isystem ${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
SDL_CONFIG="${SDL_CONFIG}"
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index 454e3ca3f341..bc8ac812720d 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index e9161a8add88..c318daf58a64 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
xml2:${PORTSDIR}/textproc/libxml2 \
cdio.12:${PORTSDIR}/sysutils/libcdio
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index d4573de7ed94..549c0661d49e 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase
USE_TK= 84
USE_TK_BUILD= 84
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_XORG= xext
CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \
-x-includes=${LOCALBASE}/include \
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index c17ff48b5085..627b9b802ac0 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv
PLIST_FILES= bin/xdvshow
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_SDL= sdl
post-patch:
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index 05312c0a8434..7284cafc2523 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 99f7bb6c03f9..13a18407f944 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_XORG= x11 xpm
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/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index dee600716241..fb7547ae566c 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 2c56054a0361..926c1e80d5cf 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -19,7 +19,7 @@ COMMENT= MPEG-1 player in GTK+ capable of playing MPEG-1 format streams
LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_BZIP2= yes
USE_GNOME= gtk12
diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index 0cfd0fd62037..ec3c0a41542e 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -16,7 +16,7 @@ COMMENT= A console Yahoo! messenger client
PLIST_FILES= bin/ari-yahoo
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
pre-configure:
@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index cc345bede6ef..08a000cf311f 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -30,7 +30,7 @@ USE_XORG= xpm xscrnsaver
USE_GNOME= gnometarget gtk20
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-oscar --disable-workwizu --enable-smtp --enable-lj
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 5bd22029ed63..347f78141c3e 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -34,7 +34,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack
USE_GSTREAMER= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PYTHON= yes
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index c2c3c5998d8d..da277fd6c202 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= QQ IM Client for KDE3
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22 autoconf:268
+USE_AUTOTOOLS= libtool autoconf
USE_GMAKE= yes
USE_BZIP2= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index c8433c9e8770..be5963a39e93 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -22,7 +22,7 @@ USE_PYTHON= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget \
pygtk2
USE_GSTREAMER= core good bad python
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index f0686ec32283..55efae44ba57 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
USE_OPENSSL= yes
USE_PYTHON= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 46d0e3f63e49..4a236c2c4fef 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc \
USE_ICONV= yes
USE_GNOME= glib12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure liboop/configure
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index b7f4d46e6fb4..8ef85d35cf3a 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -16,7 +16,7 @@ COMMENT= Jabber/XMPP client library
LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn \
gnutls.40:${PORTSDIR}/security/gnutls
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile
index 9abf2c745f15..6f915ab9860b 100644
--- a/net-im/gnome-jabber/Makefile
+++ b/net-im/gnome-jabber/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 833193f56a73..fa1e855938ac 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
USE_GNOME= gtk12
WANT_GNOME= yes
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \
--with-gtkmm-prefix=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 051f7764f44b..a4649a81eee6 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A library required by kicq (not libicq)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 5fbbc8f80b5a..ec0e2aaa96b1 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -33,7 +33,7 @@ USE_RC_SUBR= jabber
USE_ICONV= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/jabber
.if !defined(NO_INSTALL_MANPAGES)
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 33357939dca5..1fb942821e2e 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -17,7 +17,7 @@ COMMENT= An IM (Instant Messenger) KDE client for the Microsoft MSN Network
USE_XORG= xscrnsaver
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS+= --prefix=${LOCALBASE}
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 5a5e1eefa24b..331396d86f02 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= freebsd-ports@club-internet.fr
COMMENT= MSN Messenger Client for KDE3
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile
index d796119eaecd..83c05040b07b 100644
--- a/net-im/konverse/Makefile
+++ b/net-im/konverse/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE Jabber Client
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index 9f96f53027bd..b042217c3e72 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -33,7 +33,7 @@ USE_GNOME= glib20
USE_OPENSSL= yes
USE_XORG= xtst
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \
diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index a88e1a7e5c60..34cedc9f797c 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -25,7 +25,7 @@ SUB_FILES= pkg-message
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
KPOPUP_DIR= /var/tmp/kpopup
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index a840d03b6621..4172695e556b 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index 30a48cb8cf2f..c29082beb381 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -16,7 +16,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-static
USE_LDCONFIG= yes
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 0979643c157b..0e68f3a83a18 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -26,7 +26,7 @@ CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
USE_GNOME= glib20
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_DOS2UNIX= README
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index de921b2e81ae..44070f729806 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget
USE_GSTREAMER= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 5381e6b6e150..f800fb7af792 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -25,6 +25,6 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index c35bd952b8ba..50729978d549 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A C library that handles the new Yahoo! Messenger protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack
USE_LDCONFIG= yes
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index bc00ad46fff7..36147265a329 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 ltverhack
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 8e0fead5ce03..fcdfcad905ed 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open Source implementation of the Lotus Sametime protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index fda7b2dc2efa..3c40b91e88e1 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= simicq-[0-9]* sim-im-[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_QT_VER= 3
USE_XORG= x11 xext xscrnsaver
USE_OPENSSL= yes
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index 803b7b9104ef..ad4d97232852 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_QT_VER= 3
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_LDCONFIG= yes
USE_GETTEXT= yes
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index af92720cebe8..018fd3bbed44 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index e9b183fac987..96d03eaf30af 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
vapigen-0.10:${PORTSDIR}/lang/vala-vapigen
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index c0a214f403d4..ff655233b301 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sqlite3.8:${PORTSDIR}/databases/sqlite3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 1647eed92fe5..db1940206bc4 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/net-mgmt/bsnmp-ucd/Makefile b/net-mgmt/bsnmp-ucd/Makefile
index 64057ec22573..f3eb71265c96 100644
--- a/net-mgmt/bsnmp-ucd/Makefile
+++ b/net-mgmt/bsnmp-ucd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= to.my.trociny@gmail.com
COMMENT= A bsnmpd module that implements parts of UCD-SNMP-MIB
USE_MAKE= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
MAN8= bsnmp-ucd.8
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile
index 35196afd6d63..ec3789dc4413 100644
--- a/net-mgmt/cacti-spine/Makefile
+++ b/net-mgmt/cacti-spine/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV= LDFLAGS="`net-snmp-config --libs`" \
CPPFLAGS="`net-snmp-config --cflags`"
USE_MYSQL= YES
USE_OPENSSL= YES
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 97f93a9c46bf..53722999ed2e 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -18,7 +18,7 @@ COMMENT= Flow analysis tool used for analyzing Cisco's NetFlow switching
LIB_DEPENDS= Arts.0:${PORTSDIR}/net-mgmt/arts++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_BISON= build
USE_LDCONFIG= yes
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index a143605f19bd..5a4eeb91cc91 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -16,7 +16,7 @@ COMMENT= Systems & network statistics collection daemon
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
WANT_GNOME= yes
OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index a143605f19bd..5a4eeb91cc91 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -16,7 +16,7 @@ COMMENT= Systems & network statistics collection daemon
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
WANT_GNOME= yes
OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 233c02404a18..282470dba965 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -26,7 +26,7 @@ OPTIONS= GTK "Build with GTK2+ GUI" on \
PCRE "Build with PCRE regexps in filters" on
WANT_GNOME= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index a9bce47d28bd..7f1c1fdcabe8 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -18,7 +18,7 @@ PLIST_FILES= bin/rpslcheck bin/peval bin/rtconfig
USE_BISON= build
USE_GMAKE= yes
GNU_CONFIGURE= Yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
MAN1= rtconfig.1 peval.1 rpslcheck.1 irrtoolset-errors.1
diff --git a/net-mgmt/libsmi/Makefile b/net-mgmt/libsmi/Makefile
index d3709271d23a..7f36382edb49 100644
--- a/net-mgmt/libsmi/Makefile
+++ b/net-mgmt/libsmi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ \
MAINTAINER= saper@saper.info
COMMENT= A library to access SMI MIB information
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index f28a9f3c27c5..10e9f0261cc5 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -23,7 +23,7 @@ LATEST_LINK= nagios-devel
USE_ICONV= yes
USE_PERL5_BUILD= yes
USE_PHP= yes
-USE_AUTOTOOLS= autoconf:268 libltdl:22
+USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= nagios.sh
CONFLICTS= nagios-[123].*
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 7e0b14c67580..f477e7656689 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -18,7 +18,7 @@ COMMENT= Plugins for Nagios
USE_SUBMAKE= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111 autoconf:268 automake:111
+USE_AUTOTOOLS= libtool aclocal autoconf automake
ACLOCAL_ARGS= -I m4 -I gl/m4
OPTIONS= QSTAT "Game server query support (check_game)" OFF \
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index a44cd5cf11dd..78340278a4a0 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -17,7 +17,7 @@ COMMENT= Additional SNMP plugins for Nagios
LIB_DEPENDS= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:14 autoheader:268 autoconf:268
+USE_AUTOTOOLS= automake14 autoheader autoconf
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 0e88bee6ee7e..d6c92852c016 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_ICONV= yes
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= autoconf:268 libltdl:22
+USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= nagios
CONFLICTS= nagios-[12].* nagios-devel-*
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 445bd7f20710..2680c115ac38 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_ICONV= yes
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= autoconf:268 libltdl:22
+USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= nagios
CONFLICTS= nagios-[13].* nagios-devel-*
diff --git a/net-mgmt/nagiosgrapher/Makefile b/net-mgmt/nagiosgrapher/Makefile
index 31ffc9ecf66a..6fa2a9f77d74 100644
--- a/net-mgmt/nagiosgrapher/Makefile
+++ b/net-mgmt/nagiosgrapher/Makefile
@@ -31,7 +31,7 @@ USE_RC_SUBR= ${PORTNAME}
SUB_LIST= NAME=${PORTNAME}
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
PERL_MODULES= ${SITE_PERL}
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 2b7120a821c7..c92b3c33845c 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
WRKSRC= ${WRKDIR}/pixilate
-USE_AUTOTOOLS= aclocal:111 autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal autoconf automake libtool
AUTOMAKE_ARGS= --add-missing
MAN1= pixilate.1
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 6ae809548f6c..f3dcec020283 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index dec9ae482882..bc8ef6ef6cf3 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -16,7 +16,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22 aclocal:111:env
+USE_AUTOTOOLS= libtool aclocal:env
USE_GETTEXT= yes
USE_XORG= xext
USE_LDCONFIG= yes
diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index bccc6e10365a..652275f4d000 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/net-p2p/btpd/Makefile b/net-p2p/btpd/Makefile
index e76e49bbdbbb..ac08b8b9302b 100644
--- a/net-p2p/btpd/Makefile
+++ b/net-p2p/btpd/Makefile
@@ -17,7 +17,7 @@ COMMENT= Bittorrent client consisting of a daemon and client commands
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USE_AUTOTOOLS= autoconf:268 aclocal:111
+USE_AUTOTOOLS= autoconf aclocal
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile
index 1d44eb0d8782..b34fe29f1034 100644
--- a/net-p2p/cdonkey/Makefile
+++ b/net-p2p/cdonkey/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net-p2p/gift-fasttrack/Makefile b/net-p2p/gift-fasttrack/Makefile
index c8a0731fa986..2e7d3fe4accf 100644
--- a/net-p2p/gift-fasttrack/Makefile
+++ b/net-p2p/gift-fasttrack/Makefile
@@ -19,7 +19,7 @@ EXPIRATION_DATE= 2010-11-24
LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/net-p2p/gift-openft/Makefile b/net-p2p/gift-openft/Makefile
index 4200fc4750c8..e807ba241949 100644
--- a/net-p2p/gift-openft/Makefile
+++ b/net-p2p/gift-openft/Makefile
@@ -20,7 +20,7 @@ EXPIRATION_DATE= 2010-11-24
LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift \
db3.3:${PORTSDIR}/databases/db3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 43098a6f789d..13e34b9ce7e3 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -17,7 +17,7 @@ COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index e33fbddcf23a..b8899baab809 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -34,7 +34,7 @@ OPTIONS= MYSQL "Enable MySQL support" on \
USE_GNOME= gnomehack libglade2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-dialog=no \
--with-cdialog=no \
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 7e8a77d50fbf..eb207b5ad7bd 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --program-transform-name=''
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 0b37a5c29685..0d005c6122ff 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK= ${PORTNAME}2
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index 7a3a753dfc57..b78aa4246593 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -24,7 +24,7 @@ CONFLICTS= libtorrent-rasterbar-0.15.*
USE_GNOME= gnomehack
USE_OPENSSL= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I m4
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug \
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index d36ffb8a5037..6fca3e9c4bc1 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -22,7 +22,7 @@ CONFLICTS?= libtorrent-devel-[0-9]* \
rblibtorrent-[0-9]* \
rblibtorrent-devel-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig gnomehack
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index d5034fdc577a..686f12cd94b3 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]*
USE_BZIP2= yes
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= opt
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index ab0e1d2b3411..a1711232d66d 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_RC_SUBR= verlihub
USE_GCC= 4.2+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index caa3e94fe291..3c3660e51f5d 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -17,7 +17,7 @@ COMMENT= TCP proxy for applications that don't speak IPv6
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
ALL_TARGET= default
MAN1= 6tunnel.1
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 176751c4196f..5af071f7b35a 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= dhn@FreeBSD.org
COMMENT= Find the country that any IP address or hostname originates from
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= geoiplookup.1 geoipupdate.1 geoiplookup6.1
diff --git a/net/asterisk-addons/Makefile b/net/asterisk-addons/Makefile
index 36db44c0a449..ba8bf698b185 100644
--- a/net/asterisk-addons/Makefile
+++ b/net/asterisk-addons/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off
ONLY_FOR_ARCHS= i386 amd64 powerpc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
index a29b12baea1b..31d31ad139bc 100644
--- a/net/asterisk14-addons/Makefile
+++ b/net/asterisk14-addons/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk14
OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off
ONLY_FOR_ARCHS= i386 amd64 powerpc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile
index 2aa5605fa8ad..1a942385289d 100644
--- a/net/asterisk16-addons/Makefile
+++ b/net/asterisk16-addons/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16
OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off
ONLY_FOR_ARCHS= i386 amd64 powerpc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile
index b8c0087042b0..3e50ac1a66aa 100644
--- a/net/atmsupport/Makefile
+++ b/net/atmsupport/Makefile
@@ -17,7 +17,7 @@ COMMENT= Tools for testing the ATM subsystem
LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE}
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 79bf8139da9f..a338b64bc62a 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -27,7 +27,7 @@ USE_GNOME?= gnomehack ltverhack glib20 intltool
USE_GETTEXT= yes
USE_GNOME_SUBR= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
AVAHI_SLAVE?= no
CONFIGURE_ARGS?=--with-distro=freebsd \
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 11d8b4e01681..62d40839858f 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WWW_DIR?= ${PREFIX}/www/
PLIST_SUB+= VERSION=${PORTVERSION}
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_RC_SUBR= beacon
.ifdef(WITHOUT_IPV6)
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index d36a3e391799..08c01a5ecebf 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -21,7 +21,7 @@ MAN8= dictd.8
USE_RC_SUBR= ${PORTNAME}
USE_BISON= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
diff --git a/net/dosdetector/Makefile b/net/dosdetector/Makefile
index 4fc5dfd938ce..07841ce2887d 100644
--- a/net/dosdetector/Makefile
+++ b/net/dosdetector/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= msciciel@dark-zone.eu
COMMENT= Detect suspicious network traffic
HAS_CONFIGURE= yes
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
PLIST_FILES= bin/dosdetector
MAN1= dosdetector.1
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 75268c11ae10..7346c4d340bb 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool \
CONFLICTS= ekiga-2.*
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/net/freeradius-client/Makefile b/net/freeradius-client/Makefile
index 2e00c2fb0011..f6de6d921a25 100644
--- a/net/freeradius-client/Makefile
+++ b/net/freeradius-client/Makefile
@@ -17,7 +17,7 @@ COMMENT= Client library and basic utilities for RADIUS AAA
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFLICTS= radiusclient-ng-[0-9]*
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 75eb38083b9c..f30750374488 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -39,7 +39,7 @@ CONFLICTS+= freeradius-mysql-[0-9].* freeradius-[02-9].*
NO_LATEST_LINK= yes
USE_RC_SUBR= radiusd.sh
-USE_AUTOTOOLS= libltdl:22 libtool:22 autoconf:268
+USE_AUTOTOOLS= libltdl libtool autoconf
USE_GMAKE= yes
USE_OPENSSL= yes
MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -236,7 +236,7 @@ pre-configure:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \;
# Force the rebuild of some configures from configure.in, as we're patching
# the configure.in
-# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf:268 is
+# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf is
# added to USE_AUTOTOOLS
@cd ${WRKSRC}/src/modules/rlm_ldap && ${AUTOCONF} -I ${WRKSRC}
@cd ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql \
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index b3f9b6524acd..ee4ed33eabf4 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -34,7 +34,7 @@ CONFLICTS= gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
freeradius-mysql-[0-9].* freeradius-[013-9].*
USE_RC_SUBR= radiusd.sh
-USE_AUTOTOOLS= libltdl:22 libtool:22 autoconf:268
+USE_AUTOTOOLS= libltdl libtool autoconf
USE_GMAKE= yes
USE_OPENSSL= yes
MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -352,7 +352,7 @@ pre-configure:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \;
# Force the rebuild of some configures from configure.in, as we're patching
# the configure.in
-# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf:268 is
+# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf is
# added to USE_AUTOTOOLS
@cd ${WRKSRC}/src/modules/rlm_ldap && ${AUTOCONF} -I ${WRKSRC}
@cd ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql \
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 9989380e344f..6d302e689d26 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -38,7 +38,7 @@ WRKSRC= ${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
USE_PERL5_BUILD=yes
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index bff03cc76971..6d770f07e124 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323
USE_RC_SUBR= gnugk.sh
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+= --disable-firebird
USE_GMAKE= yes
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index c08e27e04cd0..70af69c6a4da 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.gnetlibrary.org/src/
MAINTAINER= araujo@FreeBSD.org
COMMENT= A simple network library built upon Glib
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib12
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 0ee0edcbe7fe..dbe2b14f7a7c 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX= 2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A simple network library built upon Glib-2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 355fc497a823..d75863a029a0 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -18,7 +18,7 @@ COMMENT= Flexible modular implementation of DICT server
USE_XZ= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 0e26e11c8f70..4bafd66cb19a 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= freeradius-0.* openradius-0.* radiusd-cistron-1.*
USE_RC_SUBR= radiusd.sh
USE_SUBMAKE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/gsambad/Makefile b/net/gsambad/Makefile
index 67af0981c63e..229e52e7f304 100644
--- a/net/gsambad/Makefile
+++ b/net/gsambad/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/${SAMBA_PORT}
SAMBA_PORT?= net/samba34
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GNOME= gtk20 pkgconfig
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index e2b5a947abb7..c6242d8230f0 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -15,7 +15,7 @@ COMMENT= A C library for writing servers
USE_GNOME= glib20 gnomehack
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc
USE_LDCONFIG= yes
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 6a2b8e208ae8..13c05977c576 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \
BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \
--with-libevent=${LOCALBASE}
MAKE_JOBS_SAFE= yes
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 109bd79de45a..ce131f9d68b8 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -15,7 +15,7 @@ COMMENT= Zeroconf/Bonjour(tm) implementation
CONFLICTS= avahi-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_LDCONFIG= yes
diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile
index dad2e5ec9d20..154e7d53581e 100644
--- a/net/ilbc/Makefile
+++ b/net/ilbc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://simon.morlat.free.fr/download/1.2.x/source/
MAINTAINER= asm@asm.kiev.ua
COMMENT= Internet Low Bit Rate codec (RFC3951)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index 5f2054593507..493174a385f3 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -106,7 +106,7 @@ LDAP_SCRIPT= ${WRKDIR}/${LDAPPATCHDIST}/dhcpd-conf-to-ldap
LDAP_SCHEMA= ${WRKDIR}/${LDAPPATCHDIST}/dhcp.schema
USE_PERL5_RUN= yes
USE_OPENLDAP= yes
-USE_AUTOTOOLS= aclocal:111 libtoolize:226 autoconf:268 autoheader:268 automake:111
+USE_AUTOTOOLS= aclocal libtoolize6 autoconf autoheader automake
LIBTOOLIZE_ARG= --copy --force
AUTOMAKE_ARGS= --foreign --add-missing --copy
CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 98dd7a8cdd12..eb13f424305b 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= yes
USE_OPENSSL= yes
USE_XORG= xtst
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
DO_NOT_COMPILE+=kopete lanbrowsing filesharing
diff --git a/net/kmuddy/Makefile b/net/kmuddy/Makefile
index 3c6600e865a4..0818b189469f 100644
--- a/net/kmuddy/Makefile
+++ b/net/kmuddy/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mxp:${PORTSDIR}/net/libmxp
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_KDELIBS_VER=3
USE_LDCONFIG= yes
diff --git a/net/knemo/Makefile b/net/knemo/Makefile
index 583dd37c714f..bb8eec6fb54c 100644
--- a/net/knemo/Makefile
+++ b/net/knemo/Makefile
@@ -16,7 +16,7 @@ COMMENT= Network monitor for KDE
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile
index aa3b540bdba8..0e6a909080cb 100644
--- a/net/lanbrowsing/Makefile
+++ b/net/lanbrowsing/Makefile
@@ -28,7 +28,7 @@ USE_RC_SUBR= lisa
USE_BZIP2= yes
USE_XORG= xtst
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdenetwork-${PORTVERSION}
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 704578be906f..d34f1592dda0 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GLib-based networking wrapper
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 7f34d5fb50ab..8019b30f33ae 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 5360fbc06fbc..732fcfd75949 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -15,7 +15,7 @@ COMMENT= A C library for creating IP packets (development version)
LATEST_LINK= ${PORTNAME}${SHORT_VER}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-link-layer=${LIBNET_LINK}
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index db5071585861..4f9142845d91 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -20,7 +20,7 @@ COMMENT= A C library for creating IP packets
CFLAGS+= -fPIC
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
MAN3= libnet${PKGNAMESUFFIX}.3
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 89a9b5461163..6758d1dc75e5 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for manipulating libpcap/tcpdump trace files
LIB_DEPENDS= pcapnav.0:${PORTSDIR}/net/libpcapnav
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= glib12
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index a99fdab1f756..0aed9fa55cfa 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= vd@FreeBSD.org
COMMENT= NSS module using a MySQL database for backend
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-mysql=${LOCALBASE}
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index a7b4dbb5add5..4e122de6a4a2 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -18,7 +18,7 @@ COMMENT= A low layer of SIP implementation
CONFLICTS= libosip2-2*
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-debug --disable-trace
USE_LDCONFIG= yes
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index f1e27c5fdecb..499d99d771f2 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/netdude/${PORTNAME}/${PORTVERSION}
MAINTAINER= brenton.chang@gmail.com
COMMENT= A libpcap wrapper library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 2612deb5cda4..ea34d384df95 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library for delta compression of streams
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index abcc859c4273..8bf09ad378e2 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -20,7 +20,7 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
INFO= socket++
diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile
index fc6cff79e993..32dd85aaccca 100644
--- a/net/libsocketcpp/Makefile
+++ b/net/libsocketcpp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/libsocket/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ wrapper library to the sockets
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 00a132f3fc9b..43e603322eef 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
USE_GNOME= gnomeprefix gnomehack libglade2 gconf2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/linc/Makefile b/net/linc/Makefile
index afde04f6bd78..b18c91bc98b7 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index f3329a020cf9..9a1bba3775c3 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= ortp-[0-9]*
USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \
diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile
index 6f968ace9134..06a318abd85e 100644
--- a/net/mcast-tools/Makefile
+++ b/net/mcast-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT= IPv6 multicast routing daemons and tools
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:268
+USE_AUTOTOOLS= automake aclocal autoconf
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS=
CONFIGURE_ENV=
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 52d255a38fb2..6420f820d9fb 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
gnutls.40:${PORTSDIR}/security/gnutls
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a642273f1bf7..e12628a7e928 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -16,7 +16,7 @@ COMMENT= File server for Mac OS X
LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BDB= 46+
USE_BZIP2= yes
USE_ICONV= yes
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 299b2f03965f..25290d7d3095 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -17,7 +17,7 @@ COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
-USE_AUTOTOOLS= libltdl:22 libtool:22
+USE_AUTOTOOLS= libltdl libtool
USE_ICONV= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 866889f1c09f..41c84147fc0a 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -21,7 +21,7 @@ NSS_LDAP_VERSION=265
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:268 autoheader:268
+USE_AUTOTOOLS= automake aclocal autoconf autoheader
USE_LDCONFIG= yes
USE_OPENLDAP= yes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 5f444ba2d5e6..4d5acee980e7 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \
DBDIR?= /var/db
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 automake:111 autoconf:268
+USE_AUTOTOOLS= libtool automake autoconf
USE_GNOME= libxml2
USE_LUA= 5.1
USE_GMAKE= yes
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 814f759bae9f..f936d9f50b6a 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -20,7 +20,7 @@ COMMENT= The Network Time Protocol Distribution
LATEST_LINK= ${PORTNAME}-dev
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 libtool:22
+USE_AUTOTOOLS= automake libtool
.if defined(ENABLE_RAWDCF)
CONFIGURE_ARGS+= --enable-RAWDCF
diff --git a/net/ntp-rc/Makefile b/net/ntp-rc/Makefile
index d2e65741df65..0f3796aa5597 100644
--- a/net/ntp-rc/Makefile
+++ b/net/ntp-rc/Makefile
@@ -20,7 +20,7 @@ COMMENT= The Network Time Protocol Distribution
LATEST_LINK= ${PORTNAME}-rc
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 libtool:22
+USE_AUTOTOOLS= automake libtool
MAN1= sntp.1 \
ntpd.1 \
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 92a37ced00c5..9f713024e408 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -20,7 +20,7 @@ COMMENT= The Network Time Protocol Distribution
LATEST_LINK= ${PORTNAME}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 libtool:22
+USE_AUTOTOOLS= automake libtool
MAN1= sntp.1 \
ntpd.1 \
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 774e83d53e1d..f16bf31128c1 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -24,7 +24,7 @@ CONFLICTS= opal-3.*
# In opal's Makefile the default make's target is optshared
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` optshared
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 9740b1a3deba..00c3fadd94fe 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
USE_BISON= build
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 984d932e8f30..6c333211a927 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -114,7 +114,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -168,7 +168,7 @@ USE_RC_SUBR= slapd.sh ${SLURPDSH}
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_AUTOTOOLS+= libltdl:22
+USE_AUTOTOOLS+= libltdl
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 0dfe3addbdf7..ef4b00ddcc09 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -128,7 +128,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -184,7 +184,7 @@ USE_RC_SUBR= slapd.sh
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_AUTOTOOLS+= libltdl:22
+USE_AUTOTOOLS+= libltdl
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 681443cc776a..908f7c61235f 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/OpenSLP/${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open-source implementation of the Service Location Protocol
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index ce80696cf283..397c0ff4486d 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
MAINTAINER= thomas@cuivre.fr.eu.org
COMMENT= The SuSE Proxy-Suite, a set of programs to enhance firewall security
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 33cd5bfb511e..96c49c1b6740 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -17,7 +17,7 @@ COMMENT= A C++-Library for PVM
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index ab64de39830a..dc833331f999 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -23,7 +23,7 @@ COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software
CONFLICTS= openbgpd-[0-9]* zebra-0*
-USE_AUTOTOOLS= libtool:22 autoheader:268
+USE_AUTOTOOLS= libtool autoheader
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PERL5_BUILD= yes
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 1afd40547fa2..2f5219cc2c76 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE= YES
USE_PYTHON= YES
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= aclocal:111 autoconf:268 automake:111 autoheader:268 libtool:22
+USE_AUTOTOOLS= aclocal autoconf automake autoheader libtool
AUTOMAKE_ARGS= -i --add-missing
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index 8cc061a0ce88..a06f274b075f 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= YES
USE_PYTHON= YES
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= aclocal:111 autoconf:268 automake:111 autoheader:268 libtool:22
+USE_AUTOTOOLS= aclocal autoconf automake autoheader libtool
AUTOMAKE_ARGS= -i --add-missing
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
diff --git a/net/roadrunner/Makefile b/net/roadrunner/Makefile
index d8882cfb5f4f..c4f831da055a 100644
--- a/net/roadrunner/Makefile
+++ b/net/roadrunner/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A portable BEEP protocol implementation
USE_GNOME= glib20 libxml2 pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
USE_GMAKE= yes
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index aa5431b480f3..bc99cdf5785a 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -18,7 +18,7 @@ COMMENT= Multiplexor, MySQL and PostgeSQL passdb backends for Samba3
USE_GMAKE= yes
GNU_CONFIGURE= yes
# Add a build dependency for Samba port
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
SAMBA_PORT?= net/samba34
diff --git a/net/samba34/Makefile b/net/samba34/Makefile
index f918db5dde6f..caf83ee9ab87 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -32,7 +32,7 @@ AUTOCONF_ARGS= ${IPATHS}
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
# directories
VARDIR?= /var
SAMBA_SPOOL?= ${VARDIR}/spool/${PORTNAME}
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 3330b6ea8fd3..21917b84c140 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -37,7 +37,7 @@ AUTOCONF_ARGS= ${IPATHS}
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
# directories
VARDIR?= /var
SAMBA_SPOOL?= ${VARDIR}/spool/${SAMBA_BASENAME}
diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile
index 2f8cca45c947..d019391a236b 100644
--- a/net/samba4-devel/Makefile
+++ b/net/samba4-devel/Makefile
@@ -39,7 +39,7 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= ${SAMBA_LIBDIR}
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
# Flags
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index f89640dab6c5..23d02f6743a4 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
USE_ICONV= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env autoheader:268:env
+USE_AUTOTOOLS= autoconf:env autoheader:env
WRKSRC= ${WRKDIR}/${PORTNAME}/source
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 386a9b73c132..25893641d5ea 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --with-boost-filesystem=boost_filesystem \
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_GMAKE= yes
USE_PYTHON= yes
USE_RC_SUBR= ${PORTNAME}
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 5d0916ec8f01..08ce2ae10fe7 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -14,7 +14,7 @@ DISTNAME= SDL_net-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= A small sample cross-platform networking library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 0d4ab5edd4d7..0036a152a333 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile
GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index 0f2f29703d0e..eead84d379bd 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -22,7 +22,7 @@ SAMBA_PORT?= net/samba34
USE_KDEBASE_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index bce50a828370..f6b7356fd632 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -17,7 +17,7 @@ COMMENT= Abstraction layer for interprocess communication
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= pkgconfig glib20 gnomehack
USE_LDCONFIG= yes
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index c9b8bceb6620..70f28ab7d7a7 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for capturing data transmitted as part of TCP connections
HAS_CONFIGURE= yes
-USE_AUTOTOOLS= automake:14
+USE_AUTOTOOLS= automake14
MAN1= tcpflow.1
PLIST_FILES= bin/tcpflow
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index fa894ac3316d..f2c274f93771 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= 5250 Telnet protocol and Terminal
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-os-dir=no --with-ssl=${OPENSSLBASE}
USE_LDCONFIG= yes
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 2f03006d3cf3..5a4ae9df92f9 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-epsilon
MAINTAINER= andy.lavr@gmail.com
COMMENT= Most SOCKS-friendly applications way with Tor
-USE_AUTOTOOLS= libtool:22 aclocal:111 autoconf:268
+USE_AUTOTOOLS= libtool aclocal autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
USE_GMAKE= yes
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index e8c17f1ccb2e..e76392c7d7f9 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -18,7 +18,7 @@ COMMENT= Transparent remote file access tool for emacsen
USE_EMACS= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR}
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index b2e4a1ecda1c..9febe86c06ec 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -16,7 +16,7 @@ COMMENT= Lightweight, portable bandwidth shaper
LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index b66877a1d90e..4d18f65ed1da 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -16,7 +16,7 @@ COMMENT= A GNOME 2 frontend for rdesktop and vncviewer
RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 44329fd87c7e..3f5d99bc267a 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= ccgnu2-1.7.0:${PORTSDIR}/devel/commoncpp \
zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
USE_XORG= xext
USE_GMAKE= yes
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index fdd2fd37c39c..b43d0626903e 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack
USE_ICONV= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index c29d703d13c3..47dd94975f19 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A user-space implementation of the NFSv3 server specification
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_BISON= build
MAN7= tags.7
diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile
index f2bd40862c47..f5d6c8796522 100644
--- a/net/uriparser/Makefile
+++ b/net/uriparser/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--disable-doc --disable-test
USE_BZIP2= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 5a1417af7777..ba143549b16b 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gnometarget
USE_PERL5= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
MAKE_ARGS= LIBTOOL="${LIBTOOL}" \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 5339f267483c..c9ba7b8a54b0 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -26,7 +26,7 @@ CONFLICTS= xmlrpc-epi-0.* xmlrpc-c-devel-[0-9]*
USE_GNOME= gnometarget
USE_PERL5= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
MAKE_ARGS= LIBTOOL="${LIBTOOL}" \
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index a9d9d1733955..59f3fdd4798c 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_GMAKE= yes
USE_ICONV= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
CONFIGURE_ARGS= --program-transform="s|^|xre-|"
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 8e36891c25a2..d14494fac99a 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An open source Remote Desktop Protocol (RDP) server
USE_XORG= x11 xfixes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env automake:env libtool
GNU_CONFIGURE= yes
USE_RC_SUBR= xrdp
diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index c8e959297b31..2b037777ee6b 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -19,7 +19,7 @@ COMMENT= Fido-Internet Gateway and Tosser
BUILD_DEPENDS= ${LOCALBASE}/news/bin/innconfval:${PORTSDIR}/news/inn
.endif
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 171b5fbdfb5b..6dba81ff675a 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= uu.3:${PORTSDIR}/converters/uulib \
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index 295295b78b66..e52315b52704 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -17,7 +17,7 @@ COMMENT= NewsCache is a free cache server for USENET News
LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++
-USE_AUTOTOOLS= automake:111 autoheader:268 autoconf:268
+USE_AUTOTOOLS= automake autoheader autoconf
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index e89702d31c8a..bada8ec12003 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -23,7 +23,7 @@ BROKEN= does not build
USE_PERL5= yes
HAS_CONFIGURE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:111 autoconf:268 aclocal:111
+USE_AUTOTOOLS= automake autoconf aclocal
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--with-conf-dir=${PREFIX}/etc/newsstar \
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 44f5de29dbda..23f772c242eb 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.xs4all.nl/~suelette/
MAINTAINER= leeym@FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
# This may be set interactively at install-time. NNTPCache will
# cache news articles and related data in ${SPOOLDIR}/nntpcache.
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 94ca09435ffa..7a75eed3fb47 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack \
ltverhack libgnomeui
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_OMF= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index a6f0bcc1041e..d7d75c689a15 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -16,7 +16,7 @@ COMMENT?= Utilities/libraries to make RAPI calls on WinCE devices
LIB_DEPENDS+= synce.0:${PORTSDIR}/palm/synce-libsynce
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GNOME= gnomehack gnometarget
USE_LDCONFIG= yes
diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index 54609f1e102d..6ad25b50305b 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -22,7 +22,7 @@ OPTIONS?= TOOLS "Build with minor rra command line tools" on \
RECURR "Enable experimential recurrence support" off
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 42fe0c45df6b..38ab377be7d3 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
hal.1:${PORTSDIR}/sysutils/hal
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GNOME= gnomehack gnometarget
CONFIGURE_ARGS+= --with-libiconv-prefix="${LOCALBASE}" \
diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile
index f9d1420fc400..26284b1039ce 100644
--- a/ports-mgmt/kports/Makefile
+++ b/ports-mgmt/kports/Makefile
@@ -17,7 +17,7 @@ COMMENT= KDE3-Version of your favorite frontend to the Ports
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFLICTS= kports-0.[89]*
RUN_DEPENDS+= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index 52677de8cb46..db57916ab69c 100644
--- a/ports-mgmt/portlint/src/portlint.pl
+++ b/ports-mgmt/portlint/src/portlint.pl
@@ -1339,7 +1339,6 @@ sub checkmakefile {
my(@mopt, @oopt);
my($pkg_version, $versiondir, $versionfile) = ('', '', '');
my $useindex = 0;
- my %autotools_deprecated = ();
my %deprecated = ();
my @deplist = ();
my %autocmdnames = ();
@@ -1736,25 +1735,6 @@ sub checkmakefile {
# whole file: check for deprecated commands
#
print "OK: checking for deprecated macros.\n" if $verbose;
- %autotools_deprecated = (
- USE_LIBTOOL => 'USE_AUTOTOOLS',
- USE_AUTOCONF => 'USE_AUTOTOOLS',
- USE_AUTOMAKE => 'USE_AUTOTOOLS',
- WANT_LIBTOOL => 'USE_AUTOTOOLS',
- WANT_AUTOCONF => 'USE_AUTOTOOLS',
- WANT_AUTOMAKE => 'USE_AUTOTOOLS',
- USE_LIBLTDL => 'USE_AUTOTOOLS',
- USE_LIBTOOL_VER => 'USE_AUTOTOOLS',
- WANT_LIBTOOL_VER => 'USE_AUTOTOOLS',
- USE_INC_LIBTOOL_VER => 'USE_AUTOTOOLS',
- WANT_AUTOMAKE_VER => 'USE_AUTOTOOLS',
- USE_AUTOMAKE_VER => 'USE_AUTOTOOLS',
- USE_ACLOCAL_VER => 'USE_AUTOTOOLS',
- USE_AUTOHEADER_VER => 'USE_AUTOTOOLS',
- USE_AUTOCONF_VER => 'USE_AUTOTOOLS',
- WANT_AUTOCONF_VER => 'USE_AUTOTOOLS',
- __HELP__ => 'http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/using-autotools.html',
- );
%deprecated = (
USE_MESA => 'USE_GL',
@@ -1763,7 +1743,7 @@ sub checkmakefile {
APACHE_COMPAT => 'USE_APACHE',
);
- @deplist = (\%autotools_deprecated, \%deprecated);
+ @deplist = (\%deprecated);
for my $dlst (@deplist) {
my $hurl = $dlst->{'__HELP__'};
diff --git a/print/cups-magicolor/Makefile b/print/cups-magicolor/Makefile
index a65bb29ca2fc..db32e2f236ef 100644
--- a/print/cups-magicolor/Makefile
+++ b/print/cups-magicolor/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster
WRKSRC= ${WRKDIR}/magicolor2430DL-${PORTVERSION}
-USE_AUTOTOOLS= automake:111:env autoconf:268
+USE_AUTOTOOLS= automake:env autoconf
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 131389d5283c..02e3acb033b4 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBA
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= fontforge.1 fontimage.1 fontlint.1 sfddiff.1
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index d6c500e33989..4e159a4ca3ec 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
PROJECTHOST= bsdistfiles
USE_GMAKE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268
+USE_AUTOTOOLS= automake:env autoconf
GNU_CONFIGURE= yes
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 424891d02bab..a3c723a1d272 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.linuxprinting.org/download/foomatic/ \
MAINTAINER= acm@FreeBSD.org
COMMENT= Foomatic wrapper scripts
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
USE_PERL5= yes
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index 8a3de5f1e88f..02809bb7ed3c 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base \
BUILD_DEPENDS= ${RUN_DEPENDS}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
TEXMFMAIN= ${PREFIX}/share/texmf
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 843283d0488e..39387e616268 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES= SF \
MAINTAINER= ports@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 6684a24827be..f28733313ba2 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -20,7 +20,7 @@ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 1dc7f1ba1ae3..0b9f2666a18f 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_XORG= xext
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}"
MAKE_ARGS= EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index c518cad06300..0fd8fcaf9a58 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -37,7 +37,7 @@ USE_XZ= yes
USE_GMAKE= yes
WANT_GNOME= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 7a6716abbe26..c1c56b8ecbe4 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -20,7 +20,7 @@ COMMENT= Admistration tool for cups
LIB_DEPENDS= gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
RUN_DEPENDS= gnomesu:${PORTSDIR}/security/libgnomesu
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 7052c744267c..7fcf70bb59ab 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -24,7 +24,7 @@ USE_GHOSTSCRIPT_RUN= yes
PLIST_SUB= VERSION=${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/print/gnome-specimen/Makefile b/print/gnome-specimen/Makefile
index f268942b430c..731da48197a8 100644
--- a/print/gnome-specimen/Makefile
+++ b/print/gnome-specimen/Makefile
@@ -20,7 +20,7 @@ GCONF_SCHEMAS= gnome-specimen.schemas
USE_GMAKE= yes
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env
+USE_AUTOTOOLS= automake:env autoconf:env
INSTALLS_ICONS= yes
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 4d25355d8a8a..a95bdcb1fc19 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gnometarget gtk20
USE_OPENSSL= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile
index da4ed7ec823c..b5fcdce37724 100644
--- a/print/kaspaliste/Makefile
+++ b/print/kaspaliste/Makefile
@@ -16,7 +16,7 @@ COMMENT= Bibliography tool for KDE/Postgres/BibTeX
USE_PGSQL= yes
USE_KDEBASE_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS+= --with-pg-includes=${LOCALBASE}/include \
--with-pg-libs=${LOCALBASE}/lib
diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile
index e78aa2e954ed..21db7488315c 100644
--- a/print/kcdlabel/Makefile
+++ b/print/kcdlabel/Makefile
@@ -16,7 +16,7 @@ COMMENT= Create covers, labels and booklets for your CD cases
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 5cac71ebdd86..870eb45adb18 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= kover.1 cddb-id.1
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index e3c922869e3f..47602ff4d319 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack ltverhack glib20
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 669d7408a13b..60eea57b7ee1 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
libartlgpl2 ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 2a65d4806f06..a67217897a94 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ bindings for the GNOME print support library
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprint
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index e47cb046ff3c..2782d618dd59 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -19,7 +19,7 @@ COMMENT= C library that supports plugin printer driver for Ghostscript
USE_BZIP2= yes
USE_GNOME= gnometarget lthack pkgconfig
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= ijs-config.1
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 354c8798e4b3..44f7c4e42e91 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A library providing routines for paper size management
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index b9f95720fa21..8a5c067cab73 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/lpr/${PORTNAME}/${PORTVERSION}
MAINTAINER= emss@free.fr
COMMENT= A library providing routines for ppd files
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= Yes
USE_GNOME= glib12
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 52f99244ac93..4c9e1d04520a 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -15,7 +15,7 @@ COMMENT= A small library for rendering Postscript documents
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnomeprefix ltverhack
USE_GHOSTSCRIPT=yes
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 28c18692b9c5..11c31c8e6a59 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -47,7 +47,7 @@ INFO= lilypond-changes lilypond-contributor lilypond-essay \
lilypond-notation lilypond-usage lilypond-web \
music-glossary
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_BISON= build
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 3ba27c938297..12390a00f8b1 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -30,7 +30,7 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= aclocal:111 autoconf:268 autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS= aclocal autoconf autoheader automake libtool
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS+= -a -c
diff --git a/print/panda/Makefile b/print/panda/Makefile
index ae5e3bef278b..fa9d6172112a 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_BDB= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-berkeley-db
USE_LDCONFIG= yes
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 142208bf5ef1..6b1e8105cb3f 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -18,7 +18,7 @@ RESTRICTED= many odd restrictions on usage and distribution
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-java=no --with-py=no --with-ruby=no --with-tcl=no
.if defined(WITH_PERL)
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index 6205bba5df20..cb2553104140 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -122,7 +122,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-2.6.2-common \
${PRTYPE} != -spr800
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-2.6.2-ekpstm::main.c
.endif
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
USE_ICONV= yes
.endif
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 6fbd5176f0b0..132480c177b6 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gnomehack gnometarget intlhack pkgconfig
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
USE_LDCONFIG= yes
diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile
index 207d168e0f20..6f87718705d9 100644
--- a/russian/ksocrat/Makefile
+++ b/russian/ksocrat/Makefile
@@ -20,7 +20,7 @@ COMMENT= KSocrat is the simple English/Russian Russian/English dictionary
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
RESTRICTED= "Redistribution not allowed"
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 8aed9907f79d..1609cd8515ae 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -22,7 +22,7 @@ USE_FORTRAN= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= autoconf:268 automake:111
+USE_AUTOTOOLS= autoconf automake
CONFIGURE_ENV= WGET=${TRUE}
CONFIGURE_ARGS= --disable-wannier90 --disable-bigdft --disable-etsf-io \
--with-plugins-tardir=/dev/null \
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 853d9ce73f7e..14614b9172e5 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BuDDy%20${PORTVERSION}
MAINTAINER= llwang@infor.org
COMMENT= A Binary Decision Diagram library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 048968299660..2b28a163aa5d 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= transfig:${PORTSDIR}/print/transfig
WRKSRC= ${WRKDIR}/${PORTNAME}-1.7alpha15/
USE_GNOME= gtk20
-#USE_AUTOTOOLS= autoconf:213
+#USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/science/crf++/Makefile b/science/crf++/Makefile
index 592fb1a83cba..89e7686ad246 100644
--- a/science/crf++/Makefile
+++ b/science/crf++/Makefile
@@ -17,6 +17,6 @@ COMMENT= Yet Another CRF toolkit
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index 6414fe527b73..f504914187ef 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -30,7 +30,7 @@ USE_FORTRAN= yes
FCFLAGS+= -O3 -ffast-math
.endif
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET=
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index 7661f2cd6844..b92887d69b89 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -39,7 +39,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%FC%%|${FC}|' ${WRKSRC}/configure.in
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
ALL_TARGET=
PLIST_FILES= include/huti_defs.h include/huti_fdefs.h lib/libhuti.a
diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile
index b8448a329021..b271be9a6b53 100644
--- a/science/ghmm/Makefile
+++ b/science/ghmm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= General Hidden Markov Model Library in C
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-0.7.0
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index d1ecfea476fa..5562ea6fedde 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -15,7 +15,7 @@ COMMENT= Compute molecular dynamics
USE_GNOME= libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --exec-prefix=${PREFIX} --program-suffix="" --enable-shared
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index ed4badb74eb0..d757a150edf0 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
AUTOMAKE_ARGS= -i --add-missing --foreign --copy
MAN1= gsmc.1
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index e81c9841216e..332153bbe3a5 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -21,7 +21,7 @@ COMMENT= Hierarchical Data Format library (from NCSA)
CONFLICTS= hdf5-1.8.*
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
LIBTOOLFILES= configure c++/configure
CONFIGURE_ARGS= --disable-debug \
diff --git a/science/kst/Makefile b/science/kst/Makefile
index 6480a8d20d77..c42feb679ba9 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= cfitsio.0:${PORTSDIR}/astro/cfitsio \
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libtool
USE_LDCONFIG= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 4a9164ebe298..a31dc16a070b 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -16,7 +16,7 @@ COMMENT= Control Language Library
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_FORTRAN= yes
USE_LDCONFIG= yes
diff --git a/science/libquantum/Makefile b/science/libquantum/Makefile
index 802d3f250ed4..0b515323e05d 100644
--- a/science/libquantum/Makefile
+++ b/science/libquantum/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= wenheping@gmail.com
COMMENT= C library for quantum computing and quantum simulation
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/science/minc/Makefile b/science/minc/Makefile
index cac55ce1f40a..8175f2ffc5e3 100644
--- a/science/minc/Makefile
+++ b/science/minc/Makefile
@@ -27,7 +27,7 @@ COMMENT= Medical Imaging NetCDF
LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 89aae2eb51bd..db51d2925283 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -28,7 +28,7 @@ COMMENT= Medical Imaging NetCDF
LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf \
hdf5.0:${PORTSDIR}/science/hdf5
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 1d698b92b558..96548cb225fe 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -46,7 +46,7 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
.endif
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_FORTRAN= yes
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index 010b44634de0..e4e66ba1ac1c 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -17,7 +17,7 @@ COMMENT= Chemistry file translation program
LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs
USE_GNOME= gnomehack gnometarget libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= obchiral.1 obconformer.1 obenergy.1 obfit.1 obgen.1 obgrep.1 \
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 25e5ad3ddc5c..41ced0c4e0f6 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -16,7 +16,7 @@ COMMENT= A mesh and field I/O library and scientific database
LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
diff --git a/science/szip/Makefile b/science/szip/Makefile
index 28583f393de1..b6ee6b032dca 100644
--- a/science/szip/Makefile
+++ b/science/szip/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= wenheping@gmail.com
COMMENT= Lossless compression library for scientific data
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
DOCFILE= Release_notes_2_0.pdf
diff --git a/science/udunits/Makefile b/science/udunits/Makefile
index 41d862e703ed..01aa0733b7d0 100644
--- a/science/udunits/Makefile
+++ b/science/udunits/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_PERL5= yes
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index ccd9aaed3238..9fea933feedf 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf \
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
USE_FORTRAN= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= yes
USE_GNOME= gnometarget gtk12
USE_ICONV= yes
diff --git a/security/aide/Makefile b/security/aide/Makefile
index f8fe21265291..fac93811e3fc 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= mhash.2:${PORTSDIR}/security/mhash
USE_GMAKE= yes
USE_BISON= build
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-mhash \
--with-zlib \
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 0471a4a2296b..f537a29f798c 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-xerces=${LOCALBASE}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 8cfc983aa459..36edfe73b834 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -22,7 +22,7 @@ OPTIONS= MYSQL "Enable MySQL support" on \
DEPRECATED= Use security/barnyard2 instead
EXPIRATION= 2010-12-31
-USE_AUTOTOOLS= autoheader:268 aclocal:111
+USE_AUTOTOOLS= autoheader aclocal
USE_RC_SUBR= barnyard.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index c68fb29e631d..3e7e946f0d04 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= corky1951@comcast.net
COMMENT= BeeCrypt is an open source cryptography library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-java
USE_LDCONFIG= yes
diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile
index b14f3aa5733e..182f01ca5a17 100644
--- a/security/bioapi/Makefile
+++ b/security/bioapi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.qrivy.net/~michael/blua/bioapi/ \
MAINTAINER= fli@shapeshifter.se
COMMENT= BioAPI library implementation
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
# Problems reported with higher optimization levels
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index ed4b47769bfa..fce8371b439f 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -21,7 +21,7 @@ USE_PERL5= yes
INSTALL_TARGET= install certificate
.endif
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
CFLAGS+= -I${OPENSSLINC}/openssl
CONFIGURE_ARGS= --with-ssltop=${OPENSSLBASE} --with-ssllib=${OPENSSLLIB}
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile
index 66316f3549fc..9a5e431e773f 100644
--- a/security/borzoi/Makefile
+++ b/security/borzoi/Makefile
@@ -19,7 +19,7 @@ COMMENT= An Elliptic Curve Cryptography Library
BUILD_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
RUN_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index cecbe1ead077..35d2a2d13cd5 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -43,7 +43,7 @@ LOGDIR= /var/log/clamav
RUNDIR= /var/run/clamav
PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index efb254a734c5..c31f800d5b73 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -41,7 +41,7 @@ LOGDIR= /var/log/clamav
RUNDIR= /var/run/clamav
PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 1229f9643558..ddaaa376ce16 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -35,7 +35,7 @@ OPTIONS+= GDBM "Use gdbm instead of system bdb" off
.else # !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index b28514ae9ad0..d506c1a1c612 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT= A collection of plug-ins to cryptographic engines
BUILD_DEPENDS= ${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
gpg-agent:${PORTSDIR}/security/gnupg
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 4f1a7f967abb..efeb4bf9ef7c 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= bg.2:${PORTSDIR}/devel/bglibs
CONFLICTS= bglibs-1.00*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= #none
USE_LDCONFIG= yes
LDFLAGS?= -s
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index 1dcf1a9e4ee3..a7bba6a10787 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -28,7 +28,7 @@ INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index ebdbd210b912..3e877140582a 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -19,7 +19,7 @@ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
LATEST_LINK= ${PORTNAME}2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index deb6d55a8985..74dc9b450d52 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= distcache-1.4*
USE_BZIP2= yes
USE_RC_SUBR= dc_server.sh
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
LIBTOOLFILES= configure ssl/configure
USE_LDCONFIG= yes
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index 5a6fd0e8cb45..5bc8e54a8d74 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= distcache-devel-*
USE_BZIP2= yes
USE_RC_SUBR= dc_server.sh
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/security/engine_pkcs11/Makefile b/security/engine_pkcs11/Makefile
index 64fec1cc8bfb..0fca770e3e73 100644
--- a/security/engine_pkcs11/Makefile
+++ b/security/engine_pkcs11/Makefile
@@ -15,7 +15,7 @@ COMMENT= An implementation of a PKCS\#11 engine for OpenSSL
LIB_DEPENDS= p11.3:${PORTSDIR}/security/libp11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index b1eed54eccd5..9edd43772518 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv3
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ipc=tcp
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index a667de580378..b6c68525eae0 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -48,7 +48,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal libtool
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 44d7e9c0103d..13a2cef4214f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -46,7 +46,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal libtool
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 7c55f7c7fcbc..6e707f4ff59f 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \
--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 2343be6cf6a8..e41a038bd5e8 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -26,7 +26,7 @@ USE_ICONV= yes
USE_GNOME= pkgconfig ltverhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index e2f2d002cc1b..df415ff4920b 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= pkgconfig ltverhack
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index e0dceaecb673..0599b66f2cad 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \
gpg-error.0:${PORTSDIR}/security/libgpg-error
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index f5e2c05d2ef6..36b42f7300a0 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
LATEST_LINK= gpgme03
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index a59bee8acfa2..3e3e4cdf05c5 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:268
+USE_AUTOTOOLS= automake aclocal autoconf
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 5a523f435935..0a054e902f4e 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -32,7 +32,7 @@ OPTIONS= IPV6 "Enable IPV6 support" on \
CRACKLIB "Use CrackLib for password quality checking" off \
X11 "Build X11 utilies" off
-USE_AUTOTOOLS= autoconf:268 autoheader:268 libtool:22
+USE_AUTOTOOLS= autoconf autoheader libtool
USE_GNOME= gnomehack pkgconfig
USE_OPENSSL= yes
USE_GETTEXT= yes
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 04d101cea4e1..2d96e96d0497 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -23,7 +23,7 @@ USE_RC_SUBR= racoon.sh
USE_OPENSSL= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --sysconfdir=${PREFIX}/etc/racoon \
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index b956f2420b66..f45e02ef2075 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
CONFLICTS= kdeutils-3.[2-6].*
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER= 3
post-patch:
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 3cc34b5122a6..ab1ba6e42667 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= pkgconfig
USE_GETTEXT= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111
+USE_AUTOTOOLS= libtool aclocal
LIBTOOLFILES= acinclude.m4 configure
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
diff --git a/security/kopete-otr/Makefile b/security/kopete-otr/Makefile
index 8742965f14fb..f58f8939ad7c 100644
--- a/security/kopete-otr/Makefile
+++ b/security/kopete-otr/Makefile
@@ -25,7 +25,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index 014e2211a6af..a47c13a66baf 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -27,7 +27,7 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_XORG= xpm
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22
+USE_AUTOTOOLS= autoconf:env automake:env libtool
.include <bsd.port.pre.mk>
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index b8adffd10151..f381bb069628 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -30,7 +30,7 @@ WITH_OPENSSL_PORT= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS?= --enable-shared --with-krb5=${PREFIX}/bin/krb5-config
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
CFLAGS="${CFLAGS}"
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index fdee7a5706ef..d56bbe2abc2d 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -29,7 +29,7 @@ WITH_OPENSSL_PORT= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS?= --enable-shared
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
CFLAGS="${CFLAGS}"
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 5085cd4eda75..5a512dea919a 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= kevlo@FreeBSD.org
COMMENT= KDE frontend to ssh
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index fac85625c238..3e02a9951444 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -50,7 +50,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal libtool
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index f25b3405aa2e..286dad5f4d56 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -46,7 +46,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal libtool
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index c4f1db286fd0..cbf520b86b60 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -19,7 +19,7 @@ LICENSE= GPLv2 LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
LICENSE_COMB= multi
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_CSTD= gnu89
GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index f4b0cce735d2..38962b87f666 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix ltverhack intlhack gconf2
USE_GMAKE= yes
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/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index adcbbe616830..1ff574cc9660 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://members.chello.nl/~h.lai/libgnomesu/
MAINTAINER= ports@FreeBSD.org
COMMENT= Library and frontend for running commands as root
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
CONFIGURE_ARGS+=--disable-install-pam
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 35d4ebee6285..ae8564bb034f 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= Common error values for all GnuPG components
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 7fe45e29f5bb..87fb8e664584 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library for encapsulating/safekeeping data in encrypted/compressed form
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
mhash.2:${PORTSDIR}/security/mhash
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 23abc6e281bf..c40472a67426 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.remlab.net/files/libident/
MAINTAINER= ports@FreeBSD.org
COMMENT= A small library to interface the ident protocol server (rfc1413)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index d0eaccb707ce..a3bbe36d0f4b 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/mcrypt/Libmcrypt/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-cipher cryptographic library (used in PHP)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-static
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 19a8b9f8eed2..5a1d64189d61 100644
--- a/security/libntlm/Makefile
+++ b/security/libntlm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= jochen@daten-chaos.de
COMMENT= A library that implement Microsoft's NTLM authentication
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 8f569399dd07..a80146f448bf 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error \
MAKE_JOBS_SAFE= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
MAN1= otr_toolkit.1
diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index e3cbe6493f2e..cddbc5818fb9 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/
MAINTAINER= ale@FreeBSD.org
COMMENT= A small layer on top of PKCS\#11 API
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 054d756126a7..ca5e25753205 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= nessus.4:${PORTSDIR}/security/nessus-libraries
DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/libnasl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
GNU_CONFIGURE= yes
USE_LDCONFIG= YES
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index a6007e40f8fa..142d5f033d93 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-libraries
USE_BISON= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-cipher
.if defined(WITH_NESSUS_BPF_SHARE)
CONFIGURE_ARGS+= --enable-bpf-sharing
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index f97a6a6046b1..124817505a61 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE}
DOCS= AUTHORS NEWS README THANKS doc/opencdk-api.html
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index 3da165c5c9ca..9ecb2f5b2b0b 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tspi.2:${PORTSDIR}/security/trousers
USE_BZIP2= YES
USE_GMAKE= YES
USE_LDCONFIG= YES
-USE_AUTOTOOLS= autoconf:268 libtool:22 automake:111
+USE_AUTOTOOLS= autoconf libtool automake
HAS_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
diff --git a/security/openct/Makefile b/security/openct/Makefile
index be9907593890..bb025ca230cf 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -16,7 +16,7 @@ COMMENT= A middleware framework for smart card terminals
OPTIONS= PCSC "Enable PC/SC support" off
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/security/opensaml/Makefile b/security/opensaml/Makefile
index ca95b4a9a4a1..e97928ef66ae 100644
--- a/security/opensaml/Makefile
+++ b/security/opensaml/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
xml-security-c.14:${PORTSDIR}/security/apache-xml-security-c
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 4b4a8647acbe..ea1417b391aa 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -22,7 +22,7 @@ OPTIONS= OPENCT "Enable direct OpenCT backend support" on \
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 68254fd2ce41..26f695be5953 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -16,7 +16,7 @@ COMMENT= Open source scep server
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_OPENLDAP= yes
USE_APACHE= 1.3+
diff --git a/security/openssl_tpm_engine/Makefile b/security/openssl_tpm_engine/Makefile
index ae52310d2e42..10f60d858af8 100644
--- a/security/openssl_tpm_engine/Makefile
+++ b/security/openssl_tpm_engine/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tspi.2:${PORTSDIR}/security/trousers
USE_GMAKE= YES
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
SUB_FILES= pkg-message
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index 723aee5408db..6b6580435c0c 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -17,7 +17,7 @@ COMMENT= A pam module for authenticating with MySQL
USE_MYSQL= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:14 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal14 autoconf libtool
ACLOCAL_ARGS= -I ${PREFIX}/share/aclocal
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --with-pam-mods-dir=${PREFIX}/lib --with-pam=/usr
diff --git a/security/pam_authsrv/Makefile b/security/pam_authsrv/Makefile
index e627417083cd..ecb629aeb9be 100644
--- a/security/pam_authsrv/Makefile
+++ b/security/pam_authsrv/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/security/fwtk:build
RESTRICTED= No form of redistribution is allowed, because of linkging against fwtk
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${PORTSDIR}/security/fwtk/work/fwtk" \
CFLAGS="${CFLAGS} -I${PORTSDIR}/security/fwtk/work/fwtk"
CONFIGURE_ARGS= --disable-encap --disable-epkg-install
diff --git a/security/pam_p11/Makefile b/security/pam_p11/Makefile
index 79d920da44f7..f1a54f8ea64b 100644
--- a/security/pam_p11/Makefile
+++ b/security/pam_p11/Makefile
@@ -16,7 +16,7 @@ COMMENT= A PAM module using crypto tokens for auth
LIB_DEPENDS= p11.3:${PORTSDIR}/security/libp11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/security/pam_per_user/Makefile b/security/pam_per_user/Makefile
index 013ad17b9ff3..552ae8b0e1f2 100644
--- a/security/pam_per_user/Makefile
+++ b/security/pam_per_user/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.feep.net/pub/software/PAM/pam_per_user/
MAINTAINER= pirzyk@FreeBSD.org
COMMENT= PAM module for per-user authentication
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN5= pam_per_user.5
diff --git a/security/pam_pseudo/Makefile b/security/pam_pseudo/Makefile
index 2ee118366e3d..cefc1d4663ba 100644
--- a/security/pam_pseudo/Makefile
+++ b/security/pam_pseudo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.feep.net/pub/software/PAM/pam_pseudo/
MAINTAINER= pirzyk@FreeBSD.org
COMMENT= PAM module for per-user authentication
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-encap --disable-epkg-install
INSTALL_TARGET= install-real
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 86767d1fd02f..849f2b5df57b 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+= prelude.20:${PORTSDIR}/security/libprelude \
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_RC_SUBR= prelude-manager.sh
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--localstatedir=/var
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 0b07a829ace9..a4b980f000d6 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -18,7 +18,7 @@ COMMENT= Racoon2 IPsec daemon
USE_RC_SUBR= YES
USE_OPENSSL= YES
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/racoon2
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 2fd1ac0238be..9a4492f169e9 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= shibboleth-sp
-USE_AUTOTOOLS= autoconf:268 automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf automake:env libtool:env
WRKSRC= ${WRKDIR}/shibboleth-${PORTVERSION}
LATEST_LINK= shibboleth2-sp
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 5289b3d931b5..4405107cae2b 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn \
gcrypt.17:${PORTSDIR}/security/libgcrypt \
gnutls.40:${PORTSDIR}/security/gnutls
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5_BUILD= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_ICONV= yes
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 409a453acc02..2db72ad10198 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -61,7 +61,7 @@ LIBNET_LIBDIR= ${LIBNET_LIBS:M-L*:S/-L//}
.endif
.if !defined(WITHOUT_DYNAMIC)
-USE_AUTOTOOLS+= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --enable-dynamicplugin
PLIST_SUB+= DYNAMIC=""
@@ -126,7 +126,7 @@ CONFIGURE_ARGS+= --enable-perfprofiling
.endif
.if defined(WITH_SNORTSAM)
-USE_AUTOTOOLS+= automake:111
+USE_AUTOTOOLS+= automake
PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
.endif
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 7b78a1116e8c..d864f7b0a83d 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -19,7 +19,7 @@ COMMENT= Secure shell client and server (remote login program)
CONFLICTS= openssh-* openssh-portable-* openssh-gssapi-* ssh2-3.*
NO_LATEST_LINK= YES
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= YES
USE_PERL5= YES
CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 248e35b17ff2..de3adb371ddc 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -23,7 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GETTEXT= yes
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fpermissive" \
LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index 756d8a61cd44..6d54e5e8ce15 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= vstr:${PORTSDIR}/devel/vstr \
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-kernel-pfkey \
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 3d7d8f01bfb2..ca6ee38be489 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -22,7 +22,7 @@ MASTER_SITE_SUBDIR= . obsolete/4.x
MAINTAINER= roam@FreeBSD.org
COMMENT= SSL encryption wrapper for standard network daemons
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_RC_SUBR= stunnel
GNU_CONFIGURE= yes
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 256eac54cb70..13f021b25296 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
pkg-config:${PORTSDIR}/devel/pkg-config
-USE_AUTOTOOLS= automake110 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
USE_RC_SUBR= suricata
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 696b4608ba54..87d42e9ae030 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= YES
USE_ICONV= YES
USE_GETTEXT= YES
USE_LDCONFIG= YES
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= YES
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
MAKE_JOBS_SAFE= YES
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 7efe621b60fa..59433e7d2b78 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= YES
USE_ICONV= YES
USE_OPENSSL= YES
USE_LDCONFIG= YES
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 03821d57dd10..a762ebfa146f 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_OPENSSL= yes
USE_QT_VER= 4
QT_COMPONENTS= gui moc_build uic_build qmake_build rcc_build linguist_build
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
CC?= gcc
CXX?= g++
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index a87a0bce63e3..8a5d6fde39c6 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -33,7 +33,7 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC}
MAKE_ARGS+= -EABS_BUILDDIR
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/security/yassl/Makefile b/security/yassl/Makefile
index d4f4599c5026..eceb40b2fa52 100644
--- a/security/yassl/Makefile
+++ b/security/yassl/Makefile
@@ -16,7 +16,7 @@ COMMENT= A embedded SSL C-Library
LICENSE= GPLv2
USE_ZIP= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-dependency-tracking
CONFIGURE_ARGS+= --enable-shared --enable-static
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 137ada664255..b1b1d2284dc7 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= rfarmer@predatorlabs.net
COMMENT= A user friendly command line shell
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 488cafa6c270..5934eb688bbe 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -24,7 +24,7 @@ ZSH_VER= ${PORTVERSION}
USE_BZIP2= yes
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268 autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
GNU_CONFIGURE= yes
.if !defined(WITH_ZSH_STATIC)
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index d742e08096ac..acd2296feeb9 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -16,7 +16,7 @@ COMMENT= Active Directory administration tool
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index ecd4ec7babc9..1c6e28e539d9 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -27,7 +27,7 @@ USE_ICONV = yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --enable-s3=yes --libdir=${PREFIX}
CONFIGURE_ENV= CPPFLAGS='-DFUSE_USE_VERSION=26' \
LDFLAGS='${PTHREAD_LIBS}'
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index c489756ae7b6..00999790af2e 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The Berkeley Automounter Suite of Utilities
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PORTDOCS= AUTHORS BUGS COPYING FAQ NEWS README.attrcache
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 45330e1e1da3..f4c53f0e2a4d 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= An open source, completely automatic on-line backup system for UNIX
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 autoheader:268
+USE_AUTOTOOLS= autoconf aclocal autoheader
ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 45330e1e1da3..f4c53f0e2a4d 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -18,7 +18,7 @@ COMMENT= An open source, completely automatic on-line backup system for UNIX
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 autoheader:268
+USE_AUTOTOOLS= autoconf aclocal autoheader
ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index aac12acde046..3fe7b344b10f 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/condor_src-${PORTVERSION}/src/
OPTIONS= SUBMIT_NODE "Configure system to be able to submit jobs" On \
EXECUTE_NODE "Configure system to execute jobs in pool" On \
MANAGER_NODE "Configure system as central manager node" On
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
USE_BISON= build
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index b8335be5785e..eb0867267787 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A full featured command-line backup tool, aimed for disks
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 1ac385591174..05e857bcd529 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 libgnomeui
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 4b0cc3f0f74b..e9c9464093a1 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/file/ \
MAINTAINER= jharris@widomaker.com
COMMENT= Utility to determine file type
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --enable-fsect-man5
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 0ce0b081b533..c2c9cfac05b2 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= decept0@gmail.com
COMMENT= Represent a file system as a set of concentric segmented-rings
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 0b1992474e8a..64922e5a1b1a 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -36,7 +36,7 @@ GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= "invokes i386 asm"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 02b2a7ee899e..b0405554af89 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= puzzle.1:${PORTSDIR}/graphics/libpuzzle \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 automake:111 autoheader:268
+USE_AUTOTOOLS= autoconf aclocal automake autoheader
CONFIGURE_ARGS+= --with-puzzle=${LOCALBASE}
PLIST_FILES= bin/ftwin
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index f45f6221d66b..0a13110b47f7 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \
--with-boost-filesystem=boost_filesystem
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile
index efc528fd0668..110ad22a762f 100644
--- a/sysutils/fusefs-fusexmp_fh/Makefile
+++ b/sysutils/fusefs-fusexmp_fh/Makefile
@@ -18,7 +18,7 @@ COMMENT= Dummy driver from fusefs-libs example
LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs
RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
USE_ICONV= yes
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 8e55fc61a0d5..e553810ee2c8 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs
RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \
--disable-mtab --with-fuse=external
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 29910b3064ef..3e60b06e70c6 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
OPTIONS+= GMETAD "include gmetad" on
USE_PYTHON= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure libmetrics/configure
GNU_CONFIGURE= yes
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index ffe96db982bf..d1a6d8ad4442 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -18,7 +18,7 @@ COMMENT= Viewer for kernel geom layer
LIB_DEPENDS= gvc:${PORTSDIR}/graphics/graphviz
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 librsvg2
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 6560a888aedf..077fc43aae8b 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -18,7 +18,7 @@ COMMENT= A utility to split and join files
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS= automake:14:env
+USE_AUTOTOOLS= automake14:env
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 3125c5fba32b..dbc742b7fb44 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
USE_XORG= x11 xtst
USE_GNOME= gnometarget gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index dbe44104c523..1e93947a8bc0 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget intlhack ltverhack libgnomeui
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
INSTALLS_OMF= yes
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 3245f23db47d..fd13bee4c29f 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack libwnck \
gnomedocutils gnomepanel
CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index afb5383de081..ad8b69551bf3 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix intlhack nautilus2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index b53eaeb4c07e..84024f055926 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -15,7 +15,7 @@ COMMENT= Shows package dependencies in tree views
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
AUTOMAKE_ARGS= --add-missing
USE_GMAKE= yes
PLIST_FILES= bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index c6860537d5e9..acaf1ddf03df 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
MAINTAINER= sem@FreeBSD.org
COMMENT= GRand Unified Bootloader
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 138a63e4c5c6..84d25638b03f 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
pcre:${PORTSDIR}/devel/pcre
RUN_DEPENDS= ${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= pkgconfig
INSTALLS_ICONS= yes
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 6fd3ce25d82e..e5ac6f73d242 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index de35c0d0d12e..58621cdaa1ab 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAN1= hdup.1
MAN5= hdup.conf.5
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index c831630d322a..ccd346203e19 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
xml2:${PORTSDIR}/textproc/libxml2
PATCH_DEPENDS= ${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
-USE_AUTOTOOLS= autoconf:268 autoheader:268 automake:111 aclocal:111 \
- libtool:22 libltdl:22
+USE_AUTOTOOLS= autoconf autoheader automake aclocal libtool libltdl
AUTOMAKE_ARGS+= --add-missing --include-deps --copy
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 2cd0c5461c6c..1ff82978db0c 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_ARCHS= sparc64
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS= autoconf:268 aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal automake libtool
ACLOCAL_ARGS= -I ${ACLOCAL_DIR}
USE_PYTHON_BUILD= yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 47a721fb16a7..2fd6feb0eb5f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
samplerate:${PORTSDIR}/audio/libsamplerate
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-k3bsetup=no \
--without-resmgr \
--without-hal \
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index 1072542312d7..85877cbc1883 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= CPU meter for Kicker
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 391e7346ac2e..43583c17fcc2 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -18,7 +18,7 @@ DEPRECATED= Project has vanished
EXPIRATION_DATE=2010-12-31
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 42cc529d415f..cbdf39f3491b 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -22,7 +22,7 @@ PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 288590ad2606..37dfdb597ce4 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index 8504f797dbce..01b6aa0588d2 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= rdiff-backup:${PORTSDIR}/sysutils/rdiff-backup
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index eaa83d47b0ff..3ee4ad2a7428 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS += --with-qt-dir=${QT_PREFIX} \
--with-extra-includes=${LOCALBASE}/include \
diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile
index 549e7b806a6a..1e2980ad1f3b 100644
--- a/sysutils/kkeyled/Makefile
+++ b/sysutils/kkeyled/Makefile
@@ -16,7 +16,7 @@ COMMENT= Panel applet to display the keyboard's LED states
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index a004693575fa..e7093f049d24 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -25,7 +25,7 @@ USE_KDELIBS_VER=3
ONLY_FOR_ARCHS= i386
USE_XORG= xtst xscrnsaver
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION}
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index 5f0feb8984e8..057c7a3ea44b 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
USE_KDELIBS_VER=3
USE_XORG= xkbfile
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${TOUCH} ${WRKSRC}/config.h.in
diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile
index 164f2990a120..49ddcf3a89ae 100644
--- a/sysutils/kmilo/Makefile
+++ b/sysutils/kmilo/Makefile
@@ -23,7 +23,7 @@ PREFIX= ${KDE_PREFIX}
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION}
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 7326ed6bf3af..a3c5840305a2 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -19,7 +19,7 @@ MAKE_JOBS_UNSAFE= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 automake:111:env aclocal:111:env
+USE_AUTOTOOLS= libtool automake:env aclocal:env
CONFIGURE_ARGS= --disable-fast-perl --enable-mt --program-transform-name=''
post-patch:
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index cbc02df9499c..d18e7c0adf91 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -15,7 +15,7 @@ COMMENT= KDE app that searches and synchronizes two directories
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index da62091b61cb..eb29f7e55b5b 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -16,7 +16,7 @@ COMMENT= Very powerful batch file renamer for KDE3
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 0d311bf536f6..1dc15237288b 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -16,7 +16,7 @@ COMMENT= Advanced shutdown utility for KDE
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index 0d311bf536f6..1dc15237288b 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -16,7 +16,7 @@ COMMENT= Advanced shutdown utility for KDE
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index 749095a8600c..18b1b2c4a7f2 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= synaptics:${PORTSDIR}/x11/libsynaptics
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 5e8fd3c507d0..30dce05c4ead 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -16,7 +16,7 @@ COMMENT= A client/server suite for LCD devices
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= autoconf:268 automake:111 aclocal:111
+USE_AUTOTOOLS= autoconf automake aclocal
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_RC_SUBR= LCDd lcdproc lcdexec
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 1543f8e5b70c..ea45af9fd8b3 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Default plugins for lineakd
LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_XORG= x11 xext xt xtst xfixes
USE_GMAKE= yes
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index c15142ac8fc5..e44d4bb934e8 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --program-prefix=''
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 78d86d8af563..070ca8f04940 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -17,7 +17,7 @@ COMMENT= Lineakd is a daemon which enables special keys on internet keyboards
USE_GMAKE= yes
USE_XORG= x11 xext xt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1558de5ed687..cb7cb740ad2f 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
desktopfileutils ltasneededhack eel2 libgnomeui
USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 0121e0768604..2c227adc7705 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Network UPS Tools
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index f918c110befa..d400c12fd1df 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Network UPS Tools
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index c7228eaa9231..fa6c32ed1895 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf:268 autoheader:268 automake:111 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf autoheader automake aclocal libtool
AUTOMAKE_ARGS+= --add-missing --copy --foreign
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 2f99eb0d4e63..3ecfdf0b6d83 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities and library to manipulate ReiserFS partitions
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-debug --disable-Werror
CFLAGS+= -Dgetopt_long_only=getopt_long
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 7435033b84e5..49b4dcb3cb9a 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -17,7 +17,7 @@ COMMENT= A small tool to generate secure, random passwords
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
post-patch:
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 22a173c00108..64344e558b8f 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 99ffbb07424f..2ccdfc6eaa51 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.clusterresources.com/downloads/torque/
MAINTAINER= jwbacon@tds.net
COMMENT= Open source resource manager
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rcp=scp
USE_GMAKE= yes
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index c9395a67b032..d88655100bbc 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -44,7 +44,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GSTREAMER= core
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-video-extractor=gstreamer \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 157f2d333e5b..123babb0cad6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack ltverhack glib20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index f282d88ca30f..16fd3b8ea305 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:111
+USE_AUTOTOOLS= libtool aclocal
ACLOCAL_ARGS= # empty
MAN1= uprecords.1
diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile
index dba90224cbc7..737c575b5e10 100644
--- a/sysutils/userinfo/Makefile
+++ b/sysutils/userinfo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/bjk/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Show information about local users
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
MAN1= ui.1
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 574e307cc964..a181815cd0f8 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -16,7 +16,7 @@ COMMENT= An uptime showing dockapp with a similar look to wmcpuload
USE_BZIP2= yes
USE_XORG= xpm
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
CONFIGURE_ARGS= --program-prefix=""
MAN1= wmupmon.1
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 245bcdf3b3fb..7997ebf6d9c5 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -24,7 +24,7 @@ OPTIONS= XKLAVIER "Keyboard layout settings" off \
NLS "Enable Native Language Support" on
CONFIGURE_ARGS= --disable-sound-settings --disable-debug
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 611f72772f17..c777c8cdf04a 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -19,7 +19,7 @@ COMMENT= A set of utilities and library to manipulate an xfs filesystem
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22:env
+USE_AUTOTOOLS= autoconf libtool:env
GNU_CONFIGURE= yes
CONFIGURE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}" \
CFLAGS="${CFLAGS}" \
diff --git a/sysutils/zetaback/Makefile b/sysutils/zetaback/Makefile
index 893d6cb3c9c8..6163ebcb8d7c 100644
--- a/sysutils/zetaback/Makefile
+++ b/sysutils/zetaback/Makefile
@@ -16,7 +16,7 @@ COMMENT= Zetaback ZFS backup and recovery management system
USE_PERL5_RUN= YES
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
MAN1= zetaback.1 zetaback_agent.1
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index a5d2c4d8bf41..df701e43c94b 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT= User utilities for zisofs
PORTDOCS= CHANGES COPYING INSTALL MRULES README
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 922db0716318..89c97a9fa608 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A set of libraries and applications which provide a thesaurus
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_CSTD= gnu89
USE_GNOME?= gnomehack gnometarget
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 11cc7fd87b07..9ad2f4bd0d41 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -17,7 +17,7 @@ COMMENT= A configuration editing tool
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268 aclocal:111 autoheader:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf aclocal autoheader automake libtool
ACLOCAL_ARGS= -I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= yes
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index ff2add573883..1a08e677712c 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= C-language sources to HTML converter
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
MAN1= c2html.1
diff --git a/textproc/clucene-contrib/Makefile b/textproc/clucene-contrib/Makefile
index 726b019732d0..3bddc2f7a778 100644
--- a/textproc/clucene-contrib/Makefile
+++ b/textproc/clucene-contrib/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_DOS2UNIX= yes
.include <bsd.port.pre.mk>
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 0093ae24a890..2793af2b5a28 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -17,7 +17,7 @@ COMMENT= CLucene is a C++ port of Lucene
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 64406908c4c9..eef0ccf6eff7 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= sobomax
MAINTAINER= ports@FreeBSD.org
COMMENT= A free C OLE library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 8fd7d1dd9d95..96ec80d58f2e 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -24,7 +24,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
ALL_TARGET= dict
INSTALL_TARGET= install.dict
MAN1= dict.1 dictl.1
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 12a1c94c4394..90becf2d0f01 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-cflags="${CFLAGS}"
ALL_TARGET= dictfmt
INSTALL_TARGET= install.dictfmt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= dictfmt.1 dictfmt_index2suffix.1 dictfmt_index2word.1 \
dictunformat.1
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
index fe129fe2caaa..e2f4106c43da 100644
--- a/textproc/ekhtml/Makefile
+++ b/textproc/ekhtml/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= miwi@FreeBSD.org
COMMENT= El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index d964e11026ee..4dd0fe4839d8 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Dictionary/spellchecking framework
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget glib20 ltverhack
CONFIGURE_ARGS= --disable-uspell \
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index ddc80acdac7f..4bdef714b9fc 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -16,7 +16,7 @@ COMMENT= A port of Adobe XMP SDK to work on UNIX
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack gnomehack gnometarget
CONFIGURE_ARGS= --enable-unittest=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 0ef7edc345a6..de78591882e8 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -16,7 +16,7 @@ COMMENT= Gnome DOM Engine
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= glib20 gnomehack
GNU_CONFIGURE= yes
CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 6554afeb3180..3ff8760699ea 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 intlhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index eb069b3970b8..f65cf0a7a4fa 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/lib/iiimcf
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 8433e83bca89..2e5e12ad0ad3 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_ICONV= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/lib/CSConv
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 491d76fa20f5..4288129149b8 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -27,7 +27,7 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= libxml2
USE_XORG= x11
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index 6cdeccc9d144..2973700757b6 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/lib/iiimp
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 5d852b21de97..308313756080 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig libxml2
USE_OPENSSL= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/iiimsf
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 81074a0bff05..a33c115d8c08 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -27,7 +27,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_MOTIF= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 9a34cafb8bf2..7751529cdcd4 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11 ice xt
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool:env
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/iiimxcf/htt_xbe
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 1ad7042e489d..a3ca9fe909a3 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -16,7 +16,7 @@ COMMENT= XML parser library mainly designed for Jabber applications
LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index ee34b397acb3..1b17cf50c25b 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
CONFLICTS= sp-1.*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 2212714466e9..59382a8a22da 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Java sources to HTML converter
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
MAN1= java2html.1
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index d51df200ee04..42a20128d97b 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= roam@FreeBSD.org
COMMENT= An English-Bulgarian-English dictionary
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-kde
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
USE_KDELIBS_VER= 3
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 6ff69449e0c3..42e3e679c4b9 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT= CSS2 parsing library
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index a82a6fe58ce8..7116fd2a96a2 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mpeg2:${PORTSDIR}/multimedia/libmpeg2
USE_GNOME= glib20
USE_PYTHON= yes
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_DOS2UNIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/libextractor
@@ -62,7 +62,7 @@ PLIST_SUB+= VORBIS=""
PLIST_SUB+= VORBIS="@comment "
.endif
-patch-autotools::
+patch-autotools-libtool::
@(cd ${PATCH_WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
${CP} $$file $$file.tmp; \
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 4e901657cafb..27cf50b269f9 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/lingoteach/OldFiles
MAINTAINER= mva@FreeBSD.org
COMMENT= A library for parsing lesson files based on the LingoTeach DTD
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libxml2
GNU_CONFIGURE= yes
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index cf35e404d99d..78186ef94f94 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library for manipulating RDF files describing LADSPA plugins
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
LIB_DEPENDS= raptor.3:${PORTSDIR}/textproc/raptor
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 5f3816a37db8..deb28302e5eb 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -36,7 +36,7 @@ pre-patch:
.if defined(WITH_PHPMRSS)
USE_PHP= yes
USE_PHP_BUILD= yes
-USE_AUTOTOOLS+= autoconf:268:env
+USE_AUTOTOOLS+= autoconf:env
post-install:
@(cd ${WRKSRC}/phpmrss; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
@(cd ${WRKSRC}/phpmrss; ./configure; ${MAKE} install)
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index d33b0751f9aa..9247765d3df0 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.saunalahti.fi/~samiuus/toni/xmlproc/
MAINTAINER= yzlin@FreeBSD.org
COMMENT= Lightweight XML Parser
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/libstree/Makefile b/textproc/libstree/Makefile
index 7d9fa0b38c3a..f73f5a057c45 100644
--- a/textproc/libstree/Makefile
+++ b/textproc/libstree/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.icir.org/christian/downloads/
MAINTAINER= clsung@FreeBSD.org
COMMENT= A Generic Suffix Tree Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile
index 4dedafb7e306..6a95bef764f6 100644
--- a/textproc/libtextcat/Makefile
+++ b/textproc/libtextcat/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES= http://software.wise-guys.nl/download/
MAINTAINER= thierry@FreeBSD.org
COMMENT= Language guessing by N-Gram-Based Text Categorization
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index f0fe9c504204..01e1657052aa 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -18,7 +18,7 @@ COMMENT= A lightweight fully POSIX compliant regexp matching library
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_LDCONFIG= yes
diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index b74658d1d56a..7c9e1cbf4239 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
ALL_TARGET= both
USE_LDCONFIG= yes
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 2922f24c12cc..1864d1c7170b 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Microsoft file word processor format import filter library
LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack ltverhack
USE_LDCONFIG= yes
diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile
index 0ddc3e34d646..f20d1fa4362e 100644
--- a/textproc/libxdiff/Makefile
+++ b/textproc/libxdiff/Makefile
@@ -17,7 +17,7 @@ COMMENT= Create file differences/patches to both binary and text files
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 655e5f364eee..3afe90826d15 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= GNOME
MAINTAINER= bland@FreeBSD.org
COMMENT= XML API for C++
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget libxml2 pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 349afbe4e66c..e4f5df37736d 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= XML parser library for GNOME
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 1ef9fba4d06d..8ffa4591eab1 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -17,7 +17,7 @@ COMMENT= An XML library which wraps expat
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 4afcdfe86d28..020cd4ee318f 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -15,7 +15,7 @@ COMMENT= A grammar checking library
USE_GNOME= gnomehack gnometarget ltverhack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_DOS2UNIX= yes
USE_CSTD= gnu99
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index ad01e6e3719c..9043ae563079 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= m17n.4:${PORTSDIR}/devel/m17n-lib
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 intltool intlhack pkgconfig glib20
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 7f0645ccc71f..ba1da3716517 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -16,7 +16,7 @@ COMMENT= C++ library to build and query a full text inverted index
USE_GNOME= gnomehack gnometarget
USE_BISON= build
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-unac
USE_LDCONFIG= yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index deae99e8d511..fbaf1b6a6df5 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -17,7 +17,7 @@ COMMENT= A minimal implementation of the Document Object Model
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GNOME= glib12
GNU_CONFIGURE= yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 221dc92687f1..1a7ce7e99185 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
pcre.0:${PORTSDIR}/devel/pcre \
expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
.if defined(WITH_MYSQL)
# To quote the author:
diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index 3504a22ef86d..ccc0a00d626f 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -16,7 +16,7 @@ COMMENT= Small XML parsing library
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-docdir=no
MAKE_JOBS_SAFE= yes
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 2ad9ef70a9c5..519390d4ae9d 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -19,7 +19,7 @@ COMMENT= Input method modules for OpenVanilla
BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_GMAKE= yes
USE_PERL5_BUILD= yes
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index e6a83f5e5fe2..c0ea5c083269 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GNOME= glib20 libxml2
USE_LDCONFIG= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index ba13a947c74d..a94fe5526141 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Perl sources to HTML converter
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
MAN1= perl2html.1
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index e70e646dd5e0..ecdda36cb95d 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -19,7 +19,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomehack lthack gnometarget libxslt
USE_PYTHON= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--with-python=${PYTHON_CMD}
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index fd4eeaf7706d..062926bcd393 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -18,7 +18,7 @@ COMMENT= Full-text search system using N-gram
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= YES
USE_BDB= 42
GNU_CONFIGURE= YES
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 4b7ba67757db..c26a1b204c6c 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -21,7 +21,7 @@ USE_BDB= yes
WITH_BDB_HIGHEST= yes
INVALID_BDB_VER=2
USE_GNOME= gnomehack gnometarget lthack pkgconfig libxml2
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 9d829a0cd744..5df34748e8fa 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}"
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index b913945196a1..d441e78450b6 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A suffix array library and tools, which provide fast full-text search
USE_GNOME= glib20 gnomehack gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= sary.1 mksary.1
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index a6e1480a77f7..0f499bcc57fb 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 8edf1d49359b..1aefc6d75404 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp \
scim:${PORTSDIR}/textproc/scim
USE_XORG= x11 xkbfile xproto
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= glib20 gtk20 intlhack
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index c6fd3e0df186..8def822922c6 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libltdl:22
+USE_AUTOTOOLS= libltdl
WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 716d63308cb3..fe1d0c7017a0 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -18,7 +18,7 @@ COMMENT= SCIM table based input method engine
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= intlhack
@@ -47,7 +47,7 @@ pre-patch:
BUILD_DEPENDS+= skim:${PORTSDIR}/textproc/skim
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST_SUB= SKIM=""
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \
-e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 3c6a649449fd..527d6230216b 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -16,7 +16,7 @@ COMMENT= Smart Common Input Method platform
USE_GNOME= gnomehack gnomehier gtk20 intlhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GMAKE= yes
USE_XORG= x11 xpm
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 17003c0a7416..02d92745bbd8 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -32,7 +32,7 @@ CONFLICTS= rarian-[0-9]*
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
USE_GNOME= gnomehack gnomehier gnometarget libxslt intlhack
USE_LDCONFIG= yes
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 49e01354816f..701e0ce95107 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -16,7 +16,7 @@ COMMENT= A text-based utility for work with dictionaries in StarDict's format
USE_BZIP2= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= glib20
SUB_FILES= pkg-message
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index b8ab35a98ea3..c540a3850fc8 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON= yes
USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
PYDISTUTILS_NOEGGINFO= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index ed6328a4b13c..755935af182e 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man
USE_GNOME= pkgconfig
USE_SQLITE= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_cv_path_CPPUNIT_CONFIG=no \
ac_cv_path_PYTHON=no \
diff --git a/textproc/ssddiff/Makefile b/textproc/ssddiff/Makefile
index 19b210a25635..d900b2c12949 100644
--- a/textproc/ssddiff/Makefile
+++ b/textproc/ssddiff/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://alioth.debian.org/frs/download.php/1469/
MAINTAINER= ports@FreeBSD.org
COMMENT= A diff application for semistructured data such as XML files
-USE_AUTOTOOLS= automake:14
+USE_AUTOTOOLS= automake14
USE_BZIP2= yes
USE_GNOME= libxml2
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index ad0a2ca8273d..4448e309d173 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -17,7 +17,7 @@ COMMENT= Toolkit for converting data between 8-bit legacy encodings and Unicode
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 6ec408dd41e1..a6e074f886b4 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= uim-pref-qt:${PORTSDIR}/textproc/uim-qt
USE_GCC= 4.2+
USE_KDELIBS_VER=3
USE_QT_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 14a009b50d4e..81efa7f02a53 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -17,7 +17,7 @@ USE_GCC= 4.2+
USE_KDE4= kdelibs automoc4
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build qt3support uic rcc
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 134c3e99b5f6..a9d5d7f984e9 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -qt
COMMENT= QT modules of uim input method
USE_QT_VER= 3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index 024bc76cfd8e..6e3dd00c9776 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build qt3support uic
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_ICONV= yes
MASTERDIR= ${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 91aa4e25aad4..677d2915f552 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
WANT_GNOME= yes
USE_GNOME+= gnometarget glib20 intltool
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_ICONV= yes
USE_PERL5_BUILD=yes
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index df83c498654c..4866b5a45262 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx
USE_GNOME= gnometarget libgsf
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MKDIR_P="${MKDIR}"
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 83654545e35d..519f1dcdd545 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xerces-c:${PORTSDIR}/textproc/xerces-c2 \
icuio:${PORTSDIR}/devel/icu
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoconf libtool
ACLOCAL_ARGS= -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I .
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 5edb32c93ae0..75394682827c 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Convert Excel and PowerPoint files to HTML and text
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:14 autoconf:268
+USE_AUTOTOOLS= automake14 autoconf
CONFIGURE_ARGS= --mandir=${PREFIX}/man
MAN1= ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index a052c2f43129..655cb32a0a77 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -19,7 +19,7 @@ COMMENT= A utility for converting MS Excel files to XML
LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole \
xml.5:${PORTSDIR}/textproc/libxml
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index 82ade15130c9..55f8f42eeac4 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML Parser and Validator
FETCH_CMD= /usr/bin/fetch
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 1bd2c43d7277..5f9c8b11ac01 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -16,7 +16,7 @@ COMMENT= XSL formatter that produces PDF and PostScript
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libgnomeprint libxslt \
libxml2 gtk20 glib20 pango
diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile
index 93f87eb110ac..bd946b843812 100644
--- a/textproc/yamcha/Makefile
+++ b/textproc/yamcha/Makefile
@@ -15,7 +15,7 @@ COMMENT= Yet Another Multipurpose CHunk Annotator
BUILD_DEPENDS= svm_learn:${PORTSDIR}/science/svmlight
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_PERL5_BUILD=yes
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index d9adc10c87c6..de8efe4518d1 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -51,7 +51,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
# THREADS "Enable threads in apr" Off
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_PERL5= yes
USE_RC_SUBR= apache2
USE_APACHE= common20
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 80e03a7f5bc2..619ec6f81bc8 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -37,7 +37,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
USE_APACHE= common22
USE_BZIP2= yes
USE_ICONV= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
USE_PERL5= yes
USE_RC_SUBR= apache22 htcacheclean
LIBTOOLFILES= configure
diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile
index 35044214dfb0..afd0e11d87ef 100644
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk14 \
wget:${PORTSDIR}/ftp/wget
PROJECTHOST= asterisk-bsd
-USE_AUTOTOOLS= autoconf:268 automake:111
+USE_AUTOTOOLS= autoconf automake
USE_GMAKE= yes
SUB_FILES= pkg-message
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 3d7edd1eb9b5..6a5576ac88bc 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -22,7 +22,7 @@ USE_QT_VER= 4
QT_COMPONENTS= corelib gui moc_build rcc_build uic_build qt3support
USE_GNOME= gnometarget libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal automake autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
.include <bsd.port.pre.mk>
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 61364961b1e7..7a01af8d3528 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -19,7 +19,7 @@ COMMENT= An implementation of an ICAP server
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= c_icap
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
SUB_FILES= pkg-install pkg-deinstall
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index fb3862c48557..258c353a17cf 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ class library for writing CGI applications
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
USE_LDCONFIG= yes
diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index a1e081a0bf85..6a549940ac89 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -16,7 +16,7 @@ COMMENT= A history cleaner for Netscape Navigator and Communicator
WANT_GNOME= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake14 autoconf213
.include <bsd.port.pre.mk>
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index bf5a851d983d..07b70b36cd88 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -30,7 +30,7 @@ ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
INFO= emacs-w3m-ja emacs-w3m
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
ALL_TARGET= default
PLIST_SUB+= LISPDIR=${LISPDIR} \
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 3cecb64b1d5d..e8cd6ad48bea 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -devkit
MAINTAINER= kimelto@gmail.com
COMMENT= FastCGI Development Kit
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/www/fcgiwrap/Makefile b/www/fcgiwrap/Makefile
index 7faf43057135..a942d1eb5755 100644
--- a/www/fcgiwrap/Makefile
+++ b/www/fcgiwrap/Makefile
@@ -21,7 +21,7 @@ LICENSE= MIT
USE_RC_SUBR= fcgiwrap
-USE_AUTOTOOLS= autoconf:268:env autoheader:268
+USE_AUTOTOOLS= autoconf autoheader
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -19,7 +19,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -19,7 +19,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 7bcaa4f21b42..5a9be71c0fd1 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -18,7 +18,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213:run
+USE_AUTOTOOLS= autoconf213:env
LATEST_LINK= firefox35
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
@@ -81,7 +81,6 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
.endif
post-extract::
- @(cd ${WRKSRC} && ${AUTOCONF})
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
@@ -100,6 +99,9 @@ post-patch:
s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/js/src/configure
+pre-configure:
+ @(cd ${WRKSRC} && ${AUTOCONF})
+
port-pre-install:
# ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 39db93ee0613..d57c99eabc15 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -19,7 +19,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 21e797bc2ff8..5815400e8daa 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -16,7 +16,7 @@ COMMENT= C library for the Flickr API
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnometarget ltverhack libxml2 pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 301073024efc..2edc2cc61793 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
apr-1:${PORTSDIR}/devel/apr1
WRKSRC= ${WRKDIR}/httpd-test/flood
-USE_AUTOTOOLS= autoconf:268 libtool:22:env
+USE_AUTOTOOLS= autoconf libtool:env
CONFIGURE_ARGS= --disable-shared \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index c2ee0e008f7f..1ca669adecc2 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= YES
USE_PERL5= YES
HAS_CONFIGURE= YES
USE_APACHE= 13
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
NO_BUILD= YES
USE_PHP= pgsql session pcre
WANT_PHP_CLI= YES
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index ff6ee8c53f09..c18ca7395b60 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library for people wanting to use libwww with gtk/gnome
LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomelibs
GNU_CONFIGURE= yes
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 3bb4cec5b213..def55322d88f 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index eda3d7c5e73b..d031c6952059 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -30,7 +30,7 @@ USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 621399e6000f..c251b5beaf2f 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -15,7 +15,7 @@ COMMENT= Collect information from all over the Internet
USE_BZIP2= yes
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure src/gatherer/curl/configure
USE_LDCONFIG= yes
NO_MTREE= yes
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 8dc9493031c2..69063d7a6dd6 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Easy-to-use offline browser utility and website copier
CONFIGURE_ARGS= --docdir="${DOCSDIR}"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= ${PREFIX}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 46ec19428ce3..7b3afc75d799 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_XORG= xpm
USE_GMAKE= yes
USE_GETTEXT= build
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <${.CURDIR}/../../x11/kde3/Makefile.kde>
.include <bsd.port.mk>
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index e58dc79994ca..6e6866f1cb60 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -18,7 +18,7 @@ COMMENT= Generic Apache2 Request Library
USE_APACHE= 2.0+
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:268 libtool:22
+USE_AUTOTOOLS= autoconf libtool
CONFIGURE_ARGS+= --with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index fabd867be594..2efc5bd544ab 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME http client library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index d2422c2378ec..0c619cb697f8 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index f0e2c50077c8..ca381e6ad44b 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= marius@nuenneri.ch
COMMENT= The W3C Reference Library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE}
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index f54b07dcc1ae..b9555d08d05a 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= mozilla-[0-9]*
GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
lib/${MOZILLA}/include lib/${MOZILLA}/lib
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
WANT_GNOME= yes
WANT_PERL= yes
ALL_TARGET= default
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index f4a5fc22e38d..5a87c5458d57 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -22,9 +22,9 @@ GNU_CONFIGURE= yes
USE_GNOME= lthack
.if !defined(_BUILDING_LIGHTTPD_MODULE)
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.else
-USE_AUTOTOOLS= autoconf:268 autoheader:268 aclocal:111 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf autoheader aclocal automake libtool
ACLOCAL_ARGS= -I m4
.endif
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd --enable-static
diff --git a/www/links/Makefile b/www/links/Makefile
index 298b5beeea4e..b38e5feb11f1 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --without-directfb
.endif
.if defined(WITH_IPV6)
-USE_AUTOTOOLS+= autoconf:268
+USE_AUTOTOOLS+= autoconf
PATCH_SITES+= http://xpisar.wz.cz/links-ipv6/:ipv6
PATCHFILES+= links-2.2-ipv6-2.diff:ipv6
.endif
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 78160ad3c7dd..b95bcb030dfb 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -30,7 +30,7 @@ OPTIONS= \
USE_LDCONFIG= yes
USE_GNOME= lthack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--enable-shared \
--sysconfdir=${PREFIX}/etc/mnogosearch \
--localstatedir=/var/mnogosearch \
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 93ad9bb30d34..69dc853dd10c 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -18,7 +18,7 @@ COMMENT= Scans content delivered by the Apache20 proxy module for viruses
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_APACHE= 2.2
GNU_CONFIGURE= yes
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index 2090f0d024f7..5338a4d03052 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -18,7 +18,7 @@ COMMENT= Apache module for loading C++ objects as handlers
MAKE_JOBS_SAFE= yes
USE_APACHE= 2.0+
-USE_AUTOTOOLS= autoconf:268 autoheader:268 libtool:22 automake:111 aclocal:111
+USE_AUTOTOOLS= autoconf autoheader libtool automake aclocal
CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index cdd2fd923cc9..60c19dd5630c 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \
USE_APACHE= 2.0+
USE_BZIP2= yes
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --man=${PREFIX}/man
MAN8= mod_mono.8
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 05e8a9b48e1c..3e1cfd9cbc35 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/rivet-${PORTVERSION}
MAKE_JOBS_SAFE= yes
USE_APACHE= 2.2+
-USE_AUTOTOOLS= automake:111 autoconf:268
+USE_AUTOTOOLS= automake autoconf
USE_TCL= 84+
GMAKE= yes
diff --git a/www/mod_transform/Makefile b/www/mod_transform/Makefile
index c63490d8ea75..a2c33be2c2b2 100644
--- a/www/mod_transform/Makefile
+++ b/www/mod_transform/Makefile
@@ -17,7 +17,7 @@ COMMENT= An XSLT and XIncludes Filter module for Apache 2.0
MAKE_JOBS_SAFE= yes
USE_APACHE= 2.0
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
HAS_CONFIGURE= yes
USE_GNOME= libxslt
diff --git a/www/moonshine/Makefile b/www/moonshine/Makefile
index 88609cedaa93..49ca9ed612ac 100644
--- a/www/moonshine/Makefile
+++ b/www/moonshine/Makefile
@@ -20,7 +20,7 @@ GITCOMMIT= 35085a4
USE_GMAKE= yes
USE_GECKO= libxul
-USE_AUTOTOOLS= libtool:22 libtoolize aclocal:111 autoconf:268 autoheader:268 automake:111
+USE_AUTOTOOLS= libtool libtoolize aclocal autoconf autoheader automake
LIBTOOLIZE_ARGS= --force --copy --automake
AUTOMAKE_ARGS= --gnu --add-missing --force --copy -Wno-portability
ACLOCAL_ARGS=
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 2b0e09c67722..6ae0ccfac5c9 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -16,7 +16,7 @@ COMMENT= An HTTP and WebDAV client library for Unix systems
CONFLICTS= neon2[6|8]-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack ltverhack
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 8a1bc9935f5f..c4773a542e91 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
OOPSVERSION= 1.5.24
USE_SUBMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
--sysconfdir=${PREFIX}/etc/oops \
--localstatedir=${OOPSVAR} \
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index fb74b1982399..a3b5d0c8c4ee 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
RUN_DEPENDS= osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
USE_GNOME= gnomehack gnometarget libglade2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index 004d45536478..ed73732a2dee 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= osb-nrcore>=0.5.2:${PORTSDIR}/www/osb-nrcore
USE_GNOME= gnomehack gnometarget gtk20 librsvg2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index b8e0d985d32a..08ec6477b0fe 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore
USE_XORG= x11 xt
USE_GNOME= gnomehack gnometarget gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index 1229acd9e8b7..d3c54285fe60 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ale@FreeBSD.org
COMMENT= A PHP Extension to help debugging a PHP script
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PHP= yes
USE_PHPIZE= yes
WITH_PHP_MOD= yes
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 3e269df3e746..9ce5d8080d85 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -19,7 +19,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
CRYPTKEY?= 11152, 368, 192, 1281, 62
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PHP= zlib
USE_PHPIZE= yes
IGNORE_WITH_PHP=4
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index 3d7fc6f545a0..1877ca07dbf6 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -24,7 +24,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/+ipv6//}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoheader:213
+USE_AUTOTOOLS= autoheader213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-user=${USER} --with-group=${GROUP} \
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index a3e3a0e1be67..a2dca3796ee4 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
WRKSRC= ${WRKDIR}/privoxy-${PORTVERSION}-stable
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_RC_SUBR= privoxy
SUB_FILES= pkg-message
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 241c4ce7e99e..69f921046891 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -18,7 +18,7 @@ JAVA_VERSION= 1.2+
HAS_CONFIGURE= yes
USE_PYTHON= yes
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
# Customizable settings
diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index a4392dd76c48..6fde82788ef8 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -54,7 +54,7 @@ BUILD_DEPENDS+= ${CORE_DEPS} \
RUN_DEPENDS+= ${BUILD_DEPENDS}
USE_PERL5= 5.8.3+
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
.include <bsd.port.pre.mk>
.if defined(WITH_DEV)
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index a4392dd76c48..6fde82788ef8 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -54,7 +54,7 @@ BUILD_DEPENDS+= ${CORE_DEPS} \
RUN_DEPENDS+= ${BUILD_DEPENDS}
USE_PERL5= 5.8.3+
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
.include <bsd.port.pre.mk>
.if defined(WITH_DEV)
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index bfe6630a25a6..d975f11109b1 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= yzlin@FreeBSD.org
COMMENT= Securely execute PHP scripts under Apache
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:111:env automake:111:env autoconf:268:env libtool:22:env
+USE_AUTOTOOLS= aclocal:env automake:env autoconf:env libtool:env
# Maintainer has not tested suPHP 0.6.x on Apache 1.3.
USE_APACHE= 2.0+
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 3c8167934411..a92852dc2dd5 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Flash rendering plugin
LIB_DEPENDS= swfdec-0.8:${PORTSDIR}/graphics/swfdec
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GNOME= gtk20
CONFIGURE_ARGS= --with-plugin-dir="${WEBPLUGINS_DIR}"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 803b28fe7d22..1f697e8ef446 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://swish-e.org/distribution/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple web indexing for humans - enhanced
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= libxml2
USE_GMAKE= yes
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index c12a39f01f7f..ffa1e7bcfa4a 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -32,7 +32,7 @@ USE_GMAKE= yes
PLIST_SUB= SHLIB="@comment " NSHLIB=""
CONFLICTS= tidy-20000804* tidy-lib-[0-9]*
.else
-USE_AUTOTOOLS= automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake autoconf libtool
AUTOMAKE_ARGS+= -a -c --foreign
USE_LDCONFIG= yes
PLIST_SUB= SHLIB="" NSHLIB="@comment "
@@ -87,7 +87,7 @@ post-patch:
. endfor
.endif
-patch-autotools::
+patch-autotools-libtool::
.if defined(WITH_SHLIB)
(cd ${WRKSRC} \
&& ${LIBTOOLIZE} --force --copy \
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index b542fca5d346..ce45dcb9b9c6 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
expat.6:${PORTSDIR}/textproc/expat2 \
pcre.0:${PORTSDIR}/devel/pcre
-USE_AUTOTOOLS= autoconf:268 automake:111 libtool:22
+USE_AUTOTOOLS= autoconf automake libtool
USE_BZIP2= yes
USE_ICONV= yes
USE_OPENSSL= yes
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index e791d29bc59f..f85cc7d91cad 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE= yes
USE_XORG= xt
USE_BISON= build
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 libxslt ltverhack:13
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 1015a6fbcf8a..ffb3fb7b8c2c 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE= yes
TCL_DVER= ${TCL_VER:S/.//}
USE_TCL= 84+
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \
--with-tcl=${TCL_LIBDIR}
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index b84d4d958e9e..4fca899c3ca9 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= World wide web server benchmarking with SSL support
USE_OPENSSL= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src
ALL_TARGET= install
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index f5c800b6cf68..a93473ff82be 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= wsdlpull.1 wsdlpull-schema.1
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index 3e19b36cbf6f..c408f2765762 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Alarm timer plugin for beep-media-player
LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnometarget gtk20
GNU_CONFIGURE= yes
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 5dba601c2640..ee9bab4cefb7 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -21,7 +21,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 74d6a909115a..57b7e48875e3 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -17,6 +17,6 @@ IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
XORG_CAT= driver
MAN4= magictouch.4x
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 535b9600e6b4..19b49d2d3a90 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess
XORG_CAT= driver
USE_XORG= damageproto glproto videoproto xextproto xf86driproto
-USE_AUTOTOOLS= automake:111:env aclocal:111:env autoconf:268 libtool:22
+USE_AUTOTOOLS= automake:env aclocal:env autoconf libtool
CONFLICTS= xf86-video-radeonhd-[0-9]*
diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile
index 73edccf95a5a..2f1faeef9580 100644
--- a/x11-fm/dolphin/Makefile
+++ b/x11-fm/dolphin/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= markus@FreeBSD.org
COMMENT= File manager for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index 3d2b2772be36..37e7b6e8170b 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22 autoconf:268:env aclocal:111:env automake:111:env
+USE_AUTOTOOLS= libtool autoconf:env aclocal:env automake:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index 9ce7238a2826..f98923db83b5 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= h.eichmann@gmx.de
COMMENT= A two window file-manager for KDE, like midnight or norton commander
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index f48b048cddcb..4356b13ba4ad 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 706f13022991..2d43538f3588 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \
fm-gtk.0:${PORTSDIR}/x11/libfm
USE_GNOME= gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_FAM= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index d29dac36b3e6..48a277e9b0eb 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/mi
PLIST_SUB+= LOCALBASE=${LOCALBASE}
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11 sm xaw xproto
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index c7bf341c9e4b..412d741a4b21 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig ltverhack
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile
index 421d9f207480..ffa08cbea07d 100644
--- a/x11-fonts/gnome-font-sampler/Makefile
+++ b/x11-fonts/gnome-font-sampler/Makefile
@@ -17,7 +17,7 @@ COMMENT= A program for viewing several fonts at once
USE_XORG= x11
USE_GNOME= libgnomeui gnomeprefix
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
post-patch:
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index adde49b5c123..7545f51a2c27 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -14,6 +14,6 @@ COMMENT= The FS library
XORG_CAT= lib
USE_XORG= fontsproto:both xproto:both xtrans
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 6a0c6dd18766..528a8dfd31ed 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -18,7 +18,7 @@ COMMENT= Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
USE_XORG= xxf86vm xxf86dga
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:14 autoconf:268 libtool:22
+USE_AUTOTOOLS= automake14 autoconf libtool
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
MAKE_ARGS= PREPROCESSOR=/usr/bin/cpp
diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index c6f255ce6e65..81160902fb59 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_XORG= xtst
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
# XXX - Workaround for a badly rolled tarball.
#pre-configure:
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index a65d115da159..b2d9a2b2d55a 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -19,7 +19,7 @@ COMMENT= A theme engine based on GtkStep and Step-pastel
WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index af3ba7f1a571..1d881a0203b0 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK theme engine designed to look nice with the GNOME desktop
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index b3cc04b96bee..87c76b0a0972 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
INSTALLS_ICONS= yes
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 60c49c04fc14..517be04f189c 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= clearlooks-metacity-0.*
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 9249ffad834a..6d2738c2fc33 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A simplistic GTK+ 2.x theme engine
USE_GNOME= gnomehack gnometarget gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
THEME= cleanice-theme-1.2.7
THEMEDIR= ${WRKDIR}/${THEME}/Theme
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 91521af55d47..9c95e6c5bff9 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gtk20 intlhack ltasneededhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
OPTIONS= ANIMATION "Enable experimental animated progressbars" off
diff --git a/x11-themes/kde-style-comix/Makefile b/x11-themes/kde-style-comix/Makefile
index 76c109c6f6e0..433a9085c153 100644
--- a/x11-themes/kde-style-comix/Makefile
+++ b/x11-themes/kde-style-comix/Makefile
@@ -19,7 +19,7 @@ COMMENT= Flat KDE style and window decoration
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile
index a36fe69fff77..695c3f4fbf39 100644
--- a/x11-themes/kde-style-lipstik/Makefile
+++ b/x11-themes/kde-style-lipstik/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= decept0@gmail.com
COMMENT= Modified Plastik KDE style
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/kde-style-polyester/Makefile b/x11-themes/kde-style-polyester/Makefile
index 3c6dcd7f3416..3f1575024049 100644
--- a/x11-themes/kde-style-polyester/Makefile
+++ b/x11-themes/kde-style-polyester/Makefile
@@ -20,7 +20,7 @@ COMMENT= KDE style and window decoration
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile
index 2aa153333196..4b74ffd3020b 100644
--- a/x11-themes/kde-style-tiblit/Makefile
+++ b/x11-themes/kde-style-tiblit/Makefile
@@ -18,7 +18,7 @@ COMMENT= KDE style focused on customization
USE_BZIP2= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/kde-windeco-activeheart/Makefile b/x11-themes/kde-windeco-activeheart/Makefile
index 953a51642dd7..aebebe4b9e40 100644
--- a/x11-themes/kde-windeco-activeheart/Makefile
+++ b/x11-themes/kde-windeco-activeheart/Makefile
@@ -19,7 +19,7 @@ COMMENT= Nice KDE window decoration with thin borders
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/kwin-${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-windeco-crystal/Makefile b/x11-themes/kde-windeco-crystal/Makefile
index 6ff2273c2cc6..639a6e752c60 100644
--- a/x11-themes/kde-windeco-crystal/Makefile
+++ b/x11-themes/kde-windeco-crystal/Makefile
@@ -18,7 +18,7 @@ COMMENT= Transparent KDE window decoration
USE_BZIP2= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_LATEST_LINK= yes
diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile
index 9ffc751532af..7aeab87d70ac 100644
--- a/x11-themes/kde-windeco-knifty/Makefile
+++ b/x11-themes/kde-windeco-knifty/Makefile
@@ -19,7 +19,7 @@ COMMENT= Lightweight KDE window decoration
USE_BZIP2= yes
USE_KDEBASE_VER=3
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-windeco-neos/Makefile b/x11-themes/kde-windeco-neos/Makefile
index 9514638fa92a..8df3b7eded60 100644
--- a/x11-themes/kde-windeco-neos/Makefile
+++ b/x11-themes/kde-windeco-neos/Makefile
@@ -18,7 +18,7 @@ COMMENT= KDE window decoration
USE_BZIP2= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/kwin-${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-windeco-smoothblend/Makefile b/x11-themes/kde-windeco-smoothblend/Makefile
index 5744f0d7eb2f..5807021e049c 100644
--- a/x11-themes/kde-windeco-smoothblend/Makefile
+++ b/x11-themes/kde-windeco-smoothblend/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= kdeartwork-3.5.[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/smooth-blend-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index b99cdde8df0d..fd2845ab8b4f 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -26,7 +26,7 @@ USE_GL= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index 2eaff9fee035..c0d93f772eca 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -18,7 +18,7 @@ COMMENT= KDM Theme Manager
USE_KDEBASE_VER=3
USE_BZIP2= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22 autoheader:268:env
+USE_AUTOTOOLS= automake:env autoconf:env libtool autoheader:env
USE_GMAKE= yes
pre-configure:
diff --git a/x11-themes/moodin/Makefile b/x11-themes/moodin/Makefile
index 2ea801639401..aa8526bea4b1 100644
--- a/x11-themes/moodin/Makefile
+++ b/x11-themes/moodin/Makefile
@@ -16,7 +16,7 @@ COMMENT= Splash screen engine for KDE
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 17bf65d25450..799819aaee09 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -19,7 +19,7 @@ COMMENT= The Notif2 GTK theme engine following the new Motif look and feel
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GTKVERSION= 1.2
diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile
index 8c61a50ec843..65d6277d55d4 100644
--- a/x11-themes/phase/Makefile
+++ b/x11-themes/phase/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= kdeartwork-3.4.*
USE_KDEBASE_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 23eb79870bab..1a583c64626b 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -19,7 +19,7 @@ COMMENT= Qt port of Plastik KDE theme
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
USE_BZIP2= yes
-USE_AUTOTOOLS= autoheader:268
+USE_AUTOTOOLS= autoheader
USE_QT_VER= 3
USE_LDCONFIG= yes
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 4ee6700fe0eb..4eb50f0b1f60 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -16,7 +16,7 @@ COMMENT= A QNX Photon like window decoration and widget style for KDE
USE_KDEBASE_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile
index 7d81feeacccd..e808f3886343 100644
--- a/x11-themes/qnxstyle/Makefile
+++ b/x11-themes/qnxstyle/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
PLIST_FILES= lib/kde3/plugins/styles/qnx.a \
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index d0a85125b816..38703d8425d6 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -16,6 +16,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A clean-looking GTK Theme Engine
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index b2edfa085c76..5b9385b98ce1 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack ltverhack
USE_BZIP2= yes
USE_GMAKE= yes
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/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index d0e084584625..90c60cf9dd25 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -26,7 +26,7 @@ COMMENT= A Tk extension (with shared libs)
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/blt2.4z
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 78f15966610c..9224011221a2 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_XORG= xrender
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomedesktop ltverhack intlhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 10170104c357..13bfa9967f85 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -29,7 +29,7 @@ USE_MYSQL= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 36a418e7aeaa..b469a90c8862 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -29,7 +29,7 @@ MAJORVER= 1.4
SHVER= 35
PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 201306b2ed4f..aac54f26efc2 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -26,7 +26,7 @@ USE_ICONV= yes
USE_GETTEXT= yes
GNOME_HTML_DIR= ${PREFIX}/share/doc/gal
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index c465f8df3625..50832a1bf146 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \
USE_GETTEXT= yes
USE_XORG= x11
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index a84eb13f6409..14155394f902 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -26,7 +26,7 @@ USE_PERL5_RUN= yes
USE_GNOME= gnomehack gtkhtml3 vte librsvg2 libgnomecanvas \
libgnomeprintui libglade2 libgnomeui
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index d81c7a59584e..f4fae95c4e49 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -20,7 +20,7 @@ USE_PERL5_BUILD= yes
USE_XORG= x11 ice xext sm inputproto xi
USE_GNOME= glib12
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
--with-xinput=xfree
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 3d0537298de0..ede6012e5f76 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -39,7 +39,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 3d0537298de0..ede6012e5f76 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -39,7 +39,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index e87c0892892c..019f5cd7f968 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data
USE_LDCONFIG= yes
USE_GNOME= gnomehack gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --includedir="${PREFIX}/include/${PORTNAME}" \
--with-html-dir="${PREFIX}/share/doc"
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index da22adc84e2b..2b0b6c734366 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 529baff2c7fe..37bd8f25db54 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+ 2.0
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 gnomehack
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index 344220a5f65c..a2d89ad5653e 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index f99b250561a0..f007315b2d3b 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -17,7 +17,7 @@ COMMENT= An OpenGL widget for the GTK+ GUI toolkit
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GL= yes
USE_GNOME= gnometarget gtk12 lthack
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 52c913dddc68..b00cf92ee438 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -20,7 +20,7 @@ LATEST_LINK= gtkglarea2
USE_GNOME= gnomehack gtk20
USE_BZIP2= yes
USE_GL= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 41f9423adc8d..1dc47f5202d9 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix gnometarget gtk20
USE_GL= yes
USE_XORG= xt
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 5a7b37f2c659..03a7941462d3 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
post-patch:
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index b7ef1106c2f2..61d1c310d1dd 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_GNOME= gnomehack gtk20 libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 0ed6e935ccc0..c8f1388d2b6d 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 9a620fa7bf3c..4dd2a5452342 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -23,7 +23,7 @@ LATEST_LINK= gtkmm2
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 1523301ec74d..91697266ca7c 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -31,7 +31,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk20 ltverhack:1
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 9a620fa7bf3c..4dd2a5452342 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -23,7 +23,7 @@ LATEST_LINK= gtkmm2
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index 17bce6f71823..eb960f49aa26 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \
USE_BZIP2= yes
USE_GNOME= gtksourceview gnomehack gtksharp20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
post-patch:
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 433d5402e8cd..67f1d87b0e06 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
ltverhack referencehack
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 8f355d89d70c..d47a8623407c 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libxml2 intlhack \
ltverhack referencehack
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index ed34e425f975..e5a8be070dfd 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= pav@FreeBSD.org
COMMENT= Single instance application library
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME= gtk20 ltverhack
USE_LDCONFIG= yes
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 336efbd6acfc..66b136c15ed3 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile
USE_GMAKE= yes
USE_GNOME= gnometarget ltverhack gdkpixbuf libglade
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-gtkgl=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index c2c754c0e812..f797c1921a63 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
CONFLICTS?= open-motif-*
USE_BZIP2= yes
-USE_AUTOTOOLS= automake:111:env autoconf:268 libtool:22
+USE_AUTOTOOLS= automake:env autoconf libtool
USE_XORG= sm ice xt xp xext x11 xextproto xrender xft
USE_LDCONFIG= yes
LIBTOOLFILES= aclocal.m4 test/aclocal.m4
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 41ec6fe547f5..a1025c6d81e1 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix libbonoboui
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index f7f87008c41a..e7d62397671c 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \
intlhack ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index a08e1fab01fb..844fa6ea5982 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
gnomeprintmm-2.5.2:${PORTSDIR}/print/libgnomeprintmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprintui
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 10bb032cd73e..97d65ff4077f 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
referencehack gvfs
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BISON= build
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 4dcb322f76b4..450ce3f3364b 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index c6c7e51bcc88..a6e4a1c3ebc8 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libgnomeuimm26
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_XORG= x11
USE_GMAKE= yes
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 18467ded73fc..6159afcb1723 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -17,7 +17,7 @@ COMMENT= A source code editor widget for GTK+
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
-USE_AUTOTOOLS= automake:111:env autoconf:268:env libtool:22
+USE_AUTOTOOLS= automake:env autoconf:env libtool
USE_GNOME= gtk12
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 9d8c21831741..0b1aea366b7f 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomepanel
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 9e7d919b63d3..5e69aee19b10 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME= gnomehack lthack gtk20 libxml2
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index d6cf21f23294..8818eb311c36 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ bindings for libsexy
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
sexy:${PORTSDIR}/x11-toolkits/libsexy
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index b6c4130fe605..7c653ff7d975 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 ltverhack referencehack intlhack
USE_BISON= build
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 3f0030aeb2d7..2021290d322c 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 widget library required by xfce4 and xfwm4
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 639cb21c7151..453b85a07329 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -20,7 +20,7 @@ USE_XORG= x11
USE_GMAKE= yes
USE_BISON= build
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack gtk20 libartlgpl2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index fc18dbf97e4b..795f5731ec52 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gahr@FreeBSD.org
COMMENT= Display scientific data as dynamic plot
USE_MOTIF= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 162572f6cb5f..8e4c698d4e0d 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -15,7 +15,7 @@ COMMENT= This is the Mowitz ("More widgets") library
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_XORG= ice sm x11 xaw xext xmu xpm xt
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index c88ea7932511..5b801e8d57cc 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://siag.nu/pub/neXtaw/
MAINTAINER= ports@FreeBSD.org
COMMENT= Athena Widgets with N*XTSTEP appearance
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_XORG= xmu x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 774e8136d3a5..3fb38963a028 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -20,7 +20,7 @@ COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295))
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFLICTS= lesstif-*
USE_GMAKE= yes
USE_XORG= xaw xbitmaps
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index ed65a8023abd..b97ca91d4903 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -32,7 +32,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20 ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--enable-static
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 732921abf8b7..f6b3aea171d9 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -17,7 +17,7 @@ COMMENT= Implements Pango library with a PDF backend for PDF output
USE_GMAKE= yes
USE_GNOME= gnomehack pango
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" \
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index bb37efc763b3..24ec0678876f 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \
CONFLICTS= paragui-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl image ttf
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 5d5ef05a3af8..b48e60889c8f 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \
CONFLICTS= paragui-devel-[0-9]*
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl image ttf
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index fc0f6920f843..41caf0060769 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://gtk.php.net/distributions/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= An extension to use gtk in PHP-applications
-USE_AUTOTOOLS= automake:111:env autoconf:268 libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf libtool:env
GNU_CONFIGURE= yes
USE_PHP= pcre
USE_PHP_BUILD= yes
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 9a9c6055b3e4..d72a3e0adfe0 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -18,7 +18,7 @@ COMMENT= An extension to use gtk2 in PHP-applications
BROKEN= does not compile
-USE_AUTOTOOLS= automake:111:env autoconf:268 libtool:22:env
+USE_AUTOTOOLS= automake:env autoconf libtool:env
USE_PHP= pcre
USE_PHP_BUILD= yes
WANT_PHP_CLI= yes
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 381f9ea30f79..7a6ab1201fc8 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -18,7 +18,7 @@ COMMENT= Libsexy bindings for Python
LIB_DEPENDS= sexy.2:${PORTSDIR}/x11-toolkits/libsexy
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pygtk2 pkgconfig
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index f81c1ce98062..e4837e660d2e 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268:env automake:111:env libtool:22:env
+USE_AUTOTOOLS= autoconf:env automake:env libtool:env
CONFIGURE_SCRIPT= autogen.sh
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 81003ff290e8..edd21840d5a4 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -16,7 +16,7 @@ DISTNAME= SDL_gui-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Graphical User Interface library for SDL
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl image ttf
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index b4c87156ac08..d3d529196bc3 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -18,7 +18,7 @@ PATCHFILES= SDL_Pango-0.1.2-API-adds.patch
MAINTAINER= edwin@mavetju.org
COMMENT= SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_SDL= sdl
USE_GNOME= pango
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 5987b3f201f6..6739dc931c71 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -18,7 +18,7 @@ COMMENT= Qt4 toolkit library for Coin
LIB_DEPENDS= Coin.61:${PORTSDIR}/graphics/Coin
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_QT_VER= 4
QT_COMPONENTS= corelib opengl moc_build
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index e9894481a33d..53ed919bb525 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -15,7 +15,7 @@ COMMENT= Themed widget set for Tk
USE_TK= 84+
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
TKPKG= ${PORTNAME}${PORTVERSION}
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 29ebe9d3ec63..ae8da4b22d51 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/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= gtk20 gnomeprefix ltverhack:2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-maintainer-flags
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index ab8d659f1696..681566b41cc3 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for GTK+ toolkit
USE_GNOME= gnomehack gtk20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
USE_LDCONFIG= yes
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index a7fe1849573c..efcfc0f4ef9f 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= vdk-2.6:${PORTSDIR}/x11-toolkits/vdk
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no
USE_LDCONFIG= yes
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index 9d54c00cb161..6a7e66b81f1b 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -17,7 +17,7 @@ DISTNAME= libvk-Apr19-2243
MAINTAINER= ports@FreeBSD.org
COMMENT= ViewKit workalike from Hungry Programmers
-USE_AUTOTOOLS= autoconf:268:env
+USE_AUTOTOOLS= autoconf:env
MOTIFPACKAGE?= open-motif
USE_MOTIF= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 2554756698ad..7828f9e4a084 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= build
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index d02102e7514b..5ef62152433c 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -16,7 +16,7 @@ DISTNAME= xbae-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_MOTIF= yes
CONFIGURE_ARGS=--enable-production --enable-static
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 4df44b83f8d6..bb743f2e6dc0 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Motif widget set for displaying HTML 3.2 documents
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
-USE_AUTOTOOLS= libtool:22:env
+USE_AUTOTOOLS= libtool:env
USE_MOTIF= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index d53dfe824aa0..c9b156771ced 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack intltool
USE_XORG= glproto
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GCONF_SCHEMAS= compiz-3d.schemas \
compiz-addhelper.schemas \
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 623eefbf5613..bffef0161ee3 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack intltool
USE_XORG= glproto
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GCONF_SCHEMAS= compiz-animation.schemas \
compiz-colorfilter.schemas \
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 1a7822cc8ac9..8c84398a7d13 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack intltool
USE_XORG= glproto
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GCONF_SCHEMAS= compiz-atlantis.schemas \
compiz-cubemodel.schemas \
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 3bca40e76b7f..aae682646601 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -28,7 +28,7 @@ USE_GL= glu
USE_GNOME= gnomehack gconf2 libxslt
USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GCONF_SCHEMAS= gwd.schemas \
compiz-annotate.schemas \
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 6904231989b9..30216d0fdbf6 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20 gconf2
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index ba371e306537..cd071c140aa7 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack glib20
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 14c3688bef42..9aa360f05c7b 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -20,7 +20,7 @@ USE_XORG= compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
USE_ICONV= yes
USE_GMAKE= yes
USE_EFL= imlib2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-esdtest --disable-dependency-tracking \
--disable-rpath --enable-mans SHELL=/bin/sh
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index d2a3a35156c2..ff089eea5f10 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack gtk20 libwnck pango
USE_XORG= xrender
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= emerald.1 \
emerald-theme-manager.1
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index cb82b013f68b..e9f9e1b671a9 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -23,7 +23,7 @@ USE_XORG= xext
USE_GNOME= esound gnometarget
USE_GL= glut
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 autoconf:268
+USE_AUTOTOOLS= libtool autoconf
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index be514788df09..4a97eafaf35c 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= xcompmgr:${PORTSDIR}/x11-wm/xcompmgr
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
DESKTOP_ENTRIES="gcompmgr" \
"Configure window effects" \
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 21b40a2e497f..b30603539101 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -18,7 +18,7 @@ COMMENT= A dock-like applet for KDE3
USE_GETTEXT= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
--enable-threads \
--disable-closure
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 731916ad0f10..c0b0cb0f02e5 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack intltool libxml2
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 5057f32d8ae9..29fefd0b0769 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -16,7 +16,7 @@ COMMENT= Standard library for Window Maker dock apps
USE_BZIP2= yes
USE_XORG= xext xpm
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-font --without-examples
USE_LDCONFIG= yes
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 2ceac06d681d..f53f2c07cebd 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_XORG= xpm
diff --git a/x11-wm/lxsession-lite/Makefile b/x11-wm/lxsession-lite/Makefile
index 233fdfff964f..f22778d08019 100644
--- a/x11-wm/lxsession-lite/Makefile
+++ b/x11-wm/lxsession-lite/Makefile
@@ -22,7 +22,7 @@ EXPIRATION_DATE= 2011-01-01
CONFLICTS= lxsession-[0-9]*
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 4af139d5d19e..8cab1fee8da2 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_XORG= x11 xcomposite xdamage
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 13ba0648561e..d69c635f9672 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index ba3547f2cced..e0725d601815 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20 libxml2 ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
LDFLAGS+="-L${LOCALBASE}/lib"
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 9094cd96a7ba..7cea4a9eade6 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
LATEST_LINK= ${PORTNAME}-devel
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
USE_GMAKE= yes
USE_ICONV= yes
USE_XORG= x11
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 59c70107ff0d..1e46ae0b7308 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDI
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_XORG= xpm
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index e2f8bff8b437..f818cc92f749 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
CONFLICTS= xfce4-systray-*
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index cdbada0d6d8b..95080790bf86 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth
LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index e3abab229bed..0032b0b31189 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Terminal emulator for the X windowing system
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index db5022fc07fa..5d93eaf672cb 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -22,7 +22,7 @@ COMMENT= Dynamic pixel format conversion library
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig gnomehack ltverhack
USE_GMAKE= yes
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index ce756d8db371..abc825fb304d 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GNOME= glib12
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-0.5.9
MAKE_JOBS_UNSAFE= yes
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index f0de371cec40..033db17a0a35 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -18,7 +18,7 @@ COMMENT?= X11 terminal emulator based on rxvt/xterm
BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html
LIB_DEPENDS= ast.2:${PORTSDIR}/devel/libast
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--enable-trans --enable-utmp \
--enable-xim --with-theme-update \
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index cea6941a7f59..5be4bf93eac4 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -16,7 +16,7 @@ COMMENT= An anti-aliased font support for gtk+
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk12
WANT_GNOME= yes
USE_ICONV= yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 8b4f2d832897..60a7551b3c72 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -32,7 +32,7 @@ USE_BISON= build
USE_PYTHON= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index d84568032537..c562f6d18649 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui evolutiondataserver gnomemenus gnomedesktop
-USE_AUTOTOOLS= autoconf:268 autoheader:268 automake:111 aclocal:111 libtool:22
+USE_AUTOTOOLS= autoconf autoheader automake aclocal libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
LIBTOOLFILES=
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index cdf43017c376..40a2dd77bad8 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -22,7 +22,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index b23c8312eb8d..1082e367f0e2 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -34,7 +34,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-network-manager \
--enable-polkit
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 7ecc0b0985bd..6328c31a7fbe 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2= yes
USE_XORG= x11 xfixes sm
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
gnomedesktop ltverhack libgnomeui librsvg2
USE_GSTREAMER= theora
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index 6ec0d1a1b2e4..1017d2f9d82b 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -18,7 +18,7 @@ COMMENT= A small application for preview your theme widgets in one small window
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
PLIST_FILES= bin/${PORTNAME}
WRKSRC= ${WRKDIR}/ThemePreview-2
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index f6f6af2d4d50..fb8481a8104c 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -16,7 +16,7 @@ COMMENT= A simple GTK-2 terminal with tabs
USE_GNOME= gnometarget vte
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PORTDOCS= README
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 36143618d88b..a515250dde6f 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_EFL= imlib2
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CXXFLAGS+= `imlib2-config --cflags` `freetype-config --cflags`
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index b37fbc93bfc4..30623fbd005d 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -40,7 +40,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 3de09a2a9877..91bb67f4e006 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -58,7 +58,7 @@ PREFIX= ${KDE_PREFIX}
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--disable-ltdl-install \
--disable-as-needed \
--enable-mt \
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 2e187e1dff67..0d0918b23830 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -16,7 +16,7 @@ COMMENT= Session Management library for X11
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
XORG_CAT= lib
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 7d54a0d2fd4e..d49a86212a9c 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268 libtool:22
+USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index 8651ac199680..cf5c5b68d17a 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -14,6 +14,6 @@ COMMENT= The XTrap library
XORG_CAT= lib
USE_XORG= trapproto:both x11 xext xextproto xt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index a38a7dab2b11..ef1cf123cfe2 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -15,7 +15,7 @@ COMMENT= X11 Xinerama library
XORG_CAT= lib
USE_XORG= x11 xext xextproto xineramaproto:both
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN3= Xinerama.3 \
XineramaQueryExtension.3 \
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 16270d3a20a7..62d50cab86ff 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -15,7 +15,7 @@ COMMENT= X print library
XORG_CAT= lib
USE_XORG= x11 xext xextproto xau printproto:both
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN3= XpCancelDoc.3 \
XpCancelJob.3 \
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index 6a2f271d16a7..58151094e88e 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -14,6 +14,6 @@ COMMENT= The XprintAppUtil library
XORG_CAT= lib
USE_XORG= printproto x11 xau xp xprintutil xproto:both
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 9e87e7df8bd3..1b9746946b04 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -14,6 +14,6 @@ COMMENT= The XprintUtil library
XORG_CAT= lib
USE_XORG= printproto:both x11 xau xp xt
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 6400ec95a453..c7a2f4258466 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -15,6 +15,6 @@ COMMENT= X Test extension
XORG_CAT= lib
USE_XORG= x11 xext recordproto:both xextproto inputproto:both \
xi
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 5b06f238f26a..d92a84cb54d9 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \
menu-cache.1:${PORTSDIR}/x11/menu-cache
USE_GNOME= gnomehack gtk20 pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_FAM= yes
USE_LDCONFIG= yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index b1d8c41e0503..82dcda4dc4ba 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -31,7 +31,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack esound libbonobo \
USE_BISON= build
USE_XORG= xpm
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 58c0f58a5cb2..c4d0030d9caf 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack ltverhack gconf2
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 41e959cfe46b..18b94006f9dc 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for libgnome 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 libgnome
GNU_CONFIGURE= yes
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index 14ca23431b9b..9cd544837b22 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -14,6 +14,6 @@ COMMENT= Old X library
XORG_CAT= lib
USE_XORG= x11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 9c6b4bcf5564..db861a3bfe1c 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 library for a freedesktop.org compliant menu implementation
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 07f6b2a5a18a..305596677636 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 library with non-graphical helper functions
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 61f9233ad7c0..472800596b95 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libxml2 glib20 ltverhack:12
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --disable-doxygen \
--with-xkb-base=${LOCALBASE}/share/X11/xkb \
diff --git a/x11/lxmenu-data/Makefile b/x11/lxmenu-data/Makefile
index 5148a8e3f49c..a11b53a581a1 100644
--- a/x11/lxmenu-data/Makefile
+++ b/x11/lxmenu-data/Makefile
@@ -17,7 +17,7 @@ USE_XORG= x11 xmu
USE_GNOME= intltool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
USE_GMAKE= yes
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index 73561c7f932e..3ad0b9bdfb6d 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -23,7 +23,7 @@ OPTIONS= ALSA "enable ALSA audio architecture support" Off \
USE_XORG= x11 xmu
USE_GNOME= gnomehack gtk20 pkgconfig
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:111:env
+USE_AUTOTOOLS= automake:env
CONFIGURE_ARGS= --prefix=${PREFIX} \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index ee5f5ffd9093..75d8c3fc0eaf 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= kmoore@FreeBSD.org
COMMENT= The menu-cache portion of LXDE
USE_GNOME= gnomehack gtk20 pkgconfig
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_FAM= yes
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 34f54be68904..7672c72f3ef5 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -20,7 +20,7 @@ IGNORE= needs an old XFree86/X.org header file to build
USE_GNOME= gtk12
USE_GMAKE= YES
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 5d2167db8ece..ad913b6de21b 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
USE_XORG= sm
USE_GNOME= gtk20 lthack
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure kiklib/configure mkf/configure
USE_PERL5_BUILD=yes
USE_GETTEXT= yes
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 28b08e513024..3a9d38c6af4d 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://download.berlios.de/segfaultskde/
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= Quick launcher for Open Office
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_KDELIBS_VER= 3
USE_GMAKE= yes
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index 0704d0c5dbbe..ce6563bcb309 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/segfaultskde/ \
MAINTAINER= citycat4@ngs.ru
COMMENT= KDE Quick launcher for Open Office 2.x
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-qt-dir=${QT_PREFIX}
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index f6d29bd6108d..c3e8bf42b8ef 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= Low-level pixel manipulation library
XORG_CAT= lib
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5_BUILD=yes
USE_GNOME= ltverhack:9
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 1ed46379eeb4..afb336dff3bf 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Launch applications by clicking on an icon bar
CONFIGURE_ENV= GTKCONFIG=${GTK_CONFIG}
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_XORG= xpm
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index c2ce12d21809..d99b4a2c514f 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A terminal emulator for the X11
USE_GNOME= gnomelibs gnomehier
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${IMLIB_CONFIG} --cflags`" \
LDFLAGS="-L${LOCALBASE}/lib `${IMLIB_CONFIG} --libs`"
ALL_TARGET= ${PORTNAME}
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index fc1ef9128c92..204fba5bcf52 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -18,7 +18,7 @@ PORTSCOUT= limit:^0\.8\.
USE_BZIP2= yes
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_XORG= xscrnsaver
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 76ea1b927add..bbee2f632ec8 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -17,7 +17,7 @@ PKGNAMESUFFIX= -devel
MAINTAINER= akosela@andykosela.com
COMMENT= A low memory usage xterm replacement that supports color
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_PERL5_BUILD=yes
USE_XORG= xpm
GNU_CONFIGURE= yes
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index faf7e6b26faf..cfef4d698b20 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg
XORG_CAT= app
USE_XORG= x11
-USE_AUTOTOOLS= aclocal:111 autoheader:268 automake:111 autoconf:268
+USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -I${LOCALBASE}/share/aclocal
PLIST_FILES= bin/sessreg
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 3ca5225067ad..d07df6946bdd 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -19,7 +19,7 @@ COMMENT= Library that supports startup notification spec from freedesktop.org
LIB_DEPENDS= xcb-aux.0:${PORTSDIR}/x11/xcb-util
USE_XORG= x11
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig ltasneededhack
GNU_CONFIGURE= yes
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 18740a0af00b..6557fafefc98 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES= bin/vdesk
PLIST_FILES+= share/doc/vdesk/${ii}
.endfor
.endif
-USE_AUTOTOOLS= autoconf:268
+USE_AUTOTOOLS= autoconf
USE_XORG= x11
post-extract:
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index ef89f3d7e8cc..adbe74e28303 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_XORG= xau xdmcp
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf"
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index c30c30e985ea..6298f84802fa 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@eitanadler.com
COMMENT= An interface to X selections ("the clipboard") from the command line
-USE_AUTOTOOLS= autoconf:268:env aclocal:111:env automake:111:env
+USE_AUTOTOOLS= autoconf:env aclocal:env automake:env
USE_XORG= x11 xmu
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index b9028ba85533..fa77d116767c 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -17,7 +17,7 @@ COMMENT= XFce 4 configuration mananger
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index 0aeb45597f8e..ee53b0e06d5f 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -15,7 +15,7 @@ COMMENT= RX helper program
XORG_CAT= app
USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
MAN1= xrx.1 libxrx.1
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index a79bb1e30652..3affddb9c7c7 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -20,7 +20,7 @@ COMMENT= Support for xscreensaver blankers in KDE
USE_KDELIBS_VER=3
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdeartwork-${PORTVERSION}
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index c8409b558905..dd10e6c9f5a3 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= BERLIOS
MAINTAINER= decept0@gmail.com
COMMENT= Quake-style terminal emulator based on KDE's Konsole
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes