aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.php.mk2
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/dasher/Makefile2
-rw-r--r--accessibility/gail/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile2
-rw-r--r--accessibility/gnome-speech/Makefile2
-rw-r--r--accessibility/gnomemag/Makefile2
-rw-r--r--accessibility/gnomespeech/Makefile2
-rw-r--r--accessibility/gok/Makefile2
-rw-r--r--arabic/katoob/Makefile2
-rw-r--r--archivers/arj/Makefile2
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/libcomprex/Makefile3
-rw-r--r--archivers/libmspack/Makefile2
-rw-r--r--archivers/liborange/Makefile2
-rw-r--r--archivers/lzo/Makefile2
-rw-r--r--archivers/lzo2/Makefile2
-rw-r--r--archivers/orange/Makefile2
-rw-r--r--archivers/rpm/Makefile4
-rw-r--r--archivers/rpm4/Makefile2
-rw-r--r--archivers/rpm5/Makefile2
-rw-r--r--archivers/torrentzip/Makefile3
-rw-r--r--archivers/ucl/Makefile2
-rw-r--r--archivers/xpk/Makefile2
-rw-r--r--archivers/zipios++/Makefile3
-rw-r--r--astro/boinc-setiathome/Makefile7
-rw-r--r--astro/glunarclock/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/libnova/Makefile2
-rw-r--r--astro/nova/Makefile1
-rw-r--r--astro/seti_applet/Makefile2
-rw-r--r--audio/Maaate/Makefile2
-rw-r--r--audio/alsaplayer/Makefile2
-rw-r--r--audio/anthem/Makefile2
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/beast/Makefile2
-rw-r--r--audio/bmp-faad/Makefile5
-rw-r--r--audio/bmp-flac/Makefile2
-rw-r--r--audio/bmp-songchange/Makefile2
-rw-r--r--audio/ccaudio/Makefile2
-rw-r--r--audio/ccaudio2/Makefile2
-rw-r--r--audio/easytag-devel/Makefile2
-rw-r--r--audio/ecasound/Makefile4
-rw-r--r--audio/ecawave/Makefile2
-rw-r--r--audio/esound/Makefile2
-rw-r--r--audio/extace/Makefile2
-rw-r--r--audio/ezstream/Makefile2
-rw-r--r--audio/faac/Makefile4
-rw-r--r--audio/faad/Makefile4
-rw-r--r--audio/festalon/Makefile2
-rw-r--r--audio/flac/Makefile2
-rw-r--r--audio/fluidsynth/Makefile2
-rw-r--r--audio/gaim-festival/Makefile2
-rw-r--r--audio/gdam/Makefile2
-rw-r--r--audio/glame/Makefile3
-rw-r--r--audio/gnapster/Makefile2
-rw-r--r--audio/gnomoradio/Makefile2
-rw-r--r--audio/goobox/Makefile2
-rw-r--r--audio/gqmpeg-devel/Makefile2
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/gstreamer-monkeysaudio/Makefile2
-rw-r--r--audio/gtkgep/Makefile2
-rw-r--r--audio/icecast2/Makefile2
-rw-r--r--audio/ices/Makefile2
-rw-r--r--audio/ices0/Makefile2
-rw-r--r--audio/id3lib/Makefile2
-rw-r--r--audio/jack/Makefile2
-rw-r--r--audio/jamboree/Makefile2
-rw-r--r--audio/lame/Makefile2
-rw-r--r--audio/liba52-devel/Makefile2
-rw-r--r--audio/liba52/Makefile2
-rw-r--r--audio/libadplug/Makefile2
-rw-r--r--audio/libao/Makefile2
-rw-r--r--audio/libcdaudio/Makefile2
-rw-r--r--audio/libcddb/Makefile2
-rw-r--r--audio/libid3tag/Makefile2
-rw-r--r--audio/libmad/Makefile2
-rw-r--r--audio/libmikmod/Makefile2
-rw-r--r--audio/libmodplug/Makefile2
-rw-r--r--audio/libmpcdec/Makefile2
-rw-r--r--audio/libmusicbrainz/Makefile2
-rw-r--r--audio/libmusicbrainz3/Makefile2
-rw-r--r--audio/libmusicbrainz4/Makefile2
-rw-r--r--audio/libmusicbrainz5/Makefile2
-rw-r--r--audio/libogg/Makefile2
-rw-r--r--audio/libsamplerate/Makefile2
-rw-r--r--audio/libshout2/Makefile2
-rw-r--r--audio/libsidplay/Makefile2
-rw-r--r--audio/libsidplay2/Makefile2
-rw-r--r--audio/libsndfile/Makefile2
-rw-r--r--audio/libtremor/Makefile4
-rw-r--r--audio/libtunepimp-old/Makefile2
-rw-r--r--audio/libtunepimp/Makefile2
-rw-r--r--audio/libvorbis/Makefile2
-rw-r--r--audio/mac/Makefile2
-rw-r--r--audio/madplay/Makefile2
-rw-r--r--audio/marlin/Makefile2
-rw-r--r--audio/mpiosh/Makefile2
-rw-r--r--audio/mt-daapd/Makefile3
-rw-r--r--audio/muine/Makefile2
-rw-r--r--audio/musicbrainz/Makefile2
-rw-r--r--audio/oggsplit/Makefile3
-rw-r--r--audio/openspc/Makefile2
-rw-r--r--audio/orpheus/Makefile2
-rw-r--r--audio/pd/Makefile2
-rw-r--r--audio/playgsf/Makefile2
-rw-r--r--audio/polypaudio/Makefile3
-rw-r--r--audio/rat/Makefile2
-rw-r--r--audio/resid/Makefile2
-rw-r--r--audio/rioutil/Makefile2
-rw-r--r--audio/rosegarden/Makefile2
-rw-r--r--audio/scrobbler/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile2
-rw-r--r--audio/sdl_sound/Makefile2
-rw-r--r--audio/speex-devel/Makefile2
-rw-r--r--audio/speex/Makefile2
-rw-r--r--audio/streamtranscoder/Makefile2
-rw-r--r--audio/streamtuner/Makefile2
-rw-r--r--audio/swami/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--audio/swhplugins/Makefile2
-rw-r--r--audio/taglib/Makefile2
-rw-r--r--audio/tagtool/Makefile2
-rw-r--r--audio/tse3/Makefile2
-rw-r--r--audio/twolame/Makefile2
-rw-r--r--audio/uade/Makefile2
-rw-r--r--audio/vat/Makefile2
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/vsound/Makefile2
-rw-r--r--audio/wavpack/Makefile2
-rw-r--r--audio/wsoundserver/Makefile2
-rw-r--r--audio/x11amp/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--audio/xmms-ahx/Makefile2
-rw-r--r--audio/xmms-arts_output/Makefile2
-rw-r--r--audio/xmms-cdparanoia/Makefile2
-rw-r--r--audio/xmms-crossfade/Makefile2
-rw-r--r--audio/xmms-efxmms/Makefile2
-rw-r--r--audio/xmms-eq/Makefile2
-rw-r--r--audio/xmms-faad/Makefile5
-rw-r--r--audio/xmms-flac/Makefile2
-rw-r--r--audio/xmms-fxt/Makefile2
-rw-r--r--audio/xmms-imms/Makefile3
-rw-r--r--audio/xmms-jack/Makefile2
-rw-r--r--audio/xmms-kde/Makefile2
-rw-r--r--audio/xmms-liveice/Makefile2
-rw-r--r--audio/xmms-mac/Makefile2
-rw-r--r--audio/xmms-mailnotify/Makefile2
-rw-r--r--audio/xmms-midi/Makefile4
-rw-r--r--audio/xmms-musepack/Makefile2
-rw-r--r--audio/xmms-nas/Makefile2
-rw-r--r--audio/xmms-nsf/Makefile2
-rw-r--r--audio/xmms-openspc/Makefile2
-rw-r--r--audio/xmms-real-random/Makefile2
-rw-r--r--audio/xmms-shn/Makefile2
-rw-r--r--audio/xmms-sndfile/Makefile2
-rw-r--r--audio/xmms-tfmx/Makefile2
-rw-r--r--audio/xmms-uade/Makefile2
-rw-r--r--audio/xmms-xymms/Makefile2
-rw-r--r--audio/xmp/Makefile2
-rw-r--r--audio/zinf/Makefile2
-rw-r--r--benchmarks/dkftpbench/Makefile3
-rw-r--r--biology/emboss/Makefile2
-rw-r--r--biology/libgenome/Makefile2
-rw-r--r--cad/brlcad/Makefile2
-rw-r--r--cad/gtkwave/Makefile2
-rw-r--r--cad/gwave/Makefile2
-rw-r--r--cad/libgeda/Makefile2
-rw-r--r--cad/ngspice_rework/Makefile2
-rw-r--r--cad/pdnmesh/Makefile2
-rw-r--r--cad/qmls/Makefile2
-rw-r--r--chinese/iiimf-le-chewing/Makefile2
-rw-r--r--chinese/iiimf-le-newpy/Makefile4
-rw-r--r--chinese/iiimf-le-ude/Makefile4
-rw-r--r--chinese/iiimf-le-xcin/Makefile5
-rw-r--r--chinese/libchewing/Makefile2
-rw-r--r--chinese/pcmanx/Makefile2
-rw-r--r--chinese/scim-chewing/Makefile2
-rw-r--r--chinese/scim-pinyin/Makefile2
-rw-r--r--chinese/wenju/Makefile2
-rw-r--r--chinese/xcin25/Makefile2
-rw-r--r--comms/gammu-devel/Makefile2
-rw-r--r--comms/gammu/Makefile2
-rw-r--r--comms/gfax/Makefile2
-rw-r--r--comms/ghfaxviewer/Makefile2
-rw-r--r--comms/gsmlib/Makefile2
-rw-r--r--comms/hamlib/Makefile2
-rw-r--r--comms/libticables/Makefile2
-rw-r--r--comms/linrad/Makefile2
-rw-r--r--comms/lirc/Makefile2
-rw-r--r--comms/openobex/Makefile5
-rw-r--r--comms/rxtx/Makefile2
-rw-r--r--comms/spandsp-devel/Makefile2
-rw-r--r--comms/spandsp-devel5/Makefile2
-rw-r--r--comms/spandsp/Makefile2
-rw-r--r--comms/tilp/Makefile2
-rw-r--r--comms/vpb2/Makefile3
-rw-r--r--converters/enca/Makefile2
-rw-r--r--converters/fribidi/Makefile2
-rw-r--r--converters/libiconv/Makefile2
-rw-r--r--converters/mimelib/Makefile2
-rw-r--r--converters/psiconv/Makefile2
-rw-r--r--converters/recode/Makefile2
-rw-r--r--databases/db3/Makefile2
-rw-r--r--databases/db42/Makefile.db2
-rw-r--r--databases/db43/Makefile2
-rw-r--r--databases/db44/Makefile2
-rw-r--r--databases/db45/Makefile2
-rw-r--r--databases/db46/Makefile2
-rw-r--r--databases/db47/Makefile2
-rw-r--r--databases/dbconnect/Makefile2
-rw-r--r--databases/dbh/Makefile2
-rw-r--r--databases/dbh10/Makefile2
-rw-r--r--databases/edb/Makefile2
-rw-r--r--databases/firebird-devel/Makefile3
-rw-r--r--databases/firebird-server/Makefile3
-rw-r--r--databases/firebird2-server/Makefile3
-rw-r--r--databases/firebird20-server/Makefile3
-rw-r--r--databases/freetds-devel/Makefile3
-rw-r--r--databases/freetds/Makefile3
-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/gnomedb/Makefile2
-rw-r--r--databases/grass-i18n/Makefile2
-rw-r--r--databases/grass/Makefile2
-rw-r--r--databases/hk_classes/Makefile2
-rw-r--r--databases/knoda/Makefile2
-rw-r--r--databases/libdbi-drivers/Makefile2
-rw-r--r--databases/libdbi/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgdamm/Makefile2
-rw-r--r--databases/libodbc++/Makefile2
-rw-r--r--databases/mdbtools/Makefile2
-rw-r--r--databases/metakit/Makefile2
-rw-r--r--databases/mird/Makefile2
-rw-r--r--databases/myodbc/Makefile2
-rw-r--r--databases/mysql++/Makefile2
-rw-r--r--databases/mysql++1/Makefile2
-rw-r--r--databases/mysql-administrator/Makefile2
-rw-r--r--databases/mysql-connector-odbc/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/mysql50-server/Makefile2
-rw-r--r--databases/mysql51-server/Makefile2
-rw-r--r--databases/mysql54-server/Makefile2
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql60-server/Makefile2
-rw-r--r--databases/mysqlcppapi/Makefile2
-rw-r--r--databases/percona55-server/Makefile2
-rw-r--r--databases/pgcluster/Makefile2
-rw-r--r--databases/postgresql-libpqxx/Makefile2
-rw-r--r--databases/postgresql-libpqxx3/Makefile2
-rw-r--r--databases/postgresql-libpqxx30/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/rrdtool/Makefile2
-rw-r--r--databases/rrdtool10/Makefile2
-rw-r--r--databases/sqlite2/Makefile2
-rw-r--r--databases/sqlite3/Makefile2
-rw-r--r--databases/sqlite34/Makefile2
-rw-r--r--databases/sqlrelay/Makefile3
-rw-r--r--databases/tdb/Makefile4
-rw-r--r--databases/unixODBC/Makefile2
-rw-r--r--databases/xbase/Makefile2
-rw-r--r--databases/xbsql/Makefile2
-rw-r--r--deskutils/bmp-docklet/Makefile2
-rw-r--r--deskutils/doodle/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/gcal/Makefile2
-rw-r--r--deskutils/gdesklets/Makefile2
-rw-r--r--deskutils/genius/Makefile2
-rw-r--r--deskutils/glabels/Makefile2
-rw-r--r--deskutils/gnochm/Makefile2
-rw-r--r--deskutils/gnome-pim/Makefile2
-rw-r--r--deskutils/gnomepim/Makefile2
-rw-r--r--deskutils/gtkjournal/Makefile2
-rw-r--r--deskutils/gucharmap/Makefile2
-rw-r--r--deskutils/kbirthday/Makefile2
-rw-r--r--deskutils/mcatalog/Makefile2
-rw-r--r--deskutils/multi-backgrounds-daemon/Makefile2
-rw-r--r--deskutils/multisync/Makefile3
-rw-r--r--deskutils/nautilus-actions/Makefile2
-rw-r--r--deskutils/nautilus-locked-folder/Makefile2
-rw-r--r--deskutils/nautilus-sendto/Makefile2
-rw-r--r--deskutils/notification-daemon/Makefile2
-rw-r--r--deskutils/planner/Makefile2
-rw-r--r--deskutils/tomboy/Makefile2
-rw-r--r--deskutils/xfce4-calendar/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/xfce4-taskbar-plugin/Makefile2
-rw-r--r--deskutils/xfce4-windowlist-plugin/Makefile2
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile2
-rw-r--r--deskutils/yank/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/ac-archive/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/Makefile2
-rw-r--r--devel/apr/Makefile4
-rw-r--r--devel/apr0/Makefile4
-rw-r--r--devel/apr1/Makefile4
-rw-r--r--devel/apr2/Makefile4
-rw-r--r--devel/arm-elf-binutils/Makefile2
-rw-r--r--devel/arm-elf-gcc295/Makefile2
-rw-r--r--devel/atlas-devel/Makefile2
-rw-r--r--devel/atlas/Makefile2
-rw-r--r--devel/autogen/Makefile2
-rw-r--r--devel/automake110/Makefile2
-rw-r--r--devel/automake14/Makefile2
-rw-r--r--devel/automake15/Makefile2
-rw-r--r--devel/automake19/Makefile2
-rw-r--r--devel/avr-binutils/Makefile2
-rw-r--r--devel/avr-gcc-3/Makefile2
-rw-r--r--devel/avr-gcc/Makefile2
-rw-r--r--devel/boehm-gc/Makefile2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/clanlib-devel/Makefile2
-rw-r--r--devel/clint/Makefile2
-rw-r--r--devel/commoncpp/Makefile2
-rw-r--r--devel/cstringbuffer/Makefile2
-rw-r--r--devel/cvsnt/Makefile2
-rw-r--r--devel/cvsutils/Makefile3
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/ddd/Makefile2
-rw-r--r--devel/desktop-file-utils/Makefile2
-rw-r--r--devel/directfb/Makefile2
-rw-r--r--devel/dotconf++/Makefile2
-rw-r--r--devel/e4graph/Makefile2
-rw-r--r--devel/eboxy/Makefile2
-rw-r--r--devel/eet/Makefile2
-rw-r--r--devel/epm/Makefile2
-rw-r--r--devel/erlslang/Makefile2
-rw-r--r--devel/fam/Makefile4
-rw-r--r--devel/ffcall/Makefile2
-rw-r--r--devel/florist/Makefile2
-rw-r--r--devel/g-wrap/Makefile2
-rw-r--r--devel/gamin/Makefile4
-rw-r--r--devel/gaul/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gconfmm26/Makefile2
-rw-r--r--devel/gcvs/Makefile3
-rw-r--r--devel/gengameng/Makefile2
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/glademm/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/gnome-build/Makefile2
-rw-r--r--devel/gnome-crash/Makefile2
-rw-r--r--devel/gnomebuild/Makefile2
-rw-r--r--devel/gnomecrash/Makefile2
-rw-r--r--devel/gnulibiberty/Makefile2
-rw-r--r--devel/gtkmozedit/Makefile2
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/guikachu/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/jakelib2/Makefile2
-rw-r--r--devel/jclassinfo/Makefile2
-rw-r--r--devel/jep/Makefile2
-rw-r--r--devel/judy/Makefile2
-rw-r--r--devel/klassmodeler/Makefile2
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/leoarg/Makefile2
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libPropList/Makefile2
-rw-r--r--devel/libassa/Makefile2
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbegemot/Makefile5
-rw-r--r--devel/libbinio/Makefile2
-rw-r--r--devel/libbnr/Makefile2
-rw-r--r--devel/libbonobo/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libcapsinetwork/Makefile2
-rw-r--r--devel/libconfuse/Makefile2
-rw-r--r--devel/libcwd/Makefile2
-rw-r--r--devel/libdaemon/Makefile2
-rw-r--r--devel/libdsp/Makefile2
-rw-r--r--devel/libevent/Makefile2
-rw-r--r--devel/libffi-devel/Makefile2
-rw-r--r--devel/libffi/Makefile2
-rw-r--r--devel/libfs++/Makefile2
-rw-r--r--devel/libghthash/Makefile2
-rw-r--r--devel/libgii/Makefile2
-rw-r--r--devel/libgiigic/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libglademm24/Makefile2
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libmusclecard/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/liboil/Makefile2
-rw-r--r--devel/libol/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopendaap/Makefile2
-rw-r--r--devel/libopensync/Makefile2
-rw-r--r--devel/libopensync022/Makefile2
-rw-r--r--devel/libpeak/Makefile2
-rw-r--r--devel/libredblack/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/libstatgrab/Makefile2
-rw-r--r--devel/libstrfunc/Makefile2
-rw-r--r--devel/libstroke/Makefile2
-rw-r--r--devel/libtap/Makefile2
-rw-r--r--devel/libtecla/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libukcprog/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/libusb/Makefile2
-rw-r--r--devel/libzt/Makefile2
-rw-r--r--devel/libzvbi/Makefile2
-rw-r--r--devel/log4c/Makefile2
-rw-r--r--devel/log4cplus/Makefile2
-rw-r--r--devel/log4cxx/Makefile4
-rw-r--r--devel/lwp/Makefile2
-rw-r--r--devel/m17n-lib/Makefile2
-rw-r--r--devel/mico/Makefile2
-rw-r--r--devel/mingw-binutils/Makefile2
-rw-r--r--devel/mingw-gcc/Makefile2
-rw-r--r--devel/mingw32-binutils/Makefile2
-rw-r--r--devel/mingw32-gcc/Makefile2
-rw-r--r--devel/mipsel-linux-binutils/Makefile2
-rw-r--r--devel/mipsel-linux-gcc/Makefile2
-rw-r--r--devel/msp430-binutils/Makefile2
-rw-r--r--devel/msp430-gcc/Makefile2
-rw-r--r--devel/msp430-gcc3/Makefile2
-rw-r--r--devel/msp430-gdb/Makefile2
-rw-r--r--devel/ncnf/Makefile2
-rw-r--r--devel/obby/Makefile2
-rw-r--r--devel/ocaml-sdl/Makefile2
-rw-r--r--devel/openzz/Makefile2
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--devel/ossp-al/Makefile2
-rw-r--r--devel/ossp-cfg/Makefile2
-rw-r--r--devel/ossp-ex/Makefile2
-rw-r--r--devel/ossp-l2/Makefile2
-rw-r--r--devel/ossp-val/Makefile2
-rw-r--r--devel/ossp-var/Makefile2
-rw-r--r--devel/ossp-xds/Makefile2
-rw-r--r--devel/pcre++/Makefile2
-rw-r--r--devel/pcre/Makefile2
-rw-r--r--devel/pcsc-lite/Makefile2
-rw-r--r--devel/physfs-devel/Makefile2
-rw-r--r--devel/physfs/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/prepstools/Makefile2
-rw-r--r--devel/privman/Makefile2
-rw-r--r--devel/pwlib/Makefile2
-rw-r--r--devel/pwlib152/Makefile2
-rw-r--r--devel/py-orbit2/Makefile2
-rw-r--r--devel/rapidsvn/Makefile3
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/rpc2/Makefile2
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/rvm/Makefile2
-rw-r--r--devel/sdl12/Makefile2
-rw-r--r--devel/sdlmm/Makefile2
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/shapelib/Makefile2
-rw-r--r--devel/shmap/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--devel/str/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--devel/subversion-devel/Makefile2
-rw-r--r--devel/subversion-freebsd/Makefile2
-rw-r--r--devel/subversion/Makefile2
-rw-r--r--devel/subversion16/Makefile2
-rw-r--r--devel/swig13/Makefile3
-rw-r--r--devel/swig20/Makefile3
-rw-r--r--devel/sysconftool/Makefile4
-rw-r--r--devel/t1lib/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/titano/Makefile2
-rw-r--r--devel/vstr/Makefile2
-rw-r--r--devel/wftk/Makefile2
-rw-r--r--devel/xfc/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--devel/xxl/Makefile2
-rw-r--r--devel/yasm/Makefile3
-rw-r--r--devel/zthread/Makefile2
-rw-r--r--devel/zziplib/Makefile2
-rw-r--r--dns/fastresolve/Makefile3
-rw-r--r--dns/idnkit/Makefile2
-rw-r--r--dns/libidn/Makefile2
-rw-r--r--dns/mydns-ng/Makefile2
-rw-r--r--dns/mydns/Makefile2
-rw-r--r--dns/posadis/Makefile4
-rw-r--r--dns/powerdns-devel/Makefile2
-rw-r--r--dns/powerdns/Makefile2
-rw-r--r--editors/abiword-plugins/Makefile2
-rw-r--r--editors/beaver/Makefile2
-rw-r--r--editors/conglomerate/Makefile2
-rw-r--r--editors/cooledit/Makefile2
-rw-r--r--editors/emacs/Makefile2
-rw-r--r--editors/emacs20-dl/Makefile2
-rw-r--r--editors/emacs20-mule-devel/Makefile2
-rw-r--r--editors/emacs20/Makefile2
-rw-r--r--editors/emacs22/Makefile2
-rw-r--r--editors/emacs23/Makefile2
-rw-r--r--editors/ghex/Makefile2
-rw-r--r--editors/gnotepad+/Makefile2
-rw-r--r--editors/gphpedit/Makefile2
-rw-r--r--editors/lpe/Makefile2
-rw-r--r--editors/mlview/Makefile3
-rw-r--r--editors/openoffice.org-1.0/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/xmleditor/Makefile2
-rw-r--r--emulators/gnuboy/Makefile2
-rw-r--r--emulators/lib765/Makefile2
-rw-r--r--emulators/libspectrum/Makefile2
-rw-r--r--emulators/libvm68k/Makefile2
-rw-r--r--emulators/mupen64-sdlinput/Makefile2
-rw-r--r--emulators/twin/Makefile2
-rw-r--r--emulators/uae/Makefile2
-rw-r--r--emulators/visualos/Makefile2
-rw-r--r--emulators/vx68k/Makefile2
-rw-r--r--emulators/xsystem35/Makefile3
-rw-r--r--finance/aqbanking/Makefile2
-rw-r--r--finance/emma/Makefile2
-rw-r--r--finance/gnofin/Makefile2
-rw-r--r--finance/khacc/Makefile3
-rw-r--r--finance/kmymoney-kde4/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--french/dico/Makefile3
-rw-r--r--french/med/Makefile2
-rw-r--r--ftp/gwget/Makefile2
-rw-r--r--ftp/moftpd/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/asc/Makefile2
-rw-r--r--games/atr3d/Makefile3
-rw-r--r--games/bomberinstinct/Makefile2
-rw-r--r--games/bombermaze/Makefile2
-rw-r--r--games/bzflag/Makefile2
-rw-r--r--games/cgoban/Makefile2
-rw-r--r--games/deng/Makefile2
-rw-r--r--games/ember/Makefile2
-rw-r--r--games/etuxracer/Makefile3
-rw-r--r--games/euchre/Makefile3
-rw-r--r--games/freecell-solver/Makefile2
-rw-r--r--games/gcompris2/Makefile2
-rw-r--r--games/ggz-client-libs/Makefile2
-rw-r--r--games/glchess/Makefile3
-rw-r--r--games/glife/Makefile2
-rw-r--r--games/gno3dtet/Makefile2
-rw-r--r--games/gnome-music-quiz/Makefile2
-rw-r--r--games/gnomememoryblocks/Makefile2
-rw-r--r--games/gracer/Makefile2
-rw-r--r--games/gtkatlantic/Makefile2
-rw-r--r--games/gturing/Makefile2
-rw-r--r--games/libggz/Makefile2
-rw-r--r--games/libmaitretarot/Makefile2
-rw-r--r--games/libmt_client/Makefile2
-rw-r--r--games/monkeybubble/Makefile2
-rw-r--r--games/moon-buggy/Makefile2
-rw-r--r--games/pinball/Makefile2
-rw-r--r--games/pioneers/Makefile2
-rw-r--r--games/quake2forge/Makefile3
-rw-r--r--games/quakeforge/Makefile2
-rw-r--r--games/scorched3d/Makefile3
-rw-r--r--games/teg/Makefile2
-rw-r--r--games/thevalley/Makefile2
-rw-r--r--games/tractorgen/Makefile2
-rw-r--r--games/tuxracer/Makefile3
-rw-r--r--games/tuxtype/Makefile3
-rw-r--r--games/vamos/Makefile2
-rw-r--r--games/xfce4-toys/Makefile2
-rw-r--r--games/xinvaders/Makefile3
-rw-r--r--games/xpuyopuyo/Makefile2
-rw-r--r--games/xracer/Makefile3
-rw-r--r--games/zangband/Makefile3
-rw-r--r--german/ksteak/Makefile2
-rw-r--r--graphics/Coin/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/Makefile3
-rw-r--r--graphics/OpenEXR/Makefile2
-rw-r--r--graphics/aalib/Makefile2
-rw-r--r--graphics/allegrogl/Makefile2
-rw-r--r--graphics/autotrace/Makefile2
-rw-r--r--graphics/bugle/Makefile2
-rw-r--r--graphics/cal3d-devel/Makefile4
-rw-r--r--graphics/cal3d/Makefile4
-rw-r--r--graphics/cegui/Makefile2
-rw-r--r--graphics/cegui04/Makefile2
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/corona/Makefile2
-rw-r--r--graphics/demeter/Makefile4
-rw-r--r--graphics/devil/Makefile2
-rw-r--r--graphics/dia/Makefile2
-rw-r--r--graphics/diacanvas2/Makefile2
-rw-r--r--graphics/divxcalc/Makefile3
-rw-r--r--graphics/djvulibre/Makefile3
-rw-r--r--graphics/edje/Makefile2
-rw-r--r--graphics/electriceyes/Makefile2
-rw-r--r--graphics/enfle/Makefile2
-rw-r--r--graphics/entice/Makefile2
-rw-r--r--graphics/epeg/Makefile2
-rw-r--r--graphics/epsilon/Makefile2
-rw-r--r--graphics/esmart/Makefile3
-rw-r--r--graphics/evas/Makefile2
-rw-r--r--graphics/exif/Makefile2
-rw-r--r--graphics/exiv2/Makefile2
-rw-r--r--graphics/exrtools/Makefile2
-rw-r--r--graphics/f-spot/Makefile2
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/freeglut/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/gimp/Makefile2
-rw-r--r--graphics/gimp1/Makefile2
-rw-r--r--graphics/gimpshop/Makefile2
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gle/Makefile2
-rw-r--r--graphics/glide3/Makefile4
-rw-r--r--graphics/gltt/Makefile2
-rw-r--r--graphics/gnomeiconedit/Makefile2
-rw-r--r--graphics/goom/Makefile2
-rw-r--r--graphics/gpdf/Makefile2
-rw-r--r--graphics/gthumb/Makefile2
-rw-r--r--graphics/gtkcairo/Makefile2
-rw-r--r--graphics/gtkdps/Makefile2
-rw-r--r--graphics/guilib/Makefile2
-rw-r--r--graphics/imlib/Makefile2
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/imlib2_loaders/Makefile2
-rw-r--r--graphics/inkscape/Makefile2
-rw-r--r--graphics/jasper/Makefile2
-rw-r--r--graphics/jpeg-mmx/Makefile2
-rw-r--r--graphics/jpeg/Makefile2
-rw-r--r--graphics/k3d/Makefile2
-rw-r--r--graphics/kludge3d/Makefile2
-rw-r--r--graphics/lcms/Makefile2
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--graphics/libflash/Makefile2
-rw-r--r--graphics/libgdgeda/Makefile2
-rw-r--r--graphics/libggi/Makefile2
-rw-r--r--graphics/libggigcp/Makefile2
-rw-r--r--graphics/libggimisc/Makefile2
-rw-r--r--graphics/libggiwmh/Makefile2
-rw-r--r--graphics/libgnomecanvasmm/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile2
-rw-r--r--graphics/libgrass5/Makefile2
-rw-r--r--graphics/libmorph/Makefile2
-rw-r--r--graphics/librsvg/Makefile2
-rw-r--r--graphics/libungif/Makefile2
-rw-r--r--graphics/libvisual-plugins/Makefile2
-rw-r--r--graphics/libvisual/Makefile2
-rw-r--r--graphics/libvisual04/Makefile2
-rw-r--r--graphics/lodju/Makefile2
-rw-r--r--graphics/mesagl/Makefile2
-rw-r--r--graphics/nip2/Makefile2
-rw-r--r--graphics/nurbs++/Makefile2
-rw-r--r--graphics/ogre312/Makefile2
-rw-r--r--graphics/ogre3d/Makefile2
-rw-r--r--graphics/ogre3d12/Makefile2
-rw-r--r--graphics/paintlib/Makefile2
-rw-r--r--graphics/passepartout/Makefile2
-rw-r--r--graphics/pixie/Makefile4
-rw-r--r--graphics/pixieplus/Makefile2
-rw-r--r--graphics/plotutils/Makefile2
-rw-r--r--graphics/povray/Makefile2
-rw-r--r--graphics/povray36/Makefile2
-rw-r--r--graphics/povray37/Makefile2
-rw-r--r--graphics/proj/Makefile2
-rw-r--r--graphics/pstoedit/Makefile2
-rw-r--r--graphics/py-visual/Makefile2
-rw-r--r--graphics/qglviewer/Makefile2
-rw-r--r--graphics/qtutils/Makefile2
-rw-r--r--graphics/quesa/Makefile2
-rw-r--r--graphics/sage/Makefile2
-rw-r--r--graphics/sane-backends/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/simage/Makefile2
-rw-r--r--graphics/sodipodi/Makefile2
-rw-r--r--graphics/sswf/Makefile2
-rw-r--r--graphics/utah-glx/Makefile2
-rw-r--r--graphics/view3ds/Makefile2
-rw-r--r--graphics/vips/Makefile2
-rw-r--r--graphics/vp/Makefile2
-rw-r--r--graphics/xmedcon/Makefile2
-rw-r--r--graphics/xmms-iris/Makefile2
-rw-r--r--graphics/xmms-nebulus/Makefile2
-rw-r--r--graphics/xmms-plazma/Makefile2
-rw-r--r--graphics/xmms-scivi/Makefile2
-rw-r--r--graphics/xmms-vumeter/Makefile2
-rw-r--r--graphics/xmms-waterfall/Makefile2
-rw-r--r--graphics/xmorph/Makefile2
-rw-r--r--graphics/xpdf/Makefile2
-rw-r--r--graphics/yafaray/Makefile2
-rw-r--r--graphics/yafray/Makefile2
-rw-r--r--hebrew/he2/Makefile2
-rw-r--r--irc/bitchx/Makefile2
-rw-r--r--irc/dancer-services/Makefile3
-rw-r--r--irc/irssi-devel/Makefile2
-rw-r--r--irc/kvirc-devel/Makefile2
-rw-r--r--irc/kvirc/Makefile2
-rw-r--r--irc/olirc/Makefile2
-rw-r--r--irc/xchat-gnome/Makefile2
-rw-r--r--irc/xchat2/Makefile2
-rw-r--r--japanese/FreeWnn-lib/Makefile3
-rw-r--r--japanese/anthy/Makefile2
-rw-r--r--japanese/aterm/Makefile2
-rw-r--r--japanese/balsa/Makefile2
-rw-r--r--japanese/celrw/Makefile2
-rw-r--r--japanese/dvipdfm/Makefile2
-rw-r--r--japanese/eb/Makefile2
-rw-r--r--japanese/eb3/Makefile2
-rw-r--r--japanese/ebview/Makefile2
-rw-r--r--japanese/emacs-emcws/Makefile2
-rw-r--r--japanese/emacs20-dl-canna/Makefile2
-rw-r--r--japanese/emacs20-dl-wnn6/Makefile3
-rw-r--r--japanese/emacs20-emcws/Makefile2
-rw-r--r--japanese/epic4/Makefile2
-rw-r--r--japanese/esecanna-module-vje25/Makefile2
-rw-r--r--japanese/esecanna-module-vje30/Makefile2
-rw-r--r--japanese/esecanna-module-wnn6/Makefile2
-rw-r--r--japanese/esecanna/Makefile2
-rw-r--r--japanese/expect/Makefile2
-rw-r--r--japanese/iiimf-le-canna/Makefile4
-rw-r--r--japanese/iiimf-le-freewnn/Makefile4
-rw-r--r--japanese/im-ja/Makefile2
-rw-r--r--japanese/ipadic/Makefile2
-rw-r--r--japanese/less/Makefile2
-rw-r--r--japanese/libicq/Makefile2
-rw-r--r--japanese/mecab-razil/Makefile2
-rw-r--r--japanese/mecab/Makefile2
-rw-r--r--japanese/mell/Makefile3
-rw-r--r--japanese/migemo/Makefile3
-rw-r--r--japanese/mutt-devel/Makefile3
-rw-r--r--japanese/mutt/Makefile3
-rw-r--r--japanese/prime-dict/Makefile3
-rw-r--r--japanese/prime-el/Makefile3
-rw-r--r--japanese/prime/Makefile3
-rw-r--r--japanese/rskkserv/Makefile2
-rw-r--r--japanese/samba/Makefile2
-rw-r--r--japanese/scim-anthy/Makefile2
-rw-r--r--japanese/scim-canna/Makefile2
-rw-r--r--japanese/scim-prime/Makefile2
-rw-r--r--japanese/scim-skk/Makefile2
-rw-r--r--japanese/scim-uim/Makefile2
-rw-r--r--japanese/suikyo/Makefile3
-rw-r--r--japanese/tcl76/Makefile2
-rw-r--r--japanese/tcl80/Makefile2
-rw-r--r--japanese/tk42/Makefile2
-rw-r--r--japanese/tk80/Makefile2
-rw-r--r--japanese/tkstep80/Makefile2
-rw-r--r--japanese/uim/Makefile2
-rw-r--r--japanese/vflib/Makefile2
-rw-r--r--japanese/xyaku/Makefile3
-rw-r--r--java/classpath/Makefile2
-rw-r--r--java/jc/Makefile2
-rw-r--r--java/jmp/Makefile2
-rw-r--r--java/kaffe/Makefile2
-rw-r--r--java/sablevm/Makefile4
-rw-r--r--korean/bitchx/Makefile2
-rw-r--r--korean/eterm/Makefile2
-rw-r--r--korean/iiimf-le-hangul/Makefile4
-rw-r--r--korean/scim-hangul/Makefile2
-rw-r--r--lang/ccscript/Makefile2
-rw-r--r--lang/chicken/Makefile2
-rw-r--r--lang/cim/Makefile2
-rw-r--r--lang/clips/Makefile2
-rw-r--r--lang/dylan/Makefile2
-rw-r--r--lang/ecl/Makefile2
-rw-r--r--lang/elk/Makefile2
-rw-r--r--lang/emacs-lisp-intro/Makefile2
-rw-r--r--lang/embryo/Makefile2
-rw-r--r--lang/ferite/Makefile2
-rw-r--r--lang/forth/Makefile2
-rw-r--r--lang/gambas/Makefile3
-rw-r--r--lang/gcl/Makefile2
-rw-r--r--lang/ghc/Makefile2
-rw-r--r--lang/glade-gpl/Makefile3
-rw-r--r--lang/gnat-glade/Makefile3
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--lang/gprolog/Makefile2
-rw-r--r--lang/guile/Makefile2
-rw-r--r--lang/libjit/Makefile2
-rw-r--r--lang/libutils/Makefile2
-rw-r--r--lang/ml-pnet/Makefile2
-rw-r--r--lang/mono/Makefile2
-rw-r--r--lang/mozart/Makefile2
-rw-r--r--lang/njs/Makefile2
-rw-r--r--lang/oo2c/Makefile2
-rw-r--r--lang/open-cobol-devel/Makefile3
-rw-r--r--lang/open-cobol/Makefile3
-rw-r--r--lang/osb-jscore/Makefile2
-rw-r--r--lang/otcl/Makefile2
-rw-r--r--lang/pfe-devel/Makefile2
-rw-r--r--lang/pfe/Makefile2
-rw-r--r--lang/php4/Makefile.ext2
-rw-r--r--lang/php5/Makefile.ext2
-rw-r--r--lang/php53/Makefile.ext2
-rw-r--r--lang/pnet-base/Makefile2
-rw-r--r--lang/pnetc/Makefile2
-rw-r--r--lang/pnetlib/Makefile2
-rw-r--r--lang/sdcc-devel/Makefile2
-rw-r--r--lang/sdcc/Makefile3
-rw-r--r--lang/see-devel/Makefile2
-rw-r--r--lang/tensile/Makefile3
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/crashecho/Makefile2
-rw-r--r--mail/cyrus-imapd22/Makefile3
-rw-r--r--mail/cyrus-imapd23/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/dspam-devel/Makefile2
-rw-r--r--mail/dspam/Makefile2
-rw-r--r--mail/evolution-sharp/Makefile2
-rw-r--r--mail/gmime/Makefile2
-rw-r--r--mail/gmime2/Makefile2
-rw-r--r--mail/jamlib/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--mail/libnewmail/Makefile3
-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/libvmime/Makefile2
-rw-r--r--mail/mail-notification/Makefile2
-rw-r--r--mail/mutt-devel/Makefile3
-rw-r--r--mail/mutt/Makefile3
-rw-r--r--mail/mutt14/Makefile3
-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-devel/Makefile3
-rw-r--r--mail/postfix-gps/Makefile3
-rw-r--r--mail/qpopper/Makefile2
-rw-r--r--mail/quickml/Makefile2
-rw-r--r--mail/rabl_client/Makefile2
-rw-r--r--mail/rabl_server/Makefile2
-rw-r--r--mail/sccmilter/Makefile2
-rw-r--r--mail/sqwebmail/Makefile2
-rw-r--r--mail/sylpheed/Makefile2
-rw-r--r--mail/sylpheed2-devel/Makefile2
-rw-r--r--mail/sylpheed2/Makefile2
-rw-r--r--mail/sylpheed3/Makefile2
-rw-r--r--mail/xfmail/Makefile2
-rw-r--r--math/asir2000/Makefile3
-rw-r--r--math/blitz++/Makefile2
-rw-r--r--math/fftw/Makefile2
-rw-r--r--math/fftw3/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/geg/Makefile3
-rw-r--r--math/gmp/Makefile2
-rw-r--r--math/gnuplot+/Makefile2
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/gsl/Makefile2
-rw-r--r--math/koctave/Makefile2
-rw-r--r--math/libgmp4/Makefile2
-rw-r--r--math/libmath++/Makefile2
-rw-r--r--math/libneural/Makefile2
-rw-r--r--math/libqalculate/Makefile2
-rw-r--r--math/maxima/Makefile3
-rw-r--r--math/mpfr/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/qalculate/Makefile2
-rw-r--r--math/qhull/Makefile2
-rw-r--r--math/qhull5/Makefile2
-rw-r--r--math/spar/Makefile2
-rw-r--r--mbone/rat/Makefile2
-rw-r--r--mbone/rtpmon/Makefile2
-rw-r--r--mbone/vat/Makefile2
-rw-r--r--mbone/vic/Makefile2
-rw-r--r--misc/afbackup/Makefile3
-rw-r--r--misc/amanda-server/Makefile2
-rw-r--r--misc/amanda25-server/Makefile2
-rw-r--r--misc/amanda26-server/Makefile2
-rw-r--r--misc/amanda32-server/Makefile2
-rw-r--r--misc/demoniac/Makefile2
-rw-r--r--misc/edonkey-tool-hash/Makefile2
-rw-r--r--misc/gtl/Makefile2
-rw-r--r--misc/libhome/Makefile2
-rw-r--r--misc/libmcal/Makefile3
-rw-r--r--misc/misterproper/Makefile2
-rw-r--r--misc/ossp-uuid/Makefile2
-rw-r--r--misc/pointless/Makefile2
-rw-r--r--misc/pybliographer/Makefile2
-rw-r--r--misc/skyutils/Makefile3
-rw-r--r--misc/talkfilters/Makefile2
-rw-r--r--misc/xfce4-iconbox/Makefile2
-rw-r--r--misc/xfce4-weather-plugin/Makefile2
-rw-r--r--multimedia/avidemux2/Makefile6
-rw-r--r--multimedia/avifile/Makefile2
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/bmp-extra-plugins/Makefile2
-rw-r--r--multimedia/camserv/Makefile3
-rw-r--r--multimedia/dvdstyler/Makefile2
-rw-r--r--multimedia/dvts/Makefile2
-rw-r--r--multimedia/gaim-xmms-remote/Makefile2
-rw-r--r--multimedia/gavl/Makefile2
-rw-r--r--multimedia/gnonlin/Makefile2
-rw-r--r--multimedia/gstreamer-editor/Makefile2
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile2
-rw-r--r--multimedia/gstreamer-ffmpeg80/Makefile2
-rw-r--r--multimedia/gstreamer-pitfdll/Makefile2
-rw-r--r--multimedia/gstreamer-plugins-gnonlin/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile2
-rw-r--r--multimedia/gstreamer/Makefile2
-rw-r--r--multimedia/gstreamer80/Makefile2
-rw-r--r--multimedia/gxmms/Makefile2
-rw-r--r--multimedia/istanbul/Makefile2
-rw-r--r--multimedia/kaffeine/Makefile2
-rw-r--r--multimedia/libdivxdecore/Makefile2
-rw-r--r--multimedia/libdv/Makefile2
-rw-r--r--multimedia/libdvbpsi/Makefile2
-rw-r--r--multimedia/libdvdcss/Makefile2
-rw-r--r--multimedia/libdvdnav/Makefile2
-rw-r--r--multimedia/libdvdread/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/libxine/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mp4v2/Makefile2
-rw-r--r--multimedia/mpeg4ip-libmp4v2/Makefile2
-rw-r--r--multimedia/mpeg4ip/Makefile2
-rw-r--r--multimedia/ogmrip/Makefile2
-rw-r--r--multimedia/okle/Makefile2
-rw-r--r--multimedia/pitivi/Makefile2
-rw-r--r--multimedia/py-gstreamer/Makefile2
-rw-r--r--multimedia/py-gstreamer80/Makefile2
-rw-r--r--multimedia/slideshow/Makefile2
-rw-r--r--multimedia/smpeg-xmms/Makefile2
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/vcdimager/Makefile2
-rw-r--r--multimedia/vic/Makefile2
-rw-r--r--multimedia/xdvshow/Makefile2
-rw-r--r--multimedia/xfce4-media/Makefile2
-rw-r--r--multimedia/xfce4-xmms-controller-plugin/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--multimedia/xmms-avi/Makefile2
-rw-r--r--multimedia/xmms-status-plugin/Makefile2
-rw-r--r--multimedia/xmms-weasel/Makefile2
-rw-r--r--multimedia/xmps-opendivx-plugin/Makefile2
-rw-r--r--multimedia/xmps-win32-plugin/Makefile2
-rw-r--r--multimedia/xmps/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/fugu/Makefile2
-rw-r--r--net-im/gaim-bangexec/Makefile2
-rw-r--r--net-im/gaim-guifications/Makefile2
-rw-r--r--net-im/gaim-ignorance/Makefile2
-rw-r--r--net-im/gaim-openq/Makefile2
-rw-r--r--net-im/gaim-rss-reader/Makefile2
-rw-r--r--net-im/gaim/Makefile2
-rw-r--r--net-im/gnomeicu/Makefile2
-rw-r--r--net-im/gnomeicu2/Makefile2
-rw-r--r--net-im/gossip/Makefile2
-rw-r--r--net-im/ickle/Makefile2
-rw-r--r--net-im/icqlib/Makefile2
-rw-r--r--net-im/jabber-aim/Makefile2
-rw-r--r--net-im/kf/Makefile2
-rw-r--r--net-im/libicq/Makefile2
-rw-r--r--net-im/libicq2000/Makefile2
-rw-r--r--net-im/libmsn/Makefile2
-rw-r--r--net-im/libyahoo2/Makefile2
-rw-r--r--net-im/licq-console/Makefile2
-rw-r--r--net-im/licq-osd/Makefile2
-rw-r--r--net-im/loudmouth/Makefile2
-rw-r--r--net-im/meanwhile-gaim/Makefile2
-rw-r--r--net-im/meanwhile/Makefile2
-rw-r--r--net-im/pidgin-guifications/Makefile2
-rw-r--r--net-mgmt/NeTraMet/Makefile2
-rw-r--r--net-mgmt/arts++/Makefile2
-rw-r--r--net-mgmt/bsnmpd/Makefile3
-rw-r--r--net-mgmt/cflowd/Makefile2
-rw-r--r--net-mgmt/etherape/Makefile2
-rw-r--r--net-mgmt/ettercap/Makefile3
-rw-r--r--net-mgmt/ipv6calc/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/Makefile3
-rw-r--r--net-mgmt/nagios-snmp-plugins/Makefile4
-rw-r--r--net-mgmt/nagios/Makefile2
-rw-r--r--net-mgmt/nagios2/Makefile2
-rw-r--r--net-mgmt/nefu/Makefile2
-rw-r--r--net-mgmt/net-snmp-devel/Makefile3
-rw-r--r--net-mgmt/net-snmp/Makefile3
-rw-r--r--net-mgmt/net-snmp4/Makefile3
-rw-r--r--net-mgmt/net-snmp53/Makefile3
-rw-r--r--net-mgmt/netsaint-plugins/Makefile3
-rw-r--r--net-mgmt/pixilate/Makefile3
-rw-r--r--net-mgmt/py-yapsnmp/Makefile2
-rw-r--r--net-p2p/apollon/Makefile2
-rw-r--r--net-p2p/cdonkey/Makefile2
-rw-r--r--net-p2p/dcd/Makefile2
-rw-r--r--net-p2p/dclib/Makefile2
-rw-r--r--net-p2p/edonkey-tool-hash/Makefile2
-rw-r--r--net-p2p/fcptools/Makefile2
-rw-r--r--net-p2p/gift/Makefile2
-rw-r--r--net-p2p/gkrellm-gift/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile3
-rw-r--r--net-p2p/libfreenet/Makefile2
-rw-r--r--net-p2p/libtorrent/Makefile2
-rw-r--r--net-p2p/mldonkey-devel/Makefile2
-rw-r--r--net-p2p/mldonkey/Makefile2
-rw-r--r--net-p2p/rtorrent/Makefile2
-rw-r--r--net-p2p/verlihub-plugins/Makefile2
-rw-r--r--net-p2p/verlihub/Makefile2
-rw-r--r--net/6tunnel/Makefile2
-rw-r--r--net/apollon/Makefile2
-rw-r--r--net/arla/Makefile2
-rw-r--r--net/atmsupport/Makefile2
-rw-r--r--net/beacon/Makefile2
-rw-r--r--net/blam/Makefile2
-rw-r--r--net/boinc-client/Makefile5
-rw-r--r--net/cdonkey/Makefile2
-rw-r--r--net/crescendo/Makefile2
-rw-r--r--net/cyphesis/Makefile2
-rw-r--r--net/dcd/Makefile2
-rw-r--r--net/dclib/Makefile2
-rw-r--r--net/dhcp-agent/Makefile2
-rw-r--r--net/dictd/Makefile2
-rw-r--r--net/dosdetector/Makefile2
-rw-r--r--net/ethereal/Makefile2
-rw-r--r--net/fcptools/Makefile2
-rw-r--r--net/freeradius/Makefile3
-rw-r--r--net/freeradius2/Makefile3
-rw-r--r--net/gatekeeper/Makefile2
-rw-r--r--net/gift/Makefile2
-rw-r--r--net/gkrellm-gift/Makefile2
-rw-r--r--net/gmdns/Makefile2
-rw-r--r--net/gnet-glib2/Makefile2
-rw-r--r--net/gnet/Makefile2
-rw-r--r--net/gnet2/Makefile2
-rw-r--r--net/gnoemoe/Makefile2
-rw-r--r--net/gnometelnet/Makefile3
-rw-r--r--net/gnu-radius/Makefile3
-rw-r--r--net/gnunet/Makefile3
-rw-r--r--net/gsk/Makefile2
-rw-r--r--net/howl/Makefile2
-rw-r--r--net/libdnet/Makefile2
-rw-r--r--net/libfreenet/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libmms/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/libosip2/Makefile2
-rw-r--r--net/libpcapnav/Makefile2
-rw-r--r--net/libsocket++/Makefile4
-rw-r--r--net/libtorrent/Makefile2
-rw-r--r--net/liferea/Makefile2
-rw-r--r--net/linc/Makefile2
-rw-r--r--net/linphone-base/Makefile2
-rw-r--r--net/mldonkey-devel/Makefile2
-rw-r--r--net/mldonkey/Makefile2
-rw-r--r--net/mrt/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netdude/Makefile3
-rw-r--r--net/netspeed_applet/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/opal3/Makefile2
-rw-r--r--net/openh323-112/Makefile2
-rw-r--r--net/openh323/Makefile2
-rw-r--r--net/openldap22-server/Makefile3
-rw-r--r--net/openldap23-server/Makefile4
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/openmpi/Makefile2
-rw-r--r--net/openslp/Makefile2
-rw-r--r--net/ortp/Makefile2
-rw-r--r--net/ossp-sa/Makefile2
-rw-r--r--net/ppxp/Makefile2
-rw-r--r--net/proxy-suite/Makefile2
-rw-r--r--net/proxychains/Makefile3
-rw-r--r--net/pvm++/Makefile2
-rw-r--r--net/quagga/Makefile2
-rw-r--r--net/rrdtool/Makefile2
-rw-r--r--net/rrdtool10/Makefile2
-rw-r--r--net/rtorrent/Makefile2
-rw-r--r--net/samba/Makefile3
-rw-r--r--net/samba3/Makefile3
-rw-r--r--net/sdl_net/Makefile2
-rw-r--r--net/serveez/Makefile2
-rw-r--r--net/tcpdump/Makefile2
-rw-r--r--net/tn5250/Makefile2
-rw-r--r--net/tramp/Makefile2
-rw-r--r--net/unfs3/Makefile2
-rw-r--r--net/verlihub-plugins/Makefile2
-rw-r--r--net/verlihub/Makefile2
-rw-r--r--net/vtun/Makefile2
-rw-r--r--net/wireshark/Makefile2
-rw-r--r--net/xmlrpc-c-devel/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
-rw-r--r--news/grn/Makefile2
-rw-r--r--news/newscache/Makefile4
-rw-r--r--news/nntpcache/Makefile2
-rw-r--r--palm/gnome-pilot-conduits/Makefile2
-rw-r--r--palm/gnome-pilot/Makefile2
-rw-r--r--palm/gnomepilot-conduits2/Makefile2
-rw-r--r--palm/gnomepilot2/Makefile2
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--palm/libmal/Makefile2
-rw-r--r--palm/pilot-link-devel/Makefile2
-rw-r--r--palm/pilot-link/Makefile2
-rw-r--r--palm/prc-tools/Makefile2
-rw-r--r--palm/synce-gnomevfs/Makefile2
-rw-r--r--palm/synce-gvfs/Makefile2
-rw-r--r--palm/synce-kde/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--palm/synce-multisync/Makefile2
-rw-r--r--palm/synce-rra/Makefile2
-rw-r--r--polish/gnugadu2/Makefile2
-rw-r--r--print/cjk-lyx/Makefile2
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/foomatic-db/Makefile3
-rw-r--r--print/freetype-tools/Makefile2
-rw-r--r--print/freetype/Makefile2
-rw-r--r--print/freetype2/Makefile2
-rw-r--r--print/gimp-print/Makefile2
-rw-r--r--print/gnome-cups-manager/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnomephotoprinter/Makefile2
-rw-r--r--print/gnomeprint/Makefile2
-rw-r--r--print/gutenprint-base/Makefile2
-rw-r--r--print/gutenprint/Makefile2
-rw-r--r--print/libgnomecups/Makefile2
-rw-r--r--print/libgnomeprintmm/Makefile2
-rw-r--r--print/libijs/Makefile2
-rw-r--r--print/libotf/Makefile2
-rw-r--r--print/libpaper/Makefile2
-rw-r--r--print/libppd/Makefile2
-rw-r--r--print/panda/Makefile2
-rw-r--r--print/pdflib/Makefile2
-rw-r--r--print/pslib/Makefile2
-rw-r--r--print/scribus-devel/Makefile2
-rw-r--r--print/scribus/Makefile2
-rw-r--r--print/teTeX-base/Makefile2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--science/buddy/Makefile2
-rw-r--r--science/chemtool-devel/Makefile2
-rw-r--r--science/chemtool/Makefile2
-rw-r--r--science/flounder/Makefile2
-rw-r--r--science/gchempaint/Makefile2
-rw-r--r--science/gchemutils/Makefile2
-rw-r--r--science/ghemical/Makefile2
-rw-r--r--science/gromacs/Makefile2
-rw-r--r--science/hdf5-18/Makefile2
-rw-r--r--science/hdf5/Makefile2
-rw-r--r--science/mbdyn/Makefile2
-rw-r--r--science/mpqc/Makefile2
-rw-r--r--science/openbabel/Makefile2
-rw-r--r--science/psi3/Makefile2
-rw-r--r--security/barnyard/Makefile3
-rw-r--r--security/beecrypt/Makefile2
-rw-r--r--security/bjorb/Makefile2
-rw-r--r--security/borzoi/Makefile2
-rw-r--r--security/clamav-devel/Makefile4
-rw-r--r--security/clamav/Makefile2
-rw-r--r--security/courier-authlib/Makefile3
-rw-r--r--security/courierpassd/Makefile2
-rw-r--r--security/cryptplug/Makefile2
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/dirmngr/Makefile2
-rw-r--r--security/distcache-devel/Makefile2
-rw-r--r--security/distcache/Makefile2
-rw-r--r--security/fakeroot/Makefile2
-rw-r--r--security/gaim-encryption/Makefile2
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/gnomekeyring/Makefile2
-rw-r--r--security/gnutls/Makefile2
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme03/Makefile3
-rw-r--r--security/gss/Makefile2
-rw-r--r--security/gtkpasman/Makefile3
-rw-r--r--security/ipsec-tools/Makefile2
-rw-r--r--security/krb5-16/Makefile2
-rw-r--r--security/krb5-17/Makefile2
-rw-r--r--security/krb5-appl/Makefile2
-rw-r--r--security/krb5/Makefile2
-rw-r--r--security/libgcrypt/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/libksba/Makefile2
-rw-r--r--security/libmcrypt/Makefile2
-rw-r--r--security/libntlm/Makefile2
-rw-r--r--security/libotr/Makefile3
-rw-r--r--security/libtasn1/Makefile2
-rw-r--r--security/mcrypt/Makefile2
-rw-r--r--security/mhash/Makefile2
-rw-r--r--security/ncrypt/Makefile4
-rw-r--r--security/nessus-devel/Makefile2
-rw-r--r--security/nessus-libnasl-devel/Makefile2
-rw-r--r--security/nessus-libnasl/Makefile2
-rw-r--r--security/nessus-libraries-devel/Makefile3
-rw-r--r--security/nessus-libraries/Makefile2
-rw-r--r--security/nessus/Makefile2
-rw-r--r--security/newpki-client/Makefile2
-rw-r--r--security/newpki-lib/Makefile4
-rw-r--r--security/newpki-server/Makefile2
-rw-r--r--security/opencdk/Makefile2
-rw-r--r--security/openct/Makefile3
-rw-r--r--security/opensc/Makefile2
-rw-r--r--security/openscep/Makefile2
-rw-r--r--security/osiris/Makefile2
-rw-r--r--security/pidgin-encryption/Makefile2
-rw-r--r--security/pinentry/Makefile2
-rw-r--r--security/poc/Makefile3
-rw-r--r--security/prelude-nids/Makefile2
-rw-r--r--security/racoon2/Makefile2
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--security/sfs/Makefile2
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/srm/Makefile2
-rw-r--r--security/ssh/Makefile2
-rw-r--r--security/steghide/Makefile2
-rw-r--r--security/stunnel/Makefile2
-rw-r--r--security/xmlsec/Makefile2
-rw-r--r--security/xmlsec1/Makefile2
-rw-r--r--sysutils/LPRng/Makefile2
-rw-r--r--sysutils/am-utils/Makefile2
-rw-r--r--sysutils/apachetop/Makefile2
-rw-r--r--sysutils/coaster/Makefile2
-rw-r--r--sysutils/dar/Makefile2
-rw-r--r--sysutils/file/Makefile2
-rw-r--r--sysutils/freeipmi/Makefile2
-rw-r--r--sysutils/fusefs-libs/Makefile2
-rw-r--r--sysutils/gfslicer/Makefile2
-rw-r--r--sysutils/gksu/Makefile2
-rw-r--r--sysutils/gnome-pkgview/Makefile2
-rw-r--r--sysutils/gnomebaker/Makefile2
-rw-r--r--sysutils/gnomesu/Makefile2
-rw-r--r--sysutils/gpkgdep/Makefile3
-rw-r--r--sysutils/grub/Makefile3
-rw-r--r--sysutils/hdup/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile2
-rw-r--r--sysutils/heartbeat2/Makefile2
-rw-r--r--sysutils/k3b-kde4/Makefile2
-rw-r--r--sysutils/k3b/Makefile2
-rw-r--r--sysutils/kcube/Makefile2
-rw-r--r--sysutils/libcdio/Makefile2
-rw-r--r--sysutils/libgksu/Makefile2
-rw-r--r--sysutils/libgksuui/Makefile2
-rw-r--r--sysutils/libieee1284/Makefile2
-rw-r--r--sysutils/lineak-defaultplugin/Makefile2
-rw-r--r--sysutils/lineak-kdeplugins/Makefile2
-rw-r--r--sysutils/lineak-xosdplugin/Makefile2
-rw-r--r--sysutils/lineak_defaultplugin/Makefile2
-rw-r--r--sysutils/lineak_kdeplugins/Makefile2
-rw-r--r--sysutils/lineak_xosdplugin/Makefile2
-rw-r--r--sysutils/lineakd/Makefile2
-rw-r--r--sysutils/ntfsprogs/Makefile2
-rw-r--r--sysutils/nvtv/Makefile2
-rw-r--r--sysutils/progsreiserfs/Makefile2
-rw-r--r--sysutils/sjog/Makefile3
-rw-r--r--sysutils/uptimed/Makefile2
-rw-r--r--sysutils/wmupmon/Makefile3
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile2
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile2
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile2
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-showdesktop-plugin/Makefile2
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-utils/Makefile2
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile2
-rw-r--r--sysutils/xfsprogs/Makefile3
-rw-r--r--sysutils/zisofs-tools/Makefile2
-rw-r--r--textproc/aiksaurus/Makefile2
-rw-r--r--textproc/aspell/Makefile2
-rw-r--r--textproc/c2html/Makefile2
-rw-r--r--textproc/cole/Makefile2
-rw-r--r--textproc/dict/Makefile2
-rw-r--r--textproc/enchant/Makefile2
-rw-r--r--textproc/expat2/Makefile2
-rw-r--r--textproc/gdome2/Makefile2
-rw-r--r--textproc/gnome-spell/Makefile2
-rw-r--r--textproc/gnomespell/Makefile2
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/gtkspell2/Makefile2
-rw-r--r--textproc/htdig/Makefile2
-rw-r--r--textproc/iiimf-client-lib/Makefile4
-rw-r--r--textproc/iiimf-csconv/Makefile4
-rw-r--r--textproc/iiimf-gnome-im-switcher/Makefile4
-rw-r--r--textproc/iiimf-gtk/Makefile4
-rw-r--r--textproc/iiimf-le-unit/Makefile4
-rw-r--r--textproc/iiimf-protocol-lib/Makefile4
-rw-r--r--textproc/iiimf-server/Makefile4
-rw-r--r--textproc/iiimf-x-lib/Makefile4
-rw-r--r--textproc/iiimf-x/Makefile4
-rw-r--r--textproc/jade/Makefile2
-rw-r--r--textproc/java2html/Makefile2
-rw-r--r--textproc/kdiff3/Makefile2
-rw-r--r--textproc/latte/Makefile3
-rw-r--r--textproc/libcroco/Makefile2
-rw-r--r--textproc/libhtmlparse/Makefile2
-rw-r--r--textproc/liblingoteach/Makefile2
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libpathan/Makefile2
-rw-r--r--textproc/libtre/Makefile2
-rw-r--r--textproc/libwpd/Makefile2
-rw-r--r--textproc/libwpd08/Makefile2
-rw-r--r--textproc/libxml++/Makefile2
-rw-r--r--textproc/libxml/Makefile2
-rw-r--r--textproc/libxml2/Makefile2
-rw-r--r--textproc/libxode/Makefile2
-rw-r--r--textproc/libxslt/Makefile2
-rw-r--r--textproc/link-grammar/Makefile2
-rw-r--r--textproc/mifluz/Makefile2
-rw-r--r--textproc/minidom/Makefile2
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/openjade/Makefile2
-rw-r--r--textproc/opensp/Makefile2
-rw-r--r--textproc/perl2html/Makefile2
-rw-r--r--textproc/raptor/Makefile2
-rw-r--r--textproc/raptor2/Makefile2
-rw-r--r--textproc/rasqal/Makefile2
-rw-r--r--textproc/redland/Makefile2
-rw-r--r--textproc/sablotron/Makefile2
-rw-r--r--textproc/sagasu/Makefile2
-rw-r--r--textproc/sary/Makefile4
-rw-r--r--textproc/scim-input-pad/Makefile2
-rw-r--r--textproc/scim-table-imengine/Makefile2
-rw-r--r--textproc/scim/Makefile2
-rw-r--r--textproc/scrollkeeper/Makefile2
-rw-r--r--textproc/senna/Makefile4
-rw-r--r--textproc/skim/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/uni2ascii/Makefile2
-rw-r--r--textproc/wbxml2/Makefile5
-rw-r--r--textproc/wv/Makefile2
-rw-r--r--textproc/wv2/Makefile2
-rw-r--r--textproc/xlhtml/Makefile3
-rw-r--r--textproc/xls2xml/Makefile2
-rw-r--r--textproc/xml-i18n-tools/Makefile2
-rw-r--r--textproc/xmlpp/Makefile2
-rw-r--r--textproc/xmlroff/Makefile2
-rw-r--r--www/amyc/Makefile2
-rw-r--r--www/apache-jserv/Makefile2
-rw-r--r--www/apache2/Makefile3
-rw-r--r--www/apache20/Makefile3
-rw-r--r--www/apache21/Makefile3
-rw-r--r--www/apache22/Makefile3
-rw-r--r--www/aria/Makefile2
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/cgicc/Makefile2
-rw-r--r--www/comclear/Makefile3
-rw-r--r--www/dpsearch/Makefile2
-rw-r--r--www/emacs-w3m/Makefile2
-rw-r--r--www/flood/Makefile3
-rw-r--r--www/gforge/Makefile2
-rw-r--r--www/glibwww/Makefile2
-rw-r--r--www/gnome-user-share/Makefile2
-rw-r--r--www/gtkhtml/Makefile2
-rw-r--r--www/harvest/Makefile2
-rw-r--r--www/httrack/Makefile2
-rw-r--r--www/kazehakase/Makefile2
-rw-r--r--www/libapreq2/Makefile2
-rw-r--r--www/libghttp/Makefile2
-rw-r--r--www/libwww/Makefile2
-rw-r--r--www/lighttpd/Makefile3
-rw-r--r--www/mdw/Makefile2
-rw-r--r--www/mnogosearch/Makefile2
-rw-r--r--www/mnogosearch31/Makefile2
-rw-r--r--www/mod_clamav/Makefile2
-rw-r--r--www/mod_webapp/Makefile3
-rw-r--r--www/mozilla-bonobo/Makefile2
-rw-r--r--www/oops/Makefile2
-rw-r--r--www/openvrml/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/p5-libapreq2/Makefile2
-rw-r--r--www/peacock/Makefile2
-rw-r--r--www/privoxy+ipv6/Makefile2
-rw-r--r--www/privoxy/Makefile2
-rw-r--r--www/scout/Makefile2
-rw-r--r--www/swfdec-plugin/Makefile2
-rw-r--r--www/swish-e/Makefile2
-rw-r--r--www/twhttpd/Makefile2
-rw-r--r--www/webstone-ssl/Makefile2
-rw-r--r--www/winhelpcgi/Makefile2
-rw-r--r--www/wml/Makefile2
-rw-r--r--www/wsdlpull/Makefile2
-rw-r--r--www/wyvern/Makefile2
-rw-r--r--x11-clocks/bmp-alarm/Makefile2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile2
-rw-r--r--x11-clocks/xmms-alarm/Makefile2
-rw-r--r--x11-fm/evidence/Makefile2
-rw-r--r--x11-fm/rox-filer/Makefile2
-rw-r--r--x11-fm/rox-session/Makefile2
-rw-r--r--x11-fm/velocity/Makefile2
-rw-r--r--x11-fm/xfce4-fm/Makefile2
-rw-r--r--x11-fonts/libXft/Makefile2
-rw-r--r--x11-fonts/ttmkfdir/Makefile2
-rw-r--r--x11-servers/driglide/Makefile4
-rw-r--r--x11-themes/baghira/Makefile2
-rw-r--r--x11-themes/buffy/Makefile2
-rw-r--r--x11-themes/clean-theme-gtk/Makefile2
-rw-r--r--x11-themes/colorstep/Makefile2
-rw-r--r--x11-themes/engradient/Makefile2
-rw-r--r--x11-themes/geramik/Makefile2
-rw-r--r--x11-themes/gnome-look/Makefile2
-rw-r--r--x11-themes/gnome-themes-extras/Makefile2
-rw-r--r--x11-themes/gtk-Mac2-theme/Makefile2
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-themes/gtk-engines/Makefile2
-rw-r--r--x11-themes/gtk-flat-theme/Makefile2
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile2
-rw-r--r--x11-themes/gtk-industrial-theme/Makefile2
-rw-r--r--x11-themes/gtk-qn-x11-theme/Makefile2
-rw-r--r--x11-themes/gtk-qt-engine/Makefile2
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile2
-rw-r--r--x11-themes/gtk-smooth-engine/Makefile2
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile2
-rw-r--r--x11-themes/gtk-zenith-theme/Makefile2
-rw-r--r--x11-themes/gtkbe/Makefile2
-rw-r--r--x11-themes/gtkstep-pastel/Makefile2
-rw-r--r--x11-themes/gtkstep/Makefile2
-rw-r--r--x11-themes/icegradient/Makefile2
-rw-r--r--x11-themes/notif2/Makefile2
-rw-r--r--x11-themes/thinice/Makefile2
-rw-r--r--x11-themes/whistlerk/Makefile2
-rw-r--r--x11-toolkits/9libs/Makefile2
-rw-r--r--x11-toolkits/SoXt/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile2
-rw-r--r--x11-toolkits/efltk/Makefile2
-rw-r--r--x11-toolkits/etox/Makefile2
-rw-r--r--x11-toolkits/ewl/Makefile2
-rw-r--r--x11-toolkits/fox-devel/Makefile2
-rw-r--r--x11-toolkits/fox12/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile2
-rw-r--r--x11-toolkits/fox16/Makefile2
-rw-r--r--x11-toolkits/freeglut/Makefile2
-rw-r--r--x11-toolkits/fxscintilla/Makefile2
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gdl/Makefile2
-rw-r--r--x11-toolkits/gtk--/Makefile2
-rw-r--r--x11-toolkits/gtk--2/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtkdatabox2/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/gtkmm30/Makefile2
-rw-r--r--x11-toolkits/guile-gnome/Makefile2
-rw-r--r--x11-toolkits/guile-gtk/Makefile2
-rw-r--r--x11-toolkits/lesstif/Makefile4
-rw-r--r--x11-toolkits/libXaw/Makefile2
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXt/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/libbonobouimm/Makefile2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile4
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
-rw-r--r--x11-toolkits/libsexy/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/neXtaw/Makefile2
-rw-r--r--x11-toolkits/p5-qt/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/Makefile4
-rw-r--r--x11-toolkits/php-gtk2/Makefile4
-rw-r--r--x11-toolkits/py-gnome/Makefile2
-rw-r--r--x11-toolkits/py-gtk/Makefile2
-rw-r--r--x11-toolkits/py-gtkglext/Makefile2
-rw-r--r--x11-toolkits/qtpixmap/Makefile2
-rw-r--r--x11-toolkits/sdl_gui/Makefile2
-rw-r--r--x11-toolkits/soqt/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/wxmozilla/Makefile2
-rw-r--r--x11-toolkits/xbae/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-wm/badwm/Makefile2
-rw-r--r--x11-wm/bbconf/Makefile2
-rw-r--r--x11-wm/blwm/Makefile3
-rw-r--r--x11-wm/enlightenment-devel/Makefile2
-rw-r--r--x11-wm/epiwm/Makefile3
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/expocity/Makefile2
-rw-r--r--x11-wm/fluxbox-devel/Makefile2
-rw-r--r--x11-wm/fluxbox/Makefile3
-rw-r--r--x11-wm/ion-2/Makefile3
-rw-r--r--x11-wm/ion3/Makefile3
-rw-r--r--x11-wm/kahakai/Makefile2
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11-wm/libepplet/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/wmg/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/Makefile2
-rw-r--r--x11-wm/xfce4-panel/Makefile2
-rw-r--r--x11-wm/xfce4-session/Makefile2
-rw-r--r--x11-wm/xfce4-systray/Makefile2
-rw-r--r--x11-wm/xfce4-wm/Makefile2
-rw-r--r--x11/alltray/Makefile2
-rw-r--r--x11/brightside/Makefile2
-rw-r--r--x11/ecore/Makefile2
-rw-r--r--x11/electricsheep/Makefile2
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/gcursor/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gnome-libs/Makefile2
-rw-r--r--x11/gnomelibs/Makefile2
-rw-r--r--x11/gtk-themepreview/Makefile2
-rw-r--r--x11/gtkterm2/Makefile2
-rw-r--r--x11/idesk/Makefile2
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXfixes/Makefile2
-rw-r--r--x11/libXi/Makefile2
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile2
-rw-r--r--x11/libXv/Makefile2
-rw-r--r--x11/libexo/Makefile2
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libgnomemm26/Makefile2
-rw-r--r--x11/libxfce4mcs/Makefile2
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/mgapdesk/Makefile2
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/multi-aterm/Makefile2
-rw-r--r--x11/portoseguro/Makefile2
-rw-r--r--x11/powershell/Makefile2
-rw-r--r--x11/rxvt-devel/Makefile2
-rw-r--r--x11/startup-notification/Makefile2
-rw-r--r--x11/tkXwin/Makefile2
-rw-r--r--x11/vdesk/Makefile2
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile3
-rw-r--r--x11/xfce4-trigger-launcher/Makefile2
1605 files changed, 1610 insertions, 1866 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index afc973417736..2916739602a2 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -168,7 +168,7 @@ PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR}
.if defined(USE_PHPIZE) || defined(USE_PHPEXT)
BUILD_DEPENDS+= phpize:${PHP_PORT}
GNU_CONFIGURE= YES
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS+= autoconf:259:env
CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
configure-message: phpize-message do-phpize
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 9bd49026d788..ada5dd21bff6 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo \
intlhack
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index b701889b8ab7..e41171f4bbd5 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
libwnck
WANT_GNOME= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GCC= 3.4+
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 5d6d65fbb91f..7b263a5d5006 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GNOME= gnomehack libgnomecanvas lthack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 4a7dfe148785..cecafe69c3a6 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 79e047ab337b..e2e343d16fb1 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNOME text-to-speech API
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libbonobo
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile
index 4a7dfe148785..cecafe69c3a6 100644
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
index 79e047ab337b..e2e343d16fb1 100644
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNOME text-to-speech API
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libbonobo
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 1e5b79a99f8f..c43db4ad6535 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -24,7 +24,7 @@ INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index 60fb5362f49f..14c5d3f4a0ad 100644
--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@@ -20,7 +20,7 @@ MAN1= katoob.1
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GETOPT_LONG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index cd4b04f01cd5..6eb35e114078 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= garga@FreeBSD.org
COMMENT= Open-source ARJ
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_WRKSRC= ${WRKSRC}/gnu
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 1ca3a1bce8ad..ce57eecf7c21 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_PERL5= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION}
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index cbf7c44040b6..5dddc506d393 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -18,9 +18,8 @@ COMMENT= Transparently handles automatic compression and decompression of files
#LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index b203005658eb..f40289b1cef8 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library for Microsoft compression formats
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index a962e9db4dcb..37075dc64aab 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-libsynce=${LOCALBASE}
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 8049f0627f80..42e40ebad857 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libs/compression
MAINTAINER= matthias.andree@gmx.de
COMMENT= Portable speedy, lossless data compression library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 631abc03be69..7d7e579f68ef 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -17,7 +17,7 @@ DISTNAME= lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= matthias.andree@gmx.de
COMMENT= Portable speedy, lossless data compression library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
diff --git a/archivers/orange/Makefile b/archivers/orange/Makefile
index a962e9db4dcb..37075dc64aab 100644
--- a/archivers/orange/Makefile
+++ b/archivers/orange/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-libsynce=${LOCALBASE}
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 588127042b2f..1ff7f17f06e1 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -20,10 +20,8 @@ CONFLICTS= rpm-4.*
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213 libtool:13:inc
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-glob
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -liconv"
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 3ea7ed492fa3..89bf9a688ba0 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
.endif
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 3ea7ed492fa3..89bf9a688ba0 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
.endif
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile
index 8262f0ec7a29..8840a4a30037 100644
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@@ -16,9 +16,8 @@ DISTNAME= trrntzip_v${PORTVERSION:S/.//}_src
MAINTAINER= swhetzel@gmail.com
COMMENT= Efficient way to prepare zipfiles for BitTorrent
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoheader:259
AUTOMAKE_ARGS= -a
-USE_AUTOHEADER_VER= 259
WRKSRC= ${WRKDIR}/trrntzip
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index f3f1e07c73a5..86d87ec48e5e 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A data compression library with low memory usage
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-shared
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 816c5e4cfcc0..5cb48fe9e392 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.jormas.com/~vesuri/xpk/ \
MAINTAINER= flynn@energyhq.es.eu.org
COMMENT= The eXternal PacKer (XPK) library system
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/archivers/zipios++/Makefile b/archivers/zipios++/Makefile
index 1c32eba33284..0480cb631ade 100644
--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@@ -20,10 +20,9 @@ GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
# port don't strictly need it, but Wesnoth use it so must we
USE_GCC= 3.4
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= automake:19:env libtool:15:inc
CONFIGURE_ARGS+=--disable-static
USE_REINPLACE= yes
-WANT_AUTOMAKE_VER=19
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}+cvs.2004.02.07
diff --git a/astro/boinc-setiathome/Makefile b/astro/boinc-setiathome/Makefile
index 12a3c3902fc5..99d82e4e6bf3 100644
--- a/astro/boinc-setiathome/Makefile
+++ b/astro/boinc-setiathome/Makefile
@@ -32,10 +32,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
glut:${PORTSDIR}/graphics/libglut
.endif
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-USE_AUTOHEADER_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoheader:259 autoconf:259 libtool:15
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
@@ -79,7 +76,7 @@ FIND_SETI_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_PROG)
pre-configure:
${TOUCH} ${WRKSRC}/missing
- cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${USE_LIBTOOL_VER}/libltdl -I m4
+ cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${LIBTOOL_VERSION}/libltdl -I m4
do-install:
${MKDIR} ${BOINC_HOME}/projects/${SETI_SITE}
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index 6231460d26fc..bc1d4691dc50 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gail gnomehack gnomepanel gnomeprefix gnometarget intlhack
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_OMF= yes
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index bcac4f0f8315..f1f6e7eb5792 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -22,7 +22,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 7cccafac2cd3..7d6fc138718b 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -17,7 +17,7 @@ COMMENT= Astronomical Calculation Library
USE_GNOME= gnometarget lthack
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GCC= 3.3
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index 6341c090307b..2289758c466c 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -27,7 +27,6 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
nova-0.11.0:${PORTSDIR}/astro/libnova
RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
-#USE_AUTOMAKE_VER=17
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index f3748cd35664..5eb32b3711af 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 7ce844e7a562..4180cab74b12 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -19,7 +19,7 @@ BROKEN= Size mismatch
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
post-patch:
diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index ffbf2125c36e..c26642985cf9 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= glib12 gnomehack gnometarget
WANT_GNOME= yes
USE_GETOPT_LONG=yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
diff --git a/audio/anthem/Makefile b/audio/anthem/Makefile
index 7543e92ad72c..df235f362100 100644
--- a/audio/anthem/Makefile
+++ b/audio/anthem/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tse3:${PORTSDIR}/audio/tse3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 86b8d0956a65..da47c2827e7b 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index c42eada17fde..1e35a2ff1151 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomecanvas
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DENODATA=255" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index 1359cb7e0790..8dabcbc5e6ee 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -23,10 +23,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
-USE_AUTOHEADER_VER= 253
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:15 autoheader:253 autoconf:253 libtool:13:inc
AUTOMAKE_ARGS= --add-missing
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index 33cd4e1808da..cbe1c88f5253 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES= lib/bmp/Input/libbmp-flac.so
USE_BZIP2= yes
USE_X_PREFIX= yes
##GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
--with-xmms-prefix="${X11BASE}"
diff --git a/audio/bmp-songchange/Makefile b/audio/bmp-songchange/Makefile
index e03245f9f9de..19fe31ce74ae 100644
--- a/audio/bmp-songchange/Makefile
+++ b/audio/bmp-songchange/Makefile
@@ -17,7 +17,7 @@ COMMENT= Beep Media Player do-this-on-song-change plugin
LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
PLIST_FILES= lib/bmp/General/libsong_change.so
diff --git a/audio/ccaudio/Makefile b/audio/ccaudio/Makefile
index 993d47f2fe91..ad3a0f44c331 100644
--- a/audio/ccaudio/Makefile
+++ b/audio/ccaudio/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= ccgnu2-1.3.1:${PORTSDIR}/devel/commoncpp
USE_GNOME= gnometarget
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4
INSTALL_TARGET= install man
INSTALLS_SHLIB= yes
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 993d47f2fe91..ad3a0f44c331 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= ccgnu2-1.3.1:${PORTSDIR}/devel/commoncpp
USE_GNOME= gnometarget
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4
INSTALL_TARGET= install man
INSTALLS_SHLIB= yes
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index fde456c28490..0b0305f99e87 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= easytag-[0-9]*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index c9b67519bde5..bd3b584cda5f 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -15,9 +15,7 @@ MAINTAINER= anarcat@anarcat.ath.cx
COMMENT= Multitrack audio processing software
USE_GMAKE= yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:14 autoconf:213 libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/ecawave/Makefile b/audio/ecawave/Makefile
index 25086ace0a09..088de2615636 100644
--- a/audio/ecawave/Makefile
+++ b/audio/ecawave/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_QT_VER= 3
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CFLAGS+= ${PTHREAD_CFLAGS:S/"//g}
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 38b72d7ecf1c..f72085917a78 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GNOME= gnometarget gnomehack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG=yes
CONFLICTS= py*-ro-[0-9]*
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 6e8a1eb0ef36..f0dcd50b566e 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= fftw3.3:${PORTSDIR}/math/fftw3
USE_X_PREFIX= yes
USE_GNOME= esound imlib gnomehack gnometarget gnomeprefix
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index 56a9028f39c3..a7dffcd299d2 100644
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2 \
CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index d4961d0b37ef..4ee7d78d222e 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -18,11 +18,9 @@ COMMENT= MPEG-2 and MPEG-4 AAC audio encoder
NO_PACKAGE= Distribution in binary form is prohibited
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=15
-USE_AUTOHEADER_VER=259
+USE_AUTOTOOLS= automake:15 autoheader:259 libtool:13
AUTOMAKE_ARGS= --add-missing
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 9512d29221ea..1372bc06b6c6 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -23,14 +23,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
NO_CDROM= "Restrictive copyright (do not sell for profit)"
-USE_AUTOMAKE_VER= 15
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= automake:15 autoheader:259 libtool:13:inc
AUTOMAKE_ARGS= --add-missing
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-drm
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index bac0ce521723..c58c2d80a2e0 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -16,7 +16,7 @@ COMMENT?= A command line player for .nsf and .hes audio files
LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 87e94377c641..39885abc9491 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
USE_ICONV= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ARGS= --enable-sse \
--with-libiconv-prefix="${LOCALBASE}" \
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index a83103051d40..dfa51b6d4dc0 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -18,7 +18,7 @@ USE_GNOME= gnomehack gnometarget pkgconfig
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/audio/gaim-festival/Makefile b/audio/gaim-festival/Makefile
index 31c025b77984..ac18a6afa86d 100644
--- a/audio/gaim-festival/Makefile
+++ b/audio/gaim-festival/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= festival:${PORTSDIR}/audio/festival \
USE_GNOME= gtk20
USE_GMAKE= yes
USE_X_PREFIX= yes
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:env
MAKE_ENV= LOCALBASE=${LOCALBASE}
PLIST_FILES= lib/gaim/festival.so
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index f60434581b74..8b72fdb8bc25 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -23,7 +23,7 @@ MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= libglade
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index f15c28ad6c04..cfcb0f4ba5a2 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -24,9 +24,8 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
USE_GCC= 3.4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 21b03db02057..e7b0c97f422e 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= imlib
WANT_GNOME= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index b706445147e9..7589cba2b701 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -27,7 +27,7 @@ USE_GCC= 3.4+
USE_GNOME= gnomehack gnomeprefix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index dfac62a2584d..7011434cac29 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo
USE_GSTREAMER= cdparanoia gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 601017c9dc45..8fc0b08fbc11 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -34,7 +34,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 3da212a6c31a..a5d5fbb5bfc5 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -28,8 +28,7 @@ USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
-USE_LIBTOOL_VER= 13
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213 libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index d8d954668e10..3ef8a88bad3f 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -22,7 +22,7 @@ PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 2606238802ba..47335982de22 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -21,7 +21,7 @@ USE_GCC= 3.4
USE_GNOME= gnomeprefix gnometarget libxml2
USE_REINPLACE= yes
USE_GMAKE= yes
-WANT_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index b0a7f5afef20..e1be182f3894 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -19,7 +19,7 @@ COMMENT= GStreamer plugin for monkeysaudio files
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= lthack gnomehack gnomeprefix
USE_GSTREAMER= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 1cca6a055b07..423a744784a8 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -16,7 +16,7 @@ COMMENT= A guitar effects processor for GTK
USE_GNOME= gnometarget gtk12
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -fPIC" LDFLAGS="${PTHREAD_LIBS}"
PLIST_SUB= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 024f9114b478..5e315df8b877 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
xslt.2:${PORTSDIR}/textproc/libxslt
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= icecast2.sh
SUB_FILES+= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index 717b2a617098..31183f52bdef 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2 \
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
.include <bsd.port.mk>
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index 728b270a26ca..404a5b7c5a2e 100644
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
LATEST_LINK= ices0
MAN1= ices.1
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index ff179b4602df..c614c8f0a95d 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index ef240bdef605..d3fff06cddf0 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -23,7 +23,7 @@ LATEST_LINK= jack
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index b4f5373da3c3..4269f847c285 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libglade2
USE_GSTREAMER= vorbis mad gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 327d3174c95c..212958cbf821 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -17,7 +17,7 @@ COMMENT= ISO code based fast MP3 encoder kit
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-nasm --enable-mp3rtp --disable-gtktest
diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile
index 2bf124e8cb99..1831debcf532 100644
--- a/audio/liba52-devel/Makefile
+++ b/audio/liba52-devel/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-oss --enable-shared
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 2bf124e8cb99..1831debcf532 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-oss --enable-shared
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 1b8d0a16042c..7559a5387f07 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -19,7 +19,7 @@ COMMENT= AdLib emulator library supporting many formats
LIB_DEPENDS= binio.1:${PORTSDIR}/devel/libbinio
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GCC= 3.4+
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 7a4472a59407..3cbcb47095da 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -15,7 +15,7 @@ COMMENT= Portable audio output library
WANT_GNOME= yes
USE_GNOME= gnomehack pkgconfig
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.if defined(NOPORTDOCS)
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index e9dfd2f7de26..837c6bc45685 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= A library for playing audio CDs
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index c04446a87897..6662521edd67 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= A library to access data on a CDDB server
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget gnomehack pkgconfig
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --without-cdio
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index fd515a68d27b..bae141d1c688 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= asa@gascom.ru
COMMENT= ID3 tags library (part of MAD project)
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
post-build:
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index a3cd7912a0ea..33b285cd5569 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= asa@gascom.ru
COMMENT= Libmad library (part of MAD project)
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-debugging \
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index f67f0ffdf28e..491d900b3a17 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -17,7 +17,7 @@ WANT_GNOME= yes
USE_GNOME= gnometarget lthack
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
MAKE_ENV= SHELL=/bin/sh
INSTALLS_SHLIB= yes
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index 36fcbee6a213..40ec0050250a 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -17,7 +17,7 @@ COMMENT= ModPlug mod-like music shared libraries
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_REINPLACE= yes
post-patch:
diff --git a/audio/libmpcdec/Makefile b/audio/libmpcdec/Makefile
index 300403a62c96..2c2d2ca3fcb1 100644
--- a/audio/libmpcdec/Makefile
+++ b/audio/libmpcdec/Makefile
@@ -16,7 +16,7 @@ COMMENT= High quality audio compression format
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 927ddf29799a..4bbcadc6603d 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= musicbrainz-*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 927ddf29799a..4bbcadc6603d 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= musicbrainz-*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index 927ddf29799a..4bbcadc6603d 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= musicbrainz-*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 927ddf29799a..4bbcadc6603d 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= musicbrainz-*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 17ebf0e02a95..3d3b4e1e8a07 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ogg/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Ogg bitstream library
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 9353ebf9752d..b17d0bd0c5a5 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
fftw3.3:${PORTSDIR}/math/fftw3
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-gcc-pipe
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 4b28b825e3c0..a27656d2ee2f 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOME+= pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFLICTS= libshout-1.0.7
USE_REINPLACE= yes
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 846bc3e348a4..0e5ed79910e1 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_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 90f26a25ebc0..faa37e70c685 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -18,7 +18,7 @@ COMMENT= Library to play Commodore 64 SID-tunes cycle accurate
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= builders/hardsid-builder/configure \
builders/resid-builder/configure \
libsidplay/configure \
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 22e8e1f0804f..95f4ca1bf8cd 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF)
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-justsrc --disable-gcc-pipe
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index cb7bd074e09f..f931cf2c01c7 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -18,9 +18,7 @@ COMMENT= Integer-only fully Ogg Vorbis compliant decoder library
SNAP_DATE= 02132004
WRKSRC= ${WRKDIR}/Tremor
USE_REINPLACE= yes
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 1a7e896f2a1b..2e5366f4b1d3 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 1a7e896f2a1b..2e5366f4b1d3 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 5c2e275cf8cb..189e8df2caae 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -16,7 +16,7 @@ COMMENT= Audio compression codec library
LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 6b31cd1bc133..eed9117bc9d9 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -19,7 +19,7 @@ COMMENT= Monkey's Audio lossless audio (de)compressor
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+= --enable-backward
WRKSRC= ${WRKDIR}/mac-3.99-u4
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 7029717ea1e4..6b9966179400 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
WANT_GNOME= yes
USE_GETTEXT= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
ALL_TARGET= all madtime
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index ca32f3d71a3a..9a492932d5c2 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburne
USE_GSTREAMER= flac gconf mad vorbis
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lcam"
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 647a882eae9a..fe33709149c0 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -18,7 +18,7 @@ COMMENT= Digit@lway MPIO MP3 player tool
LIB_DEPENDS= usb-0.1:${PORTSDIR}/devel/libusb
USE_ICONV= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index b685a52daeb4..9c44b2049de9 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 CC="${CC} -pthread"
CONFIGURE_ARGS= --with-id3tag=${PREFIX}
-USE_AUTOHEADER_VER= 259
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoheader:259 autoconf:259:env
DAAPD_USER?= daapd
DAAPD_GROUP?= daapd
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index db49130cb49d..f5ed411f2d46 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intltool libgnomeui
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index df2f5276a43a..352cd29bc2fd 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= libmusicbrainz-*
USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index 9c54fb7fca82..da1c8e1f7d86 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 15
+USE_AUTOTOOLS= automake:15 autoconf:259
AUTOMAKE_ARGS= --add-missing
MAN1= oggsplit.1
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index a24dec4444fa..5fc8f9aa95d7 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -16,7 +16,7 @@ COMMENT= A command line player for .spc and .zst files
ONLY_FOR_ARCHS= i386 # contains x86 asm code
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
PORTDOCS= README
PLIST_FILES= bin/OpenSPClite include/OpenSPC.h lib/libOpenSPC.so lib/libOpenSPC.so.3 \
diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile
index 0a00aaa564d8..e773fc94fe39 100644
--- a/audio/orpheus/Makefile
+++ b/audio/orpheus/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 9f468869c9dd..773a2ebca6f5 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -27,7 +27,7 @@ PATCH_WRKSRC= ${WRKSRC}/..
PLIST= ${WRKDIR}/pkg-plist
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
WRKSRC= ${WRKDIR}/pd-0.37-1test1/src
.include <bsd.port.pre.mk>
diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 3eb850e0b1f2..0f6de5c439b7 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -15,7 +15,7 @@ COMMENT= A command line player for gsf audio files
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4+
# avoid a "of memory error" gcc bug
diff --git a/audio/polypaudio/Makefile b/audio/polypaudio/Makefile
index 7d0107bc56ba..0906eba50728 100644
--- a/audio/polypaudio/Makefile
+++ b/audio/polypaudio/Makefile
@@ -23,8 +23,7 @@ USE_XLIB= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
# Needs libtool archive (.la) files for libltdl
-USE_INC_LIBTOOL_VER=15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15:inc
USE_GMAKE= yes
USE_GETOPT_LONG=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 8481e1c1916d..d6597db03a45 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -19,7 +19,7 @@ COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool
TCLTK_VERSION= 8.3
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
MAN1= rat.1
MANCOMPRESSED= no
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index 4d6c132105f0..cb38934e5ead 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ehaupt
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Cycle-based SID emulator engine
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index fad003365b89..eae0746bbd71 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 63a75f15b8e8..b1474ee5c56b 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2
post-patch:
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index f8650a028179..8809ab7cb5e1 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= bmp-scrobbler-* \
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index d914c2185684..0c2325924945 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -17,7 +17,7 @@ COMMENT= A sample multi-channel audio mixer library
USE_SDL= sdl
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index b8afa7e3deda..d8e23ca80312 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -17,7 +17,7 @@ COMMENT= A SDL audio library and player for some popular sound file formats
USE_SDL= sdl
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index b60ca786bff1..9b01da618b05 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= speex-1.0*
USE_GNOME= gnomehack
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4+
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 95eb9a82e4f1..cc614b92345e 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= speex-devel-*
USE_GNOME= gnomehack
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index 3a8e421532ae..bd822c4a3fb7 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \
mp3lame:${PORTSDIR}/audio/lame
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
PLIST_FILES= bin/streamTranscoder
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 62bfaae7b98e..eca0ef0bf27a 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/
USE_X_PREFIX= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/audio/swami/Makefile b/audio/swami/Makefile
index 1d274a6b4b87..dcfba2d1306a 100644
--- a/audio/swami/Makefile
+++ b/audio/swami/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomelibs gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 504e2eccb71a..a196f9f79d4e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtk12
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
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 3638cc5f491a..f1a9be7a7976 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 1015ef8e6c1f..65dd69b62a91 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library for manipulating ID3 tags and Ogg comments
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 4707c6036ab8..2fdbc5e7443f 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack libglade2 gnomehier
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index 76e7bac29c83..4548598934bf 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -15,7 +15,7 @@ COMMENT= A MIDI library
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-doc-install
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile
index 69f9e6a22b36..5acaad909065 100644
--- a/audio/twolame/Makefile
+++ b/audio/twolame/Makefile
@@ -16,7 +16,7 @@ COMMENT= MPEG Audio Layer 2 encoder
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget
INSTALLS_SHLIB= yes
MAN1= twolame.1
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index a1012a3209c7..2b6eb73defc7 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${X11BASE}/lib/xmms \
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 97ca722aaf4a..dcabef94cc45 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_X_PREFIX= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
MAN1= vat.1
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index b835b3759030..885645debfef 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
vorbis.3:${PORTSDIR}/audio/libvorbis
USE_GETTEXT= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-vcut
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 38c7a436fcfd..f33e4ab4a198 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_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if !defined(NOPORTDOCS)
post-install:
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index b0e4658e3237..f20224521a3c 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= kwm
MAINTAINER= kwm@FreeBSD.org
COMMENT= Compress (and restore) both 16 and 24-bit audio files in .wav format
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_ICONV= yes
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 61b0914bf699..076ab22fbb60 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
USE_X_PREFIX= yes
WANT_GNOME= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/WINGs"
MAN1= get-wsound-flags.1x getsoundset.1x setsoundset.1x \
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 31b6ac69877b..3948a784597a 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -18,7 +18,7 @@ COMMENT= X11-based MP3 player with nice graphical interface
USE_XLIB= yes
USE_GNOME= gtk12 esound
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure libx11amp/configure
CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 361764987f2a..8ec6d1c7dfa4 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index bbd2a6e025a2..02e776247a5f 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
PLIST_FILES= lib/xmms/Input/libahx.so
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index b4b30a0165a8..a1b9cd84de16 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_FILES= lib/xmms/Output/libarts.so \
diff --git a/audio/xmms-cdparanoia/Makefile b/audio/xmms-cdparanoia/Makefile
index 5a2e4454537d..dda72e15fa4b 100644
--- a/audio/xmms-cdparanoia/Makefile
+++ b/audio/xmms-cdparanoia/Makefile
@@ -27,7 +27,7 @@ EXPIRATION_DATE= 2006-01-08
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 56258eb9a5b2..bda7ceeae550 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -16,7 +16,7 @@ COMMENT= XMMS Output plugin for crossfading between songs
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/audio/xmms-efxmms/Makefile b/audio/xmms-efxmms/Makefile
index 6a55eeca607c..4e1051f8d48b 100644
--- a/audio/xmms-efxmms/Makefile
+++ b/audio/xmms-efxmms/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
PLIST_FILES= lib/xmms/Effect/libefx.so
diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index 358a9a1c4c2d..9b93e29669bd 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
PLIST_FILES= lib/xmms/Effect/libeq.so
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 3ecb5cd3a82b..ad7827299e8a 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -24,10 +24,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
-USE_AUTOHEADER_VER= 253
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:15 autoheader:253 autoconf:253 libtool:13:inc
AUTOMAKE_ARGS= --add-missing
USE_X_PREFIX= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index a94acd76e41a..99b8da39b203 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
FLAC.7:${PORTSDIR}/audio/flac
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
--with-xmms-prefix="${X11BASE}"
diff --git a/audio/xmms-fxt/Makefile b/audio/xmms-fxt/Makefile
index aa030352fe4d..42922006cc7c 100644
--- a/audio/xmms-fxt/Makefile
+++ b/audio/xmms-fxt/Makefile
@@ -17,7 +17,7 @@ COMMENT= Surround/Echo effect plugin for XMMS
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 829379c0e13f..f00910ea3d8a 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -28,8 +28,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= autoheader:259 autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 87932e207043..09e3a8844d41 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/xmms-jack
USE_X_PREFIX= yes
USE_GNOME= gtk12 gnometarget
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
PLIST_FILES= lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 20558e4d4c8c..5eb570e45be5 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_KDELIBS_VER=3
WRKSRC= ${WRKDIR}/${DISTNAME:S/0.0/0/}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 77fba645acb1..feca12bf2da8 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -23,6 +23,6 @@ WRKSRC= ${WRKDIR}/LiveIce-1.0.0
PLIST_FILES= lib/xmms/Effect/libliveice.so
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
.include <bsd.port.mk>
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index cc99bc0b50d2..7fd2809a88e3 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= CPPFLAGS=${CPPFLAGS}
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CPPFLAGS+= "-I${LOCALBASE}/include"
PLIST_FILES= lib/xmms/Input/libxmms-mac.so
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 0c71deb39981..b6c777fc584f 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -17,7 +17,7 @@ COMMENT= "XMMS plugin, that plays a sound on incoming mail and opens the MUA"
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 45533df354ef..581941377cb4 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -19,8 +19,6 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GNOME= gtk12
USE_X_PREFIX= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:14 autoconf:213 libtool:13:inc
.include <bsd.port.mk>
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 4cc2c7bf9213..94717af88b96 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES= lib/xmms/Input/xmms-mpegplus-1.8.0.so
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
.include <bsd.port.pre.mk>
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index 08f2cb0b3ea3..1a6777d96433 100644
--- a/audio/xmms-nas/Makefile
+++ b/audio/xmms-nas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
PLIST_FILES= lib/xmms/Output/libnas.so
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index 735b25f01a10..5c84ff912f27 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -17,7 +17,7 @@ COMMENT= XMMS input-plugin for playing Nintendo(TM) NSF audio files
BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index a2a201400b1c..9a0386d5f5a0 100644
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -24,6 +24,6 @@ PLIST_FILES= lib/xmms/Input/openspc.so
ONLY_FOR_ARCHS= i386 # contains x86 assembler code
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/audio/xmms-real-random/Makefile b/audio/xmms-real-random/Makefile
index de26391d6fdc..6ccdcf2109db 100644
--- a/audio/xmms-real-random/Makefile
+++ b/audio/xmms-real-random/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 5b243ae76746..a9f20ee6b7b2 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index 4477d10ffdcc..5aad8eb1c43a 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
PLIST_FILES= lib/xmms/Input/libxmms_sndfile.so
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index e6d12200220b..1f6e3bdf36fc 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk12 lthack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
PLIST_FILES= lib/xmms/Input/libtfmx.so
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index a1012a3209c7..2b6eb73defc7 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${X11BASE}/lib/xmms \
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 0790bf4c71af..02934733ef4f 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 362d0c06fd71..b7961bcd40d0 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
WANT_GNOME= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-alsa
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 429f800040a5..36e93d4c6010 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gnomehack gnometarget gtk20 lthack
WANT_GNOME= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-ipv6
diff --git a/benchmarks/dkftpbench/Makefile b/benchmarks/dkftpbench/Makefile
index 57782f91fb6e..7c99404250b6 100644
--- a/benchmarks/dkftpbench/Makefile
+++ b/benchmarks/dkftpbench/Makefile
@@ -18,7 +18,6 @@ PLIST_FILES= bin/dkftpbench
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=259
-USE_AUTOMAKE_VER=14
+USE_AUTOTOOLS= automake:14 autoconf:259
.include <bsd.port.mk>
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index ec6b750a313b..ab1707ad3087 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= nss-* qmail-ldap2-* digest-*
USE_SUBMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_XLIB= yes
USE_MOTIF= yes
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index d621343d651d..fcd53ecfab72 100644
--- a/biology/libgenome/Makefile
+++ b/biology/libgenome/Makefile
@@ -17,7 +17,7 @@ COMMENT= Toolkit for developing bioinformatic related software in C++
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 1a74769951ac..c86082eb774d 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -22,7 +22,7 @@ USE_GL= yes
USE_GMAKE= yes
PREFIX?= ${LOCALBASE}/${PORTNAME}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
NO_MTREE= yes
INSTALLS_SHLIB= yes # Not really useful, but pet portlint
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 9f1813c3cf85..eef2f338a7c6 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_GNOME= gtk12
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 46709b94579c..a299d5d48f55 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= graph:${PORTSDIR}/graphics/plotutils
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \
guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 82a8f869243c..2c8e56415d42 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -19,7 +19,7 @@ COMMENT= gEDA tools base utility library
LIB_DEPENDS= gdgeda.6:${PORTSDIR}/graphics/libgdgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gtk20 gnomehack
INSTALLS_SHLIB= yes
diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 9fc32a5f2ba8..61c0a50688af 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -18,7 +18,7 @@ COMMENT= A circuit simulator derived from spice3f5
WRKSRC= ${WRKDIR}/ng-spice-rework-${PORTVERSION}
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER?=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
.ifndef PACKAGE_BUILDING
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index 3e56ba716fe6..463dfaee16c7 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -26,7 +26,7 @@ USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
MAN1= pdnmesh.1
MAN5= pdnmesh_input.5
diff --git a/cad/qmls/Makefile b/cad/qmls/Makefile
index c4b2f4b5178e..9fc1d9ca015a 100644
--- a/cad/qmls/Makefile
+++ b/cad/qmls/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Quine-McCluskey Logic Simplifier
PLIST_FILES= bin/qmls
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/chinese/iiimf-le-chewing/Makefile b/chinese/iiimf-le-chewing/Makefile
index 0636f7dd3f0d..dc9ebff5424e 100644
--- a/chinese/iiimf-le-chewing/Makefile
+++ b/chinese/iiimf-le-chewing/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
USE_XLIB= yes
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CPPFLAGS= -I${LOCALBASE}/include
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 20cad28e0c78..939a286541c6 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -24,10 +24,8 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env
WANT_AUTOHEADER_VER= 259
-WANT_AUTOMAKE_VER= 19
-WANT_LIBTOOL_VER= 15
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index eae6759eae59..d5705a350a7f 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -24,10 +24,8 @@ ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env
WANT_AUTOHEADER_VER= 259
-WANT_AUTOMAKE_VER= 19
-WANT_LIBTOOL_VER= 15
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index 6e37b9ac5e99..f4cc094af894 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -23,11 +23,8 @@ USE_BZIP2= yes
USE_XLIB= yes
USE_GNOME= libxml2
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 259
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= automake:19 autoheader:259 autoconf:259 libtool:15
AUTOMAKE_ARGS= --add-missing
-USE_AUTOMAKE_VER= 19
-USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
do-extract:
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index fe8e2bd9fcec..2fc4190ef290 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= kcwu@csie.org
COMMENT= The Chewing intelligent phonetic input method library
USE_GNOME= gnomehack pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index edc97125c337..6b794ee0be44 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -18,7 +18,7 @@ COMMENT= BBS client using GTK+ 2.x
USE_GNOME= gtk20 intlhack
USE_GCC= 3.3+
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index 58b704941069..c92f8ef93b0f 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV+= CPPFLAGS="-D__STDC_ISO_10646__"
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 178a0495ce9b..a7321d88787a 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomehack lthack
USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index fdf152692310..8a3d0b366012 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 6181a5d49632..36305c61c0fc 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/xcin
USE_GETTEXT= yes
USE_ICONV= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index 90025ddf0b52..9cf99e43157a 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
INSTALLS_SHLIB= yes
PORTDOCS= *
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 90025ddf0b52..9cf99e43157a 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
INSTALLS_SHLIB= yes
PORTDOCS= *
diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index d8f4cc325bac..d347a30357c5 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehier libgnomeprint
STRIP=
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 8ba762cc7b88..afd21bc21d79 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GNOME= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 258f90e73704..d5b44d1b318c 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= gnometarget lthack
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 9401b75ea01c..b68bccdd134d 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= esn@x123.info
COMMENT= Shared libraries for Amateur Radio Equipment Control Applications
USE_PERL5= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GNOME= pkgconfig gnomehack
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 8027b036b1a3..c68bfe1dabad 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index b1c41df72700..af4f2091719e 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
WRKSRC= ${WRKDIR}/${PORTNAME}-01.20
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 2ab9ca2a3677..44ebe152c457 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -17,7 +17,7 @@ COMMENT= Linux Infared Remote Control
USE_XLIB= yes
USE_GETOPT_LONG=yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index d8e1b7e46f22..96ad8b5192b7 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -14,10 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mad@madpilot.net
COMMENT= Open source implementation of the OBEX protocol
-USE_AUTOCONF_VER= 253
-USE_AUTOHEADER_VER= 253
-WANT_AUTOMAKE_VER= 14
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:14:env autoheader:253 autoconf:253 libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index ae9d1c696569..3f6eba0942ca 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_JAVA= yes
JAVA_VERSION= 1.2+
JAVA_OS= native
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index 1987f992e0ce..5a51d6e7ff78 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile
index 1987f992e0ce..5a51d6e7ff78 100644
--- a/comms/spandsp-devel5/Makefile
+++ b/comms/spandsp-devel5/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 1987f992e0ce..5a51d6e7ff78 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 86a32a8dfca8..e00a5efbf6f6 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20 libglade2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"\
diff --git a/comms/vpb2/Makefile b/comms/vpb2/Makefile
index 8a1464b0af74..54de9fc19fd6 100644
--- a/comms/vpb2/Makefile
+++ b/comms/vpb2/Makefile
@@ -18,8 +18,7 @@ DEPRECATED= "mastersite disappeared, no longer maintained by author"
EXPIRATION_DATE= 2005-12-31
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213 libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index db730f987e17..e2b462f56029 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -17,7 +17,7 @@ USE_GNOME= pkgconfig
USE_ICONV= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 7dda5d636957..8983a147c452 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A Free Implementation of the Unicode Bidirectional Algorithm
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig
INSTALLS_SHLIB= yes
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 624fd55b54ef..76cbb125139e 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A character set conversion library
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
LIBTOOLFILES= configure libcharset/configure
CONFIGURE_ARGS= --enable-static \
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index d582bbb0b054..b600cdc0d640 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_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 7e03df219db7..d015172d62f1 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -16,7 +16,7 @@ COMMENT= A conversion utility to convert Psion 5(MX) files into other formats
USE_GETOPT_LONG=yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-imagemagick=no
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 433b0a43a835..7a7c4eddc7e0 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_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --without-included-gettext
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 1e189ac6f3f5..c57fc86bea19 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index ff9be911fad1..192a62c74557 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -9,7 +9,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index 26f9f2b68996..636966954b0e 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index ea3d5ac9aeaf..334b0cdf1e99 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_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index ffa3f99edcfa..e4a7bf12d4da 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Disk Based Hashtables
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index ffa3f99edcfa..e4a7bf12d4da 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Disk Based Hashtables
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index afa34caec560..d109defdac86 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://enlightenment.freedesktop.org/files/
MAINTAINER= vanilla@FreeBSD.org
COMMENT= Enlightenment Database Library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 0923e32d3abc..1d7c34b4cfb6 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -20,8 +20,7 @@ COMMENT= The open-source InterBase(tm) 6.0 spin-off (Classic version)
USE_BZIP2= yes
USE_GMAKE= yes
-WANT_LIBTOOL_VER= 15
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env libtool:15:env
GNU_CONFIGURE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_GCC= 3.4+
LOCALSTATEDIR= /var/db/firebird
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_GCC= 3.4+
LOCALSTATEDIR= /var/db/firebird
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 52683c1157a4..9cda1aff1f70 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -22,8 +22,7 @@ USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_GCC= 3.4+
LOCALSTATEDIR= /var/db/firebird
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index f4553e73ed12..e0509c549861 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -19,8 +19,7 @@ USE_ICONV= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_LIBTOOL_VER= 15
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env libtool:15
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 f4553e73ed12..e0509c549861 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -19,8 +19,7 @@ USE_ICONV= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_LIBTOOL_VER= 15
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env libtool:15
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 d7b74b68f4c6..96f680e8259b 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomelibs
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
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 b150bab27b24..1a9f34a8f466 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
COMMENT= The GNU database manager
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 6b2f38735eef..6b676c055b5b 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -16,7 +16,7 @@ COMMENT= Object-Relational Database Management System
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS?=--prefix=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 385a1d093608..702120dc2f21 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnomehier libgda
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 385a1d093608..702120dc2f21 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnomehier libgda
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index 71e686b21324..1430643eb779 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -68,7 +68,7 @@ USE_GL= yes
USE_PERL5= yes
USE_BISON= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \
--with-libs=${LOCALBASE}/lib \
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index d33f0ba13fec..568e559113a6 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -44,7 +44,7 @@ USE_GL= yes
USE_PERL5= yes
USE_BISON= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \
--with-libs=${LOCALBASE}/lib \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 9c28bc20c023..569c16bb3e75 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--with-pythondir=${PYTHONBASE}
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/
OPTIONS= MYSQL "Build MySQL driver" on \
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index a630f0d88d91..8e05b1007662 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index f485f44defb6..5fecc1034f5b 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_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-static \
--with-dbi-incdir=${LOCALBASE}/include/dbi
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 53efc0234b6b..8bd55243b218 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= seanc@FreeBSD.org
COMMENT= Database Independent Abstraction Layer for C
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
post-patch:
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 2d79d522a229..cf2a5793e599 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 6a1b9164115a..f784a5aa4a87 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -25,7 +25,7 @@ USE_GCC= 3.4
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack libgda2
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index a50c32483a82..78ebf5539a36 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= fjoe@FreeBSD.org
COMMENT= A C++ class library and toolset for ODBC access to data sources
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index e7e252f24ced..4d897be57e73 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk # To build man-pages
USE_REINPLACE= yes
USE_BISON= yes
USE_GNOME= glib20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 7e77ed607f08..2df7576f09f8 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_SCRIPT= ../unix/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
INSTALLS_SHLIB= yes
diff --git a/databases/mird/Makefile b/databases/mird/Makefile
index 7230262a6635..41cb0535be2f 100644
--- a/databases/mird/Makefile
+++ b/databases/mird/Makefile
@@ -19,7 +19,7 @@ COMMENT= A free database library with transaction support
WRKSRC= ${WRKDIR}/${DISTNAME}
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index efc9a8de3e63..58538d79840e 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -17,7 +17,7 @@ COMMENT= ODBC driver for MySQL
USE_MYSQL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --with-mysql-path=${LOCALBASE} --without-samples \
--disable-gui --enable-test=no
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index cd01417946f8..1e617481742b 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= sergey@network-asp.biz
COMMENT= Complex C++ API for MySQL
USE_MYSQL= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
CONFIGURE_ARGS+= --disable-examples
INSTALLS_SHLIB= yes
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index cd01417946f8..1e617481742b 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= sergey@network-asp.biz
COMMENT= Complex C++ API for MySQL
USE_MYSQL= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
CONFIGURE_ARGS+= --disable-examples
INSTALLS_SHLIB= yes
diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index f695311f8f01..0d3f050fc312 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -25,7 +25,7 @@ COMMENT= Powerful visual administration console for MySQL environment
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index efc9a8de3e63..58538d79840e 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -17,7 +17,7 @@ COMMENT= ODBC driver for MySQL
USE_MYSQL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --with-mysql-path=${LOCALBASE} --without-samples \
--disable-gui --enable-test=no
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index d771a83565b5..f58dbdade32f 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_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index e0958e28dd8a..3e2eeff35917 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_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 7d9cc4a28c56..dd9b709a63eb 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_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index f1cbfb9b6c52..1122af73e51d 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -17,7 +17,7 @@ COMMENT= A fork of mysql++ C++ API for MySQL
USE_MYSQL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 85622ed3ce32..dc5a429dac7c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if ${PKGNAMESUFFIX} == "-server"
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index 63ece10098ca..7c04203ecb76 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_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_REINPLACE= yes
MAKE_FLAGS= # empty
MAKEFILE= # empty
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= girgen@FreeBSD.org
COMMENT= A new C++ interface for PostgreSQL
USE_PGSQL= YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GMAKE= YES
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= girgen@FreeBSD.org
COMMENT= A new C++ interface for PostgreSQL
USE_PGSQL= YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GMAKE= YES
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index 43f1a5dab1be..c369aeace5d8 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= girgen@FreeBSD.org
COMMENT= A new C++ interface for PostgreSQL
USE_PGSQL= YES
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GMAKE= YES
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 1eb38d45f43b..f9830a2b63d8 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -108,7 +108,7 @@ USE_BISON= yes
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${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 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${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 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${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 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${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 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 171f826d37a5..a763eaaabe78 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -108,7 +108,7 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
. endif
. if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata.34:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index 2405f89d86e3..3ba9950435db 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -14,7 +14,7 @@ DISTNAME= pure-db-${PORTVERSION}
MAINTAINER= sergei@FreeBSD.org
COMMENT= Set of libraries for creating and reading constant databases
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
DOCS= AUTHORS FORMAT_DESCR NEWS README
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index f223c213a236..7fe718f8c598 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= cgi.1:${PORTSDIR}/devel/cgilib \
png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-perl-site-install --disable-python
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 79efec6da00c..5175b663b3a7 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -19,7 +19,7 @@ MAKE_ENV= PERL=${PERL}
CONFLICTS= rrdtool-1.2*
LATEST_LINK= rrdtool10
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 27058e41d030..49850895a000 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -56,7 +56,7 @@ MAKE_ENV+= TCL_VER=${TCL_V}
USE_GMAKE= YES
USE_GNOME= pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
USE_REINPLACE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index a39dc6d876a7..e3d88d36c600 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -20,7 +20,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper
USE_GMAKE= YES
USE_GNOME= pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
HAS_CONFIGURE= YES
USE_REINPLACE= YES
INSTALLS_SHLIB= YES
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index a39dc6d876a7..e3d88d36c600 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -20,7 +20,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper
USE_GMAKE= YES
USE_GNOME= pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
HAS_CONFIGURE= YES
USE_REINPLACE= YES
INSTALLS_SHLIB= YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index a7c50baa3fb7..9eb55364d607 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= rudiments.0:${PORTSDIR}/devel/rudiments
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
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 69ce79967648..08a70ec77b07 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -16,9 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Trivial Database
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:14 autoconf:213 libtool:13:inc
INSTALLS_SHLIB= yes
MAN3= tdb.3 tdb_chainlock.3 tdb_close.3 tdb_delete.3 tdb_error.3 \
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 22eb5a489afe..5521d0a15d55 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -17,7 +17,7 @@ CONFLICTS= libiodbc-*
USE_GNOME= gnomehack gnometarget
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-static --enable-shared \
--with-libiconv-prefix=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index ca67981a8b71..4ab5357ec96c 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= lthack
INSTALLS_SHLIB= yes
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index d4eef2874089..2a7357e8af45 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_BISON= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index f0c00a586967..6f5be94acebe 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile
index 0db4f1a50480..593a4fa42cec 100644
--- a/deskutils/doodle/Makefile
+++ b/deskutils/doodle/Makefile
@@ -18,7 +18,7 @@ COMMENT= Quickly search documents
LIB_DEPENDS= extractor.2:${PORTSDIR}/textproc/libextractor
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_FAM= yes
INSTALLS_SHLIB= yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index b86e14683ea4..ac8ae9a7a704 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_OMF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 2facb556302c..d88bea78ff08 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -21,7 +21,7 @@ COMMENT= The GNU Gregorian calendar program
USE_GETTEXT= yes
# required to rebuild info files if needed.
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= yes
INFO= gcal
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index f6de55bba49b..0ab33dd24966 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack librsvg2 pygnomeextras
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 028e82507594..a8d71e3eb04d 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtksourceview intlhack \
libgnomeui vte
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure mpfr/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 8bdc80defab1..77c85e58194d 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui \
desktopfileutils intlhack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index f94f1f3bcc8e..65b681a9acff 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/_chmlib.so:${PORTSDIR}/textproc/pychm
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygnomeextras
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index bfbad9c9a9d4..c1e580b8cbb4 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index bfbad9c9a9d4..c1e580b8cbb4 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 46cf63262977..fc9eed0a49f7 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
USE_X_PREFIX= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomehack lthack gnometarget
CONFIGURE_ARGS= --enable-gtkspell
INSTALLS_SHLIB= yes
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 8685060d734c..f22b68530258 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils
WANT_GNOME= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index a19d910d31c8..072e4a8f5d1e 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
# may or may not solve the alpha compilation issue....
CONFIGURE_ARGS= --with-pic
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 8ab2714b10c0..5631b85b42b9 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -36,7 +36,7 @@ MOZILLA= mozilla
USE_GNOME= gnomeprefix gnomehack gconf2 intlhack
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile
index a1975c1733fc..daa031dcd3d8 100644
--- a/deskutils/multi-backgrounds-daemon/Makefile
+++ b/deskutils/multi-backgrounds-daemon/Makefile
@@ -16,7 +16,7 @@ COMMENT= Change your GNOME2 backgound when you switch to other workspace
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnomeprefix libgnomeui libwnck
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 57fd96090ef6..eadd33870758 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -20,8 +20,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-WANT_AUTOMAKE_VER=19
+USE_AUTOTOOLS= automake:19:env libtool:15
USE_X_PREFIX= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 20ca6668933b..6b9162afcb40 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -16,7 +16,7 @@ COMMENT= Extension for Nautilus to configure programs to launch on files
USE_GNOME= nautilus2 intlhack pygtk2
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index f9703a958e0d..a26991877321 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.ids.org.au/~jam6/locked-folders/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= nautilus2
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 237490c00f56..b30d18900d9f 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 2c6d82e89adc..fe76db91eb6e 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= dbus-1.1:${PORTSDIR}/devel/dbus \
sexy:${PORTSDIR}/x11-toolkits/libsexy
USE_GNOME= gnomehack gnometarget intlhack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 461d478978a8..e089274db418 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -26,7 +26,7 @@ WANT_GNOME= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-static \
--disable-python \
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index be7f7be0bb39..70578a79e998 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
USE_GNOME= gnomehack gnometarget intltool gnomeprefix gnomepanel
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index 92fb0e138a4b..f192cf74b6eb 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 068fdcff6944..60995d967417 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
index 9ae2c5b11d04..63b7f1f38ff5 100644
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ b/deskutils/xfce4-taskbar-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
index 09cbfeee282e..8732812745de 100644
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ b/deskutils/xfce4-windowlist-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index bd6e31f7486f..135def87590d 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index 0841a64cb61a..0fcfc388acdf 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs gnomehack gnomeprefix
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index f81f39bc26cf..cbadb7e5e6f4 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib12 gnometarget
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure popt/configure libIDL/configure
CONFIGURE_ARGS= --disable-indent
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 2cd9f8d195bc..6d80885b8336 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libidl
CONFIGURE_ARGS= --disable-indent \
--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile
index 84aac97486c7..bdbcffbf5c44 100644
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@@ -17,7 +17,7 @@ COMMENT= A set of useful GNU autoconf macros
USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index c27c7fe35d73..dfbbf915dbe5 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -18,7 +18,7 @@ COMMENT= Curses library for Ada
BUILD_DEPENDS= gnat:${PORTSDIR}/lang/gnat
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \
--disable-termcap --includedir=${PREFIX}/include/ncurses \
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index 4daf731dd183..270296831fbb 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
USE_PYTHON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index a79a9cc48081..b335d86222bb 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= yes
USE_XLIB= yes
WANT_GNOME= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
.include "Makefile.man"
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index a79a9cc48081..b335d86222bb 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= yes
USE_XLIB= yes
WANT_GNOME= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
.include "Makefile.man"
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index b03226a64d6e..851e106c7230 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index e22327eef2fe..000576a66b55 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNU binutils for vanilla ARM cross-development
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --target=${PKGNAMEPREFIX:S/-$//}
CONFIGURE_ARGS= --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index fd6f18fd3516..0826d41f1952 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
CONFIGURE_ARGS+= --with-cpu="${DEFAULT_CPU}"
.endif
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure etc/configure gcc/configure libiberty/configure \
libobjc/configure texinfo/configure \
texinfo/testsuite/configure
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index fdc847091b49..a35ec17001ad 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 442dd4d9780d..7b237b51e40d 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index b3e1a956ca1c..82801c0b1522 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-libguile=yes --with-libxml2=yes
INSTALLS_SHLIB= yes
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 7fb11d447301..49a152e11a0c 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.9)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
BUILD_VERSION= 19
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 51d78810ff49..f444adab3a81 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.4)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213:env
BUILD_VERSION= 14
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index c4bb29f020f3..15b5ddf2b3f1 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.5)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
BUILD_VERSION= 15
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 7fb11d447301..49a152e11a0c 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.9)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
BUILD_VERSION= 19
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index cfc6c690a028..cc073f6662af 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --target=avr
.if (${MACHINE_ARCH} == "amd64")
MACHINE_ARCH= x86_64
.endif
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure intl/configure ld/configure \
libiberty/configure opcodes/configure
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 8974c68607d9..f892b180c6d3 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
-USE_AUTOHEADER_VER= 213
+USE_AUTOTOOLS= autoheader:213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 8974c68607d9..f892b180c6d3 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
-USE_AUTOHEADER_VER= 213
+USE_AUTOTOOLS= autoheader:213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 27ad6386d377..71ea539eeac3 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gc${PORTVERSION:S/.a/alpha/}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= lthack
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 4d49dac7448f..e31b9de53492 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack bonobo gconf
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 2654fc10c08d..c85d98133b0e 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -32,7 +32,7 @@ USE_PERL5_BUILD= yes
USE_XLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index 9ad906faa9e5..b09e099fb185 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -19,7 +19,7 @@ COMMENT= A static source code checker for C++
USE_PYTHON= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
INSTALLS_SHLIB= yes
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 8c1cc04493c0..b914aa4c6ab0 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --without-libxml2
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_cv_path_DOXYGEN=no
diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile
index 24fd31dd9e8b..4ca5db2a6220 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_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= csb.3
MANCOMPRESSED= no
diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index d12330d5de69..32300a9f649e 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -15,7 +15,7 @@ COMMENT= CVS clone
CONFLICTS= cvs-1*
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_RC_SUBR= cvslockd.sh
CONFIGURE_ARGS= --enable-fork\
--disable-odbc --disable-postgres\
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index 77f829751f62..9f2575f8e917 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
USE_PERL5= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=15
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS= automake:15 autoconf:253
AUTOMAKE_ARGS= --add-missing
MAN1= cvsutils.1
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b23b2c6b95cc..087851ffaa27 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS?= expat.5:${PORTSDIR}/textproc/expat2
USE_GNOME?= gnomehack glib20 libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index e07ac7408988..71cfae09928e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_XPM= yes
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CFLAGS+= -Wno-deprecated
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index aa82cc292570..f38051d0f0b5 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
USE_GNOME= glib20
WANT_GNOME= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 2a9163efbe02..de0fe2b2af50 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_SDL= sdl
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_PERL5= yes
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index b018b8bd9841..6b041ffe6e1a 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mark_sf@kikg.ifmo.ru
COMMENT= Configuration file parser written in C++
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/e4graph/Makefile b/devel/e4graph/Makefile
index bd5d67d18cff..8629a6377f61 100644
--- a/devel/e4graph/Makefile
+++ b/devel/e4graph/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/all
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-metakit=${LOCALBASE} \
--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} --enable-tcl \
--with-expat=${LOCALBASE} --enable-xml
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 21379be62620..f2b497b00f13 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -21,7 +21,7 @@ USE_SDL= sdl gui mixer
USE_GNOME= gnometarget libxml2 lthack
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-lirc
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 1fceaf0a59a4..2174a9227bd3 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -15,7 +15,7 @@ COMMENT= Enlightenment Data Handling Library
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index 4646b04f92cb..35b861faa36c 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -25,7 +25,7 @@ PATCH_SITES+= http://installation.openoffice.org/
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
MAN1= epm.1 epminstall.1 mkepmlist.1 setup.1
MAN5= epm.list.5 setup.types.5
diff --git a/devel/erlslang/Makefile b/devel/erlslang/Makefile
index cb6b0f518bbd..0469b24add64 100644
--- a/devel/erlslang/Makefile
+++ b/devel/erlslang/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
PLIST_SUB= VERSION="${PORTVERSION}"
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_WRKSRC=${WRKSRC}/config
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index baa69560b01c..ab80520bb557 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -20,9 +20,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
-USE_AUTOMAKE_VER=15
-USE_AUTOCONF_VER=253
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 9ad178132915..33ac81836f11 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Foreign function call libraries
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
NOT_FOR_ARCHS= sparc64
MAN3= avcall.3 callback.3 trampoline.3 trampoline_r.3 vacall.3
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index 61a5c6f7ceeb..3fb4d60637d1 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -18,7 +18,7 @@ COMMENT= FSU implementation of POSIX.5, the POSIX Ada binding
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-threads
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 7bdeb9c306d6..f4c362665a01 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
INFO= g-wrap
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index ae4d0a759ea7..f406dab7cdaf 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -25,9 +25,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
CONFLICTS= fam-[0-9]*
.if defined(GAMIN_SLAVE)
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
.else
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.endif
post-patch:
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 1821d90f7673..4982381f5f5c 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}"
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 20c04be60e90..c63d0ffdd033 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index cb0df3f4d786..9dd0e730cb01 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gconf2
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index b760c9bff718..02f79289496f 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack gconf2
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 670d0aae9610..ae1493fc822d 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -32,8 +32,7 @@ MAN1= cvs.1
MAN5= cvs.5
MAN8= cvsbug.8
INFO= cvs cvsclient
-WANT_AUTOMAKE_VER= 14
-WANT_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14:env autoconf:213:env
post-install:
install-info ${PREFIX}/info/cvs.info ${PREFIX}/info/dir
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 6b5e38f314fc..b58a5c45b1a5 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -16,7 +16,7 @@ COMMENT= An SDL game engine library
USE_SDL= image sdl
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --program-prefix=""
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 6dcf502d60dc..86c3f4c4fe92 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU gettext package
USE_ICONV= yes
LIBTOOLFILES= autoconf-lib-link/configure gettext-runtime/configure \
gettext-runtime/libasprintf/configure gettext-tools/configure
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= ACLOCAL="${TRUE}" \
AUTOCONF="${TRUE}" \
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index f5932cd9653c..56a4362eea09 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
PLIST_FILES= bin/glade-- bin/glademm-embed
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 3d304ef18dca..9a73b994d39c 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 426c682238b1..3825e854771c 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 0c0c501e6e00..0cc94b211705 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -19,7 +19,7 @@ COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 426c682238b1..3825e854771c 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index 0c0c501e6e00..0cc94b211705 100644
--- a/devel/gnomecrash/Makefile
+++ b/devel/gnomecrash/Makefile
@@ -19,7 +19,7 @@ COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index 9f40b3568dd5..be6c7af033b0 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/libiberty
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-install-libiberty
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFLICTS= freelibiberty-*
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index 9ed2524cb8ac..e267534e801e 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_REINPLACE= yes
WITH_MOZILLA?= firefox
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
.include <bsd.port.pre.mk>
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 228c971a2fa4..0562eae43dbc 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE= yes
USE_SDL= sdl image
USE_GMAKE= yes
USE_GCC= 3.2+
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-allegro
INSTALLS_SHLIB= yes
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 6af026024671..cfc0019f0abb 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index f5b0ff66762a..9946f85849ba 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -17,7 +17,7 @@ COMMENT= Multi-platform helper library for networking and security applications
OPTIONS= SSLDEBUG "Enable gwenhywfar SSL debug (if SSL enabled)" off \
MEMDEBUG "Enable memory debugger statistic" off
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_OPENSSL= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index a7e881c5179c..a10efd92da5b 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -18,7 +18,7 @@ COMMENT= A small C++ tools library based on STL
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
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 19e6ce20c4cc..97124aad9ef8 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A cross platform C++ class library with a Java-like API
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index 6b59eacb20c4..35d5421c80d9 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -18,7 +18,7 @@ COMMENT= Shows information about Java class, dependencies and more
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_GNOME= pkgconfig gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 05e6e951c645..3069f5e91775 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}
USE_JAVA= yes
JAVA_VERSION= 1.2+
USE_PYTHON= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= jep.1
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index 6253d6eae039..71b3dac060a8 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= General purpose dynamic array
GNU_CONFIGURE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= YES
INSTALLS_SHLIB= YES
USE_REINPLACE= YES
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index 33194399fce4..5f74c868cb78 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config
USE_GNOME= gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= WXWINDOWS="yes"
PLIST_FILES= bin/klassmodeler
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 1702e87c3374..b70583aad8fe 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_SDL= image sdl
USE_GNOME= gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/leoarg/Makefile b/devel/leoarg/Makefile
index 2e9a550c1eb6..6fcadc8b635e 100644
--- a/devel/leoarg/Makefile
+++ b/devel/leoarg/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A class for parsing command lines
USE_GNOME= gnometarget lthack
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --disable-static
INSTALLS_SHLIB= yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 302a6d79785f..e2ee9b36348e 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_BISON= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 95c141863f1a..684e4d3af028 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -15,7 +15,7 @@ DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Property library for gnome and Window Maker
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 857bc9c500b6..11b67ae01745 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -17,7 +17,7 @@ COMMENT= An C++ networking library and application framework
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --disable-html-docs --disable-static
INSTALLS_SHLIB= yes
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index d02928453bc0..8448fa523504 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index b80835572016..dd13749923d9 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
USE_X_PREFIX= yes
USE_GNOME= gnomehack
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index 3c1c2d384619..395870c5fa10 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -16,12 +16,9 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= automake:19:env autoconf:259:env libltdl:15 libtool:15:env
INSTALLS_SHLIB= yes
-WANT_AUTOCONF_VER= 259
-WANT_AUTOMAKE_VER= 19
-WANT_LIBTOOL_VER= 15
MAN1= cstrc.1 frame.1 getfields.1 intro.1 panic.1 prstat.1 readline.1 \
rpoll.1 strnchr.1 strnlen.1 strsave.1 strtrimsp.1 verb.1 xalloc.1
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index 106a99bdec88..c51d645c7495 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Binary I/O stream class library
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GCC= 3.4+
diff --git a/devel/libbnr/Makefile b/devel/libbnr/Makefile
index 55ce44734afa..ff9ce18c6ad4 100644
--- a/devel/libbnr/Makefile
+++ b/devel/libbnr/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://dspam.nuclearelephant.com/sources/extras/ \
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= GPL implementation of the Bayesian Noise Reduction algorithm
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 8231b2581e73..63c3c7ab7e8f 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index b4063737c3fd..1d47b4306a1a 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack libbonobo
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index 0a79e6506096..3699fd161221 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/
MAINTAINER= petef@FreeBSD.org
COMMENT= Network library aimed at easy development of C++ server daemons
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile
index 7c26475aa102..1c127be0e2ee 100644
--- a/devel/libconfuse/Makefile
+++ b/devel/libconfuse/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck
.endif
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --disable-nls
CFLAGS+= -I${WRKSRC}/src
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 768e134df1fb..d0f2edd36478 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-threading
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GETOPT_LONG=yes
diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile
index 0fab73ad4e23..6fe68d2eaa66 100644
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= Lightweight C library that eases the writing of UNIX daemons
CONFIGURE_ARGS= --disable-lynx
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index d52cb0ea826d..92a4f9ad2c15 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -19,7 +19,7 @@ COMMENT= C++ class library of common digital signal processing functions
WRKSRC= ${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:env
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
INLINE_VER="${INLINE_VER}"
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 0905d21d167b..7b409e9686a3 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= petef@FreeBSD.org
COMMENT= Provides an API to execute callback functions on certain events
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index bb38cd9258c7..b02cbb0429cc 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/libffi/
MAINTAINER= horance@freera.net
COMMENT= Foreign Function Interface
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index bb38cd9258c7..b02cbb0429cc 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/libffi/
MAINTAINER= horance@freera.net
COMMENT= Foreign Function Interface
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index 919e56cc96a3..3c9ae20dc7c4 100644
--- a/devel/libfs++/Makefile
+++ b/devel/libfs++/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library which provides a file_iterator class
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index 49aebf8a8945..3390b770cf23 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Generic Hash Table
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index dee3338d6b18..75514e7fef48 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -19,7 +19,7 @@ COMMENT= GGI API for input sources
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
MAN1= mhub.1
diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile
index 66e553fb2b88..9b7ebc2280b2 100644
--- a/devel/libgiigic/Makefile
+++ b/devel/libgiigic/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gii.0:${PORTSDIR}/devel/libgii
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8764ec9d0b56..6d7d3ac2658a 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libxml2 gtk20
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index d523df80ec08..a8148bf5cf9f 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 71b3832ca523..8a3732f65227 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack libglade2
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 0dadef5824d1..2e543fe38692 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= freeassociation
MAINTAINER= joe@zircon.seattle.wa.us
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 67c8e7ecc1b5..e9274b5b8a95 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -15,7 +15,7 @@ COMMENT= Library for parsing RFC2425 MIME Directory Profile information
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_BISON= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libmusclecard/Makefile b/devel/libmusclecard/Makefile
index 474480a82a0b..74001029d205 100644
--- a/devel/libmusclecard/Makefile
+++ b/devel/libmusclecard/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --enable-muscledropdir=${LOCALBASE}/lib/pcsc/services
USE_REINPLACE= yes
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
MAN8= bundleTool.8
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 52971a4793b2..fd51065209f6 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-1.1:${PORTSDIR}/devel/dbus \
USE_GNOME= gnomehack gnometarget intlhack glib20
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 4f8b6de75306..a350a3a9a4df 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -15,7 +15,7 @@ COMMENT= Library of optimized inner loops
USE_GNOME= glib20
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index d7f687733610..901a768ce7f5 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= vince@blue-box.net
COMMENT= Library needed by syslog-ng
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_GCC= 3.3+
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 0acd08f0f557..98d022fe1aaa 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libwww
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index 108a5122182b..92dd826b796d 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -16,7 +16,7 @@ COMMENT= C lib used to connect to iTunes(R) music shares
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= libopendaap.3
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 9e77a929b7cb..447ba3f165ae 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_GNOME= gnomehack glib20 libxml2
USE_REINPLACE= yes
diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile
index 9e77a929b7cb..447ba3f165ae 100644
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_GNOME= gnomehack glib20 libxml2
USE_REINPLACE= yes
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index 86dc6ad860a4..3c9e1c8d4692 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -18,7 +18,7 @@ COMMENT= Parallel Events and Asynchronous tasKing Library
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= CFLAGS="${CFLAGS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}"
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index 9f5410268e62..5c00abc13d40 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library that provides the red-black balanced tree algorithm
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 64e9ce1c5076..d4dbcf877503 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library for Shared Buffer IPC
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 71b8da065f94..cbd321ab79df 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libsigc \
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 2ca2a68581f0..3105b2364963 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -23,6 +23,6 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++12
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 7a5501e23508..3411313c5744 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++20
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
PLIST_SUB= VERSION="2.0" API_VERSION="2.0"
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 9aa2028f363e..58ad6ec61ea2 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -19,7 +19,7 @@ COMMENT= An extension of libSigC++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 5d86e518ed0c..7219c4dc788a 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -22,7 +22,7 @@ COMMENT= Provides a useful interface to system statistics
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget pkgconfig
MAN3= sg_get_cpu_percents.3 sg_get_cpu_stats.3 \
diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile
index 24a05f6cc1bc..a487df609721 100644
--- a/devel/libstrfunc/Makefile
+++ b/devel/libstrfunc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= vlm@lionet.info
COMMENT= Handles CGI forms, MIME, templates, date conversions, etc
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=""
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index bf637d775261..e0edacb335fa 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -16,7 +16,7 @@ COMMENT= A stroke translation library
USE_XLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libtap/Makefile b/devel/libtap/Makefile
index f47ce8c0f9b7..b8a4861d81ec 100644
--- a/devel/libtap/Makefile
+++ b/devel/libtap/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= nik@FreeBSD.org
COMMENT= Library implementing the Test Anything Protocol
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= tap.3
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index f244e6065928..6649428faab8 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive command line editing facilities
USE_SUBMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= default
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 087dbc8d026f..d3b17495e691 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index e64a548cdfef..7a69710709da 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator file types library
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index 0881fb82f9cd..01e4e31b02b9 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -24,7 +24,7 @@ MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomehack gnometarget pkgconfig lthack
.include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 73e35dd9bee3..606b51abfb92 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for manipulating Unicode characters and strings
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 917c5fb9547f..dee4ad1c9581 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -18,6 +18,6 @@ COMMENT= Library giving userland programs access to USB devices
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-docs
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/libzt/Makefile b/devel/libzt/Makefile
index b717ecd74e68..36b3b182e84a 100644
--- a/devel/libzt/Makefile
+++ b/devel/libzt/Makefile
@@ -17,7 +17,7 @@ DEPRECATED= mastersite disappeared, no longer maintained by author
EXPIRATION_DATE=2005-12-31
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 72f9f40157b2..d062aef05b03 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
USE_GETTEXT= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index 90abb92caf83..15b5f86cfc8c 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Logging for C Library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index b349e2d40293..b7b1786654ae 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= petri.totterman@hmv.fi
COMMENT= A logging library for C++
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 3ebaa263ae8e..ac53c52272e3 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -28,10 +28,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost
CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
.endif
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13
AUTOMAKE_ARGS= --add-missing
-USE_LIBTOOL_VER=13
LIBTOOL_VARS= --force --automake
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index cedb6fb14938..a9eab1b8fe03 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A userspace thread library
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 5e24c6b3a91b..9ab537dcc4bb 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
USE_XLIB= yes
USE_GNOME= gnometarget libxml2 pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index b085c2da1b4c..de5b04d835e1 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
#CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} \
# CXXFLAGS="${CXXFLAGS}" CPP=${CPP}
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index fe7160a14095..e96af66b060d 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-20011113
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --target=i386-mingw32msvc
MAN1= i386-mingw32msvc-addr2line.1 \
diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index e0e34fe104d0..d3430023c3e5 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/i386-mingw32msvc/bin/as:${PORTSDIR}/devel/mingw-binuti
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}-20010828
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_GMAKE= yes
USE_REINPLACE= yes
WITHOUT_CPU_CFLAGS= yes
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 4c6b99c711c6..7f7da1f6efc2 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -36,7 +36,7 @@ PATCH_DIST_STRIP= -p1
#USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--disable-nls --disable-win32-registry \
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 66f0a5600ead..235dc0c2d335 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--enable-languages=c,c++,f77,objc,java \
--with-gcc --with-gnu-ld --with-gnu-as \
diff --git a/devel/mipsel-linux-binutils/Makefile b/devel/mipsel-linux-binutils/Makefile
index 38ea58d075fd..9cc8fe654661 100644
--- a/devel/mipsel-linux-binutils/Makefile
+++ b/devel/mipsel-linux-binutils/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} --with-gnu-ld --with-gnu-as \
--with-gcc --without-x11
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure ld/configure opcodes/configure
MAN1= ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/mipsel-linux-gcc/Makefile b/devel/mipsel-linux-gcc/Makefile
index 8574fedd3a04..6dc4e488eaf1 100644
--- a/devel/mipsel-linux-gcc/Makefile
+++ b/devel/mipsel-linux-gcc/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
ONLY_FOR_ARCHS= i386 alpha
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5= yes
LIBTOOLFILES= configure gcc/configure
MAN1= ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 \
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 9d68b857a1d6..46c8e6e91574 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure ld/configure opcodes/configure
MAN1= ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 14110629496b..421731e64ebc 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--enable-languages=c --disable-nls \
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index 14110629496b..421731e64ebc 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes