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
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-gdb/Makefile b/devel/msp430-gdb/Makefile
index bb94decf6bf7..17dda033e70e 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GDBVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//}
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
LIBTOOLFILES= configure opcodes/configure bfd/configure
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 670bd31b22c0..82f44198fb7d 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -18,7 +18,7 @@ COMMENT= Generic configuration management library
LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc
INSTALLS_SHLIB= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= YES
post-patch:
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 67a00faf9f5a..7f9b951c402d 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --without-howl
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.if !defined(WITHOUT_NLS)
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index de983b2403cd..6f239355e73c 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
lablgl:${PORTSDIR}/graphics/ocaml-lablgl
USE_SDL= sdl ttf image mixer
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-findlib
USE_GMAKE= yes
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index cd1c58c5bd4e..62cbdfc5ba27 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -19,7 +19,7 @@ COMMENT= An interpreted dynamic parser
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 2fbab01b70c8..3e387ed87065 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ bindings for ORBit, a CORBA 2.2-compliant ORB
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack orbit2
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
post-patch:
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index 12c124715a10..3d96635d8b17 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
check: build
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 37e075c8d4be..b397d9697079 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= cfg.3
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index d6803a41e673..38f338d6d836 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -18,7 +18,7 @@ COMMENT= OSSP ex is a small exception handling library for use in C
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index 1da7776cb570..e4a9b6886548 100644
--- a/devel/ossp-l2/Makefile
+++ b/devel/ossp-l2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A C library for a flexible and sophisticated Unix logging facility
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= l2-config.1 l2tool.1
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 5984e542f2fc..b4cbe3d6427b 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
MAN1= val-config.1
MAN3= val.3
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 2de614bc03fa..a1f5cfadefe8 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -18,7 +18,7 @@ COMMENT= A flexible, full-featured and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-xds/Makefile b/devel/ossp-xds/Makefile
index 7874c3b4a209..a81953e81b68 100644
--- a/devel/ossp-xds/Makefile
+++ b/devel/ossp-xds/Makefile
@@ -17,7 +17,7 @@ COMMENT= A generic and extensible framework for serialization
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= xds-config.1
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 333ff01dffa8..5b8f89032b6c 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -20,7 +20,7 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
LDFLAGS="`${PCRE_CONFIG} --libs`"
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 0450e15eb1c5..e9700ed80197 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -19,7 +19,7 @@ COMMENT= Perl Compatible Regular Expressions library
CONFLICTS?= pcre-utf8-[0-9]*
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index af96dd7af0e2..bdeba71c2af3 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -18,7 +18,7 @@ COMMENT= A smartcard development library
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
WRKSRC= ${WRKDIR}/pcsc-lite-1.2.9-beta7
INSTALLS_SHLIB= yes
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index f9efa96a2f76..1d32a588989e 100644
--- a/devel/physfs-devel/Makefile
+++ b/devel/physfs-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
NO_LATEST_LINK= yes
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 633aa106cc41..a18880e1e83a 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 25763585cb0e..4c66b10e70a6 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -21,7 +21,7 @@ COMMENT= A getopt(3) like library with a number of enhancements, from Redhat
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 1fb2c12a8e14..73ea812dbd79 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Posadis C++ DNS library
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 72e4a149d0fa..b06751d847d5 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -20,7 +20,7 @@ USE_PGSQL= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gtk20 gconf2 glib20 libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 2ca409b0b1a7..0879d9099823 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library that makes it easy for programs to use privilege separation
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 378dbaced7ee..f9bee15d41c6 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ENV= OSRELEASE=${OSVERSION}
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/pwlib152/Makefile b/devel/pwlib152/Makefile
index 378dbaced7ee..f9bee15d41c6 100644
--- a/devel/pwlib152/Makefile
+++ b/devel/pwlib152/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ENV= OSRELEASE=${OSVERSION}
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index df8e9d777339..3e731036b13e 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack orbit2
USE_PYTHON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config
.include <bsd.port.mk>
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index f4b2c4c6133a..3ea4467a316a 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS= apr-1-config:${PORTSDIR}/devel/apr-svn \
${SVNDEP}:${PORTSDIR}/devel/subversion
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
CONFIGURE_ARGS= --with-wx-config=${WXCONFIG} \
--with-apr-config=apr-1-config \
--with-apu-config=apu-1-config
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 0164d090f47e..93a2197a681a 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -19,7 +19,7 @@ COMMENT= A complete regular expressions C++ solution
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index ee894c8c54d7..a4041b4da412 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -15,7 +15,7 @@ COMMENT= An interprocess communication library
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 0d78b51209f9..58f10e7f3b6d 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -17,7 +17,7 @@ COMMENT= A utility C++ class library for daemons, clients, servers and more
USE_GNOME= pkgconfig
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLBASE}/include \
--with-ssl-libs=-L${OPENSSLBASE}/lib --disable-pcre
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index ac3c30712919..4a1e6a519dbb 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -18,6 +18,6 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index eb027f970554..c5ba077105f7 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
WANT_GNOME= yes
CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index d4232a6e6dfe..576335df004d 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer)
USE_SDL= sdl
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 0c5c2d170428..d62d36fa90a5 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= boost_thread.3:${PORTSDIR}/devel/boost
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index d14171473fca..ee2aadc95171 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://dl.maptools.org/dl/shapelib/
MAINTAINER= ports@FreeBSD.org
COMMENT= C API for reading and writing ArcView Shapefiles
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:env
ALL_TARGET= lib
INSTALLS_SHLIB= yes
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index e9e92476a7a9..417ed0300c0c 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -18,7 +18,7 @@ COMMENT= Shared-memory-based hashmaps
LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 8649300907c8..ac5566c92955 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOME= gnomehack glib12 libxml
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/str/Makefile b/devel/str/Makefile
index 38319008d286..4768579934db 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -16,7 +16,7 @@ COMMENT= Generic String Library
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= str-config.1
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 63fb3c3a51d0..3873c22f92fa 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -17,7 +17,7 @@ COMMENT= A scanner/parser generator
USE_ICONV= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 925aa51f004d..49fb4d3197e5 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= xride@x12.dk
COMMENT= Simplified Wrapper and Interface Generator
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env libtool:13
VER= ${PORTVERSION:R}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -108,7 +108,6 @@ CONFIGURE_ARGS+= --without-java
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC -DPIC"
ALL_TARGET= swig
PLIST_SUB+= VER="${VER}"
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 925aa51f004d..49fb4d3197e5 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= xride@x12.dk
COMMENT= Simplified Wrapper and Interface Generator
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env libtool:13
VER= ${PORTVERSION:R}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -108,7 +108,6 @@ CONFIGURE_ARGS+= --without-java
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC -DPIC"
ALL_TARGET= swig
PLIST_SUB+= VER="${VER}"
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index b43bfcba2bf5..b7cc4b7aca7e 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -18,9 +18,7 @@ USE_BZIP2= yes
USE_PERL5= yes
HAS_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19
-USE_ACLOCAL_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:259
MAN1= sysconftool.1 sysconftoolcheck.1
MAN7= sysconftool.7
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 744d93deba64..b6348623c5ed 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
ALL_TARGET= without_doc
INSTALLS_SHLIB= yes
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index d1a9dd5ba365..50f0679d0e50 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tclreadline
MAINTAINER= darius@dons.net.au
COMMENT= GNU readline for TCL
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
MANN= tclreadline.n
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 4efbc4b006c2..dab3d66fbcce 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
USE_GNOME= gnomelibs libglade
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
.include <bsd.port.pre.mk>
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index 05a27dbbbc2e..db56450cc5fc 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= robert@rs.tarrant.tx.us
COMMENT= General purpose string library for C
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index 0101b00e9092..d946c4d0b132 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
OPTIONS= SDL_MIXER "music and sound support" off
USE_FREETYPE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 440e20769cb3..7e3d5763bdfb 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -22,7 +22,7 @@ USE_GETTEXT= yes
USE_GCC= 3.4+
USE_GNOME= glib20 gtk20 atk pango pkgconfig libglade2 gnomehack
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/devel/xparam/Makefile b/devel/xparam/Makefile
index b1f4f18f6989..64b8ca0fba13 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A general-purpose tool for parameter handling in C++
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index ba13623d2180..67ae0e62bb4d 100644
--- a/devel/xxl/Makefile
+++ b/devel/xxl/Makefile
@@ -15,7 +15,7 @@ COMMENT= C and C++ that provides exception handling and asset management
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-threads
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 6145ac5539a4..6092ec450ed2 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -16,8 +16,7 @@ COMMENT= A complete rewrite of the NASM assembler
USE_REINPLACE= yes
USE_ICONV= yes
-USE_LIBLTDL= yes
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259 libltdl:15
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 34f0842dc736..a50e82a6f8b5 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A platform-independent object-oriented C++ threading library
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-ftime --disable-static
USE_GMAKE= yes
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 577babbf6580..c89cc827e12e 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
USE_GNOME= gnomehack
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 8277a216d129..6c1bc4696bad 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -23,8 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
PERL=${PERL}
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
# Default to db3
WITH_BDB_VER?= 3
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index 6b8e5f9ad26c..6060ec531802 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library to handle internationalized domain names
USE_ICONV= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \
--enable-runidn \
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 1f122d7e5418..fd8f259a24bd 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -18,7 +18,7 @@ COMMENT= Internationalized Domain Names command line tool
USE_GETOPT_LONG= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5_BUILD= yes
USE_REINPLACE= yes
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 90632e6a13e8..1114b588e3fa 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -16,7 +16,7 @@ COMMENT= DNS server designed to utilize the MySQL database
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_RC_SUBR= mydns.sh
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index 90632e6a13e8..1114b588e3fa 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -16,7 +16,7 @@ COMMENT= DNS server designed to utilize the MySQL database
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_RC_SUBR= mydns.sh
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index bcd290a24dbf..6eb2ea9cf6ee 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -17,9 +17,7 @@ COMMENT= Domain Name Server (DNS) implementation
LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= autoconf:259 libltdl:15 libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index dad98825b1a4..14aa741862d4 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost
USE_GMAKE= YES
USE_SUBMAKE= YES
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= YES
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index dad98825b1a4..14aa741862d4 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost
USE_GMAKE= YES
USE_SUBMAKE= YES
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= YES
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 614747c5e44d..657c9193cbc4 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnometarget gtk20
WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-all
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index b17b2d1a744a..6c3c8239893d 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -17,7 +17,7 @@ COMMENT= A programmer's text editor for GTK+ 2.0
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
USE_GNOME= gnomehack gnomeprefix gtk20 gtksourceview lthack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 60146a200290..38084bff0f4d 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 4501c55e8f80..8e105eb04fa7 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON= yes
USE_GETTEXT= 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="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index b12417cff6eb..4e035ab5c90b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
PATCH_DIST_STRIP= -p1
.endif
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 26772a08a628..621c5e669f26 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
EMACS_VER= 20.7
diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile
index f47ed88fa1cd..011bc7e8f699 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
EMACS_VER= 20.7
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 53133624f1a6..c4ceb55129c2 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= emacs-19.* emacs-21.* \
ONLY_FOR_ARCHS= i386 alpha
DEPRECATED= "editors/emacs is recommended instead for new installations"
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
EMACS_VER= 20.7
LATEST_LINK?= ${PKGNAMEPREFIX}emacs20
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index b12417cff6eb..4e035ab5c90b 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
PATCH_DIST_STRIP= -p1
.endif
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index b12417cff6eb..4e035ab5c90b 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
PATCH_DIST_STRIP= -p1
.endif
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index f6d1dce88e42..36c721da1c7b 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 1baf6ec4b648..67d98b0be45b 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE= yes
USE_XPM= yes
WANT_GNOME= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index b3249280a550..8b0840d614ee 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -19,7 +19,7 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
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/editors/lpe/Makefile b/editors/lpe/Makefile
index 05a799f2c0c8..143898877347 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include" \
LIBS="-ltermcap"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 4daacce95459..9e833bcd086c 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -18,10 +18,9 @@ COMMENT= A tree oriented XML editor for Gnome
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
USE_REINPLACE= yes
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 7e496e4ac1e3..59ad7de75977 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -109,7 +109,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
Xvfb:${X_VFBSERVER_PORT} \
${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT}
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
TCSH?= /bin/tcsh
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index d5f4f97671fb..6d0d51decd3d 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -53,7 +53,7 @@ XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
STRIP=
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET=--build=${XEMACS_ARCH}
CONFIGURE_ARGS= --enable-mule \
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 1bb237a098bd..6e8769dac093 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -39,7 +39,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
STRIP=
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--enable-clash-detection \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index f91e8535b327..e5d352cc7729 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -28,7 +28,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_BZIP2= yes
WANT_GNOME= yes
STRIP=
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--with-clash-detection \
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 3fb92a61a8a5..f9b64a94aa09 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -51,7 +51,7 @@ USE_GETTEXT= yes
USE_XLIB= yes
USE_XPM= yes
STRIP=
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS= --with-x11 \
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index e18592d9acc1..bcecf0838988 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GNOME= gnomehack libglade
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 8eef9a5263c4..02bafaa53e27 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
USE_SDL= sdl
USE_REINPLACE= yes
USE_XLIB= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --with-sdl
diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile
index 28d808a44fb6..4c44c976dd25 100644
--- a/emulators/lib765/Makefile
+++ b/emulators/lib765/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.seasip.demon.co.uk/Unix/LibDsk/
MAINTAINER= kemm@in-line.ru
COMMENT= Emulation of uPD765a Floppy Disc Controller
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.if !defined(NOPORTDOCS)
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 68a2289fcf2e..f130c8eb5912 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -17,7 +17,7 @@ COMMENT= Handling of ZX-Spectrum emulator files formats
USE_PERL5_BUILD= yes
WANT_GNOME= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= libspectrum.3
diff --git a/emulators/libvm68k/Makefile b/emulators/libvm68k/Makefile
index ffc38dec5887..0e6ee218c130 100644
--- a/emulators/libvm68k/Makefile
+++ b/emulators/libvm68k/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.hypercore.co.jp/vx68k/${PORTNAME}-${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= M68000 virtual machine library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index a692d33ac904..221514ddb8be 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
USE_GCC= 3.4
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= autoheader:259
ONLY_FOR_ARCHS= i386
PLUGIN_NAME= blight_input
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 0da7cd1b2c4c..2329b62bd1fa 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XLIB= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
.if ${MACHINE_ARCH} == "alpha"
CONFIGURE_ARGS+=--disable-intp
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index f85ab2eed596..5753eb9d0a4d 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= e-uae-*
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --enable-sound --enable-vidmode --enable-dga
USE_XLIB= yes
USE_GNOME= gtk20
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 120c81974970..d6f8d1d168a3 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libglade
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/emulators/vx68k/Makefile b/emulators/vx68k/Makefile
index dd631552fe1a..99c41758cc9e 100644
--- a/emulators/vx68k/Makefile
+++ b/emulators/vx68k/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= vm68k.4:${PORTSDIR}/emulators/libvm68k
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
LIBTOOLFILES= configure vx68k-gtk/configure
#LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 33689788317c..902945db7f19 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -16,8 +16,7 @@ COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 8aa648e39932..728b9cf17057 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -21,7 +21,7 @@ OPTIONS= OFX "LibOFX support" off \
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index 8db32172489a..5b48d8099f99 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
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/finance/gnofin/Makefile b/finance/gnofin/Makefile
index a29ab9b49115..2e95a742630d 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -18,7 +18,7 @@ COMMENT= Light-weight GNOME based financial management program
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
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/finance/khacc/Makefile b/finance/khacc/Makefile
index 63eb1d1d9189..5afbdaa47f23 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_KDELIBS_VER= 3
USE_PERL5_BUILD= yes
USE_GMAKE= yes
-WANT_AUTOMAKE_VER= 19
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19:env autoconf:259:env
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-qhacc-config=${X11BASE}/bin
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 54493fe77516..a81bd074121d 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= kmymoney2.1
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 54493fe77516..a81bd074121d 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= kmymoney2.1
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index 5f62c1f2b13b..9a4673a82923 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Check bank codes of German banks
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/finance/libofx/Makefile b/finance/libofx/Makefile
index 54824f827c22..23041008a7c3 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \
--with-opensp-includes=${LOCALBASE}/include/OpenSP
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 61a6b73926ea..3d039a5b4c28 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.17
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
.include <bsd.port.pre.mk>
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index c6296add101c..c40ae044d97c 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -21,7 +21,7 @@ USE_QT_VER= 3
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \
--with-qt-libs=${QT_PREFIX}/lib
diff --git a/french/dico/Makefile b/french/dico/Makefile
index 5d9e69d7a974..9e74c3f4d8fc 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -28,8 +28,7 @@ USE_REINPLACE= true
USE_ZIP= true
EXTRACT_CMD= UNZIP= unzip
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_GMAKE= true
AUTOMAKE_ARGS= --add-missing --foreign --include-deps
MAKE_ARGS= prefix=${PREFIX}
diff --git a/french/med/Makefile b/french/med/Makefile
index 7d414b26e9f8..bdb30eb53772 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -24,7 +24,7 @@ SHORT_TK_VER= ${TK_VER:S/.//}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 3bf604f1334f..310e7cdb1001 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/ftp/moftpd/Makefile b/ftp/moftpd/Makefile
index 103b43c0a708..a50dfe02c497 100644
--- a/ftp/moftpd/Makefile
+++ b/ftp/moftpd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= clement
MAINTAINER= clement@FreeBSD.org
COMMENT= A powerful FTP server supporting IPv6, TLS, and much more
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index ee487f485db0..f9865ea1dc28 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -23,7 +23,7 @@ COMMENT= A replacement ftp server for Un*x systems
CONFLICTS= wu-ftpd-[0-9]* heimdal-[0-9]*
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \
--enable-noop --disable-numericuid --enable-nlst-dirs \
--enable-ipv6 \
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index f38e1ee80fbf..5de626076025 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -20,7 +20,7 @@ COMMENT= A replacement ftp server for Un*x systems
CONFLICTS= wu-ftpd+ipv6-[0-9]* heimdal-[0-9]*
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \
--enable-noop --disable-numericuid --enable-nlst-dirs \
--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index fd0236d19e72..183a70a87b03 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS+= --without-pam --without-pgsql
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 98e037db39c0..0813aaf2e9d0 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_SDL= sdl
USE_XPM= 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/games/asc/Makefile b/games/asc/Makefile
index bb611ff381a4..9468c86eb637 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \
CXXFLAGS="-D_UNICODE_BROKEN_" \
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 58b0c9be8b43..b40aa6a1ac81 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -33,8 +33,7 @@ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-sound
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index df46e73fa4a0..6950b2ae52db 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_SDL= mixer sdl
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5_BUILD=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 1beea8c98a59..41371bf6c6c7 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Bomberman clone for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 28cbf84ae544..5948c9c9ef8b 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 345f2139a048..0c97f91ab178 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -17,7 +17,7 @@ COMMENT= Internet Go Server client and game editor
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 58f25b98b390..7b92eb683962 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/games/ember/Makefile b/games/ember/Makefile
index b21b85d1815d..09046dfe6ff9 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
openal.0:${PORTSDIR}/audio/openal
CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image
USE_REINPLACE= YES
GNU_CONFIGURE= YES
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 33e0f7b96e09..3e8dca0b3afd 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index a4e1d1ada715..dffa9d98dcc7 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -16,8 +16,7 @@ MAINTAINER= laszlof@vonostingroup.com
COMMENT= Very popular card game with variable skill levels
PLIST_FILES= bin/euchre
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_GNOME= gtk12
.include <bsd.port.mk>
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 538056d3c14f..2526c457937b 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/fc-solve/
MAINTAINER= ports@FreeBSD.org
COMMENT= A program that automatically solves games of Freecell
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 03510a180689..71848e8fc87e 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= gnuchess:${PORTSDIR}/games/gnuchess \
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_SDL= mixer
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui pygnome2
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index f39181530f12..63dc0769ffff 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnometarget
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
INSTALLS_SHLIB= yes
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 0cd1e8ba9005..4fc7a81e7989 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -24,8 +24,7 @@ USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_REINPLACE= yes
MAN6= ${PORTNAME}.6
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 6dfae69b64f7..5c3084bd3d00 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -18,7 +18,7 @@ COMMENT= Conway's Game of Life for GNOME
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack libglade
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e7230ff69530..90a1b6ba98ec 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gnome-music-quiz/Makefile b/games/gnome-music-quiz/Makefile
index 126bd7b97c5b..8381eb3f53fa 100644
--- a/games/gnome-music-quiz/Makefile
+++ b/games/gnome-music-quiz/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= rhythmbox:${PORTSDIR}/audio/rhythmbox
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix libgnomeui
USE_GSTREAMER= gconf
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
pre-configure:
@${RM} -f \
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index adf1999bf6f2..bf12ad3feb3f 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -19,7 +19,7 @@ COMMENT= Memory Blocks game for GNOME
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 3168fd48822c..e3bcccc4e16f 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
USE_MESA= YES
USE_PERL5_BUILD=yes
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/tcl8.2 \
-I${X11BASE}/include" \
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index 082edaa5d4b1..7ffb1450db20 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -16,7 +16,7 @@ COMMENT= GtkAtlantic is a game like Monopoly(tm)
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 98eceea3ca9b..e72b6706f2c8 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple turing machine simulator for GNOME 2
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
INSTALLS_OMF= yes
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 9dfa29215c51..cad83ccc2208 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= yinjieh@csie.nctu.edu.tw
COMMENT= The GGZ Gaming Zone - Base Library
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
INSTALLS_SHLIB= yes
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index b4ec86815888..9baf444a2f6a 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= thierry@FreeBSD.org
COMMENT= Core library of MaitreTarot, a Tarot card game
USE_BZIP2= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= glib20 libxml2 lthack
INSTALLS_SHLIB= yes
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index ff7129e23a82..cdd80d999abb 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -18,7 +18,7 @@ COMMENT= Client-side library of MaitreTarot, a Tarot card game
LIB_DEPENDS= maitretarot.0:${PORTSDIR}/games/libmaitretarot
USE_BZIP2= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= glib20 libxml2 lthack
INSTALLS_SHLIB= yes
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 923b345168ec..e2911bef6d0a 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
HAS_MONKEYS= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GSTREAMER= ogg gconf
USE_GNOME= gnomehack gnomeprefix librsvg2 libgnomeui \
diff --git a/games/moon-buggy/Makefile b/games/moon-buggy/Makefile
index fc7ebcfeff47..6ec14978dee5 100644
--- a/games/moon-buggy/Makefile
+++ b/games/moon-buggy/Makefile
@@ -23,7 +23,7 @@ COMMENT= Drive a buggy across the moons surface
LIB_DEPENDS= esd:${PORTSDIR}/audio/esound:install
.endif
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sharedstatedir=/var/games\
--with-setgid=games
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index bedc2f9503d6..128560f6e422 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -27,7 +27,7 @@ USE_SDL= image mixer sdl
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 88ec0b12373f..c200d85fb761 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -18,7 +18,7 @@ COMMENT= An Internet playable version of the Settlers of Catan for GNOME/GTK
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index f087a3fffadf..5324ca740f67 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -17,8 +17,7 @@ COMMENT= First Person Shooter with many addons available
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_REINPLACE= yes
WANT_SDL= yes
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 3723b9ca9d1f..5f0efaeb4056 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -30,7 +30,7 @@ WADFILE= quakesw-1.0.6.tar.gz
PROGFILE= qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
SKINFILES= skinbase.zip qw_skins.zip
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_XLIB= yes
USE_REINPLACE= yes
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index de77d54d42de..aef8511f2955 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -32,8 +32,7 @@ USE_SDL= mixer net sdl
GNU_CONFIGURE= yes
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15 autoconf:253
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/scorched
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 551b87d8333f..54c9f08b8d49 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -18,7 +18,7 @@ COMMENT= A turn-based strategy game for GNOME
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui lthack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index aa274731c77d..eaa858044db9 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -13,7 +13,7 @@ DISTNAME= valley-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
COMMENT= The Valley is a rewrite of an old RPG from the early 1980s
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_X= yes
HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index d0059e8e107c..7061bbd36df0 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= elfrink@introweb.nl
COMMENT= Generates ASCII tractors
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
MAN6= tractorgen.6
PLIST_FILES= bin/tractorgen
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 33e0f7b96e09..3e8dca0b3afd 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 155ee7920bd0..c5e4a7546ae7 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -18,8 +18,7 @@ COMMENT= An educational typing tutor starring Tux the Linux Penguin
USE_SDL= image mixer sdl
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index df03d8f45cc3..fac86bbb4b3f 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -25,7 +25,7 @@ USE_GL= yes
USE_GETOPT_LONG= 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="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 58e072d37693..b503ecee073d 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
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/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 1cd0906a14f4..47f9c072c6de 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -21,8 +21,7 @@ NO_CDROM= "don't sell for profit"
USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
AUTOMAKE_ARGS= --include-deps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index e4bf746cf395..52bcc483bbfc 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -17,7 +17,7 @@ COMMENT= A puzzle game, somewhat like Tetris
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 1dfb0bf5cb26..fd4f9af7d0ea 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_XLIB= yes
USE_MESA= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 34cf9dfe6139..e311c3e7fc7e 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -18,8 +18,7 @@ COMMENT= Zangband (Zelazny Angband) with color, X11 support
USE_XLIB= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --datadir=${PREFIX}/lib \
--with-setgid=${SHAREGRP}
diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index 21b9c2427249..f9f22a65a7a2 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= steak:${PORTSDIR}/german/steak
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index c249433c7271..ff247f103f3c 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
USE_GL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \
--enable-3ds-import --enable-sound
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -29,7 +29,7 @@ OPTIONS+= FPX "Build FPX backend -- broken on non-i386 systems" \
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= GraphicsMagick++-config.1 \
GraphicsMagick-config.1 \
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -29,7 +29,7 @@ OPTIONS+= FPX "Build FPX backend -- broken on non-i386 systems" \
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= GraphicsMagick++-config.1 \
GraphicsMagick-config.1 \
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index b2f29fdf3d38..2dbd0b4178e0 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -29,7 +29,7 @@ OPTIONS+= FPX "Build FPX backend -- broken on non-i386 systems" \
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= GraphicsMagick++-config.1 \
GraphicsMagick-config.1 \
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 7acb87acb855..1f790f32aa37 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -18,7 +18,7 @@ COMMENT= Fast pixel formats conversion library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0fea22e81b9d..fe7e00fa6d0e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -21,8 +21,7 @@ USE_PERL5= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index eda454286c76..7e9f59048d75 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= openexr
MAINTAINER= nork@FreeBSD.org
COMMENT= A high dynamic-range (HDR) image file format
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= YES
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 234774f5b588..0fe51d08c0af 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -18,7 +18,7 @@ COMMENT= An ascii art library
WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_X11)
diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index a57dd87a4cbf..8c2b73711de3 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253
GNU_CONFIGURE= yes
MAKEFILE= makefile
ALL_TARGET= lib
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 45e74f6fa179..5d35e36ca0cc 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
USE_XLIB= yes
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index a9c7cd88ba66..cdb369089ae6 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
.include <bsd.port.pre.mk>
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index e203abf65215..f0a4dc5c2ac8 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -23,10 +23,8 @@ CONFLICTS= cal3d-[0-9]*
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_GCC= 3.2+
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoheader:259 libtool:15:inc
AUTOMAKE_ARGS= "--add-missing"
-USE_AUTOHEADER_VER= 259
-USE_INC_LIBTOOL_VER= 15
INSTALLS_SHLIB= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 4e4275c580aa..ce98c76ecf93 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -19,10 +19,8 @@ CONFLICTS= cal3d-devel-[0-9]*
USE_BZIP2= yes
USE_GNOME= pkgconfig
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoheader:259 libtool:15:inc
AUTOMAKE_ARGS= "--add-missing"
-USE_AUTOHEADER_VER= 259
-USE_INC_LIBTOOL_VER= 15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --disable-static
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 068fb803d16e..79abdeeb07bd 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= IL.1:${PORTSDIR}/graphics/devil
WRKSRC= ${WRKDIR}/${PORTNAME}_mk2
CONFIGURE_ARGS= --without-xerces-c
USE_REINPLACE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/graphics/cegui04/Makefile b/graphics/cegui04/Makefile
index 068fb803d16e..79abdeeb07bd 100644
--- a/graphics/cegui04/Makefile
+++ b/graphics/cegui04/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= IL.1:${PORTSDIR}/graphics/devil
WRKSRC= ${WRKDIR}/${PORTNAME}_mk2
CONFIGURE_ARGS= --without-xerces-c
USE_REINPLACE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 359f7186bf63..aa2774ee5743 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PYTHON= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index 18cf15ec1e98..c6ee44dbeb8c 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
GNU_CONFIGURE= yes
USE_GNOME= gnometarget lthack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile
index 5f9de0a1d18d..553b81d92a98 100644
--- a/graphics/demeter/Makefile
+++ b/graphics/demeter/Makefile
@@ -24,9 +24,7 @@ USE_GL= yes
USE_X_PREFIX= yes
WANT_GNOME= yes
WANT_SDL= yes
-USE_AUTOCONF_VER= 253
-USE_AUTOMAKE_VER= 15
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 4b8d1e44e9dc..e9128f1324c3 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -33,7 +33,7 @@ CFLAGS+= "-I${LOCALBASE}/include/SDL11"
.endif
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
-L${X11BASE}/lib"
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index e59dc079cc42..5e9964931e04 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack
WANT_GNOME= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl" \
LOCALBASE="${LOCALBASE}"
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 2d00c01ab6f4..6f5fa790f1a0 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -20,7 +20,7 @@ USE_GNOME= gnomehack gnometarget pygnome2
USE_PYTHON= 2.2+
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_SHLIB= yes
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 9392d1bac656..2d026b9a28c7 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -17,8 +17,7 @@ COMMENT= DivX Calculator
USE_BZIP2= yes
USE_QT_VER= 3
USE_GMAKE= yes
-WANT_AUTOMAKE_VER= 15
-WANT_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15:env autoconf:253:env
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index f97ba7d553ab..7fe640bd287b 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -26,8 +26,7 @@ PKGNAMESUFFIX= -nox11
USE_ICONV= yes
USE_PERL5_BUILD=yes
-USE_AUTOCONF_VER=259
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15:inc
INSTALLS_SHLIB= yes
DATADIR= ${PREFIX}/share/djvu
CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 0fff7cf98f83..36a84588b2f1 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= embryo.9:${PORTSDIR}/lang/embryo \
evas.1:${PORTSDIR}/graphics/evas \
ecore.1:${PORTSDIR}/x11/ecore
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index a3a82cdc1617..51b3c526bb9a 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -19,7 +19,7 @@ COMMENT= A graphic view base imlib & gtk
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 9bb00c0e2ca5..5c8813c19847 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --enable-all-plugins \
--enable-plugins-dir \
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index d0e9de6e7c0a..3cf6fb49bd7e 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -17,7 +17,7 @@ COMMENT= An image viewer written using libraries for Enlightenment 0.17 developm
LIB_DEPENDS= esmart_thumb.0:${PORTSDIR}/graphics/esmart
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index 3f3f22627b74..5b1d5cdc6345 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -15,7 +15,7 @@ COMMENT= An IMMENSELY FAST JPEG thumbnailer library API
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 3181620d30db..7e484c0058ec 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -16,7 +16,7 @@ COMMENT= A small, display independent, and quick thumbnailing library
LIB_DEPENDS= epeg.9:${PORTSDIR}/graphics/epeg \
edje.5:${PORTSDIR}/graphics/edje
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index 32276db967f2..dfef10670876 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -17,8 +17,7 @@ COMMENT= Evas smart objects development libraries
LIB_DEPENDS= epsilon.0:${PORTSDIR}/graphics/epsilon
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 0cae41fa74c5..41e31ff45069 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
eet.9:${PORTSDIR}/devel/eet
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_FREETYPE2= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig gnometarget
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index ca7f0e897f45..930d3ad7a60c 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -17,7 +17,7 @@ COMMENT= Command line utility to read and manipulate EXIF data
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
popt.0:${PORTSDIR}/devel/popt
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-popt-prefix=${LOCALBASE}
MAN1= exif.1
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 5acc7542d592..97cdd593856e 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Exif and Iptc metadata manipulation library and tools
BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index e4e9e863cc25..713965dd53ad 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= Half:${PORTSDIR}/graphics/OpenEXR \
png:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GETOPT_LONG=yes
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 2416ad5a4179..06626b85aa91 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 9db83153d637..4f374b05d88f 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -18,7 +18,7 @@ COMMENT= Fonts and font libraries necessary for Enlightenment
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= imlib
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 084381995b54..144b8428f8a5 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index e49244927392..b899c3f537c4 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -19,7 +19,7 @@ USE_MOTIF= yes
USE_X_PREFIX= yes
USE_MESA= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=${X11BASE}
diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 01f51a160e43..6cd91e856c46 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -16,7 +16,7 @@ COMMENT= GEOS implements all the OpenGIS "Simple Features for SQL"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_BZIP2= YES
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 70364256e6ba..5f1551a33e9e 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
post-patch:
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index ca3921c1e734..aea4a8c2e3ff 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tools and library routines for working with GIF images
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
WANT_GNOME= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
WANT_GNOME= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 442e451c7acf..7a3abc7bb550 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -41,7 +41,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 4c5a4231f818..d9e03cd7973b 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -39,7 +39,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
WANT_GNOME= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index effea9eca041..4542d30cb1a1 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_PERL5_BUILD= yes
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index d15f593246c3..c1c270382319 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_MESA= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= "LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}"
MAN3= gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle \
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 8acddcb1e3f8..63c42a6a8499 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -21,9 +21,7 @@ USE_BZIP2= yes
WRKSRC= ${WRKDIR}/Glide3
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:14 autoconf:253 libtool:13:inc
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
MAKEFILE= makefile.autoconf
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 2c0620c3544e..dc7ce9f1e857 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_MESA= yes
USE_FREETYPE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib"
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index d2622b192ed0..e2a23a4a69b1 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index a719e4949826..c2b38d10102a 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
USE_GCC= 3.4
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-sdltest --enable-static
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 0946cb1d4aa2..7ea93a3182e4 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
desktopfileutils
USE_X_PREFIX= 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/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 4bbf930762be..f14a101c036a 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gtkcairo/Makefile b/graphics/gtkcairo/Makefile
index 83d155b7bcdf..46454a8fabd5 100644
--- a/graphics/gtkcairo/Makefile
+++ b/graphics/gtkcairo/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GNOME= gtk20 gnometarget gnomehack
INSTALLS_SHLIB= yes
USE_REINPLACE= 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/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index fbcb7eda699d..0de8e1781339 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
RUN_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index da600bd1493b..3452b85498db 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A very simple GUI framework for use with SDL
USE_SDL= sdl
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 9e5d49ae343c..055be5a9b30f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12 gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 8136bff67c71..a671181dc182 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -20,12 +20,10 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
-USE_LIBLTDL= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libltdl:15 libtool:15
USE_GNOME= gnomehack pkgconfig gnometarget
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
INSTALLS_SHLIB= yes
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 67465e781632..0b555cd7fc3d 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
edb.1:${PORTSDIR}/databases/edb \
eet.9:${PORTSDIR}/devel/eet
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" \
LIBS="-L${PREFIX}/lib"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 8adc3fe4b085..ceefc950c44e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libxslt
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4
CONFIGURE_ARGS= --with-popt \
--with-gnome-print
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 79f0273ef390..e4d1da1bf689 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_ZIP= yes
USE_GNOME= gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index a335ceb704eb..a6d5bb9adaaf 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386
WRKSRC= ${WRKDIR}/jpeg-mmx
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 259eb60ae8b1..3dda0d190a6c 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -24,7 +24,7 @@ COMMENT= IJG's jpeg compression utilities
WRKSRC= ${WRKDIR}/jpeg-6b
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index db90cd0d00d6..96a7f8e98822 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ \
CONFLICTS= atlas-3* superlu-3*
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GL= yes
USE_GNOME= gnometarget gtk12 libxslt
GNU_CONFIGURE= yes
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index da51f215a86c..151b803e4863 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -24,7 +24,7 @@ USE_GL= yes
USE_GNOME= gnometarget gtk20
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-lib-GL
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 39603711a33c..173625b917f4 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -18,7 +18,7 @@ COMMENT= Light Color Management System -- a color management library
USE_GNOME= gnomehack gnometarget lthack
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --without-jpeg --without-tiff
INSTALLS_SHLIB= yes
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 30a8fa88c71a..063727b6303b 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -19,7 +19,7 @@ COMMENT= Library for high-performance 2D graphics
USE_BZIP2= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFLICTS= libart-[0-9]*
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 30a8fa88c71a..063727b6303b 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -19,7 +19,7 @@ COMMENT= Library for high-performance 2D graphics
USE_BZIP2= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFLICTS= libart-[0-9]*
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 6efc996d5a78..995377396217 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= yinjieh@csie.nctu.edu.tw
COMMENT= Library to read digital camera file meta-data
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
INSTALLS_SHLIB= yes
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index f0c3348f1249..0f4aaa9e0dd9 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
jpeg.9:${PORTSDIR}/graphics/jpeg
WRKSRC= ${WRKDIR}/${DISTNAME}/lib
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 435e438ca654..0efddb8416ff 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 4cb83ea376e1..6892e1d6749a 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gii.0:${PORTSDIR}/devel/libgii
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 734b853043a9..e136bc419096 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
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/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index 142627957048..052f082b6371 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
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/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index cb084fd650c9..ea206aa7b8db 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
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/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 8784f712907d..a0057e99df6e 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomecanvas
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index cfb591ab7ba7..7c1eb3a6776f 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnometarget pkgconfig
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure libgphoto2_port/configure
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index 70b71c9cb428..3784474aa74a 100644
--- a/graphics/libgrass5/Makefile
+++ b/graphics/libgrass5/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library of functions from the GRASS GIS application for use by non-GRASS programs
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
INSTALLS_SHLIB= yes
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index 19c58b7f9ce5..dd869ad9377e 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for loading (and saving) 3d modeller object files
CONFLICTS= xmorph*
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index a5d616acae0f..c3750b7012f7 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomelibs gdkpixbuf
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index ca3921c1e734..aea4a8c2e3ff 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tools and library routines for working with GIF images
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile
index 25bf437be6e7..84edd3ec2fa4 100644
--- a/graphics/libvisual-plugins/Makefile
+++ b/graphics/libvisual-plugins/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= visual.0:${PORTSDIR}/graphics/libvisual
WANT_GNOME= yes
USE_GNOME= gnometarget pkgconfig
USE_XLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-alsa
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index ce7820530c56..c8d61cb3f178 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -20,7 +20,7 @@ COMMENT= Abstraction library that sits between apps and visual plugin
USE_XLIBS= yes
USE_GNOME= gnomehack pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index ce7820530c56..c8d61cb3f178 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -20,7 +20,7 @@ COMMENT= Abstraction library that sits between apps and visual plugin
USE_XLIBS= yes
USE_GNOME= gnomehack pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 84deff24d940..75808c662a76 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk
MAN1= lodju-create.1 lodju-gallery.1 lodju.1
MANCOMPRESSED= yes
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
HAS_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gtk12 gdkpixbuf
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index a3b8b0b720fa..74fb145eee0b 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
.endif
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV+= GLVER="${GLVER}" LIBS="-lm"
SUB_GL= src si-glu src-glu
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 0102bdbddeec..6d3cdacffbad 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vips.14:${PORTSDIR}/graphics/vips \
USE_GMAKE= yes
USE_GNOME= gnomemimedata glib20 pkgconfig gtk20
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
MAN1= nip2.1
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index e76e614b6da3..4255a52d940a 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ library for representing curves or surfaces
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --program-transform-name="s/x/x/"
INSTALLS_SHLIB= yes
diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre312/Makefile
+++ b/graphics/ogre312/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= zzip.10:${PORTSDIR}/devel/zziplib \
WRKSRC= ${WRKDIR}/ogrenew
CONFIGURE_ARGS= --disable-cg --program-transform-name=
USE_REINPLACE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= zzip.10:${PORTSDIR}/devel/zziplib \
WRKSRC= ${WRKDIR}/ogrenew
CONFIGURE_ARGS= --disable-cg --program-transform-name=
USE_REINPLACE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index ddaed421207f..b1a9f957fd3a 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= zzip.10:${PORTSDIR}/devel/zziplib \
WRKSRC= ${WRKDIR}/ogrenew
CONFIGURE_ARGS= --disable-cg --program-transform-name=
USE_REINPLACE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile
index 13edd440d026..0abf4d7ee2da 100644
--- a/graphics/paintlib/Makefile
+++ b/graphics/paintlib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
tiff:${PORTSDIR}/graphics/tiff \
ungif:${PORTSDIR}/graphics/libungif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-SDL --disable-dfb
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 26c7d5b9dfc9..9c5c2dcb3d93 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 32f0f3d8d9f4..0ff6978ea8ef 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,9 +22,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
-WANT_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 213
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= automake:15:env autoconf:213 libtool:13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 8b0663562cbc..4a3842cdf9e1 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_BZIP2= yes
.include <bsd.port.pre.mk>
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index df5096dcfa26..8f481733fde6 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -17,7 +17,7 @@ COMMENT= A plotting library and toolkit
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MOTIFLIB="${MOTIFLIB}" \
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -33,7 +33,7 @@ USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -33,7 +33,7 @@ USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 5f21a21acf72..28439d7be6b2 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -33,7 +33,7 @@ USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index e373d223b3aa..bde051576eee 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -17,7 +17,7 @@ COMMENT= Cartographic Projections library
NADFILES= proj-nad27-1.2.tar.gz
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 41f4c84d0f30..e8f7c6d86481 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -22,7 +22,7 @@ OPTIONS= IMAGEMAGICK "Enable magick++ interface" on \
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GHOSTSCRIPT= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 9d086aca5199..83ef7b8f272b 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYNUMERIC}
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= 2.3+
USE_REINPLACE= yes
USE_XLIB= yes
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index 53bb81dca4cb..6885ab61574c 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -18,7 +18,7 @@ COMMENT= Use OpenGL to play around with three dimensional scenes
USE_QT_VER= 3
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= QTDIR="${X11BASE}"
INSTALLS_SHLIB= yes
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index 6ee8f06fde5d..2cdd0d169b89 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
USE_GNOME= glib12
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index ca7ccdd5e9e6..1a6b3bf7c34a 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= ip@doom.homeunix.org
COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM)
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GL= yes
USE_X_PREFIX= yes
diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile
index 060f8a884026..4ba3568f0b8a 100644
--- a/graphics/sage/Makefile
+++ b/graphics/sage/Makefile
@@ -16,7 +16,7 @@ COMMENT= OpenGL extension library
USE_SDL= sdl
USE_GL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 4691a4052921..45a5a96083ec 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -29,7 +29,7 @@ OPTIONS= USB "USB support" on \
USE_GNOME= gnometarget
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --disable-locking
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index cbbc069d3b39..9ea8778fb926 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -19,7 +19,7 @@ COMMENT= SDL graphics drawing primitives and other support functions
USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --includedir=${PREFIX}/include/SDL11 \
--disable-mmx
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index b5319a2618b3..96a0711a0db2 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_SDL= sdl
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 2ec047abf909..67d6ecabddda 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -20,7 +20,7 @@ USE_SDL= sdl
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 92920dcaf489..18b21594566e 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
png.5:${PORTSDIR}/graphics/png
USE_XLIB= 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/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 164534b873c5..1a1e1536078b 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --without-gnome-print \
--with-popt
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index a58dda8fce92..79c413867dfa 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/sswf-${PORTVERSION}
USE_ICONV= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index cb131f15b8f2..d1b48ab7d857 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -24,7 +24,7 @@ EXPIRATION_DATE= 2005-12-05
BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index f7a5425be96f..4467d697cce7 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -29,7 +29,7 @@ USE_QT_VER= 3
USE_MESA= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index b3ffa56dff61..e6e80722719c 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= fftw3.3:${PORTSDIR}/math/fftw3 \
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 pkgconfig pango
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index a78b515414c2..8f74a1ec9055 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -15,7 +15,7 @@ COMMENT= An image viewer for X
USE_SDL= image
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index c818c3c5605e..e79f60641ad9 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= tdv94ped@cs.umu.se
COMMENT= A medical image conversion utility and library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_SUBMAKE= yes
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index 5a76864e72df..02f251bab9cb 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
PLIST_FILES= lib/xmms/Visualization/libiris.so
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GL= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index a97d544c035f..aab99a01d51e 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_MESA= yes
USE_GNOME= gtk12
USE_BZIP2= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile
index 4aebbb48b96d..ae9e407fd08e 100644
--- a/graphics/xmms-plazma/Makefile
+++ b/graphics/xmms-plazma/Makefile
@@ -20,7 +20,7 @@ USE_GL= yes
USE_GNOME= gtk12
USE_SDL= sdl
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
PLIST_FILES= lib/xmms/Visualization/libplazma.so
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index 1769ed7e8ea4..bf05c82e184b 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-patch:
@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index 0a57ae19c0a0..b210ea858a70 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
DATADIR= ${PREFIX}/share/xmms/VU_Meter_skins
diff --git a/graphics/xmms-waterfall/Makefile b/graphics/xmms-waterfall/Makefile
index 557c0b956b69..cf3dad5c4325 100644
--- a/graphics/xmms-waterfall/Makefile
+++ b/graphics/xmms-waterfall/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
PLIST_FILES= lib/xmms/Visualization/libwaterfall.so
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 51a98edd5784..5c131dd69c0f 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= libmorph*
USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GNOME= gnometarget lthack
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 04e2b486a182..69089f536217 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -25,7 +25,7 @@ USE_X_PREFIX= yes
USE_MOTIF= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index 931da686b541..076b2a262994 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile
index 931da686b541..076b2a262994 100644
--- a/graphics/yafray/Makefile
+++ b/graphics/yafray/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile
index cc35f40599d0..d4ce022368fc 100644
--- a/hebrew/he2/Makefile
+++ b/hebrew/he2/Makefile
@@ -18,7 +18,7 @@ COMMENT= An editor for editing (primarily LaTeX) Hebrew files
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 82e07ee50b95..1df0a47a4218 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -74,7 +74,7 @@ LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
.endif
.if defined(WITH_IPV6)
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253
.endif
.if ${ARCH} == "alpha" || ${ARCH} == "ia64" || ${ARCH} == "amd64"
diff --git a/irc/dancer-services/Makefile b/irc/dancer-services/Makefile
index 7946a391a7c3..886ec95df417 100644
--- a/irc/dancer-services/Makefile
+++ b/irc/dancer-services/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= The IRC services (nickserv, chanserv, etc.) for dancer-ircd
-WANT_AUTOMAKE_VER=15
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= automake:15:env autoconf:253:env
USE_RC_SUBR= yes
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 5c945ff0efdc..6f67724746c9 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= irssi-0.8*
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index eb7d296899d9..f0d1f41db352 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --mandir=${PREFIX}/man
PLIST_SUB= VER=${PORTVERSION}
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index eb7d296899d9..f0d1f41db352 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --mandir=${PREFIX}/man
PLIST_SUB= VER=${PORTVERSION}
diff --git a/irc/olirc/Makefile b/irc/olirc/Makefile
index 7f163d8d907e..69e017a57c28 100644
--- a/irc/olirc/Makefile
+++ b/irc/olirc/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES= bin/olirc
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
do-install:
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 2c12159abf91..1d3e57c4ecbe 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-nls \
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index e33d70c5250a..a724f2516cd9 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index c24da35eb50c..c2b359302fb7 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/FreeWnn-1.10-pl020
ALL_TARGET= includes all
INSTALL_TARGET= install install.man
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 213
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:213 libtool:15
MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}"
INSTALLS_SHLIB= yes
USE_BZIP2= yes
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index e49478928bb3..53b386525820 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Another kana-kanji conversion system
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME= gnometarget lthack pkgconfig
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 8a73c3490907..d7cad69057b0 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -21,7 +21,7 @@ COMMENT= A color vt102 terminal emulator with transparency support
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_X_PREFIX= yes
USE_XPM= yes
GNU_CONFIGURE= yes
diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile
index 2eb7c3b7e4ad..2a8c3a454b73 100644
--- a/japanese/balsa/Makefile
+++ b/japanese/balsa/Makefile
@@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/balsa-0.8.0ja
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_PERL5_BUILD=yes
USE_GMAKE= yes
LIBTOOLFILES= configure libmutt/configure
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index 92b086368da3..152f3bfcf1f2 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.nurs.or.jp/~kurati/celrw/
MAINTAINER= shuna@pop16.odn.ne.jp
COMMENT= Cellular phone-number read/write tool (in Japan only)
-WANT_AUTOMAKE_VER=15
+USE_AUTOTOOLS= automake:15:env
USE_BZIP2= yes
HAS_CONFIGURE= yes
ALL_TARGET=
diff --git a/japanese/dvipdfm/Makefile b/japanese/dvipdfm/Makefile
index fcc34942a972..031a63ce7550 100644
--- a/japanese/dvipdfm/Makefile
+++ b/japanese/dvipdfm/Makefile
@@ -30,7 +30,7 @@ BROKEN= Incorrect pkg-plist
MAN1= dvipdfm.1
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${PREFIX}/include" \
CFLAGS="${CFLAGS} -I${PREFIX}/include" \
LDFLAGS=-L${PREFIX}/lib
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 777efea25272..1a35d90f52bf 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -61,7 +61,7 @@ DIST_SUBDIR= eb
USE_BZIP2= yes
USE_GETTEXT= yes
USE_PERL5= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-nls \
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 526ba5a241bf..63a153aba161 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -61,7 +61,7 @@ DIST_SUBDIR= eb
USE_GETTEXT= yes
USE_PERL5= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-nls \
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index bd7197b1f830..79185b733c01 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= ja-ebview-gtk2-*
USE_GETOPT_LONG= yes
USE_GNOME= imlib
USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index b50ea1150465..6475d5321212 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= YES
EMACS_VER= 21.3
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index 640a83a0d177..3f08593da63a 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -43,7 +43,7 @@ DLCANNA_VER= 1.4
# hack to allow parallel build to work
.if defined(PACKAGE_BUILDING)
USE_GMAKE= yes
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
.endif
post-install:
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 297bf2d766f7..0775311f9ab0 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
${NONEXISTENT}:${EMACSDL_DIR}:configure
RUN_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wnn6 \
@@ -38,7 +38,6 @@ EMACSDL_SRCDIR= ${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
# hack to allow parallel build to work
.if defined(PARALLEL_PACKAGE_BUILD)
USE_GMAKE= yes
-WANT_AUTOCONF_VER=253
.endif
post-install:
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index fbe86e2f4f1d..2419978a17d6 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
LATEST_LINK= ja-emcws20
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= YES
EMACS_VER= 20.7
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index b381fe46a2e5..27cb3d230f3b 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
USE_BZIP2= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
DISTFILE_HELP= ${PORTNAME}pre2-help.tar.gz
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 0217d4799080..de0504452ae9 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -19,7 +19,7 @@ COMMENT= Esecanna module for VJE-Delta 2.5
RUN_DEPENDS= ${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
DIST_SUBDIR= esecanna
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 42909c094303..b460d8d12082 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
USE_PERL5= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
# VJE-Delta 3.0 is installed under /usr/local fixedly
CONFIGURE_ARGS= --with-vjecfgfile="/usr/local/etc/vje30/vje.cfg"
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 40849aab5e61..7fac385da09b 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -20,7 +20,7 @@ COMMENT= Esecanna module for Wnn6
LIB_DEPENDS= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
RUN_DEPENDS= ${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${PREFIX}/include/wnn6" \
LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index 6f42147cae26..9cb1d93e1af4 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -21,7 +21,7 @@ COMMENT= Pseudo cannaserver which wraps some other input engines
USE_RC_SUBR= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_ARGS= --with-piddir="${PIDDIR}"
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index ea5ef372ab7e..3f9e166bf2fe 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -15,7 +15,7 @@ COMMENT= A sophisticated scripter based on Japanized tcl/tk
LIB_DEPENDS= tk80jp.1:${PORTSDIR}/japanese/tk80
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
CONFIGURE_ARGS= --enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
--with-tkconfig=${PREFIX}/lib/tk8.0jp \
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 37f843549e52..f4ce059436d8 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -29,10 +29,8 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_XLIB= 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/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index 0a98be9bde13..3861e7c4e83a 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -28,10 +28,8 @@ USE_BZIP2= yes
USE_ICONV= 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/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index f972a853068d..a442e520bb71 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -21,7 +21,7 @@ OPTIONS+= WNN "Use FreeWnn" on
USE_PERL5_BUILD= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack gnomepanel lthack
GNU_CONFIGURE= yes
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index e09cdeaa0d52..c63f521773e2 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= chasen:${PORTSDIR}/japanese/chasen-base
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-dicdir=${PREFIX}/share/chasen/dic
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-install:
${INSTALL_DATA} ${WRKSRC}/chasenrc \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index eec5ea2924bb..91119422007e 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -26,7 +26,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
COMMENT= Less + zcat + ISO-2022 - a pager similar to more and pg
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-cs-regex
MAN1= jless.1 jlesskey.1
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 398af93b0904..de5b9380733e 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/japanese/mecab-razil/Makefile b/japanese/mecab-razil/Makefile
index c424f5f06cbe..8d359a140a4a 100644
--- a/japanese/mecab-razil/Makefile
+++ b/japanese/mecab-razil/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= mecab.0:${MECAB_PORTDIR}
USE_PERL5_BUILD= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 9740dbc72903..087a47da69fa 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -21,7 +21,7 @@ IPADIC_DISTNAME= ipadic-2.5.1
USE_PERL5_BUILD= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/japanese/mell/Makefile b/japanese/mell/Makefile
index 1e3cafa5f5b8..7891697dfdf1 100644
--- a/japanese/mell/Makefile
+++ b/japanese/mell/Makefile
@@ -14,9 +14,8 @@ MAINTAINER= otsuji@users.sourceforge.jp
COMMENT= Emacs Lisp for taiyaki-elisp, especially for the prime
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoconf:259
AUTOMAKE_ARGS= -af
-USE_AUTOCONF_VER= 259
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index f9b083e467da..c0cb190f3c21 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -20,8 +20,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT?= Japanese incremental search tool
.if !defined(EMACS_PORT_NAME)
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in
PLIST_SUB= MIGEMO="" ELISP="@comment "
.endif
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index ca31ada2a139..7a8c8d77eb89 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -60,8 +60,7 @@ NO_LATEST_LINK= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 1909da65cf8d..f20ca4b07752 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -41,8 +41,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
USE_REINPLACE= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/prime-dict/Makefile b/japanese/prime-dict/Makefile
index ad2a6c54b608..1a7eeca99acf 100644
--- a/japanese/prime-dict/Makefile
+++ b/japanese/prime-dict/Makefile
@@ -19,8 +19,7 @@ USE_RUBY= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime-el/Makefile b/japanese/prime-el/Makefile
index e2a1b6fc72e9..ebd9f8559e32 100644
--- a/japanese/prime-el/Makefile
+++ b/japanese/prime-el/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japane
prime:${PORTSDIR}/japanese/prime
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile
index 780370b2e813..73093ea90c58 100644
--- a/japanese/prime/Makefile
+++ b/japanese/prime/Makefile
@@ -25,8 +25,7 @@ RUBY_WITH_PTHREAD= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
PLIST_SUB= X11BASE=${X11BASE}
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index edb5fd5d8d15..4a3e33587f16 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
.endif
USE_RUBY= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
USE_RC_SUBR= rskkserv.sh
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index e8840b64706d..6b732defda9f 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -27,7 +27,7 @@ SAMBA_JA_VERSION= 1.0beta1
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
# directories
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 8b7d8ef8ce54..27a772545d52 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= 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/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index eb57d1caf8f2..fafbb735cd68 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= lthack
USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index b9db6ff7cd93..8d176bab7a20 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= lthack
USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 6c21ac804f66..6818d0fb210b 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 3d5720e807f6..c7ea9f18279d 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= 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/japanese/suikyo/Makefile b/japanese/suikyo/Makefile
index 74246bc6b1a6..2efc04163919 100644
--- a/japanese/suikyo/Makefile
+++ b/japanese/suikyo/Makefile
@@ -17,8 +17,7 @@ USE_RUBY= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 2c030cbfe7b2..2174bedc365b 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= taguchi@tohoku.iij.ad.jp
COMMENT= Japanized Tcl (Tool Command Language)
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 5f3f11770304..5a2deb4def96 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -26,7 +26,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --enable-shared
RANLIB= ranlib
PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg-install.tclsh
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 936f587066f5..1d32ddf5c7cf 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -20,7 +20,7 @@ COMMENT= Japanized TK (Tcl Tool Kit)
LIB_DEPENDS= tcl76jp.1:${PORTSDIR}/japanese/tcl76
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_XLIB= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 14ec51bffe22..69910c183808 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -28,7 +28,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_XLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index b0159eb7e43f..62bdb2aa4c28 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
USE_REINPLACE= yes
USE_XLIB= yes
USE_XPM= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gcc --enable-shared --enable-step \
--with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
diff --git a/japanese/uim/Makefile b/japanese/uim/Makefile
index ee2add526e09..105f2e2f60d2 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -25,7 +25,7 @@ WANT_GNOME= yes
USE_GNOME= lthack gnometarget glib20
USE_GMAKE= yes
USE_ICONV= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 07ebf8fa4166..3e350e6057c7 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION}
USE_FREETYPE= yes
USE_GETTEXT= yes
USE_XLIB= yes
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-freetype \
--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index bec1be8ee7dd..f679c68f178e 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${EDICT_FILE}:${PORTSDIR}/japanese/edict \
USE_X_PREFIX= yes
USE_RUBY= yes
-USE_AUTOCONF_VER= 213
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= autoconf:213 libtool:13
CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \
--with-ruby="${RUBY}" \
--with-netscape="${LOCALBASE}/bin/netscape"
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 4398f6e7a694..c86eb663df46 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GNU project to create a free Java class library
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gtk20 libartlgpl2 pkgconfig
USE_JAVA= yes
USE_JIKES= yes
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 0925d503ef9b..9c882205c888 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
MAN1= jc.1
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_JAVA= yes
USE_GMAKE= yes
JAVA_BUILD= jre
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 6024d390d59e..1633299b0976 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -37,7 +37,7 @@ CFLAGS+= -DJMPDEBUG -g
CFLAGS+= -O3
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_JAVA= yes
JAVA_VERSION= 1.2+
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index a4bfa542c348..064e59f0c657 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_ICONV= yes
LIBTOOLFLAGS=
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index aa0c76311a51..236e4ebcd18e 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -23,11 +23,9 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \
gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259 libltdl:15 libtool:15
#GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL= yes
INSTALLS_SHLIB= yes
PLIST_SUB= PORTVERSION=${PORTVERSION}
CONFIGURE_ENV= CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib"
diff --git a/korean/bitchx/Makefile b/korean/bitchx/Makefile
index 7aecd1fd3a51..87330b6da31f 100644
--- a/korean/bitchx/Makefile
+++ b/korean/bitchx/Makefile
@@ -22,7 +22,7 @@ COMMENT= An alternative ircII color client support patched for korean
WRKSRC= ${WRKDIR}/BitchX
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_ARGS= --with-plugins \
--exec-prefix="${PREFIX}/share" \
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index d2876415c2d6..0e4923e6436f 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanya
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= imlib
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" LOCALBASE="${LOCALBASE}"
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index 060cad507ca1..7deda2dd563e 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -25,10 +25,8 @@ USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_XLIB= 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/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index 5f5e04c8894e..e2387a913c73 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
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/lang/ccscript/Makefile b/lang/ccscript/Makefile
index 53713abbeb9c..b313756ed923 100644
--- a/lang/ccscript/Makefile
+++ b/lang/ccscript/Makefile
@@ -18,7 +18,7 @@ COMMENT= State-event driven class extendible C++ script interpreter
LIB_DEPENDS= ccgnu2-1.3.1:${PORTSDIR}/devel/commoncpp
USE_GNOME= gnometarget
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4
INSTALL_TARGET= install man
INSTALLS_SHLIB= yes
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 3a804f8b50d4..684c3e08aff1 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Scheme-to-C compiler
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= chicken-config.1 chicken-profile.1 chicken-setup.1 chicken.1 \
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 9ba94ec29e93..a160abf641f4 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Compiler for the SIMULA programming language
USE_PERL5= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/lang/clips/Makefile b/lang/clips/Makefile
index 40b6e62a30ae..210f8999f87e 100644
--- a/lang/clips/Makefile
+++ b/lang/clips/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@dougdidit.com
COMMENT= CLIPS is a productive development and delivery expert system tool
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 38693fd1aeca..c80c7f414ff5 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -45,7 +45,7 @@ ONLY_FOR_ARCHS= i386
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAKEFILE= GNUmakefile
ALL_TARGET= default
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 0d27fa77074f..48d90133d51a 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -29,7 +29,7 @@ INFO= ecl ecldev
USE_GMAKE= YES
USE_PERL5_BUILD=yes
GNU_CONFIGURE= YES
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --with-asdf --with-tcp --with-system-gmp --enable-boehm=included
# We need to tell ECL where to find the GMP includes
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index b7139f3e8d15..98bf309a115b 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
USE_BZIP2= yes
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFLAGS= # none
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 92d0b56702ba..f649136268bb 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR= emacs
MAINTAINER= amakawa@jp.FreeBSD.org
COMMENT= An introduction to Emacs Lisp programming
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
.include <bsd.port.mk>
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index c4791dbca8eb..8db78b4a7039 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://enlightenment.freedesktop.org/files/
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A C like scripting language used in parts of the Enlightenment
-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/lang/ferite/Makefile b/lang/ferite/Makefile
index a356b0863375..c42373d8dad0 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -17,7 +17,7 @@ COMMENT= An embeddable scripting language
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
xml2.5:${PORTSDIR}/textproc/libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index 31549d5fc6fc..cdc53326ae20 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_ARGS= OPTIM="${CFLAGS}"
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --disable-float
MAN1= pfe.1
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index f21811ce0614..44c1d6b10a3d 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -16,11 +16,10 @@ COMMENT= Gambas Almost Means BASic
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
ml.0:${PORTSDIR}/math/ldouble
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
LIBTOOLFILES= configure libltdl/configure
LIBTOOLFLAGS= # none
USE_GMAKE= yes
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index a980f074a69a..389245726c83 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4
ONLY_FOR_ARCHS= i386
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
USE_XLIB= yes
CONFIGURE_ARGS=--prefix=${PREFIX} \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 15fe7b9f4f94..309b0fcfcca8 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x
IGNORE= requires newer version of perl
.endif
-WANT_AUTOCONF_VER=259 # Need this to regenerate patched configure in OpenAL
+USE_AUTOTOOLS= autoconf:259:env
LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4 \
glut.3:${PORTSDIR}/graphics/libglut \
openal.0:${PORTSDIR}/audio/openal \
diff --git a/lang/glade-gpl/Makefile b/lang/glade-gpl/Makefile
index ba10cd586bcf..38e3e9b6c1a1 100644
--- a/lang/glade-gpl/Makefile
+++ b/lang/glade-gpl/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
.if ${OSVERSION} >= 500039
WITHOUT_CPU_CFLAGS= yes
.endif
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213
CONFIGURE_ENV= ADA=adagcc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index ba10cd586bcf..38e3e9b6c1a1 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
.if ${OSVERSION} >= 500039
WITHOUT_CPU_CFLAGS= yes
.endif
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= automake:14 autoconf:213
CONFIGURE_ENV= ADA=adagcc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 495619cc4d74..dd6d2de3b5c4 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4
PREFIX= ${LOCALBASE}/GNUstep
NO_MTREE= yes
ETCDIR= ${LOCALBASE}/etc
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-procfs
CONFIGURE_TARGET=
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index a8765a57b71e..8d8e1bbfdc86 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}.orig/src/src
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-c-flags="${CFLAGS}" \
--with-doc-dir=none \
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 99ec957b21de..3ca9229269b8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= guile
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNU Ubiquitous Intelligent Language for Extension
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/lang/libjit/Makefile b/lang/libjit/Makefile
index aaeb01e968e4..ff1c821dea95 100644
--- a/lang/libjit/Makefile
+++ b/lang/libjit/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Libjit implements Just-In-Time compilation functionality
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile
index e3cabeed5f24..a9ab01a5a884 100644
--- a/lang/libutils/Makefile
+++ b/lang/libutils/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Support lib for Tensile/NSL
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= CFLAGS="${CFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/lang/ml-pnet/Makefile b/lang/ml-pnet/Makefile
index 5e1048020616..fbf849b1f136 100644
--- a/lang/ml-pnet/Makefile
+++ b/lang/ml-pnet/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= cscc:${PORTSDIR}/lang/pnet-base \
${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
RUN_DEPENDS= ${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
.include "${.CURDIR}/../pnet/Makefile.pnet"
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index cff7242de90e..44d699154658 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -22,7 +22,7 @@ USE_BISON= yes
USE_GNOME= gnomehack glib20
USE_GMAKE= yes
LIBTOOLFILES= configure libgc/configure
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index e5c0bb666d13..8860d4593625 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -32,7 +32,7 @@ USE_BISON= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes
USE_XLIB= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
# magic wand: set INSTALL to some absurd value, or else
# mozart's configure will not find the right install
# when configuring as root.
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 687299a18ba2..1b98e3051671 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -18,7 +18,7 @@ COMMENT= NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
CONFLICTS= js-1.5.*
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
.if defined(NOPORTDOCS)
USE_REINPLACE= yes
.endif
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 161fdc49b678..d151d39fa414 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gc4.14.tar.gz
MAINTAINER= ob@breuninger.org
COMMENT= Optimizing Oberon-2 compiler of University of Kaiserslautern, Germany
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
MAN1= oo2c.1 oob.1 ooef.1 oocn.1 oowhereis.1
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index c89a8f81dda2..77227d1d688e 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -17,10 +17,9 @@ COMMENT= An open-source COBOL compiler
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index c89a8f81dda2..77227d1d688e 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -17,10 +17,9 @@ COMMENT= An open-source COBOL compiler
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile
index 466f4da77e10..cca566fbe7ea 100644
--- a/lang/osb-jscore/Makefile
+++ b/lang/osb-jscore/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= gtk-webcore
MAINTAINER= ahze@FreeBSD.org
COMMENT= Javascript interpreter port from Apple's KHTML and part of Gtk-Webcore
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GNOME= gtk20 gnomehack
INSTALLS_SHLIB= yes
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 129e7f39ecbd..f6dc4be7ec8d 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -16,7 +16,7 @@ COMMENT= MIT Object Tcl
LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4
INSTALLS_SHLIB= yes
diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile
index 6a968c35b878..da568681c1b1 100644
--- a/lang/pfe-devel/Makefile
+++ b/lang/pfe-devel/Makefile
@@ -19,7 +19,7 @@ LATEST_LINK= pfe-devel
USE_PERL5_BUILD=yes
USE_GNOME= gnometarget lthack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= pfe/configure
LIBTOOLFLAGS= # none
CONFIGURE_ARGS= --mandir=${PREFIX}/man
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 6a968c35b878..da568681c1b1 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -19,7 +19,7 @@ LATEST_LINK= pfe-devel
USE_PERL5_BUILD=yes
USE_GNOME= gnometarget lthack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= pfe/configure
LIBTOOLFLAGS= # none
CONFIGURE_ARGS= --mandir=${PREFIX}/man
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index d222d04bf5e8..56a31f86b18b 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -177,7 +177,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
.endif
.if ${PHP_MODNAME} == "mcve"
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 7666667c2e32..11eef6fbfb59 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -166,7 +166,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
.endif
.if ${PHP_MODNAME} == "mcve"
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 7666667c2e32..11eef6fbfb59 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -166,7 +166,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
.endif
.if ${PHP_MODNAME} == "mcve"
diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index a24999a44fe6..391b0400141c 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -24,7 +24,7 @@ USE_XLIB= yes
.endif
USE_GCC= 3.4
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/lang/pnetc/Makefile b/lang/pnetc/Makefile
index ced10d737fbf..be9fbb39dd13 100644
--- a/lang/pnetc/Makefile
+++ b/lang/pnetc/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= cscc:${PORTSDIR}/lang/pnet-base \
${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
RUN_DEPENDS= ${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
.include "${.CURDIR}/../pnet/Makefile.pnet"
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 52f62731e2cd..5d974baa283a 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= cscc:${PORTSDIR}/lang/pnet-base \
USE_XLIB= yes
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 50b35e5e2d49..f49ec232ca1d 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -86,7 +86,7 @@ PLIST_SUB+= HC08=""
CONFIGURE_ARGS+= --disable-ucsim
PLIST_SUB+= UCSIM="@comment "
.else
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= sim/ucsim/aclocal.m4
PLIST_SUB+= UCSIM=""
.endif
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index 9bc4aa10db69..cd23fede6f40 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --disable-pic16-port
PLIST_SUB+= PIC16="@comment "
.else
BUILD_DEPENDS+= gpasm:${PORTSDIR}/devel/gputils
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
PLIST_SUB+= PIC16=""
.endif
@@ -89,7 +89,6 @@ PLIST_SUB+= HC08=""
CONFIGURE_ARGS+= --disable-ucsim
PLIST_SUB+= UCSIM="@comment "
.else
-USE_LIBTOOL_VER= 15
LIBTOOLFILES= sim/ucsim/aclocal.m4
PLIST_SUB+= UCSIM=""
.endif
diff --git a/lang/see-devel/Makefile b/lang/see-devel/Makefile
index 05d1525ad5ad..9c39984d72f8 100644
--- a/lang/see-devel/Makefile
+++ b/lang/see-devel/Makefile
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile
index 19e1f2758f63..2432776d22c2 100644
--- a/lang/tensile/Makefile
+++ b/lang/tensile/Makefile
@@ -18,10 +18,9 @@ COMMENT= Programming language designed for especially complex processing texts
LIB_DEPENDS= utils.1:${PORTSDIR}/lang/libutils
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
LIBTOOLFLAGS= # none
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 0e62ae3218bb..4e838d2467d4 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -32,8 +32,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui \
gtkhtml3
USE_REINPLACE= yes
USE_GCC= 3.4+
-USE_LIBTOOL_VER=15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_ICONV= yes
CONFIGURE_ARGS= --enable-threads \
--enable-gtkhtml \
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 829c04b5fc96..4887bc1ae1e5 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -66,7 +66,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if defined(WITH_RCORDER)
USE_RCORDER= courier.sh
diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile
index fc1c45c0ba4d..7786aefef592 100644
--- a/mail/crashecho/Makefile
+++ b/mail/crashecho/Makefile
@@ -25,7 +25,7 @@ EXTRACT_CMD= rpm2cpio
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= | ${CPIO} -i
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= crashecho.1 \
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index e12ca954a4c6..a92756663d7c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -176,8 +176,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=259
-USE_AUTOHEADER_VER=259
+USE_AUTOTOOLS= autoconf:259 autoheader:259
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index e12ca954a4c6..a92756663d7c 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -176,8 +176,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=259
-USE_AUTOHEADER_VER=259
+USE_AUTOTOOLS= autoconf:259 autoheader:259
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index e12ca954a4c6..a92756663d7c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -176,8 +176,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=259
-USE_AUTOHEADER_VER=259
+USE_AUTOTOOLS= autoconf:259 autoheader:259
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 096c637d10d9..08d6c408c966 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -88,7 +88,7 @@ OPTIONS+= QMAIL "Play nice with Qmail mail server" off
OPTIONS+= CGI "Install CGI (pulls in apache)" off
OPTIONS+= TRAIN_SCRIPT "Install trainning script (needs perl)" off
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 8f0d8f1477d3..4a03b233131a 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -90,7 +90,7 @@ OPTIONS+= QMAIL "Play nice with Qmail mail server" off
OPTIONS+= CGI "Install CGI (pulls in apache)" off
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 17354e00b273..cafa39afd7a0 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
USE_GNOME= gnomehack evolutiondataserver
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 52e45fbd5c31..a6d4d2ac0316 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_GNOME= glib12
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CFLAGS+= -L${LOCALBASE}/lib # req'd to find iconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 8fc8e1fb262f..7d137da32c13 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= gmime-1.0.*
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget glib20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \
--with-html-dir=${PREFIX}/share/doc \
--enable-mono=no
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index 8a0356fb17b3..57131be4d211 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A JAM subroutine library
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
NO_INSTALL_MANPAGES= yes
INSTALLS_SHLIB= yes
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 0c8e08310ebd..39377f293285 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -19,7 +19,7 @@ COMMENT= A library for posting electronic mail
USE_BZIP2= yes
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 16c985d541d2..a5de60552914 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A mail library
USE_ICONV= 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/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index d1cc37bc9e57..23eefe5cd107 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -17,9 +17,8 @@ COMMENT= Generic mail checking library
LIB_DEPENDS= gnutls.12:${PORTSDIR}/security/gnutls \
oop.4:${PORTSDIR}/devel/liboop
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index a628576683a8..ae3edb44802b 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= mnag@FreeBSD.org
COMMENT= Sender Policy Framework (SPF) library and client
USE_BZIP2= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
OPTIONS= RFC_RECURSION "Change SPF recursion to 20 (as per RFC)" off \
diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile
index c940ff47aca4..4bdd70a878eb 100644
--- a/mail/libspf2-10/Makefile
+++ b/mail/libspf2-10/Makefile
@@ -20,7 +20,7 @@ LATEST_LINK= libspf2-10
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 821fbcd1ba4f..e363815bfb10 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= ${PORTNAME}-1.0.*
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index bb65c3151185..7678c199de20 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -16,7 +16,7 @@ COMMENT= Sender Rewriting Scheme 2 C Implementation
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 1a6020f41a48..aafd1cef3aaa 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_GCC= 3.3+
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-debug
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 6f98c7e4080f..025ca7a4c959 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -18,7 +18,7 @@ COMMENT= A mail notification for freedesktop.org-compliant system trays
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack eel2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d6a142efeac4..9bb7d56374cf 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -146,8 +146,7 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
USE_REINPLACE= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_OPENSSL= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 0cc696500f68..4dc64607a688 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -78,8 +78,7 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19 # configure.in is patched by <PATCHFILES>
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 0cc696500f68..4dc64607a688 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -78,8 +78,7 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19 # configure.in is patched by <PATCHFILES>
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 74283d1a0b49..f10856bac142 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -63,7 +63,7 @@ MAINTAINER= scott+ports@sabami.seaslug.org
COMMENT= A cleaned up MH mailer suite
USE_REINPLACE= yes
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \
--sysconfdir=${PREFIX}/etc/nmh
.ifdef NMH_EDITOR
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index af46a72e48f7..bead780e260b 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -24,7 +24,7 @@ MAN8= perdition.8
MANCOMPRESSED= no
USE_GETTEXT= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR}
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index b56d383c211b..c10df276e1e1 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= mnag@FreeBSD.org
COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 17e776a78567..941e60d4cc68 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -17,7 +17,7 @@ COMMENT= A flexible, modular RFC-compliant POP3 daemon
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN5= pop3lite.conf.5
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index efa94d06e132..9abcaf2e1d7e 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mbr@FreeBSD.org
COMMENT= POP3 Proxy Server derived from UP IMAP Proxy
GNU_CONFIGURE= YES
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213
USE_RC_SUBR= YES
SAMPLE_EXT= sample
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 3686348b0df1..9057e8b94614 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -16,7 +16,7 @@ COMMENT= Suite of programs for setting up large POP3 server systems
BUILD_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
USE_PERL5= yes
PDM_MODULES= any master
diff --git a/mail/postfix-gps-devel/Makefile b/mail/postfix-gps-devel/Makefile
index 376c52a515de..e09eb9f7db8b 100644
--- a/mail/postfix-gps-devel/Makefile
+++ b/mail/postfix-gps-devel/Makefile
@@ -23,8 +23,7 @@ SCRIPT_FILES= gps-maintain.pl gps-db-update.pl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_GCC= 3.4
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 6725ba1fc8fd..b0b85789b037 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -24,8 +24,7 @@ SCRIPT_FILES= gps-maintain.pl gps-db-update.pl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_GCC= 3.4
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index b02ef2557b66..e3162ed18f07 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Berkeley POP 3 server (now maintained by Qualcomm)
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_REINPLACE= yes
USE_OPENSSL= yes
CONFIGURE_ENV= LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index 2c662767ac6d..80f37da4ba3a 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -22,7 +22,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
QUICKML_USER= quickml
QUICKML_GROUP= quickml
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
USE_RUBY= yes
diff --git a/mail/rabl_client/Makefile b/mail/rabl_client/Makefile
index e5939fa11e95..7fb3a7b886f6 100644
--- a/mail/rabl_client/Makefile
+++ b/mail/rabl_client/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.nuclearelephant.com/projects/rabl/sources/ \
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= Reactive Autonomous Blackhole List client
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/rabl_server/Makefile b/mail/rabl_server/Makefile
index 16bee5845bf6..58dfc58cd34f 100644
--- a/mail/rabl_server/Makefile
+++ b/mail/rabl_server/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.nuclearelephant.com/projects/rabl/sources/ \
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= Reactive Autonomous Blackhole List server
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile
index b513f1e4559a..2448d6cd25ca 100644
--- a/mail/sccmilter/Makefile
+++ b/mail/sccmilter/Makefile
@@ -20,7 +20,7 @@ IGNORE= requires Sendmail 8.12; upgrade the base system
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_RC_SUBR= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=/var
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index a6f763b96672..836886fc54c5 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -71,7 +71,7 @@ USE_REINPLACE= YES
USE_GETTEXT= YES
USE_GMAKE= YES
USE_RC_SUBR= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 7c2a848fbfae..ee88ddffe998 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
NO_LATEST_LINK= yes
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index fb47236e2745..1645dce70470 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index caa614a61cfa..33161b070196 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index caa614a61cfa..33161b070196 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index a261fc0608d8..4f872fa0dd80 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
USE_BZIP2= yes
USE_GNOME= glib12
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_X_PREFIX= yes
USE_XPM= yes
INSTALLS_SHLIB= yes
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 1eec182ea1cf..6e92638e78d6 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -20,8 +20,7 @@ COMMENT= The system Risa/Asir is a general computer algebra system
LIB_DEPENDS= pari-2.2:${PORTSDIR}/math/pari-devel
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 253
-USE_AUTOMAKE_VER= 15
+USE_AUTOTOOLS= automake:15 autoconf:253
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari
ASIR_SRC_VERSION= 20051010
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index bfaa60a3a669..2b2331990e82 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -25,7 +25,7 @@ MAKE_ARGS= NOPORTDOCS=yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen
MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 22df3859a5c0..c6d40a010106 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -24,7 +24,7 @@ FFTW_SUFIX=
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-shared
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 95e15daae232..fa18c0a9a18b 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -22,7 +22,7 @@ FFTW3_FLAVOR?= default
FFTW3_SUFX=
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
USE_PERL5_BUILD=yes
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index eb3f03008a40..e77de7aa571d 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut
USE_KDELIBS_VER= 3
USE_GL= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 75747b641494..58504545ec74 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -18,8 +18,7 @@ COMMENT= Visualise multiple 2D-functions of one variable
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
AUTOMAKE_ARGS= -a -i
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 0dc547385d3e..ce45cbb1fce3 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -17,7 +17,7 @@ DISTNAME= gmp-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A free library for arbitrary precision arithmetic
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-cxx
INSTALLS_SHLIB= yes
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 8d57b9337444..2f80faea3484 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_FREETYPE= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} \
--includedir=${LOCALBASE}/include/ \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 880eaaf77388..6f96c06ce9f4 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --with-png=${LOCALBASE}
PATCH_SITES= http://www.bmsc.washington.edu/people/merritt/gnuplot/
PATCHFILES= datastrings_4.0.patch histograms_4.0.patch
PATCH_DIST_STRIP= -p1
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --enable-datastrings \
--enable-histograms
PLIST_SUB+= HISTOGRAMS=""
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 1a66f341440b..da0f04a4a3fc 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= jon.drews@gmail.com
COMMENT= The GNU Scientific Library - mathematical libs
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split'
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 82fa56ede456..958c3fe6e1e4 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -17,7 +17,7 @@ COMMENT= KDEGUI for octave
RUN_DEPENDS= octave:${PORTSDIR}/math/octave
USE_BZIP2= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_QT_VER= 3
USE_KDELIBS_VER=3
USE_GMAKE= yes
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index 0dc547385d3e..ce45cbb1fce3 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -17,7 +17,7 @@ DISTNAME= gmp-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A free library for arbitrary precision arithmetic
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-cxx
INSTALLS_SHLIB= yes
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index 5342bade1b33..aa184ebb9ce0 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= jhb@FreeBSD.org
COMMENT= C++ Library for Symbolic and Numeric Calculus Applications
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index b908b9dc5b71..3431157d61d6 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://ieee.uow.edu.au/documents/contrib/
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ implementation of the classic 3-layer perceptron in library form
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index f09385f03c36..da143ba45955 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= cln.4:${PORTSDIR}/math/cln
USE_X_PREFIX= yes
USE_GCC= 3.4+
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= intlhack lthack pkgconfig gnomehack glib20 libxml2
INSTALLS_SHLIB= yes
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 4b6b7c43a5b9..e35c8284675d 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/${LISPPORT} \
USE_XLIB= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:14 autoconf:253
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-posix-shell=${LOCALBASE}/bin/bash \
--with-wish=${LOCALBASE}/bin/wish8.4 \
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index afbd31e8d326..1109611e0c5b 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for multiple-precision floating-point computations
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-gmp=${LOCALBASE} \
--enable-shared
INSTALLS_SHLIB= yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 38a56dbb4f20..1d3544032212 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -18,7 +18,7 @@ COMMENT= The GNU spreadsheet for X11 and terminals
USE_PERL5_BUILD= yes
USE_BISON= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index a8553747e38c..02043498b1ae 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
gd.4:${PORTSDIR}/graphics/gd \
qhull.5:${PORTSDIR}/math/qhull
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 62d3db1db5d2..fab97c1731d6 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GNOME= gnomeprefix gnomehack intlhack libglade2 libgnome
INSTALLS_OMF= yes
diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index 412c21823b08..65e139a8a117 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -16,7 +16,7 @@ COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces
USE_REINPLACE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.if !defined(NOPORTDOCS)
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index 412c21823b08..65e139a8a117 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -16,7 +16,7 @@ COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces
USE_REINPLACE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.if !defined(NOPORTDOCS)
diff --git a/math/spar/Makefile b/math/spar/Makefile
index 2be020fabb59..00866bf3f899 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -17,7 +17,7 @@ COMMENT= A modular math parser
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= spar.1
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 8481e1c1916d..d6597db03a45 100644
--- a/mbone/rat/Makefile
+++ b/mbone/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/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 279f43f848cf..b09d58e47664 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -16,7 +16,7 @@ COMMENT= A program to montior loss in multicast sessions
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
MAN1= rtpmon.1
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 97ca722aaf4a..dcabef94cc45 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
gsm.1:${GSM_DIR}
USE_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/mbone/vic/Makefile b/mbone/vic/Makefile
index 06531c477491..89d3cf2b20f6 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -17,7 +17,7 @@ COMMENT= MBONE video tool
LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
uclmmbase:${PORTSDIR}/devel/uclmmbase
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_X_PREFIX= yes
CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
-x-includes=${PREFIX}/include \
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index ccc145da1644..41855aa787e6 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -39,8 +39,7 @@ RUN_DEPENDS+= wish8.3:${PORTSDIR}/x11-toolkits/tk83
.else
MAKE_ARGS+= NO_GUI=yes
.endif
-USE_AUTOCONF_VER= 213
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= autoconf:213 libtool:13
.if defined(NO_AUTOKEY) && defined(PACKAGE_BUILDING)
INGORE = "cannot be build in batch mode whithout automated DES key generation"
.endif
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 60147fec978a..2332ee08c17c 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -22,7 +22,7 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index e5ff0092ae8f..8b391463a722 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_REINPLACE= yes
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/misc/edonkey-tool-hash/Makefile b/misc/edonkey-tool-hash/Makefile
index 42734de85a04..65e0bc642ad9 100644
--- a/misc/edonkey-tool-hash/Makefile
+++ b/misc/edonkey-tool-hash/Makefile
@@ -18,7 +18,7 @@ COMMENT= Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
PLIST_FILES= bin/edonkey-tool-hash
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/ed2k_hash-${PORTVERSION}
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index e3a591692f29..58334309f92b 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -20,7 +20,7 @@ RESTRICTED= License forbids redistribution (source or binary)
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= lthack
USE_GCC= 3.3 # Won't build with 3.4
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index 1c5775ce1b0b..0923d483081e 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -21,7 +21,7 @@ OPTIONS+= DB4 "Support for DB4" off
OPTIONS+= PAM "Support for PAM (Experimental)" off
OPTIONS+= PGSQL "Support for PostgreSQL (Experimental)" off
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
INSTALLS_SHLIB= yes
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 1769ae525a04..bb486b60d23b 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -16,9 +16,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
MAINTAINER= thierry@pompo.net
COMMENT= Modular Calendar Access Library
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13
HAS_CONFIGURE= yes
-USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mstore --with-icap \
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 954c11a86170..9b8e0d33a046 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GNOME application designed to manage cyclic tasks
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index ddce77995904..fa3b5cb55fac 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -18,7 +18,7 @@ COMMENT= ISO-C & Perl API and CLI for generating Universally Unique Identifiers
CONFLICTS= e2fsprogs-[0-9]*
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --disable-shared --enable-static
diff --git a/misc/pointless/Makefile b/misc/pointless/Makefile
index b75bea2783b2..f4b31932f1c5 100644
--- a/misc/pointless/Makefile
+++ b/misc/pointless/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GL= yes
USE_PYTHON= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --prefix=${PREFIX} --program-transform-name=""
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib/${PYTHON_VERSION}/config/
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 7bb83a0493d2..63b8429e8408 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
USE_GNOME= glib12 gnomehack gnomeprefix
USE_PYTHON= yes
USE_X_PREFIX= 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/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 3a0ba5b748d0..6e1a6609de0e 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -15,8 +15,7 @@ COMMENT= A library required by smssend (same author)
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER= 259
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= autoconf:259 libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 8baf2c5d459c..6f3b3698fded 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -16,7 +16,7 @@ COMMENT= Set of filters to convert English text to various stereotyped dialects
CONFLICTS= jive* chef* filters-*
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index fb8a84330481..d98596420b13 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
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/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 027282e48287..028c8086466c 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
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}
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index ae1f49dfe525..10db19d3e5e6 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -16,16 +16,14 @@ DISTNAME= avidemux-${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
COMMENT= Simple GUI based video editor
-PATCH_DEPENDS= ${ACLOCAL}:${PORTSDIR}/devel/automake${WANT_AUTOMAKE_VER}
+PATCH_DEPENDS= ${ACLOCAL}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}
LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
mad.2:${PORTSDIR}/audio/libmad \
xml2.5:${PORTSDIR}/textproc/libxml2
-WANT_AUTOCONF_VER=259
-WANT_AUTOMAKE_VER=19
+USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
USE_GNOME= gnomeprefix gnomehack gtk20
WANT_SDL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 6ab975170b10..ed49564e97ee 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -22,7 +22,7 @@ USE_SUBMAKE= yes
USE_REINPLACE= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
LIBTOOLFILES= acinclude.m4
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 9fc0229dbfa3..1665f8afdadc 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gtk20 libglade2
WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index 48ff1db4db61..c3e8b5201a3a 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= libglade2 esound
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} \
--with-vorbis=${LOCALBASE}
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index cf303f9d776d..d881b2ef4bab 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -24,9 +24,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ONLY_FOR_ARCHS= i386 alpha
USE_X_LIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_REINPLACE= yes
-USE_AUTOCONF_VER=259
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 8372a9ce0e29..6b26119b2999 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
DVDSTYLER_ICON= ${DATADIR}/rc/dvdstyler.png
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_GMAKE= yes
CONFIGURE_ARGS= --with-wx-config=wxgtk2-2.6-config
diff --git a/multimedia/dvts/Makefile b/multimedia/dvts/Makefile
index 44e3611e187c..ee62cb1d202f 100644
--- a/multimedia/dvts/Makefile
+++ b/multimedia/dvts/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP= -p4
MAINTAINER= simokawa@FreeBSD.org
COMMENT= An implementation of Digital Video Transport System
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
MAN1= dvts.1 dvsend.1 dvrecv.1
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index e0e9d14fd568..3887adb3ecf6 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 2ded53505a03..702179229f44 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for handling uncompressed video and audio data
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
samplerate.1:${PORTSDIR}/audio/libsamplerate
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/gnonlin/Makefile b/multimedia/gnonlin/Makefile
index 7b9e6a799388..56a67e3111f0 100644
--- a/multimedia/gnonlin/Makefile
+++ b/multimedia/gnonlin/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= pitivi-0.1.1*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index c2962f7268e7..82ea07479954 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack \
gnomehier \
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 5a1bd20a4dde..7b46d74ac5bf 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_GSTREAMER= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -fno-force-addr" \
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index 5a1bd20a4dde..7b46d74ac5bf 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_GSTREAMER= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -fno-force-addr" \
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index c144e612859d..c74c81c7ce00 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
USE_REINPLACE= yes
USE_GSTREAMER= yes
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 7b9e6a799388..56a67e3111f0 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= pitivi-0.1.1*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index b69fbbb916a7..dc930afbc787 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -34,7 +34,7 @@ USE_GNOME+= gnomehack \
gnometarget \
pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GST_PLUGIN?= base
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index b69fbbb916a7..dc930afbc787 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -34,7 +34,7 @@ USE_GNOME+= gnomehack \
gnometarget \
pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GST_PLUGIN?= base
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index d689be0237f4..688d212f83eb 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack \
gnomeprefix \
glib20 \
libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-docs-build \
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index d689be0237f4..688d212f83eb 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack \
gnomeprefix \
glib20 \
libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-docs-build \
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 49cd5d3810b5..0012d14b7607 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/istanbul/Makefile b/multimedia/istanbul/Makefile
index 704aae4117d5..545f7734c11e 100644
--- a/multimedia/istanbul/Makefile
+++ b/multimedia/istanbul/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-g
USE_GNOME= pygtk2
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= 2.4+
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 5d04288d1646..d220802c6811 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
USE_GSTREAMER= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
CONFIGURE_ENV= CXXFLAGS="${CFLAGS}"
CONFIGURE_TARGET=
diff --git a/multimedia/libdivxdecore/Makefile b/multimedia/libdivxdecore/Makefile
index c6b039fcff77..e487f3cfd721 100644
--- a/multimedia/libdivxdecore/Makefile
+++ b/multimedia/libdivxdecore/Makefile
@@ -16,7 +16,7 @@ COMMENT= OpenDivX decoding engine from Project Mayo
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
PLIST_SUB= LIB_VERSION="${LIB_VERSION}"
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 2ea04115df0f..a698bc97848c 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gnometarget
WANT_GNOME= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-gtk-prefix="${X11BASE}" \
--x-includes="${X11BASE}/include" \
--x-libraries="${X11BASE}/lib"
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 3d6099ad2c9b..090eb9559a4e 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= A library for MPEG TS and DVB PSI tables decoding and generation
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-release
INSTALLS_SHLIB= yes
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index a6613061ea65..35a696b0fbe5 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -20,7 +20,7 @@ NO_CDROM= CSS code may violate the DMCA
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 267e48e223ee..2c9c512b932f 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-transform-name=''
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 8e26a5fc2d5a..d19416a7b34e 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -17,7 +17,7 @@ COMMENT= This is needed by ogle, which is a DVD player that supports DVD menus
LIB_DEPENDS= dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index c866ccb4db03..eeea7c6eaa84 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= fame
MAINTAINER= ports@FreeBSD.org
COMMENT= A video encoding library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 0ff2c5f291cc..e79bfccb7e4d 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams
USE_GNOME= lthack
USE_XLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index b6eb8f563998..a6a0a3ac9267 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -28,7 +28,7 @@ USE_GL= yes
USE_GNOME= gnometarget gnomehack pkgconfig
WANT_GNOME= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-firewire
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 99189dbd43f9..47d8ab6310fe 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_REINPLACE= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 17a1d76e4b71..66d9a827f39a 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -36,7 +36,7 @@ PATCH_DEPENDS= libtool15:${PORTSDIR}/devel/libtool15
USE_GETTEXT= yes
USE_ICONV= yes
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
WANT_GNOME= yes
USE_GNOME= gnomehack gnometarget
USE_GMAKE= yes
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index c5498f793339..4f425ab09dd5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
CONFLICTS= mplex-*
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index eff5e81aa7f9..52f4916bac87 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mpeg-4 library and tools from mpeg4ip
USE_GMAKE= yes
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile
index eff5e81aa7f9..52f4916bac87 100644
--- a/multimedia/mpeg4ip-libmp4v2/Makefile
+++ b/multimedia/mpeg4ip-libmp4v2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mpeg-4 library and tools from mpeg4ip
USE_GMAKE= yes
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 4143fb318f7b..c7cb8ca37000 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \
USE_GNOME= gtk20
USE_SDL= sdl
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL11 -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index ab7b46587375..a8a9a15d5e4e 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS= xvidcore:${PORTSDIR}/multimedia/xvid \
USE_REINPLACE= yes
USE_GNOME= gtk20 glib20 gconf2 libglade2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index 171107a097d9..51efdbc04877 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -17,7 +17,7 @@ COMMENT= A KDE frontend to the Ogle DVD player
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 6252881bf431..b8a34d18475b 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnometarget pygtk2 pkgconfig pygnome2
USE_GSTREAMER= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docs-build
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index f82ac47a7b8c..2dd3aea67866 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= pygtk2 \
gnomehack \
pkgconfig
USE_GSTREAMER= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index f82ac47a7b8c..2dd3aea67866 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= pygtk2 \
gnomehack \
pkgconfig
USE_GSTREAMER= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile
index 39d6c70dff83..98ff2da1f70d 100644
--- a/multimedia/slideshow/Makefile
+++ b/multimedia/slideshow/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
WRKSRC= ${WRKDIR}/${DISTNAME:C/-pre.*//}
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PYTHON= yes
USE_REINPLACE= yes
USE_SDL= image ttf
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index b20d773b44f2..5713e79d67ea 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES= lib/xmms/Input/libsmpeg_xmms.so
USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehack gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 3bd607c8a97f..25e7345d0795 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=
WANT_GNOME= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_SDL= sdl
INSTALLS_SHLIB= yes
CONFIGURE_ENV= GLBASE="${X11BASE}" \
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index c4c1b9417168..48e15c8cd1e1 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gtk12
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
WANT_SDL= yes
GNU_CONFIGURE= yes
LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 5fecc4c8a2c6..646aa130a048 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
xml2:${PORTSDIR}/textproc/libxml2 \
cdio.6:${PORTSDIR}/sysutils/libcdio
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 06531c477491..89d3cf2b20f6 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -17,7 +17,7 @@ COMMENT= MBONE video tool
LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
uclmmbase:${PORTSDIR}/devel/uclmmbase
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_X_PREFIX= yes
CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
-x-includes=${PREFIX}/include \
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index 2ef225acc98f..aec3eb94280f 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv
PLIST_FILES= bin/xdvshow
GNU_CONFIGURE= YES
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_REINPLACE= YES
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index c748275391a7..d26bdcdf251d 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
USE_BZIP2= yes
USE_GETOPT_LONG=yes
USE_GNOME= libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index 2c22b77f4eaa..f16c799bd650 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gtk20
USE_X_PREFIX= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PORTNAME}
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index c2d94259e125..c7bdb624aea0 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
USE_BZIP2= yes
USE_GNOME= gtk20
USE_X_PREFIX= 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/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 705a914b58dd..d9f8cbc52984 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gtk12
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-win32-path=${LOCALBASE}/lib/win32
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index ac5dbf7a253f..ddd6ee4a6774 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index 10dffe82eec5..ec522c98202a 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -17,7 +17,7 @@ COMMENT= A XMMS plugin to hide the player
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index bd3ca2923a0f..0279eb925781 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GNOME= gtk12
USE_X_PREFIX= yes
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 68077c37afc4..3f4539f144a1 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gtk12
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index b8ae840be4ff..ea080046345f 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
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/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 7c68d39ed1fd..2062f46f14ce 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gtk12
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-gl
diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index c376bc372905..843edbaea2fe 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -17,7 +17,7 @@ COMMENT= A console Yahoo! messenger client
PLIST_FILES= bin/ari-yahoo
USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
pre-configure:
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 589848d618f1..9d157cb8f675 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -30,7 +30,7 @@ WANT_GNOME= yes
USE_GNOME= gdkpixbuf gnometarget
USE_OPENSSL= yes
USE_GETOPT_LONG= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index f2f637f0c65d..1a88c01b0b3e 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -19,7 +19,7 @@ USE_OPENSSL= yes
USE_PYTHON= yes
USE_XLIB= yes
USE_X_PREFIX= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index ee245520bfe8..9546012eb493 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
PLIST_FILES= lib/gaim/bangexec.so
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 1bdb215901c3..9cf63bd8af9b 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if !defined(WITHOUT_NLS)
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index 3f09f226ab42..4743d7dc29a7 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
SUB_FILES= pkg-message
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 66013d979cba..5565cc0a4e2d 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-static=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/net-im/gaim-rss-reader/Makefile b/net-im/gaim-rss-reader/Makefile
index e4f840002211..b2b5cfb749e2 100644
--- a/net-im/gaim-rss-reader/Makefile
+++ b/net-im/gaim-rss-reader/Makefile
@@ -25,7 +25,7 @@ IGNORE= Requires update to work with Gaim 0.82.1
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= "--with-gaim=${X11BASE}/include/gaim"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 9ef46b78bd5b..d6bc2ba47ce8 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomeprefix gnomehack gtk20
WANT_GNOME= yes
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-static=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 77c115af01c6..04c21dd0b04e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
GCONF_SCHEMAS= gnomeicu.schemas
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 77c115af01c6..04c21dd0b04e 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
GCONF_SCHEMAS= gnomeicu.schemas
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 43ffffd487be..54b3770c435b 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 4faeeca229a9..f7304491eadc 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= gtk12
WANT_GNOME= yes
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index bdc549485a32..0e30799a3f9a 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library required by kicq (not libicq)
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/net-im/jabber-aim/Makefile b/net-im/jabber-aim/Makefile
index 8e095f553b6e..bd4a81611573 100644
--- a/net-im/jabber-aim/Makefile
+++ b/net-im/jabber-aim/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net-im/jabber
WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION:R}
PLIST_FILES= lib/jabber/aimtrans.so
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_ICONV= yes
CONFIGURE_ARGS+=--with-jabberd=${LOCALBASE}/include/jabber
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index 1373ff267519..04665debda14 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GNOME= libglade2
USE_GETOPT_LONG= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 55586ef6accf..447be3ac200c 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index ba1a4308b186..01b5baff2a03 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --disable-static
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index 5c826e22a7e8..114e7ddfd529 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for connecting to MSN Messenger service
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index ab507e1d40d4..3a79ce614ea5 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A C library that handles the new Yahoo! Messenger protocol
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
post-patch:
diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index 911edf611d6e..7eb093a96f4a 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= cdk.4:${PORTSDIR}/devel/cdk
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Ncurses-based console plugin for Licq
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
LIBS="${PTHREAD_LIBS}"
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 4aba4f733a5a..77e032a7dc36 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net-im/licq-qt-gui
# plugin (gtk+) and wish run osd with it. i've not tested with
# plugins other than qt-gui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LICQ_PORT?= net-im/licq
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index ca43440a4af6..045427974b44 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -17,7 +17,7 @@ COMMENT= Lightweight Jabber client library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack glib20
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 928b8b0795bc..3c5f82b05404 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index b5ed547d1c1b..5aabbb818182 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-doxygen=no \
--with-gmp-prefix=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 1bdb215901c3..9cf63bd8af9b 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
.if !defined(WITHOUT_NLS)
diff --git a/net-mgmt/NeTraMet/Makefile b/net-mgmt/NeTraMet/Makefile
index eaf9e3aa59a8..243c74a46aee 100644
--- a/net-mgmt/NeTraMet/Makefile
+++ b/net-mgmt/NeTraMet/Makefile
@@ -25,7 +25,7 @@ NETRAMET_DOCS= usguide.pdf srlguide.pdf ntmref.pdf nm_rc.pdf \
WRKSRC= ${WRKDIR}/NeTraMet${PORTVERSION:S/.//}
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
.if defined(WITH_MOTIF)
diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile
index b0889ea75e4a..e20b649cc70f 100644
--- a/net-mgmt/arts++/Makefile
+++ b/net-mgmt/arts++/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GCC= 2.95
MANL= artsportagg.l artsports.l artsprotos.l artsnets.l artsdump.l \
diff --git a/net-mgmt/bsnmpd/Makefile b/net-mgmt/bsnmpd/Makefile
index 9a712fcc3d58..333a93c5e6e9 100644
--- a/net-mgmt/bsnmpd/Makefile
+++ b/net-mgmt/bsnmpd/Makefile
@@ -22,8 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libbegemot=${LOCALBASE}
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoconf:259
INSTALLS_SHLIB= yes
USE_GCC= 3.2+
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 0f83ea8cbf62..04620a17c076 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_BISON= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GCC= 2.95
CONFIGURE_ARGS= --enable-shared --with-artspp=${LOCALBASE}
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 6eb1e01b5bdf..8ab7a617992d 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -18,7 +18,7 @@ COMMENT= A graphical network traffic visualization tool for gnome
USE_GETTEXT= yes
USE_GNOME= libglade2 libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index e65a4083f800..96194a6525d6 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -28,7 +28,7 @@ OPTIONS= GTK "Build with GTK2+ GUI" on \
WANT_GNOME= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_REINPLACE= yes
MAN5= etter.conf.5
@@ -72,7 +72,6 @@ CONFIGURE_ARGS+= --without-libpcre
.endif
.if !defined(WITHOUT_PLUGINS)
-USE_LIBLTDL= yes
MAN8+= ettercap_plugins.8
DOCS+= doc/plugins
CONFIGURE_ARGS+= --enable-plugins
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 5dce7893f565..3cf5864d1ca3 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -16,7 +16,7 @@ COMMENT= Convert, change and calculate with IPv6 addresses
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 31835543f117..f27a0c640bbe 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -107,8 +107,7 @@ PLIST_SUB+= SUB_LDAP="@comment "
CONFIGURE_ENV= LOCALBASE=${LOCALBASE} LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 3bbefa3475d9..c5eb9820046f 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -17,9 +17,7 @@ COMMENT= Additional SNMP plugins for Nagios
LIB_DEPENDS= netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
-USE_AUTOHEADER_VER= 213
+USE_AUTOTOOLS= automake:14 autoheader:213 autoconf:213
USE_GETOPT_LONG= yes
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index fff394f04ec2..c5de86caf4d6 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index fff394f04ec2..c5de86caf4d6 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 4c6aa6fd14e7..24274a90ad2d 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} --disable-html
USE_OPENSSL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= nefu.1
MAN4= nefu.conf.4
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PATCH_DEPENDS= ${LIBTOOL_DEPENDS}
USE_REINPLACE= yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_RC_SUBR= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PATCH_DEPENDS= ${LIBTOOL_DEPENDS}
USE_REINPLACE= yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_RC_SUBR= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 3c634c4ee04d..355953a2b902 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= ports@FreeBSD.org
COMMENT= An extendable SNMP implementation
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213 libtool:13:inc
USE_REINPLACE= yes
USE_PERL5= yes
-USE_INC_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CFLAGS+= -fPIC
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PATCH_DEPENDS= ${LIBTOOL_DEPENDS}
USE_REINPLACE= yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_RC_SUBR= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
diff --git a/net-mgmt/netsaint-plugins/Makefile b/net-mgmt/netsaint-plugins/Makefile
index b5707049ffd3..cb105aca8572 100644
--- a/net-mgmt/netsaint-plugins/Makefile
+++ b/net-mgmt/netsaint-plugins/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/share/netsaint/sbin \
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
MKDIR="${MKDIR}"
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index d2960e01692d..38a3cdd50378 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -23,8 +23,7 @@ CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
CFLAGS+= -I${LOCALBASE}/include
LIBS= `${LIBNET_CONFIG} --libs`
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 253
-USE_AUTOMAKE_VER= 15
+USE_AUTOTOOLS= automake:15 autoconf:253
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}" CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 0d79437ed899..9ce47ca02206 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
USE_GMAKE= yes
USE_PYTHON= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index bce6f1c95924..fd4b9d195342 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile
index d806d330287f..7d09fa56279a 100644
--- a/net-p2p/cdonkey/Makefile
+++ b/net-p2p/cdonkey/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net-p2p/dcd/Makefile b/net-p2p/dcd/Makefile
index 90b507259478..702f14b8f1d2 100644
--- a/net-p2p/dcd/Makefile
+++ b/net-p2p/dcd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= mraleks@bk.ru
COMMENT= Direct Connect Hub clone for Unix
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 77729151784a..8858c847be8e 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile
index 42734de85a04..65e0bc642ad9 100644
--- a/net-p2p/edonkey-tool-hash/Makefile
+++ b/net-p2p/edonkey-tool-hash/Makefile
@@ -18,7 +18,7 @@ COMMENT= Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
PLIST_FILES= bin/edonkey-tool-hash
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/ed2k_hash-${PORTVERSION}
diff --git a/net-p2p/fcptools/Makefile b/net-p2p/fcptools/Makefile
index 492bc06d754f..8c02412aa76b 100644
--- a/net-p2p/fcptools/Makefile
+++ b/net-p2p/fcptools/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= FreeNet client library and command-line tools for shell scripting
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME:L}
INSTALLS_SHLIB= yes
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 9c3a1ccef895..b58adea5b45a 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -18,7 +18,7 @@ COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 2239f2bc1dc7..cdf37db41d9a 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_X_PREFIX= yes
PLIST_FILES= libexec/gkrellm2/plugins/gift.so
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index aee271e4031c..77d34182b123 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -20,13 +20,12 @@ COMMENT= An anonymous, distributed, reputation-based network
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13:inc
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 lthack
-USE_INC_LIBTOOL_VER=13
USE_OPENSSL= yes
USE_REINPLACE= yes
diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index dc23fadbf3f5..4128446f84fc 100644
--- a/net-p2p/libfreenet/Makefile
+++ b/net-p2p/libfreenet/Makefile
@@ -18,7 +18,7 @@ COMMENT= Freenet library written in C
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet
INSTALLS_SHLIB= yes
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 2e8ffe170236..49771d90035f 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -19,7 +19,7 @@ USE_GCC= 3.4
USE_GNOME= pkgconfig gnomehack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index f89ad3d606cc..6a13bc815a29 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= mldonkey-[0-9]*
USE_BZIP2= yes
USE_ICONV= yes
USE_RC_SUBR= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 94243bb28bda..1c93695909a1 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
CONFLICTS= mldonkey-devel-[0-9]*
USE_BZIP2= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_ICONV= yes
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index c49825599c58..1e678dbeaa93 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
SUB_FILES= pkg-message
diff --git a/net-p2p/verlihub-plugins/Makefile b/net-p2p/verlihub-plugins/Makefile
index d97da078109b..08def04562d9 100644
--- a/net-p2p/verlihub-plugins/Makefile
+++ b/net-p2p/verlihub-plugins/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
WRKSRC= ${WRKDIR}/vh_plugins-0.1
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/include/verlihub
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/verlihub -I${LOCALBASE}/include/mysql"
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index 071d57db9bf6..33a204d8a2c5 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/verlihub-0.9.8c
USE_MYSQL= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index c85777b56a6f..5d443039bdca 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
ALL_TARGET= default
MAN1= 6tunnel.1
diff --git a/net/apollon/Makefile b/net/apollon/Makefile
index bce6f1c95924..fd4b9d195342 100644
--- a/net/apollon/Makefile
+++ b/net/apollon/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 4a7701316100..fc19598bcb29 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -15,7 +15,7 @@ COMMENT= A free AFS client implementation
USE_XLIB= yes
USE_RC_SUBR= arla.sh
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile
index 7fe3c910d265..7aafc2887a88 100644
--- a/net/atmsupport/Makefile
+++ b/net/atmsupport/Makefile
@@ -18,7 +18,7 @@ COMMENT= Tools for testing the ATM subsystem
LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index d8479c948f32..63e572828bd4 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WWW_DIR?= ${PREFIX}/www/
PLIST_SUB+= VERSION=${PORTVERSION}
USE_PERL5= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 989ef0aa58fb..d8b07504cb9d 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -35,7 +35,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack intltool libgnomeui
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-mozilla=${MOZILLA}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index b2e7c70a8c96..ea5ace5e0c23 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -32,10 +32,7 @@ LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv \
USE_XLIBS= yes
.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
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net/cdonkey/Makefile b/net/cdonkey/Makefile
index d806d330287f..7d09fa56279a 100644
--- a/net/cdonkey/Makefile
+++ b/net/cdonkey/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index a8be9b74b797..06c40b5b0291 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+= --enable-compile-warnings=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 61ddbe655f86..f177a92b0d68 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
CONFIGURE_ARGS= --with-python=${LOCALBASE}
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/net/dcd/Makefile b/net/dcd/Makefile
index 90b507259478..702f14b8f1d2 100644
--- a/net/dcd/Makefile
+++ b/net/dcd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= mraleks@bk.ru
COMMENT= Direct Connect Hub clone for Unix
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index 77729151784a..8858c847be8e 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net/dhcp-agent/Makefile b/net/dhcp-agent/Makefile
index aa6bb89ad999..aee69ac99c6f 100644
--- a/net/dhcp-agent/Makefile
+++ b/net/dhcp-agent/Makefile
@@ -18,7 +18,7 @@ COMMENT= A portable UNIX Dynamic Host Configuration suite
BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index f6726a217fd3..50c8d3649dc8 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -22,7 +22,7 @@ MAN8= dictd.8
USE_RC_SUBR= yes
USE_REINPLACE= yes
USE_BISON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/dosdetector/Makefile b/net/dosdetector/Makefile
index e1653ae2dbf9..40bb3737ac53 100644
--- a/net/dosdetector/Makefile
+++ b/net/dosdetector/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= msciciel@darkzone.ma.cx
COMMENT= Detect suspicious network traffic
HAS_CONFIGURE= yes
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= autoheader:259
PLIST_FILES= bin/dosdetector
MAN1= dosdetector.1
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index bff1bba761a7..4561e1504209 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtk2
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/fcptools/Makefile b/net/fcptools/Makefile
index 492bc06d754f..8c02412aa76b 100644
--- a/net/fcptools/Makefile
+++ b/net/fcptools/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= FreeNet client library and command-line tools for shell scripting
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME:L}
INSTALLS_SHLIB= yes
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 641b3f5e772a..64bcfca11d57 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -21,11 +21,10 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_RC_SUBR= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13
USE_GMAKE= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
--localstatedir=/var \
--disable-ltdl-install \
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 641b3f5e772a..64bcfca11d57 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -21,11 +21,10 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_RC_SUBR= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13
USE_GMAKE= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
--localstatedir=/var \
--disable-ltdl-install \
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index b2fa412e02ea..ea99215e83e7 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
USE_RC_SUBR= yes
RC_DIR= ${PREFIX}/etc/rc.d
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ENV= ${MAKE_ENV}
NOCLEANDEPENDS= yes
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 9c3a1ccef895..b58adea5b45a 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -18,7 +18,7 @@ COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net/gkrellm-gift/Makefile b/net/gkrellm-gift/Makefile
index 2239f2bc1dc7..cdf37db41d9a 100644
--- a/net/gkrellm-gift/Makefile
+++ b/net/gkrellm-gift/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_X_PREFIX= yes
PLIST_FILES= libexec/gkrellm2/plugins/gift.so
diff --git a/net/gmdns/Makefile b/net/gmdns/Makefile
index e1640af13756..40656c2b52c8 100644
--- a/net/gmdns/Makefile
+++ b/net/gmdns/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GNU implementation of multicast DNS, part of Zeroconf
USE_BZIP2= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= 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/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index 13a2e30f60a6..1a116c39b94e 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple network library built upon Glib-2
USE_REINPLACE= yes
USE_GNOME= gnomehack glib20
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-glib2
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index f0a744a6fba7..f17b32888528 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -15,7 +15,7 @@ COMMENT= A simple network library built upon Glib
USE_REINPLACE= yes
USE_GNOME= gnomehack glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= gnet-config.1
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 2292f23bdba7..60358e48fa5e 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A simple network library built upon Glib-2
USE_GNOME= gnomehack glib20
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if !defined(NOPORTDOCS)
CONFIGURE_ARGS+= --with-html-dir=${DOCSDIR}
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 3ab68f5270b8..3ff8f0eab50e 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomeprefix gtksourceview libglade2 libgnomeui vte
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 6987034ead33..b15b68be8526 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A nice frontend to the telnet, ssh, and rlogin clients for GNOME
-WANT_AUTOMAKE_VER=15
+USE_AUTOTOOLS= automake:15:env libtool:15
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 23f2c8c6790b..cdc42e127cd9 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -20,10 +20,9 @@ USE_RC_SUBR= yes
USE_SUBMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libltdl:15 libtool:13
INSTALLS_SHLIB= yes
USE_GETTEXT= yes
-USE_LIBLTDL= yes
CONFIGURE_TARGET= # empty
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index aee271e4031c..77d34182b123 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -20,13 +20,12 @@ COMMENT= An anonymous, distributed, reputation-based network
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13:inc
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 lthack
-USE_INC_LIBTOOL_VER=13
USE_OPENSSL= yes
USE_REINPLACE= yes
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index a95f58c8570e..63a429ea7351 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C library for writing servers
USE_GNOME= glib20 gnomehack gnometarget
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-gtk-doc
INSTALLS_SHLIB= yes
diff --git a/net/howl/Makefile b/net/howl/Makefile
index e560cad1cdc6..5ad80ec1e425 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -15,7 +15,7 @@ COMMENT= Zeroconf/Bonjour(tm) implementation
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= yes
CPPFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 43f5ac4c5306..4ba9177d92ed 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple interface to low level networking routines
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if defined(WITH_PYTHON)
USE_PYTHON= yes
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index dc23fadbf3f5..4128446f84fc 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -18,7 +18,7 @@ COMMENT= Freenet library written in C
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet
INSTALLS_SHLIB= yes
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 6ad8577034f1..ebf96c926374 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index fe0458d1a9d1..f67ee4701e47 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -18,7 +18,7 @@ COMMENT= Library for parsing mms:// and mmsh:// type network streams
USE_REINPLACE= yes
USE_GNOME= gnomehack gnometarget pkgconfig glib20
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
pre-configure:
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 155dd6cfaa68..175ccfeca713 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C library for creating IP packets
CONFLICTS= libnet-devel-1.1.*\
libnet-1.1.*
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION}
MAN3= libnet.3
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index ed1b19a3c7ac..37f4e61e1dc0 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library for manipulating libpcap/tcpdump trace files
LIB_DEPENDS= pcapnav.0:${PORTSDIR}/net/libpcapnav
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= glib12
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index 4759868ad8f8..99a4357f815d 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-mysql=${LOCALBASE}
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_MYSQL= yes
.include <bsd.port.pre.mk>
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index 97402a95fe1b..cf510b6c239f 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A low layer of SIP implementation
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
#LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index cce36b2c30cb..e23012ee6fab 100644
--- a/net/libosip2/Makefile
+++ b/net/libosip2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A low layer of SIP implementation
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-debug --disable-trace
INSTALLS_SHLIB= yes
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index e20a1d17a59d..bdfa38753d1e 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= yb@bashibuzuk.net
COMMENT= A libpcap wrapper library
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 914f78abfff6..21a3b8f4fbd9 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -17,9 +17,7 @@ COMMENT= A C++ wrapper library to the sockets
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:inc
SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
INFO= socket++
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 2e8ffe170236..49771d90035f 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -19,7 +19,7 @@ USE_GCC= 3.4
USE_GNOME= pkgconfig gnomehack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 8b9d6ad55c61..b339aeb85f91 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgtkhtml
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 182515c26b85..4be2d9753ec7 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index a2434222a32b..5346c9267caa 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure oRTP/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index f89ad3d606cc..6a13bc815a29 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= mldonkey-[0-9]*
USE_BZIP2= yes
USE_ICONV= yes
USE_RC_SUBR= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 94243bb28bda..1c93695909a1 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
CONFLICTS= mldonkey-devel-[0-9]*
USE_BZIP2= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_ICONV= yes
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index f118a93fb6fb..8611d45dd55f 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -16,7 +16,7 @@ COMMENT= Multi-threaded Routing Toolkit
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
MAN8= mrtd.8
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 06a30d69dc00..7e01e6f5f54e 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -16,7 +16,7 @@ COMMENT= Network access framework for IPv4/IPv6
LIB_DEPENDS= sigc++-2.0.0:${PORTSDIR}/devel/libsigc++20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
.if !defined(WITHOUT_NLS)
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index ebf599762301..556ddee20519 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+= TIMELORD=""
.else
PLIST_SUB+= TIMELORD="@comment "
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 187be2235455..116a2986e136 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -17,10 +17,9 @@ COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13:inc
USE_ICONV= yes
USE_GETTEXT= yes
-USE_INC_LIBTOOL_VER= 13
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lltdl"
USE_GMAKE= yes
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 4a996b68a546..d2c1ca4e0632 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-libgtop
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a4962552962a..2d67c39c8de3 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -26,7 +26,7 @@ USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
PLIST_SUB+= DBDIR=${DBDIR} \
SHLIB=${PORTVERSION:S/.p/pre/}
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 07925a934eaf..414b5e818b55 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -86,7 +86,7 @@ BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -143,7 +143,6 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || defined(WITH_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 84db959a34cb..53c9fdacc23e 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -98,7 +98,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -156,7 +156,7 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
+USE_AUTOTOOLS+= libltdl:15
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 84db959a34cb..53c9fdacc23e 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -98,7 +98,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -156,7 +156,7 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
+USE_AUTOTOOLS+= libltdl:15
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index e6f8b8781ad2..f77e9275b939 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -24,7 +24,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
# Can't use until does not imply GNU_CONFIGURE or there's a sane way
# to change the prefix for configure.
-#USE_LIBTOOL_VER=15
+#USE_AUTOTOOLS= libtool:15
MPIBASE?= mpi
MPIDIR?= ${MPIBASE}/${UNIQUENAME}
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 1048b4bb74d0..052b95cdb96b 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= openslp
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open-source implementation of the Service Location Protocol
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openslp \
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 3f15c0f6e7eb..32e48527cdf0 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= A Real-time Transport Protocol (RTP) stack
USE_GNOME= glib20
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
INSTALLS_SHLIB= yes
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index f6de793f6a18..4652837207ed 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3+= sa.3
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index ff99706137b9..ebb92ccd0ff6 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
USE_PERL5_BUILD=yes
USE_XPM= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
.if defined(WITH_TCLJP)
CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \
--with-wish=${PREFIX}/bin/wish8.0jp \
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index bb8c96ccd424..1d9cc5a693aa 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
MAINTAINER= thomas@cuivre.fr.eu.org
COMMENT= The SuSE Proxy-Suite, a set of programs to enhance firewall security
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index 103b398a7075..71005a04ae1c 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -14,8 +14,7 @@ COMMENT= Multi-proxifier
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14 autoconf:213
INSTALLS_SHLIB= yes
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 1c4b024df995..cf3c558f4fc6 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C++-Library for PVM
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \
--with-pvm-libs=${LOCALBASE}/lib
INSTALLS_SHLIB= yes
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index b3bbf02b2e25..a1c1fda46e32 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_PERL5_BUILD= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure
MAN1= vtysh.1
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index f223c213a236..7fe718f8c598 100644
--- a/net/rrdtool/Makefile
+++ b/net/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/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index 79efec6da00c..5175b663b3a7 100644
--- a/net/rrdtool10/Makefile
+++ b/net/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/net/rtorrent/Makefile b/net/rtorrent/Makefile
index c49825599c58..1e678dbeaa93 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
SUB_FILES= pkg-message
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 32e2d4d41abf..9ffe0130c0ef 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -32,8 +32,7 @@ COMMENT= A free SMB and CIFS client and server for UNIX
CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.*
USE_SUBMAKE= YES
USE_GMAKE= YES
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213 libtool:15
# directories
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 0e3e1ae311f3..7f4f031df443 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -21,8 +21,7 @@ CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
USE_ICONV= yes
GNU_CONFIGURE= yes
-#USE_AUTOHEADER_VER= 259
-#USE_AUTOCONF_VER= 259
+#USE_AUTOTOOLS= autoconf:259 autoheader:259
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index b301b0088268..03f4a9269835 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= GUI.0:${PORTSDIR}/graphics/guilib
USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 4da12a502ff7..393f546612ec 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -22,7 +22,7 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config
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/net/tcpdump/Makefile b/net/tcpdump/Makefile
index b54a34c735d8..70548add5aeb 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -68,7 +68,7 @@ PLIST_SUB+= NOTBASE=""
CONFIGURE_ARGS+= --without-crypto
.else
USE_OPENSSL= defined
-USE_AUTOCONF_VER?= 253
+USE_AUTOTOOLS= autoconf:253
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl-configure.in
.endif
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 148d668169e0..5aac398cc616 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -17,7 +17,7 @@ COMMENT= 5250 Telnet protocol and Terminal
USE_GNOME= gnomehack gnometarget pkgconfig
USE_OPENSSL= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-os-dir=no --with-ssl=${OPENSSLBASE}
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 6b277baad62a..8a099b084be4 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -18,7 +18,7 @@ COMMENT= Transparent remote file access tool for emacsen
EMACS_PORT_NAME?= emacs21
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR}
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index 8ab84c83dffc..235d72362940 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= clement@FreeBSD.org
COMMENT= A user-space implementation of the NFSv3 server specification
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_BISON= YES
MAN7= tags.7
diff --git a/net/verlihub-plugins/Makefile b/net/verlihub-plugins/Makefile
index d97da078109b..08def04562d9 100644
--- a/net/verlihub-plugins/Makefile
+++ b/net/verlihub-plugins/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
WRKSRC= ${WRKDIR}/vh_plugins-0.1
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/include/verlihub
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/verlihub -I${LOCALBASE}/include/mysql"
diff --git a/net/verlihub/Makefile b/net/verlihub/Makefile
index 071d57db9bf6..33a204d8a2c5 100644
--- a/net/verlihub/Makefile
+++ b/net/verlihub/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/verlihub-0.9.8c
USE_MYSQL= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index bf83bb6bbc6d..214407cc1a64 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -22,7 +22,7 @@ MAN8= vtund.8
MLINKS= vtund.8 vtun.8
USE_OPENSSL= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --localstatedir=/var \
--with-ssl-headers=${OPENSSLBASE}/include/openssl \
--with-ssl-lib=${OPENSSLBASE}/lib \
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index bff1bba761a7..4561e1504209 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtk2
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 432215d2f1d5..c0cbd262649b 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 432215d2f1d5..c0cbd262649b 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 84c9e464b961..0c2fb14f9da0 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
LIBTOOLFILES= configure libmutt/configure
CONFIGURE_ENV= glibpath="${GLIB_CONFIG}" \
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index 9c10a8781f15..2b97e99184f0 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -17,9 +17,7 @@ COMMENT= NewsCache is a free cache server for USENET News
LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++
-USE_AUTOMAKE_VER= 19
-USE_AUTOHEADER_VER= 259
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoheader:259 autoconf:259
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
AUTOMAKE_ARGS= --add-missing
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 813278ac86cb..6093151c59b3 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
-WANT_AUTOMAKE_VER=15
+USE_AUTOTOOLS= automake:15:env
.if defined(WITH_LDAP) || defined(WITH_LDAP2)
USE_OPENLDAP= yes
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 41a269576924..943daf617ec7 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_BISON= yes
USE_GNOME= gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 3de8d5c07539..feec2df36883 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 41a269576924..943daf617ec7 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_BISON= yes
USE_GNOME= gnomeprefix gnomehack libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 3de8d5c07539..feec2df36883 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 4d74d7c41179..7308be24d915 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
USE_X_PREFIX= yes
USE_GNOME= gnomehier
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins
CFLAGS+= -I${LOCALBASE}/include
diff --git a/palm/libmal/Makefile b/palm/libmal/Makefile
index 5df06c9b5475..822d5ac88c2f 100644
--- a/palm/libmal/Makefile
+++ b/palm/libmal/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library encapsulating malsync
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
USE_GMAKE= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
HAS_CONFIGURE= YES
CONFIGURE_ARGS= --with-pilot-prefix=${LOCALBASE}
INSTALLS_SHLIB= YES
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 1f910acf9f08..8cbfd265e449 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
USE_ICONV= yes
USE_GETOPT_LONG=yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_PERL5= yes
TCL_VER?= 8.4
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 1f910acf9f08..8cbfd265e449 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -18,7 +18,7 @@ COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
USE_ICONV= yes
USE_GETOPT_LONG=yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_PERL5= yes
TCL_VER?= 8.4
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index f27a18653f98..46081fdb0aaf 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -26,7 +26,7 @@ COMMENT= Collection of tools supporting C and C++ programming for Palm OS
# but right now it does not.
ONLY_FOR_ARCHS= i386
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_BZIP2= YES
USE_BISON= YES
USE_GMAKE= YES
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index d1f29cdf147a..15cd56dc9528 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2
USE_GNOME= gnomeprefix gnometarget gnomevfs2
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \
--with-libsynce=${LOCALBASE}
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index d1f29cdf147a..15cd56dc9528 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2
USE_GNOME= gnomeprefix gnometarget gnomevfs2
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \
--with-libsynce=${LOCALBASE}
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index 4cc79f3869ee..846d049e6e13 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS+= synce-serial-start:${PORTSDIR}/palm/synce-serial \
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 9691fed4b89c..4e92f8bdc618 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -21,7 +21,7 @@ MAN1= pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 s
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_ICONV= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index c4b2ffb8cb32..f2d8dc518d1b 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
MAN1= synce-matchmaker.1
USE_ICONV= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE}
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 460d8d256dba..f9f28741d7bb 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -17,7 +17,7 @@ MAN1= synce.1
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 28aa2bb98928..4343bf445b56 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync
USE_GNOME= gnomeprefix gnometarget gnomevfs2
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \
--with-libsynce=${LOCALBASE} \
--with-librra=${LOCALBASE} \
diff --git a/palm/synce-rra/Makefile b/palm/synce-rra/Makefile
index c4b2ffb8cb32..f2d8dc518d1b 100644
--- a/palm/synce-rra/Makefile
+++ b/palm/synce-rra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
MAN1= synce-matchmaker.1
USE_ICONV= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE}
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 7dacf1249180..956c96dbcbf0 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WANT_GNOME= yes
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 9a7ffe6b8680..f75fc4cdd4ce 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -32,7 +32,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --with-frontend=qt \
--with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 04c6d24a8b75..8f5d019f6736 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
-I${LOCALBASE}/include/freetype2"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
MAN1= fontforge.1 sfddiff.1
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 4b0488a0ee44..55258dc6032d 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
-WANT_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:15:env autoconf:259
GNU_CONFIGURE= yes
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index 50320260e01e..2a329de6edb4 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
USE_REINPLACE= yes
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index a42a795ae409..8d8a1bfa42a8 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -20,7 +20,7 @@ MASTER_SITE_SUBDIR= freetype1
MAINTAINER= ports@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
USE_REINPLACE= yes
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index d80ad32a9944..ae14bd82dd5f 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
MAKE_ENV= TOP=""
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget pkgconfig
USE_REINPLACE= yes
LIBTOOLFILES= builds/unix/configure
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 588768f31c68..89d47e7715f1 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT= yes
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gimp=no
INSTALLS_SHLIB= yes
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 0820f7561e21..bcd483551815 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
desktopfileutils
INSTALLS_SHLIB= 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/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 1102e84ed125..5941c12152b9 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
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/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index c35cf229a95e..d23948f6be6a 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -19,7 +19,7 @@ COMMENT= Gnome Photo Printer is intended for printing photos in an easy way
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui libglade2 libgnomeprintui gnomevfs2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
post-install:
${INSTALL_DATA} ${FILESDIR}/gnomephotoprinter.desktop ${PREFIX}/share/gnome/applications
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 1102e84ed125..5941c12152b9 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
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/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 588768f31c68..89d47e7715f1 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT= yes
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gimp=no
INSTALLS_SHLIB= yes
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index 588768f31c68..89d47e7715f1 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT= yes
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gimp=no
INSTALLS_SHLIB= yes
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 46466f1b6a14..bbc2351ff4f3 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 5c7835869167..c9bb312a4938 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnomehack libgnomeprint
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index 70ef6be2da89..4ecc5742ffb7 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -18,7 +18,7 @@ COMMENT= C library that supports plugin printer driver for Ghostscript
USE_BZIP2= yes
USE_GNOME= gnometarget lthack pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= ijs-config.1
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index d1368e5094cd..7fc70363b670 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library for handling OpenType fonts
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_XLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 6a2f69e88536..d8370805690a 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.3/-3/}
MAINTAINER= lofi@freebsd.org
COMMENT= A library providing routines for paper size management
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= Yes
USE_GETOPT_LONG=Yes
CONFIGURE_ARGS= --build=${CONFIGURE_TARGET}
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index d378177edb3c..dab1a3ec5490 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lpr
MAINTAINER= e-masson@kisoft-services.com
COMMENT= A library providing routines for ppd files
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= Yes
USE_GETOPT_LONG=Yes
USE_GNOME= glib12
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 850fea7b6d3d..ebec9816504e 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 \
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget lthack pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-berkeley-db
INSTALLS_SHLIB= yes
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 33052857bfdf..e08e8d81ebe8 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A C library for dynamically generating PDF
RESTRICTED= "many odd restrictions on usage and distribution"
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 2fab0ce2dc46..e902f430bb86 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
USE_GNOME= gnomehack gnometarget intlhack pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_prog_DOC_TO_MAN=""
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 5258c1f204ae..0fa3b9779611 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -29,7 +29,7 @@ USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
MAN1= scribus.1
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 5258c1f204ae..0fa3b9779611 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -29,7 +29,7 @@ USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
MAN1= scribus.1
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index cc3eee964b7b..914402bf33b4 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
gd.4:${PORTSDIR}/graphics/gd
WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-multiplatform \
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index dfb6b362cafe..6acb2bd13e9c 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -28,7 +28,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
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 64e0e9f0ee02..dcac73ed8362 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= buddy
MAINTAINER= llwang@infor.org
COMMENT= A Binary Decision Diagram library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 2d4acea615fd..c25e638c0d8d 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= transfig:${PORTSDIR}/print/transfig
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-gtk2/
USE_REINPLACE= yes
USE_GNOME= gtk12
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-emf=yes
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index b1af56d50668..2db01955a9ea 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= transfig:${PORTSDIR}/print/transfig
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 7ef3d89a2c3b..d5710bf8a312 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \
png:${PORTSDIR}/graphics/png
USE_MESA= 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 ${PTHREAD_LIBS} -lstdc++"
USE_GMAKE= yes
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index a8a6deca1e2d..5820ea5210fe 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes
GCONF_SCHEMAS= gchempaint-arrows.schemas
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeprintui libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 73104212fa11..df0774e6a581 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix intlhack libglade2 libgnomeprint libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 02ffc98ad84e..a812783d0486 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mpqc
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
.include <bsd.port.pre.mk>
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 7397bc370bc5..f66960d3f92f 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/mpich/bin/mpicc:${PORTSDIR}/net/mpich
.endif
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 7eddaed89648..3cc1a303cf1d 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= koziol@ncsa.uiuc.edu
COMMENT= Hierarchical Data Format library (from NCSA)
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
LIBTOOLFILES= configure c++/configure
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-cxx --enable-production \
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index 7eddaed89648..3cc1a303cf1d 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= koziol@ncsa.uiuc.edu
COMMENT= Hierarchical Data Format library (from NCSA)
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
LIBTOOLFILES= configure c++/configure
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-cxx --enable-production \
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 470b519ed003..38079c028732 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/umfpack
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS+= --program-prefix='' --with-umfpack=yes
CPPFLAGS+= -I${LOCALBASE}/include/UMFPACK ${PTHREAD_CFLAGS}
LDFLAGS+= -lm -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index abccea20ed24..634eae65442c 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
LIB_DEPENDS= atlas:${PORTSDIR}/math/atlas
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
.if defined(WITH_ICC)
CC= ${LOCALBASE}/intel_cc_80/bin/icc
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index 93c0128cd269..f07fefabec35 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Chemistry file translation program
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=open
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 2370ace348d9..1e4aa02c064d 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --with-cc=${CC} \
--with-cxx=${CXX} \
diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index b4551b9c4d7e..164adf21acb2 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
OPTIONS= MYSQL "Enable MySQL support" off \
POSTGRESQL "Enable PostgreSQL support" off
-USE_AUTOCONF_VER= 259
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= autoheader:259 autoconf:259
USE_REINPLACE= yes
USE_RC_SUBR= yes
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 82c2389f401e..fd867863a720 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -17,7 +17,7 @@ COMMENT= BeeCrypt is an open source cryptography library
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 0c3c1129e227..e8366c253ad6 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -20,7 +20,7 @@ USE_PERL5= yes
INSTALL_TARGET= install certificate
.endif
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CFLAGS+= -I${OPENSSLINC}/openssl
CONFIGURE_ARGS= --with-ssltop=${OPENSSLBASE} --with-ssllib=${OPENSSLLIB}
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile
index 8c3cb00abbeb..e8b96d6ed794 100644
--- a/security/borzoi/Makefile
+++ b/security/borzoi/Makefile
@@ -18,7 +18,7 @@ COMMENT= An Elliptic Curve Cryptography Library
BUILD_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
RUN_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index ad63dcd670e4..f6e83251e9f0 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -30,9 +30,7 @@ OPTIONS= MILTER "Compile the milter interface" Off \
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=259
-USE_AUTOMAKE_VER=19
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15
LIBTOOLFILES= acinclude.m4
INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 52dc643291ba..83192b317328 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -26,7 +26,7 @@ OPTIONS= MILTER "Compile the milter interface" Off \
LIBUNRAR "Support for external Unrar library" Off
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 0a00887598c8..35cb8df14f04 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -37,8 +37,7 @@ OPTIONS+= GDBM "Use gdbm instead of system bdb" off
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBLTDL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15 libltdl:15
USE_PERL5= yes
USE_REINPLACE= yes
USE_SUBMAKE= yes
diff --git a/security/courierpassd/Makefile b/security/courierpassd/Makefile
index f784a5f2adb5..eb45b34e6afc 100644
--- a/security/courierpassd/Makefile
+++ b/security/courierpassd/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_GETTEXT= YES
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index da978a9a5bfa..4c65fc3ccef5 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT= A collection of plug-ins to cryptographic engines
BUILD_DEPENDS= ${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
gpg-agent:${PORTSDIR}/security/gnupg-devel
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 850c3dbaa997..4716af79efda 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -48,9 +48,7 @@ MAN8= sasldblistusers.8 saslpasswd.8 saslauthd1.8
USE_RC_SUBR= YES
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= automake:14 autoconf:213 libtool:13:inc
AUTOMAKE_ARGS= --add-missing --include-deps
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index a9901b9cbe33..ba0f3e064537 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
USE_BZIP2= yes
USE_OPENLDAP= yes
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
INFO= dirmngr
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index 511f0f240c07..3e7094363668 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= distcache-1.4*
USE_BZIP2= yes
USE_RC_SUBR= dc_server.sh
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
LIBTOOLFILES= configure ssl/configure
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index ac804306c5d8..aab88e3053ad 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= distcache-devel-*
USE_BZIP2= yes
USE_RC_SUBR= dc_server.sh
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index 71289954f5d6..3b362d29df79 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= Meno.Abels@Adviser.com
COMMENT= Simulate the root user behaviour
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 1d6b3c5acaec..4914c63d7dc8 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= nss3:${PORTSDIR}/security/nss
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 2ad71a50ac96..ada08bfd048a 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20
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/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile
index 2ad71a50ac96..ada08bfd048a 100644
--- a/security/gnomekeyring/Makefile
+++ b/security/gnomekeyring/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20
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/security/gnutls/Makefile b/security/gnutls/Makefile
index cf0248a18744..a3b9fa7073e1 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -37,7 +37,7 @@ USE_ICONV= yes
USE_GETTEXT= yes
USE_GNOME= pkgconfig
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 06b5c4553e92..f0fa2bb08277 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
gpgsm:${PORTSDIR}/security/gnupg-devel
LIB_DEPENDS= gpg-error:${PORTSDIR}/security/libgpg-error
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 7c99911c4275..428c7b545153 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -20,9 +20,8 @@ LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
LATEST_LINK= gpgme03
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= autoconf:259 libtool:13:inc
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
INSTALLS_SHLIB= yes
USE_REINPLACE= YES
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 2d15e73528e5..64ff93e20b96 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= heimdal-*
USE_PERL5_BUILD= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-kerberos5
INSTALLS_SHLIB= yes
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 287d1fe4c23e..bf03eb485407 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -21,8 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-USE_ACLOCAL_VER= 14
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14 aclocal:14
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 695a176314c8..b70d30217b9e 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-debug --enable-dpd --enable-natt=kernel \
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?= --enable-shared --enable-static
CONFIGURE_ARGS+= --disable-thread-support
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?= --enable-shared --enable-static
CONFIGURE_ARGS+= --disable-thread-support
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?= --enable-shared --enable-static
CONFIGURE_ARGS+= --disable-thread-support
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?= --enable-shared --enable-static
CONFIGURE_ARGS+= --disable-thread-support
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 0d90c8cd79ae..67f9d6eca024 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -16,7 +16,7 @@ COMMENT= "General purpose crypto library based on code used in GnuPG"
LIB_DEPENDS= gpg-error.1:${PORTSDIR}/security/libgpg-error
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 58927650597b..da51c20d8293 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library and frontend for running commands as root
USE_X_PREFIX= yes
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
CONFIGURE_ARGS+=--disable-install-pam
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 513d6a373dbb..6f62e94ae11a 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -16,7 +16,7 @@ COMMENT= Common error values for all GnuPG components
USE_GPG= yes
SIG_SUFFIX= .sig
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 5f79bf6cd450..aca38909f63b 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
mhash.2:${PORTSDIR}/security/mhash
USE_BZIP2= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig
diff --git a/security/libident/Makefile b/security/libident/Makefile
index ab99ab6a0e6d..008d3dfbde2d 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A small library to interface the ident protocol server (rfc1413)
USE_GNOME= gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= ident.3
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 98206a1996f5..7042e203c150 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 2325de2d57de..fe9e9703751c 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-cipher cryptographic library (used in PHP)
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-static
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 60b914fe46d1..94be87f45b1c 100644
--- a/security/libntlm/Makefile
+++ b/security/libntlm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library that implement Microsoft's NTLM authentication
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 09f13cc3016a..666cf7155d4c 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -18,8 +18,7 @@ COMMENT= The portable OTR Messaging Library and toolkit
LIB_DEPENDS= gpg-error:${PORTSDIR}/security/libgpg-error \
gcrypt:${PORTSDIR}/security/libgcrypt
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= autoconf:259 libtool:15
INSTALLS_SHLIB= yes
MAN1= otr_toolkit.1
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index f336e82480c7..19281d83be29 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -20,7 +20,7 @@ COMMENT= ASN.1 structure parser library
USE_GPG= yes
SIG_SUFFIX= .sig
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 36fd5e19bef1..7835f9b3a5f0 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -23,7 +23,7 @@ COMMENT= Replacement for crypt(1)
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
mhash.2:${PORTSDIR}/security/mhash/
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_GETTEXT= yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --with-catgets
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index e80c48e3b504..28037b786f36 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= roam@FreeBSD.org
COMMENT= An easy-to-use library for strong hashes such as MD5 and SHA1
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_PERL5_BUILD=yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \
diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile
index 2d7d0a8ff59c..3092ed16dc83 100644
--- a/security/ncrypt/Makefile
+++ b/security/ncrypt/Makefile
@@ -17,9 +17,7 @@ COMMENT= Advanced AES file encryption tool
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19
-USE_ACLOCAL_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:259
PLIST_FILES= bin/ncrypt bin/nrm
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 8275e65f186d..1364d3962ad1 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/nessus-core
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall.sh
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= YES
USE_RC_SUBR= YES
WANT_GNOME= yes
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index daf751bfc88a..8493593d1830 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/libnasl
USE_BISON= YES
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= YES
MAN1= nasl.1 nasl-config.1
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index ea4e6640cff8..7da455563a06 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/libnasl
USE_BISON= YES
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= YES
MAN1= nasl.1 nasl-config.1
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index cc3c2aa612c3..3442e9b7cc05 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -27,8 +27,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-libraries
USE_BISON= YES
-USE_AUTOCONF_VER= 213
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= autoconf:213 libtool:13
CONFIGURE_ARGS= --enable-cipher
.if defined(WITH_NESSUS_BPF_SHARE)
CONFIGURE_ARGS+= --enable-bpf-sharing
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index ea96d582b360..5dc37bc6249a 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -27,7 +27,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-libraries
USE_BISON= YES
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --enable-cipher
.if defined(WITH_NESSUS_BPF_SHARE)
CONFIGURE_ARGS+= --enable-bpf-sharing
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 6b1533bd4b12..ebd35e0ff30f 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -32,7 +32,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-core
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall.sh
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_REINPLACE= YES
USE_RC_SUBR= YES
WANT_GNOME= yes
diff --git a/security/newpki-client/Makefile b/security/newpki-client/Makefile
index 4c3a0455699f..c75f70c0ce3e 100644
--- a/security/newpki-client/Makefile
+++ b/security/newpki-client/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= newpki.2:${PORTSDIR}/security/newpki-lib \
WRKSRC= ${WRKDIR}/${PORTNAME}-2.0.0
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config
USE_GNOME= gnometarget
diff --git a/security/newpki-lib/Makefile b/security/newpki-lib/Makefile
index f66716f274bf..e376e556df75 100644
--- a/security/newpki-lib/Makefile
+++ b/security/newpki-lib/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
.if ${OSVERSION} < 500000
USE_GCC= 3.4
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
@@ -49,7 +49,7 @@ patch-autotools:
done);
.else
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.endif
pre-patch:
diff --git a/security/newpki-server/Makefile b/security/newpki-server/Makefile
index f91ec2aed742..f26ac45a6b88 100644
--- a/security/newpki-server/Makefile
+++ b/security/newpki-server/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= newpki.2:${PORTSDIR}/security/newpki-lib
WRKSRC= ${WRKDIR}/${PORTNAME}-2.0.0
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 8807af6bf2c4..ebbdd485876f 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt
USE_GPG= yes
SIG_SUFFIX= .sig.asc
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/openct/Makefile b/security/openct/Makefile
index a16f382b72c5..be20afdf5f92 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.opensc.org/files/ \
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= A middleware framework for smart card terminals
-USE_LIBTOOL_VER= 15
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GMAKE= yes
USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index d8fcde5f2822..2e0832079692 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -17,7 +17,7 @@ USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 33752073dbe4..6d4cf28a6d9f 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -17,7 +17,7 @@ USE_REINPLACE= yes
USE_OPENSSL= yes
USE_OPENLDAP= yes
USE_APACHE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index c05e9680043f..c216f7d299d9 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -20,7 +20,7 @@ OPTIONS= OSIRISMD "Enable to build the management daemon" off \
CLI "Enable to build the management CLI" off
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= yes
.include <bsd.port.pre.mk>
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 1d6b3c5acaec..4914c63d7dc8 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= nss3:${PORTSDIR}/security/nss
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 784ddf4111f1..dc2fb33d57b3 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -23,7 +23,7 @@ CONFLICTS?= pinentry-[a-z]*-[0.9]*
USE_GETOPT_LONG=yes
USE_ICONV= yes
WANT_GNOME= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/security/poc/Makefile b/security/poc/Makefile
index 31b8ebc72524..ba69f56fc710 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= towitoko.2:${PORTSDIR}/devel/towitoko
PLIST_FILES= bin/poc
USE_GETOPT_LONG=yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index 9d558708f4b4..3846e6557f0c 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -20,7 +20,7 @@ EXPIRATION_DATE= 2005-11-21
LIB_DEPENDS= prelude.1:${PORTSDIR}/security/libprelude
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-html-dir=${PREFIX}/share/doc
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 32d3521ab626..cd203c67172f 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -22,7 +22,7 @@ BROKEN= "Kerberos5 is required in the system"
USE_RC_SUBR= YES
USE_OPENSSL= YES
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET=
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 764574ce76ec..52602cffac46 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 74e9e3bbac23..ad49282d8d41 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -21,7 +21,7 @@ INFO= sfs
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-sfsuser=sfs \
--with-sfsgroup=sfs \
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index f6261e77f5d7..bc31287c1df5 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -22,7 +22,7 @@ USE_PERL5_BUILD= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_ICONV= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --disable-starttls \
diff --git a/security/srm/Makefile b/security/srm/Makefile
index c4233df5c940..1bccf0c465bb 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Secure rm, a utility which destroys file contents before unlinking
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
MAN1= srm.1
PLIST_FILES= bin/srm
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index aeb75ecc6be1..f7ec753d8882 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -19,7 +19,7 @@ COMMENT= Secure shell client and server (remote login program)
CONFLICTS= openssh-* openssh-portable-* openssh-gssapi-* ssh2-3.*
NO_LATEST_LINK= YES
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= YES
USE_PERL5= YES
CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 177711344081..4a3916b74938 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
USE_GETTEXT= yes
USE_PERL5= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= yes
USE_GCC= 3.4
CONFIGURE_TARGET=
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 5216ddbfd81b..ae286e2899ac 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -18,7 +18,7 @@ COMMENT= SSL encryption wrapper for standard network daemons
USE_OPENSSL= YES
USE_REINPLACE= YES
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= YES
GNU_CONFIGURE= yes
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 06f868d773a6..dfa7fb6999ed 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
USE_OPENSSL= yes
USE_GNOME= gnomehack libxslt
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 19d8c9934d3f..3b2a42746bd3 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
USE_OPENSSL= yes
USE_GNOME= gnomehack lthack libxslt gnometarget
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
PLIST_FILES= bin/xmlsec1 bin/xmlsec1-config etc/xmlsec1Conf.sh
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index cda6b71bdeef..6105cfccc2f2 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -22,7 +22,7 @@ COMMENT= An Enhanced Printer Spooler
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
SUB_FILES= pkg-message pkg-install
SUB_LIST= SYSCONFDIR="${SYSCONFDIR}"
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 2903c3b32e2a..afa4ebeecc7a 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The Berkeley Automounter Suite of Utilities
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
PORTDOCS= AUTHORS COPYING BUGS FAQ NEWS README.attrcache
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index b999d0e634f0..40e7393af537 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= esn@x123.info
COMMENT= Apache RealTime log stats
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/sysutils/coaster/Makefile b/sysutils/coaster/Makefile
index 39171bcae00d..0e390de68b77 100644
--- a/sysutils/coaster/Makefile
+++ b/sysutils/coaster/Makefile
@@ -28,7 +28,7 @@ USE_GCC= 3.4
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 276fa740bb54..ece75c764fee 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ebrandi@fugspbr.org
COMMENT= A full featured command-line backup tool, aimed for disks
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CPPFLAGS+= -DHAVE_DECL_GETOPT=0
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 4611629c9380..df4a1bf049a6 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/file/ \
MAINTAINER= jharris@widomaker.com
COMMENT= Utility to determine file type
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-fsect-man5
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 5d80c3fa5d37..c5fa60f34edd 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= guile:${PORTSDIR}/lang/guile
BUILD_DEPENDS+= ${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index e4ecaabefef0..2e3d1cda5f9c 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -15,7 +15,7 @@ DISTNAME= fuse-${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
COMMENT= FUSE allows filesystem implementation in userspace
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin \
PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 96f3b310d69f..1fa12302f52b 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -18,7 +18,7 @@ COMMENT= A utility to split and join files
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WANT_AUTOMAKE_VER=14
+USE_AUTOTOOLS= automake:14:env
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 1559a5b0a3fe..7530b3375fca 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 1889530bdef4..6924821d3f8d 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 1848f8e7c586..a6beba92606e 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GCC= 3.4+
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GSTREAMER= vorbis mad flac
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnomesu/Makefile b/sysutils/gnomesu/Makefile
index 159cf0f36042..0b413f694f27 100644
--- a/sysutils/gnomesu/Makefile
+++ b/sysutils/gnomesu/Makefile
@@ -17,7 +17,7 @@ COMMENT= A gtk frontend to su
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack libgnomeui libzvt
MAN1= gnomesu.1
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index d52c318a1ebc..d5c3b0e9952d 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -16,8 +16,7 @@ COMMENT= Shows package dependencies in tree views
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15 autoconf:253
AUTOMAKE_ARGS= --add-missing
USE_GMAKE= yes
PLIST_FILES= bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index e7f555bc8644..1b7300139d80 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
MAINTAINER= sem@FreeBSD.org
COMMENT= GRand Unified Bootloader
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index c177d3b60e36..105b3947355c 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
MAN1= hdup.1
MAN5= hdup.conf.5
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index d78260cffe2e..2e7e0520eb9b 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= glib12
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-fatal-warnings
diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile
index d78260cffe2e..2e7e0520eb9b 100644
--- a/sysutils/heartbeat2/Makefile
+++ b/sysutils/heartbeat2/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= glib12
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-fatal-warnings
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 05a2e6774f52..2c5be2385345 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 05a2e6774f52..2c5be2385345 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 0ef0ade67bcf..04ba28094a0f 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -18,7 +18,7 @@ USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
post-patch:
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index b6a8ea38c0d0..530c4a155f77 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -16,7 +16,7 @@ COMMENT= Compact Disc Input and Control Library
LIB_DEPENDS= cddb.3:${PORTSDIR}/audio/libcddb \
popt.0:${PORTSDIR}/devel/popt
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget pkgconfig gnomehack
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 15e2d08bb4e8..129eb3530b83 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xauth:${X_CLIENTS_PORT} \
USE_GNOME= pkgconfig glib20
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-gtk-doc=no
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/libgksuui/Makefile b/sysutils/libgksuui/Makefile
index 5815eff7bea2..18c521a8b958 100644
--- a/sysutils/libgksuui/Makefile
+++ b/sysutils/libgksuui/Makefile
@@ -16,7 +16,7 @@ COMMENT= A graphical fronted to su library
USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-gtk-doc=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile
index 0a4619b80c09..807b71d33720 100644
--- a/sysutils/libieee1284/Makefile
+++ b/sysutils/libieee1284/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= IEEE1284 communications library
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
ONLY_FOR_ARCHS= i386
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 126467335e02..999da62b567c 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Default plugins for lineakd
LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index 4b7c71a2021b..c80d732efba2 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --program-prefix=''
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= lineak_kdeplugins.1
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index e7ce61250b31..2c5a7c3de979 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-prefix=''
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= lineak_xosdplugin.1
diff --git a/sysutils/lineak_defaultplugin/Makefile b/sysutils/lineak_defaultplugin/Makefile
index 126467335e02..999da62b567c 100644
--- a/sysutils/lineak_defaultplugin/Makefile
+++ b/sysutils/lineak_defaultplugin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Default plugins for lineakd
LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/lineak_kdeplugins/Makefile b/sysutils/lineak_kdeplugins/Makefile
index 4b7c71a2021b..c80d732efba2 100644
--- a/sysutils/lineak_kdeplugins/Makefile
+++ b/sysutils/lineak_kdeplugins/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --program-prefix=''
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAN1= lineak_kdeplugins.1
diff --git a/sysutils/lineak_xosdplugin/Makefile b/sysutils/lineak_xosdplugin/Makefile
index e7ce61250b31..2c5a7c3de979 100644
--- a/sysutils/lineak_xosdplugin/Makefile
+++ b/sysutils/lineak_xosdplugin/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-prefix=''
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= lineak_xosdplugin.1
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 7e49ca8d59be..8621d9184519 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -37,7 +37,7 @@ USE_GCC= 3.4
GNU_CONFIGURE= yes
EXTRA_PATCHES= ${FILESDIR}/extra-patch-ltmain.sh
.else
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.endif
post-patch:
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index c089f4ad76d3..90ea4b641718 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
USE_GETOPT_LONG=yes
WANT_GNOME= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --program-transform-name=""
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile
index 125c914fb0c2..cceed26af358 100644
--- a/sysutils/nvtv/Makefile
+++ b/sysutils/nvtv/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386
CONFIGURE_ENV= CC="${CC} -I${PREFIX}/include"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
USE_GNOME= gtk12
USE_REINPLACE= yes
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 81818a461c84..ebeb7cea770c 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -17,7 +17,7 @@ COMMENT= Utilities and library to manipulate ReiserFS partitions
GNU_CONFIGURE= yes
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/sjog/Makefile b/sysutils/sjog/Makefile
index a029d91e5e90..cbe946953105 100644
--- a/sysutils/sjog/Makefile
+++ b/sysutils/sjog/Makefile
@@ -16,8 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Userland daemon for Sony Vaio Jog Dial
ONLY_FOR_ARCHS= i386
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 7cbfc6de6115..521a12f61cce 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -16,7 +16,7 @@ COMMENT= Rob Kaper's uptime daemon
PREFIX= ${LOCALBASE}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${LOCALBASE}
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 7138870f7c92..471faf1e4eb9 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -16,8 +16,7 @@ COMMENT= An uptime showing dockapp with a similar look to wmcpuload
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_AUTOMAKE_VER= 15
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= automake:15 autoheader:259
CONFIGURE_ARGS= --program-prefix=""
MAN1= wmupmon.1
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 6bb6010e2e92..642a15b432bd 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS= i386
USE_GNOME= gtk20
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/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index be7cbe3d5367..8792eea2e6d8 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GCC= 3.4
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 8b79fa9fd0f5..3db9aafde631 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
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/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index c48b2da08d81..bfaa33443200 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -23,7 +23,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
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 55a666dacd05..baac4895ec16 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
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/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index ea1a8ee2d9f1..9aeae841aaa4 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GNOME= gtk20
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/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index d80cd30b2170..efa526116aed 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk20
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/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index ebeec217a418..be7e3eaddb45 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
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/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 53ff1129e53c..f8caaf8909fe 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE= yes
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/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 0d66cd96c856..0fbceeb120d6 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 88362bf72317..2d60a396ea58 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -18,8 +18,7 @@ COMMENT= A set of utilities and library to manipulate an xfs filesystem
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15:env
GNU_CONFIGURE= yes
CONFIGURE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}" \
CFLAGS="${CFLAGS}" \
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index 96851a256394..29efbbd58372 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -16,7 +16,7 @@ COMMENT= User utilities for zisofs
PORTDOCS= README CHANGES INSTALL
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETOPT_LONG= yes
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 0811950ba8fc..1d5f7503c06e 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_GNOME?= gnomehack gnometarget
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?=--without-gtk
.include <bsd.port.mk>
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 2db0eaa116bd..6a00b2245209 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= aspell-0.60.4.tar.gz
MAINTAINER?= thierry@FreeBSD.org
COMMENT?= Spelling checker with better suggestion logic than ispell
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \
--enable-docdir=${DOCSDIR} \
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 92bd7fe90050..984c84eb62a4 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= C-language sources to HTML converter
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
MAN1= c2html.1
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 98f9bd466527..35ef0b30957c 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= sobomax
MAINTAINER= ports@FreeBSD.org
COMMENT= A free C OLE library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 6dff6861e271..77b2a792366b 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -19,7 +19,7 @@ COMMENT= Dictionary Server Protocol (RFC2229) client
USE_BISON= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
--with-etcdir=${PREFIX}/etc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index cb507cf1c2bc..c382c6e788b5 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -18,7 +18,7 @@ COMMENT= Dictionary/spellchecking framework
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget glib20 ltverhack
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 0b2a08dddee3..5b210030867d 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= expat
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= XML 1.0 parser written in C
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
ALL_TARGET= default
INSTALLS_SHLIB= yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 2bea5046f1cd..a5a4f71472b8 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
USE_GNOME= glib20 gnomehack
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" CPPFLAGS="-I${LOCALBASE}/include"
PLIST_SUB= DOCSDIR="share/doc/${DISTNAME}"
INSTALLS_SHLIB= yes
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index a0915b56f51b..7012ac229427 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index a0915b56f51b..7012ac229427 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index e7f2e7066136..7ca1c9b14ea0 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index e7f2e7066136..7ca1c9b14ea0 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 631667284b54..2ab4d428834b 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -22,7 +22,7 @@ COMMENT= A www indexing and searching system
RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-config-dir=${PREFIX}/etc/htdig \
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 5ea1b2a7203e..a1642fee7127 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -26,10 +26,8 @@ INSTALLS_SHLIB= yes
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}/lib/iiimcf
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index d680198a38fb..40f441c12ba8 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -22,10 +22,8 @@ USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_REINPLACE= 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}/lib/CSConv
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 985493423730..695aac8bbe86 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -27,10 +27,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= intltool gconf2 libglade2 libgnomeui \
gnomepanel gnomeprefix gnomehack
-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}/gnome-im-switcher
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 071cf66fe80a..0b6a3b774d79 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -30,10 +30,8 @@ USE_REINPLACE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= intltool gtk20
-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}/iiimgcf
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index cc9edcc1dfff..0f7bdabce240 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -29,10 +29,8 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= libxml2
USE_XLIB= 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/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index 62c0d6372246..2735680426c3 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -22,10 +22,8 @@ INSTALLS_SHLIB= yes
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}/lib/iiimp
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index ee3aca7841a5..8f751c8c032f 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -27,10 +27,8 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig libxml2
USE_OPENSSL= 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}/iiimsf
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index f6f89341b302..b4b7260895b5 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -28,10 +28,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_MOTIF= yes
USE_OPENSSL= 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}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 163a818ae3b6..8cd9ef2f16f4 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -26,10 +26,8 @@ USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_XLIB= 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}/iiimxcf/htt_xbe
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 938ee6d09988..4fd0088cad87 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= sp-1.*
RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog
PLIST_SUB= XMLCATMGR=${XMLCATMGR}
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 83c2e4f1792c..beb4a9d2f099 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Java sources to HTML converter
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
MAN1= java2html.1
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 061a60ca759c..684fa3d99ab9 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -17,7 +17,7 @@ COMMENT= A KDE3 graphical frontend for diff
USE_KDELIBS_VER= 3
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 7a252ec53697..db3614df3c8f 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -17,8 +17,7 @@ COMMENT= Simple language for marking up text in a very expressive way
USE_BISON= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= autoconf:213 libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index e2b26a9911cb..5222e8b6cbc7 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT= CSS2 parsing library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack lthack glib20 libxml2
diff --git a/textproc/libhtmlparse/Makefile b/textproc/libhtmlparse/Makefile
index 8cb83e8b9ffc..54a2352a18aa 100644
--- a/textproc/libhtmlparse/Makefile
+++ b/textproc/libhtmlparse/Makefile
@@ -17,7 +17,7 @@ BROKEN= "mastersite disappeared"
DEPRECATED= ${BROKEN}
EXPIRATION_DATE= 2005-12-09
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 0e89e423baa7..0544b8ac227b 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library for parsing lesson files based on the LingoTeach DTD
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libxml2
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.if defined(WITH_COMP)
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index f4ce40711e56..7d36debd3606 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
LIB_DEPENDS= raptor.2:${PORTSDIR}/textproc/raptor
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index c0d9d6e26126..062242cbfc1d 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
USE_BISON= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes
XERCESCROOT= `cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index eeb438a7e07d..4936fc40b716 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -18,7 +18,7 @@ COMMENT= A lightweight fully POSIX compliant regexp matching library
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig lthack
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 98c85827a161..fb4b39ec0f39 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libgsf
INSTALLS_SHLIB= yes
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 98c85827a161..fb4b39ec0f39 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libgsf
INSTALLS_SHLIB= yes
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index c3313267252f..229173d74bbd 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= bland@FreeBSD.org
COMMENT= XML API for C++
USE_GNOME= gnomehack gnometarget libxml2 pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 9196450af85c..5b620beb2dfb 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -18,7 +18,7 @@ COMMENT= XML parser library for GNOME
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
pre-patch:
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ae2fd0807580..6ba286eb5441 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -25,7 +25,7 @@ COMMENT?= XML parser library for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME?= gnomehack gnometarget pkgconfig
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 60262a932fd8..2338300b7e44 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT= An XML library which wraps expat
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 82a1e9f2f955..f59695094307 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -17,7 +17,7 @@ COMMENT?= The XSLT C library for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME?= gnomehack gnometarget libxml2
USE_REINPLACE= yes
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 3c86aa100300..0af15ec31f4e 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -17,7 +17,7 @@ USE_GNOME= gnometarget
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
DOCS= LICENSE README
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index e6216b315c3f..c0de473a8cfe 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ library to build and query a full text inverted index
USE_ICONV= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--without-unac
INSTALLS_SHLIB= yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index e239844c097b..7f2de3155b02 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
USE_ICONV= yes
USE_REINPLACE= yes
USE_GNOME= glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-libxml2=yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index ff825d5f846b..fdd873d6fc24 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
# Please don't remove the comments, as soon as autoconf/libtool get's
# updated in the ports collection the comments may be removed.
# They serve as a reminder.
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
#LIBTOOLFLAGS= --disable-ltlibs --release-suffix
USE_REINPLACE= yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index fbcf3af24607..e90ef86c2291 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= osp.3:${PORTSDIR}/textproc/opensp
RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_GMAKE= YES
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 1b903f1617fb..291310daf58b 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT= yes
USE_GMAKE= YES
USE_ICONV= yes
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${PREFIX}/share/sgml/openjade
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index 26413ffe9af8..265aebbe16d8 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Perl sources to HTML converter
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
MAN1= perl2html.1
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 55bb050910b5..e216935d9e53 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
USE_GNOME= gnomehack gnometarget libxml2
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
--with-curl-config=${LOCALBASE}/bin/curl-config \
--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 55bb050910b5..e216935d9e53 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
USE_GNOME= gnomehack gnometarget libxml2
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
--with-curl-config=${LOCALBASE}/bin/curl-config \
--with-pkg-config=${LOCALBASE}/bin/pkg-config \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 9810cf87bc5e..64ea6b1ca6a3 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -39,7 +39,7 @@ USE_GNOME= gnomehack gnometarget lthack pkgconfig
USE_OPENSSL= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
LIBTOOLFLAGS= --enable-ltlibs
LIBTOOLFILES= configure rasqal/configure
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 9810cf87bc5e..64ea6b1ca6a3 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -39,7 +39,7 @@ USE_GNOME= gnomehack gnometarget lthack pkgconfig
USE_OPENSSL= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
LIBTOOLFLAGS= --enable-ltlibs
LIBTOOLFILES= configure rasqal/configure
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 1a60bef850b8..2a3611d286ab 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
USE_GMAKE= yes
USE_ICONV= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5_BUILD= yes
MAN1= sabcmd.1
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 6468d33f499b..a84f955c57d5 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
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/textproc/sary/Makefile b/textproc/sary/Makefile
index 3de0764b8ba2..780a861ea508 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -20,10 +20,8 @@ USE_GNOME= glib20 gnomehack
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13
AUTOMAKE_ARGS= -a
-USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= sary.1 mksary.1
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 57c88dc1a327..c905c3f8b545 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOME= intlhack
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index cdfb9b452174..caa78cce7860 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= intlhack
.include <bsd.port.pre.mk>
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 077d069750e6..c2b702288b5a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -22,7 +22,7 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 688c122f9538..1e66eb1688ed 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -35,7 +35,7 @@ DOCBOOK_VERSION= 4.1.2
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_BISON= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gnomehier gnometarget libxslt
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index df18a60dc023..fbffdbeed954 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -16,9 +16,7 @@ COMMENT= Embeddable Fulltext Search Engine
LIB_DEPENDS= mecab-razil:${PORTSDIR}/japanese/mecab-razil
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14 autoconf:259 libtool:15
USE_GMAKE= YES
INSTALLS_SHLIB= YES
CONFIGURE_ARGS= --with-sennahome=${SENNA_HOME}
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 3a214166e5a0..d1afb160f1ca 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index ee2add526e09..105f2e2f60d2 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -25,7 +25,7 @@ WANT_GNOME= yes
USE_GNOME= lthack gnometarget glib20
USE_GMAKE= yes
USE_ICONV= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 66ef6feae139..60879cb3fc4e 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://critical.ch/distfiles/
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Convert between UTF-8 Unicode and 7-bit ASCII equivalents
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
MAN1= uni2ascii.1 ascii2uni.1
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index f3cc4b271904..a459954fcdba 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -19,10 +19,7 @@ COMMENT= Library & tools for converting wbxml<->xml
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_LIBTOOL_VER= 15
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15
AUTOMAKE_ARGS= -acf
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index c1fb6cf82806..5ca9b7927684 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx-ssl
USE_GETOPT_LONG= yes
USE_GNOME= gnometarget pkgconfig glib20
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-exporter \
--with-glib=glib2 \
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index 7bf829416310..d0737313bf3b 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} --disable-debug
USE_GNOME= gnometarget libgsf
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index b32cb57a13e8..a7e5b836fa98 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -18,8 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Convert Excel and PowerPoint files to HTML and text
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index efd35e8f343d..5997cb9b281d 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -18,7 +18,7 @@ COMMENT= A utility for converting MS Excel files to XML
LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole \
xml.5:${PORTSDIR}/textproc/libxml
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 34c271c2a267..2411dc8c9e41 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT= Xml internationalization support for GNOME, and others
USE_GMAKE= yes
USE_PERL5= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFLICTS= intltool-*
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index 23c174309d3d..ae0a18590748 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -18,7 +18,7 @@ COMMENT= XML Parser and Validator
USE_REINPLACE= yes
FETCH_CMD= /usr/bin/fetch
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
pre-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 27e516d9362f..1ad37410264b 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libgnomeprint libxslt
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 43aea5ae113c..6ff1f847f1c2 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.crevola.com/about/current/
MAINTAINER= petef@FreeBSD.org
COMMENT= Display the contents of your Netscape cache
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index 0a5ffbbd1fe0..0e1da71bcfae 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\
USE_GMAKE= yes
GMAKE= ${LOCALBASE}/bin/gmake # Must have the full path.
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_PERL5= yes
APACHE_COMPAT= yes
JAVAVM?= ${LOCALBASE}/bin/javavm
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index f0002f8c86a6..3baad1ee2316 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -52,8 +52,7 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
AUTOHEADER=${AUTOHEADER}
USE_ICONV= yes
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_PERL5= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 81c32cd90afd..c49f1f096892 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -51,8 +51,7 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
AUTOHEADER=${AUTOHEADER}
USE_ICONV= yes
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_PERL5= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index b7756748ab8b..b8be68d8bb1c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -41,8 +41,7 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
USE_BZIP2= yes
USE_ICONV= yes
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_PERL5= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index b7756748ab8b..b8be68d8bb1c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -41,8 +41,7 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
USE_BZIP2= yes
USE_ICONV= yes
-USE_AUTOCONF_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_PERL5= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/www/aria/Makefile b/www/aria/Makefile
index c985c4ed88fa..453422acd49e 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -21,7 +21,7 @@ USE_OPENSSL= yes
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 1fa50b7601f7..367673ea0f6d 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
USE_QT_VER= 3
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mt --program-prefix="" \
--with-libxml2-include="${LOCALBASE}/include/libxml2"
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 7a0a8e5c71a0..5a0059ae5375 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -16,7 +16,7 @@ COMMENT= A C++ class library for writing CGI applications
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS}
INSTALLS_SHLIB= yes
diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index 7085a187c03a..1dce4b61c2ff 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -17,8 +17,7 @@ COMMENT= A history cleaner for Netscape Navigator and Communicator
USE_REINPLACE= yes
WANT_GNOME= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14 autoconf:213
.include <bsd.port.pre.mk>
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index 89b8612216e4..dcb572829d57 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -18,7 +18,7 @@ COMMENT= Open source search engine for Internet and Intranet sites
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
DOCSDIR= ${PREFIX}/share/doc/dataparksearch
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index a0999e0284c0..28f9cc2c0361 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -25,7 +25,7 @@ ICONDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
INFODIR?= info
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
ALL_TARGET= default
PLIST_SUB+= LISPDIR=${LISPDIR} \
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 1bd8a85a6154..ce6213711f37 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \
apr-1:${PORTSDIR}/devel/apr
WRKSRC= ${WRKDIR}/httpd-test/flood
-USE_AUTOCONF_VER= 253
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= autoconf:253 libtool:15:env
CONFIGURE_ARGS= --disable-shared \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index 53162bc0562f..2b4156e528d5 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -21,7 +21,7 @@ USE_REINPLACE= YES
USE_PERL5= YES
HAS_CONFIGURE= YES
USE_APACHE= YES
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
NO_BUILD= YES
USE_PHP= pgsql session pcre
WANT_PHP_CLI= YES
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index f4100e528fdf..3fec17d27c70 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs
-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/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index b7c837ae7c75..7104814a2498 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -24,7 +24,7 @@ USE_APACHE= yes
APACHE_PORT= www/apache2
USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 2afdef7917b5..a2835636f566 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 9d2cfc6abb4b..b1c7e1348fdc 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -17,7 +17,7 @@ COMMENT= Collect information from all over the Internet
USE_BZIP2= yes
USE_PERL5= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
NO_MTREE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX}/${PORTNAME} --without-wish
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 9bdb1036f89a..c074686b3406 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_REINPLACE= yes
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/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 9925bf52b77e..0db5da8e7628 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -18,7 +18,7 @@ COMMENT= Kazehakase is a browser with gecko engine like Epiphany or Galeon
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20
USE_GMAKE= yes
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index b4de3ee1e9df..e82c426bc28f 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WITH_APACHE2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${APXS}
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index ec0b2c9886cb..e1056bad6593 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= sources/libghttp/1.0
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME http client library
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 9e6616d56b74..de8dea952924 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= The W3C Reference Library
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib
USE_PERL5_BUILD=yes
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 90c2743ed72f..2ec371642ff0 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -17,10 +17,9 @@ COMMENT= A secure, fast, compliant, and very flexible Web Server
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
USE_REINPLACE= yes
USE_RC_SUBR= lighttpd.sh
-USE_LIBTOOL_VER= 15
USE_GNOME= lthack
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd
diff --git a/www/mdw/Makefile b/www/mdw/Makefile
index 78f6490193a4..2b2cda5b6a69 100644
--- a/www/mdw/Makefile
+++ b/www/mdw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.redbrick.dcu.ie/~colmmacc/mdw/
MAINTAINER= petef@FreeBSD.org
COMMENT= A utility to check the MD5 sum of a webpage
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_REINPLACE= yes
MAN1= mdw.1
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 48b21cc5ce32..19799428c621 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -20,7 +20,7 @@ MAN5= indexer.conf.5
INSTALLS_SHLIB= yes
USE_GNOME= lthack
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index 690de528ec3a..9298749bea8f 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -21,7 +21,7 @@ MAN5= indexer.conf.5
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
APACHE_COMPAT= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index bee4fe19e92b..b6d445a9cd16 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+= clamav:${PORTSDIR}/${CLAMAV_PORT}
USE_APACHE= YES
WITH_APACHE2= YES
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
.if defined(WITH_CLAMAVDEVEL)
CLAMAV_PORT= security/clamav-devel
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index 24f5ec28a80c..17b3c93d4ed2 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -21,8 +21,7 @@ BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:configure
USE_REINPLACE= yes
USE_APACHE= yes
-WANT_AUTOCONF_VER=253
-WANT_LIBTOOL_VER=13
+USE_AUTOTOOLS= autoconf:253:env libtool:13:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/www/mozilla-bonobo/Makefile b/www/mozilla-bonobo/Makefile
index 607fe249d72a..02c7b63684fb 100644
--- a/www/mozilla-bonobo/Makefile
+++ b/www/mozilla-bonobo/Makefile
@@ -36,7 +36,7 @@ HEADERS_SUFX=
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix libgnomeui libgnomeprint
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-plugin-install-dir="${PREFIX}/lib/browser_plugins" \
diff --git a/www/oops/Makefile b/www/oops/Makefile
index f7ca5bd31c9f..362e9418645b 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
OOPSVERSION= 1.5.24
USE_SUBMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
--sysconfdir=${PREFIX}/etc/oops \
--localstatedir=${OOPSVAR} \
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 69c8fda27c42..a589c298fec5 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -29,7 +29,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gtk20
USE_SDL= sdl
USE_GCC= 3.4
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla"
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index df92ce5ce290..86eb8904f1d1 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= nrcit.0:${PORTSDIR}/www/osb-nrcit
USE_X_PREFIX= yes
USE_GNOME= libglade2 gnomehack gnomeprefix
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index 45bec41413c9..22a238c90432 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= nrcore.0:${PORTSDIR}/www/osb-nrcore \
USE_GNOME= gtk20 gnomehack
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index 95b9f6215cd2..06c9091acccf 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -17,7 +17,7 @@ COMMENT= Gtk-Webcore's browser engine
LIB_DEPENDS= jscore.0:${PORTSDIR}/lang/osb-jscore
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_REINPLACE= yes
USE_GNOME= gtk20 gnomehack
USE_GCC= 3.4
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index b4de3ee1e9df..e82c426bc28f 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WITH_APACHE2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${APXS}
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 75856382689a..5d281fde8080 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -18,6 +18,6 @@ COMMENT= A GUI-based HTML Editor for GTK+/GNOME
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui gtksourceview gtkhtml3
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
.include <bsd.port.mk>
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index defa95177f9e..3d7fc6f545a0 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -24,7 +24,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/+ipv6//}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOHEADER_VER=213
+USE_AUTOTOOLS= autoheader:213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-user=${USER} --with-group=${GROUP} \
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 03cf4d7074ab..b02712789fbe 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -19,7 +19,7 @@ COMMENT= Privoxy is a web proxy with advanced filtering capabilities
WRKSRC= ${WRKDIR}/privoxy-${PORTVERSION}-stable
USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_REINPLACE= yes
USE_RC_SUBR= privoxy.sh
diff --git a/www/scout/Makefile b/www/scout/Makefile
index e13ee57226e5..6f2f6567933c 100644
--- a/www/scout/Makefile
+++ b/www/scout/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://sid.joedog.org/pub/scout/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to harvest URLs from a given start point
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+= --disable-shared --enable-static
MAN1= scout.1
PLIST_FILES= bin/scout
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 389f26e4cd52..2fba8cd6420d 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -31,7 +31,7 @@ USE_GNOME= gnomehack gtk20 libartlgpl2
USE_GSTREAMER= gconf
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 3ee04e43e8f9..3de8f4813009 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple web indexing for humans - enhanced
USE_GNOME= libxml2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
diff --git a/www/twhttpd/Makefile b/www/twhttpd/Makefile
index 9ca097182a0c..cca4cac1be47 100644
--- a/www/twhttpd/Makefile
+++ b/www/twhttpd/Makefile
@@ -17,7 +17,7 @@ COMMENT= Secure HTTP Proxy
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
do-install:
@${INSTALL_PROGRAM} -o root -g wheel -m 0755 ${WRKSRC}/twhttpd ${PREFIX}/sbin/twhttpd
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index 898afd21369b..4a1b07866e78 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= fortune@n.jpn.ph
COMMENT= World wide web server benchmarking with SSL support
USE_OPENSSL= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src
ALL_TARGET= install
diff --git a/www/winhelpcgi/Makefile b/www/winhelpcgi/Makefile
index ac948684490f..96068402cd24 100644
--- a/www/winhelpcgi/Makefile
+++ b/www/winhelpcgi/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf
WRKSRC= ${WRKDIR}/${PORTNAME}-1.0rc3
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14
USE_GETTEXT= yes
USE_APACHE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 5f47736beccf..71e31e56deb6 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-perl=${PERL5}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
PERL_ARCH="${PERL_ARCH}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= wml_backend/p2_mp4h/configure
PLIST_SUB+= ARCH=${PERL_ARCH}
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 8e74587e9a3d..c9b8967ea749 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ WSDL Parser
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG=yes
WRKSRC= ${WRKDIR}/${DISTNAME:R}
GNU_CONFIGURE= yes
diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index 6bf9ccc82074..625d090f4d88 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -16,7 +16,7 @@ COMMENT= Simple/powerful/lightweight/secure/embed-able HTTP server
USE_BZIP2= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
NO_MTREE= yes
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index c8cd0c221828..d4ea5bf7f2d1 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
USE_BZIP2= yes
USE_GNOME= gnometarget gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
PLIST_FILES= lib/bmp/General/libalarm.so
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index d4df93c128c8..aae3b5243343 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
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}
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index c45e390d16eb..cd2e60d3b7a5 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk12
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
PLIST_FILES= lib/xmms/General/libalarm.so
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index b412bf0f5808..2c259b390312 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -30,7 +30,7 @@ USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_GETTEXT= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-dbus \
--disable-dcop \
--enable-ecore-ipc \
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 6147f519dcae..e0df105ba051 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -22,7 +22,7 @@ PLIST_SUB+= LOCALBASE=${LOCALBASE}
USE_XLIB= yes
USE_GNOME= pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
HAS_CONFIGURE= yes
MAN1= rox.1
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index e15d1918f5e4..37b1b56540e2 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
WRKSRC= ${WRKDIR}/ROX-Session-${PORTVERSION}
USE_GNOME= gtk20 pkgconfig libxml2
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
HAS_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 9d26a76389a0..143d9c4b0224 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ryan.moe@fastfreedom.net
COMMENT= GNOME file and desktop manager
WRKSRC= ${WRKDIR}/velocity-0.1.0
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index c4dc1553eca9..74b7ccfed890 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -30,7 +30,7 @@ USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_XPM= 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/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index da2d65dea056..e02a8a8debe9 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index c82c2e9a87b7..ae4258c2305c 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -17,7 +17,7 @@ COMMENT= Create fonts.scale file for use with TrueType font server
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-WANT_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:env
PLIST_FILES= bin/ttmkfdir
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 1ac950536b4f..3e9b9833e8b9 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -18,9 +18,7 @@ COMMENT= Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
USE_BZIP2= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:14 autoconf:253 libtool:13:inc
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
MAKE_ARGS= PREPROCESSOR=/usr/bin/cpp
diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index 5a2db7f5c005..770bac91535b 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -24,7 +24,7 @@ USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
# XXX - Workaround for a badly rolled tarball.
#pre-configure:
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 9af585512a42..c68d7f2821da 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index d5b2f1086c90..74cbdae01f1e 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -19,7 +19,7 @@ COMMENT= The Clean GTK theme engine
WRKSRC= ${WRKDIR}/gtk-clean-theme
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gtk12
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 7506f2100d4a..2a9d22d35748 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index b3d28ca9db81..181537cf6e28 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 98b34c19b6db..e1dec6101280 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${X11BASE}/lib/gtk/themes/engines/libqtpixmap.so:${PORTSDIR}/x11-to
WRKSRC= ${WRKDIR}/Geramik-${PORTVERSION}
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index cdd7840c3a2f..1cc9c8777cb5 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -17,7 +17,7 @@ COMMENT= A GTK theme engine designed to look nice with the GNOME desktop environ
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 3d17063cb182..46c4b34e4aea 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-theme
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
INSTALLS_ICONS= yes
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 57fcea3f5f92..cd456035fd26 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 46ed823af8cd..22b8437d3a49 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= philip@FreeBSD.org
COMMENT= A simplistic GTK+ 2.x theme engine
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gtk20
THEME= cleanice-theme-1.2.7
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index c2bd8e5cfbf7..faeaa17a4c04 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -17,7 +17,7 @@ COMMENT= Theme engine for gtk+ toolkits
USE_X_PREFIX= yes
USE_GNOME= imlib
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
THEMES= metal notif pixmap raleigh redmond95
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index f06d67af5f71..2e4b85f48647 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 3239ddf7bcc9..1992867bd377 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -19,7 +19,7 @@ COMMENT= A port of the Flat GTK+ engine to GTK+ 2.0
WRKSRC= ${WRKDIR}/gtk-flat-theme-2.0
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 40b13680e94b..63e20e69a2a6 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
XIMIAN_SUBVERSION= 0
XIMIAN_DISTVERSION= 6.3
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index c51a8ac13dc0..bac040451962 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 73117126b86d..6f944508b12a 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= kdecore:${PORTSDIR}/x11/kdelibs3
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gtk20
USE_QT_VER= 3
USE_REINPLACE= yes
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 73117126b86d..6f944508b12a 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= kdecore:${PORTSDIR}/x11/kdelibs3
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gtk20
USE_QT_VER= 3
USE_REINPLACE= yes
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index 855bddff7dff..24a47b0854cd 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= amistry@am-productions.biz
COMMENT= Flexible GTK Theme Engine
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
WANT_GNOME= yes
CONFIGURE_ENV= X11BASE="${X11BASE}"
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index f97993372ebd..ad8bb4224201 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= An XFCE engine for GTK 2.0
USE_GNOME= gnomehack gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index 22193b08cb42..2b4519a03720 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/zenith-1.0
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index ecf9f8e09ec5..9ca1bf41299f 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/GTKBeEngine
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index e0bf5d65c04b..1e29f9c61b39 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index fa522133bf83..967d32db092e 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 06c4a7b4ba92..45276fff3505 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.5
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index b65d3bcb2a6e..ce74ea0b2f19 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GTKVERSION= 1.2
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index fc6c46bdc02c..c6244211ef8d 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 2b3bcd6788a9..1f3fd9334ba4 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gtk-theme-WhistlerK
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index 1c5130241cda..f892cf7f1ea7 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Plan9 compatibility libraries
USE_XLIB= YES
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--includedir=${PREFIX}/include/9libs
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 371ab310e420..0107524a5e01 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= Coin.44:${PORTSDIR}/graphics/Coin
USE_GL= yes
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${X11BASE}
# avoid renaming of soxt-config and soxt-config.1
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 2e066e8c5987..39bc62415755 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_PERL5= yes
USE_X_PREFIX= 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/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index b3d7071a26a7..b8573d34171a 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -31,7 +31,7 @@ USE_MYSQL= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
diff --git a/x11-toolkits/etox/Makefile b/x11-toolkits/etox/Makefile
index 741ad66c0204..fe16d1ddc40a 100644
--- a/x11-toolkits/etox/Makefile
+++ b/x11-toolkits/etox/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= evas.1:${PORTSDIR}/graphics/evas \
edb.1:${PORTSDIR}/databases/edb
USE_X_PREFIX= yes
-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/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index f678f7555bec..ac859ba8f29e 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= embryo.9:${PORTSDIR}/lang/embryo \
ecore.1:${PORTSDIR}/x11/ecore
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index fbeede77070f..5ae3d8bea951 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index f484ea56ed41..e9660d551cca 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GNOME= lthack
USE_GL= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index fbeede77070f..5ae3d8bea951 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index f484ea56ed41..e9660d551cca 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GNOME= lthack
USE_GL= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
index 084381995b54..144b8428f8a5 100644
--- a/x11-toolkits/freeglut/Makefile
+++ b/x11-toolkits/freeglut/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 5aeb02d78b4d..621bae051352 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Fox toolkit reimplementation of Scintilla editing widget
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS+= --enable-shared --disable-static
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index c4fdf3f829cc..17444c312bfd 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs
USE_ICONV= yes
GNOME_HTML_DIR= ${PREFIX}/share/doc/gal
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 403e3dcb3b4a..0bcfbbe58a07 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -18,7 +18,7 @@ COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 8d6e34506d30..68eb163caa41 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 1874665b1c19..80e500ee9be9 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 01399dcb80e8..4ba1a1b0cf56 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
USE_X_PREFIX= yes
LATEST_LINK= gtk-sharp10
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 7e6661f3ec22..1490abd0d9b9 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \
USE_X_PREFIX= yes
LATEST_LINK= gtk-sharp20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 2467d239240c..a80b52d38699 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -19,7 +19,7 @@ COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GNOME= glib12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 03bcebba9577..a459c3a34f0c 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFLICTS= gtkdatabox-0.1.*
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 86bb98223610..8d584d0a1971 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gtk12
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index c6368fa519b4..7685035eec6d 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+ 2.0
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gtk20 gnomehack
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index dedcefe7ecca..54386a31ff56 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 98bc6dac6b11..ee2b896c0317 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GL= yes
USE_GNOME= gnometarget gtk12 lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index ad34a9feb749..28ce2a1f9e13 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gtk20
USE_BZIP2= yes
USE_GL= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index e819f273eb44..6fd73b696b13 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_GL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index fc6f3cddcf63..adc06dd98cc0 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index ff821ef612cd..581389e6fec0 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_X_PREFIX= yes
USE_GNOME= glib20 gtk20 gnomehack
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
LDFLAGS= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 8d6e34506d30..68eb163caa41 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 1874665b1c19..80e500ee9be9 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 1874665b1c19..80e500ee9be9 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 000661e93c8e..82065853e450 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -19,7 +19,7 @@ COMMENT= Guile binding library for GNOME
LIB_DEPENDS= guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomeprefix bonobo gtkhtml libglade
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-bonobo --with-gtkhtml --without-gal \
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index fe35a502203a..da860d73426f 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12 gnometarget
USE_REINPLACE= yes
-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/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index da8035b062ae..abb947a9458a 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -19,11 +19,9 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
CONFLICTS?= open-motif-*
MANUAL_PACKAGE_BUILD= do not want to install during interactive build
-WANT_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19:env autoconf:259 libtool:15:inc
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 15
LIBTOOLFILES= aclocal.m4 test/aclocal.m4
CONFIGURE_ARGS+= --enable-static --enable-shared --enable-production
CONFIGURE_ARGS+= --disable-maintainer-mode
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 8ff895d46df4..3074131e6720 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -29,7 +29,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 5d4770bb755a..2552db315f85 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 8fcdf76c9362..742474947084 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 6712a90fab0f..4dc9f1f2161e 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
libgnomecanvas libgnome
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 6293cc5e274a..473d2a0d6aa1 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix libbonoboui
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 5b161b7edfda..c6d758394b94 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
USE_REINPLACE= yes
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index cf35f774a987..6aea556a2d44 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprintui
USE_GCC= 3.4
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 26b38fbb2238..44ba28371a66 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index ec79d9981d21..7b1b791b2041 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -31,7 +31,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack libgnomeui
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 8b2255fbc801..fb76c6e8b6dc 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -18,13 +18,11 @@ COMMENT= A source code editor widget for GTK+
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
-WANT_AUTOMAKE_VER=15
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= automake:15:env autoconf:253:env libtool:13:inc
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_INC_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CFLAGS+= -fPIC
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 9e271e6f9bb2..76b543a6fcc9 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack lthack gnomepanel
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 396c3f39bf99..e9969b65e49f 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_GNOME= gnomehack lthack gtk20 libxml2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 2c1fbef4203b..d200da9f96fb 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index ceb9dd138c7c..615224d3c110 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomeprefix gnomehack gtk20 libartlgpl2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 25d43f84613c..b2a66f5b0cca 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Display scientific data as dynamic plot
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index ce050968c175..6e5482416181 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -15,7 +15,7 @@ COMMENT= Athena Widgets with N*XTSTEP appearance
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index 874e2a555887..f96e2a64e4a4 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -23,7 +23,7 @@ COMMENT= A set of Perl bindings for the Qt toolkit
USE_GL= yes
USE_QT_VER= 3
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 18eb3c59832a..b5f58f70d850 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pango
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 05b14762fe9b..0fa1be4cdce1 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs \
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image ttf
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 05b14762fe9b..0fa1be4cdce1 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs \
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image ttf
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index f77d8d43ef6c..2c2b216697c4 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -15,9 +15,7 @@ MASTER_SITES= http://gtk.php.net/distributions/ \
MAINTAINER= kiesel@schlund.de
COMMENT= An extension to use gtk in PHP-applications
-WANT_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19:env autoconf:259 libtool:15:env
GNU_CONFIGURE= yes
USE_PHP= pcre
USE_PHP_BUILD= yes
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index f77d8d43ef6c..2c2b216697c4 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -15,9 +15,7 @@ MASTER_SITES= http://gtk.php.net/distributions/ \
MAINTAINER= kiesel@schlund.de
COMMENT= An extension to use gtk in PHP-applications
-WANT_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19:env autoconf:259 libtool:15:env
GNU_CONFIGURE= yes
USE_PHP= pcre
USE_PHP_BUILD= yes
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index ddca3c0e3d5c..f03713011728 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gtkhtml gnometarget
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure pygtk/configure
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--with-gnome-config=${X11BASE}/bin/gnome-config \
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index b5bbd76c7171..6b312880c3eb 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs gdkpixbuf libglade
USE_PYTHON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 841fa8ef5755..a231eaf381dd 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
USE_GNOME= gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index fef92482808f..699674a6b2ba 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -16,7 +16,7 @@ COMMENT= Modifed GTK pixmap engine to obtain Theme information from Qt
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
WRKSRC= ${WRKDIR}/${DISTNAME:S/7043-//}
.if !defined(WITHOUT_GTK1)
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index eca89e5c9700..a00fa863487b 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Graphical User Interface library for SDL
USE_SDL= sdl image ttf
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 94f0b4117a08..153e56b64ed9 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Coin.44:${PORTSDIR}/graphics/Coin
USE_QT_VER= 3
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
CONFIGURE_ARGS= --with-pthread=yes --with-coin=${X11BASE}
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 60b1028698b1..eebe8ad1c36a 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for GTK+ toolkit
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget gtk20
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 3d237fe72ec8..4a451ab0acab 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk20
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-opt=no
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index 8fa8160593b4..05c4b9e14ea9 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libvk-Apr19-2243
MAINTAINER= ports@FreeBSD.org
COMMENT= ViewKit workalike from Hungry Programmers
-WANT_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253:env
MOTIFPACKAGE?= open-motif
USE_X_PREFIX= yes
USE_MOTIF= yes
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 116e49e14680..2fe96e6cfb37 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index 84f19484c7a8..928ae1c8f473 100644
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_GNOME= gnomehack gnometarget
WXGTK_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-wx-config=${WXGTK_CONFIG} --enable-python
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 405469e35d5a..9b5caee338c4 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -17,7 +17,7 @@ DISTNAME= Xbae-${PORTVERSION}
MAINTAINER= ports@freebsd.org
COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 8f0d2ed12780..6ea23a7d8db6 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Motif widget set for displaying HTML 3.2 documents
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
-WANT_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:env
USE_MOTIF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 603c8a5dc5bd..36c29ab3bf23 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -19,7 +19,7 @@ COMMENT= Window manager based on evilwm
DOCDIR= share/doc/${PORTNAME}
DOCS= AUTHORS COPYING ChangeLog INSTALL LICENSE README THANKS TODO
PLIST= ${WRKDIR}/pkg-plist
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_GMAKE= y
USE_X_PREFIX= y
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index be7563f59752..483c4d3302aa 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -17,7 +17,7 @@ COMMENT= Configurator for the Blackbox window manager
USE_X_PREFIX= yes
USE_QT_VER= 3
USE_PERL5_BUILD= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= bbconf.1
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index d9527032b928..5e5bc4206195 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -17,8 +17,7 @@ COMMENT= Portuguese derivative of qvwm, simplified to conserve resources
RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage
-USE_AUTOCONF_VER= 213
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14 autoconf:213
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
MAN1= blwm.1x
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 0b9d94e4162f..06903f53c93e 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack gnometarget
USE_ICONV= yes
USE_GETTEXT= yes
NO_LATEST_LINK= 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/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index a4049116a664..a6349d34196a 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -24,8 +24,7 @@ CONFIG= icons key menu start style window workspace
DOCS= AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \
README TODO
PLIST= ${WRKDIR}/pkg-plist
-USE_AUTOCONF_VER= 213
-WANT_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14:env autoconf:213
USE_X_PREFIX= yes
post-extract:
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index d69f6a5b72a2..7cfb498297e0 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= esound lthack
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index d24eda4fcf46..70f6d6a53b60 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= metacity*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomeprefix gnomehack gnomehier gconf2 libglade2
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 93de1533d9f6..bdf254a268c8 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnometarget
WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
MAN1= fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index d0475d174925..256a99129fe0 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -37,8 +37,7 @@ CONFIGURE_ARGS+= --enable-kde
#.if defined(WITH_REMEMBER)
#USE_GMAKE= yes
-#WANT_AUTOMAKE_VER= 14
-#CONFIGURE_ENV= AUTOMAKE=automake14
+#USE_AUTOTOOLS= automake:14:env
#.endif
.if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index abcd49d0cd75..53c711dff5f8 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
-USE_LIBLTDL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= DEFINES="${IONDEFINES}"
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index abcd49d0cd75..53c711dff5f8 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
-USE_LIBLTDL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libltdl:15 libtool:15
USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= DEFINES="${IONDEFINES}"
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 7f295b928cb9..e30813064126 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -26,7 +26,7 @@ DEPRECATED= "Development ceased"
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PYTHON= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index b3419b3bc43c..61b2700241b8 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-font --without-examples
INSTALLS_SHLIB= yes
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index 3fba6f25d2d7..0daef64f5d62 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="${CPPFLAGS}" \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index fa6df89923b4..9ed07c3b73f6 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -28,7 +28,7 @@ USE_XPM= yes
USE_PERL5= yes
USE_GETTEXT= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 9c33678348f0..27c9eda79043 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 917cf5e2bf17..7845d111a251 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -30,7 +30,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
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 747c94b283c8..ffce08278166 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
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/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index ed557b0da5d0..0c800b97a7eb 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -30,7 +30,7 @@ USE_GNOME= gnomehack
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 6f46799bb01f..47af341ae67d 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
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}
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 3c8b7cffa2e8..35a0499fd347 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -29,7 +29,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
USE_XPM= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 29e40eb069f2..7ff438680256 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -17,7 +17,7 @@ COMMENT= Dock any application with no native tray icon
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index 4e369119be0f..ce88024b2aeb 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -17,7 +17,7 @@ COMMENT= A tool to add reactivity to the edges and corners of the GNOME desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack libwnck libgnomeui
CONFIGURE_ARGS= --enable-tray-icon
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 8245fb89c4f2..a201bc73a541 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -17,7 +17,7 @@ COMMENT= A core event abstraction library
LIB_DEPENDS= evas.1:${PORTSDIR}/graphics/evas
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_ICONV= yes
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 53d2eb8592ba..75105dc54394 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-2.6.2
USE_X_PREFIX= yes
USE_SDL= sdl
USE_REINPLACE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
.if !defined(NOPORTDOCS)
MAN1= electricsheep.1
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 3cb25cc120b1..c32ac15afa6d 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
ast.2:${PORTSDIR}/devel/libast
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS?=--enable-trans --enable-utmp \
--enable-xim --with-theme-update \
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 8eda4c04fe1a..e4faf56eed08 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= file-roller:${PORTSDIR}/archivers/fileroller
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 143ea846f371..2da57a189d4a 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gtk12
WANT_GNOME= yes
USE_ICONV= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 0ca73c46c897..6f7a5dc64c87 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -22,7 +22,7 @@ INSTALLS_OMF= yes
USE_RC_SUBR= gdm.sh
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \
--with-html-dir=${GNOME_HTML_DIR} \
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 0eb5a292cf58..1e8a8e640442 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -27,7 +27,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
LIBTOOLFILES= configure libart_lgpl/configure
CONFIGURE_ARGS= --disable-test-gnome
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 0eb5a292cf58..1e8a8e640442 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -27,7 +27,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
LIBTOOLFILES= configure libart_lgpl/configure
CONFIGURE_ARGS= --disable-test-gnome
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index b275128856c2..fe51f110631d 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -18,7 +18,7 @@ COMMENT= A small application for preview your theme widgets in one small window
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-WANT_AUTOMAKE_VER= 19
+USE_AUTOTOOLS= automake:19:env
PLIST_FILES= bin/${PORTNAME}
WRKSRC= ${WRKDIR}/ThemePreview-2
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c49477d3f323..d1c361bb41c2 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -20,7 +20,7 @@ USE_GNOME= gnometarget vte
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PORTDOCS= README
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 3f7cc10ea5a5..809b8f50fd4c 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CXXFLAGS+= `imlib2-config --cflags` `freetype-config --cflags`
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 37c8671d24cb..dd5e832c2d57 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index f092977a6c65..85123076a1f0 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 7960cd3bfcfa..d80ee69519ea 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -23,7 +23,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
USE_GNOME= gnomehack pkgconfig
INSTALLS_SHLIB= yes
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 1ed37398c2d0..44b3bd33a346 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index f2a8d694c871..b20731d017c7 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -29,7 +29,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
MAN3= Xcursor.3
INSTALLS_SHLIB= yes
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 58a80cf88efd..14e716b49a4f 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index ca4a84836707..8eb9867781e1 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index caf85cf2638d..9ec158fdaffb 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 643c11ec21ab..bab6a804bf45 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -27,7 +27,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 258d25dcd4a4..19f4157b2ce0 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 3e7e282ad082..d43c9bebfa02 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -28,7 +28,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 469d86022389..4bf3ced4d94f 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -29,7 +29,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 8faacf984e29..463464ef837c 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -24,7 +24,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 62588ca3e353..5844a294909f 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GNOME= glib20
USE_X_PREFIX= yes
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index d8b697bba0bd..ba62c2a0f746 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnome
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index d6fdf0c34f9d..ef4ba0b4676a 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack libgnome
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 9df55b57e066..fdb6f781801d 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
NO_FILTER_SHLIBS= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 2dbe2ca7ef7d..6bda003832e7 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
NO_FILTER_SHLIBS= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 3ec757055fd6..ac259d070eeb 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack libxml2
INSTALLS_SHLIB= yes
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
CONFIGURE_ARGS= --disable-doxygen \
--with-xkb-base=${X11BASE}/lib/X11/xkb
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 23276ce4865c..fef25e3c6ffb 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -19,7 +19,7 @@ COMMENT= Matrox Powerdesk for *nix
USE_X_PREFIX= YES
USE_GNOME= gtk12
USE_GMAKE= YES
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 5ac498404ab3..237a7af2d322 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -17,7 +17,7 @@ COMMENT= Multilingual X11 terminal emulator
USE_X_PREFIX= yes
USE_GNOME= gtk20 lthack
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --with-imagelib=gdk-pixbuf --enable-utmp \
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index cac30db984d9..3715741c7bba 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= esn@x123.info
COMMENT= A multi terminal based on aterm
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 91b96069cda9..f3e8c398a109 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= trevor@FreeBSD.org
COMMENT= Launch applications by clicking on an icon bar
CONFIGURE_ENV= GTKCONFIG=${GTK_CONFIG}
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_X_PREFIX= yes
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 19c74b1f83b9..29ec49c1a416 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -17,7 +17,7 @@ COMMENT= A terminal emulator for the X11
USE_X_PREFIX= yes
USE_GNOME= gnomelibs
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${IMLIB_CONFIG} --cflags`" \
LDFLAGS="-L${LOCALBASE}/lib `${IMLIB_CONFIG} --libs`"
ALL_TARGET= ${PORTNAME}
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 7a0f22e7aecf..c852e14911a0 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -22,7 +22,7 @@ DISTNAME= rxvt-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= A low memory usage xterm replacement that supports color
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5_BUILD=yes
USE_X_PREFIX= yes
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 7bb884219b96..96596bfae7f8 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -20,7 +20,7 @@ COMMENT= Library that supports startup notification spec from freedesktop.org
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile
index 211c272187ac..adf4e7cf48e4 100644
--- a/x11/tkXwin/Makefile
+++ b/x11/tkXwin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tcl${SHORT_TK_VER}:${PORTSDIR}/lang/tcl${SHORT_TK_VER} \
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 85d9fd128ee0..2e67c7733038 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES+= share/doc/vdesk/${ii}
.endfor
.endif
USE_X_PREFIX= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
post-extract:
# Avoid having to read this lengthy file.
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 2c4b8831c3ad..c6d95df9ae50 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
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}
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 0aaaa924224f..518bb3f51bad 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -15,7 +15,6 @@ COMMENT= A task manager for XFCE
BUILD_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 autoconf:259
.include <bsd.port.mk>
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 2b2c7ba5efce..f5eb453bd132 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -27,7 +27,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>