aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/atk/Makefile2
-rw-r--r--accessibility/dasher/Makefile2
-rw-r--r--accessibility/gail/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile2
-rw-r--r--accessibility/gnomemag/Makefile2
-rw-r--r--accessibility/gnopernicus/Makefile2
-rw-r--r--arabic/katoob/Makefile2
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/file-roller/Makefile2
-rw-r--r--archivers/fileroller/Makefile2
-rw-r--r--archivers/libcomprex/Makefile2
-rw-r--r--archivers/lzo/Makefile2
-rw-r--r--archivers/lzo2/Makefile2
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--archivers/sectar/Makefile2
-rw-r--r--archivers/ucl/Makefile2
-rw-r--r--archivers/xpk/Makefile2
-rw-r--r--astro/glunarclock/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/libnova/Makefile2
-rw-r--r--audio/Maaate/Makefile2
-rw-r--r--audio/alsaplayer/Makefile2
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/ecasound/Makefile2
-rw-r--r--audio/esound/Makefile2
-rw-r--r--audio/extace/Makefile2
-rw-r--r--audio/faad/Makefile2
-rw-r--r--audio/flac/Makefile2
-rw-r--r--audio/fluidsynth/Makefile2
-rw-r--r--audio/gdam/Makefile2
-rw-r--r--audio/glame/Makefile2
-rw-r--r--audio/gnapster/Makefile2
-rw-r--r--audio/gnome-media/Makefile2
-rw-r--r--audio/gnomemedia2/Makefile2
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/gtkgep/Makefile2
-rw-r--r--audio/icecast2/Makefile2
-rw-r--r--audio/ices/Makefile2
-rw-r--r--audio/id3lib/Makefile2
-rw-r--r--audio/lame/Makefile1
-rw-r--r--audio/liba52-devel/Makefile2
-rw-r--r--audio/liba52/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/libogg/Makefile2
-rw-r--r--audio/libsamplerate/Makefile2
-rw-r--r--audio/libsidplay/Makefile2
-rw-r--r--audio/libsndfile/Makefile2
-rw-r--r--audio/libvorbis/Makefile2
-rw-r--r--audio/madplay/Makefile2
-rw-r--r--audio/mpiosh/Makefile2
-rw-r--r--audio/net-rhythmbox/Makefile2
-rw-r--r--audio/rat/Makefile2
-rw-r--r--audio/resid/Makefile2
-rw-r--r--audio/rhythmbox-devel/Makefile2
-rw-r--r--audio/rhythmbox/Makefile2
-rw-r--r--audio/rosegarden/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile2
-rw-r--r--audio/sdl_sound/Makefile2
-rw-r--r--audio/sound-juicer/Makefile2
-rw-r--r--audio/speex-devel/Makefile2
-rw-r--r--audio/speex/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--audio/swhplugins/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/wsoundserver/Makefile2
-rw-r--r--audio/x11amp/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--audio/xmixer/Makefile2
-rw-r--r--audio/xmms-arts/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-flac/Makefile2
-rw-r--r--audio/xmms-kde/Makefile2
-rw-r--r--audio/xmms-liveice/Makefile2
-rw-r--r--audio/xmms-mailnotify/Makefile2
-rw-r--r--audio/xmms-midi/Makefile5
-rw-r--r--audio/xmms-musepack/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/xmp/Makefile2
-rw-r--r--audio/zinf/Makefile2
-rw-r--r--biology/libgenome/Makefile2
-rw-r--r--cad/geda-gschem/Makefile2
-rw-r--r--cad/geda-netlist/Makefile2
-rw-r--r--cad/geda-symcheck/Makefile2
-rw-r--r--cad/geda-utils/Makefile2
-rw-r--r--cad/gnetlist/Makefile2
-rw-r--r--cad/gschem/Makefile2
-rw-r--r--cad/gtkwave/Makefile2
-rw-r--r--cad/libgeda/Makefile2
-rw-r--r--cad/qmls/Makefile2
-rw-r--r--chinese/dictd-database/Makefile2
-rw-r--r--chinese/eterm/Makefile2
-rw-r--r--chinese/vflib/Makefile2
-rw-r--r--chinese/wenju/Makefile2
-rw-r--r--chinese/xcin25/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/lirc/Makefile2
-rw-r--r--comms/tilp/Makefile2
-rw-r--r--comms/vpb2/Makefile4
-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/recode/Makefile2
-rw-r--r--databases/db3/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/Makefile2
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds/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/hk_classes/Makefile2
-rw-r--r--databases/knoda/Makefile2
-rw-r--r--databases/libdbi/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgdamm/Makefile2
-rw-r--r--databases/libgnomedb/Makefile2
-rw-r--r--databases/libiodbc/Makefile2
-rw-r--r--databases/mdbtools/Makefile2
-rw-r--r--databases/memcached/Makefile2
-rw-r--r--databases/mergeant/Makefile2
-rw-r--r--databases/metakit/Makefile2
-rw-r--r--databases/myodbc/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/percona55-server/Makefile2
-rw-r--r--databases/puredb/Makefile2
-rw-r--r--databases/rrdtool/Makefile2
-rw-r--r--databases/rrdtool10/Makefile2
-rw-r--r--databases/sqlite/Makefile2
-rw-r--r--databases/sqlite2/Makefile2
-rw-r--r--databases/unixODBC/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/gnome-pim/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile2
-rw-r--r--deskutils/gnomepim/Makefile2
-rw-r--r--deskutils/gnomeutils2/Makefile2
-rw-r--r--deskutils/gucharmap/Makefile2
-rw-r--r--deskutils/kbirthday/Makefile2
-rw-r--r--deskutils/multi-backgrounds-daemon/Makefile2
-rw-r--r--deskutils/xfce4-calendar/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/yank/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/adacurses/Makefile2
-rw-r--r--devel/alf/Makefile2
-rw-r--r--devel/arm-aout-binutils/Makefile2
-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/avr-binutils/Makefile2
-rw-r--r--devel/boehm-gc/Makefile2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/bugbuddy2/Makefile2
-rw-r--r--devel/clanlib-devel/Makefile2
-rw-r--r--devel/clint/Makefile2
-rw-r--r--devel/cvsgraph/Makefile2
-rw-r--r--devel/cvsnt/Makefile2
-rw-r--r--devel/directfb/Makefile2
-rw-r--r--devel/e4graph/Makefile2
-rw-r--r--devel/erlslang/Makefile2
-rw-r--r--devel/fam/Makefile2
-rw-r--r--devel/ffcall/Makefile2
-rw-r--r--devel/florist/Makefile2
-rw-r--r--devel/g-wrap/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gconfmm26/Makefile2
-rw-r--r--devel/gengameng/Makefile2
-rw-r--r--devel/glade2/Makefile2
-rw-r--r--devel/glademm/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gnome-build/Makefile2
-rw-r--r--devel/gnome-crash/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfsmm/Makefile2
-rw-r--r--devel/gnomebuild/Makefile2
-rw-r--r--devel/gnomecrash/Makefile2
-rw-r--r--devel/gnomevfs-extras/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile2
-rw-r--r--devel/korelib/Makefile2
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libPropList/Makefile4
-rw-r--r--devel/libargparse/Makefile2
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libcapsinetwork/Makefile2
-rw-r--r--devel/libdsp/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/libglade2/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libglademm24/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libidn/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libol/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopendaap/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/libsoup/Makefile2
-rw-r--r--devel/libsoup22/Makefile2
-rw-r--r--devel/libstatgrab/Makefile2
-rw-r--r--devel/libstroke/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/libuta/Makefile2
-rw-r--r--devel/libvanessa_adt/Makefile2
-rw-r--r--devel/libvanessa_logger/Makefile2
-rw-r--r--devel/libvanessa_socket/Makefile2
-rw-r--r--devel/libzt/Makefile2
-rw-r--r--devel/libzvbi/Makefile2
-rw-r--r--devel/log4c/Makefile2
-rw-r--r--devel/lwp/Makefile2
-rw-r--r--devel/mingw-binutils/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/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/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/pkg-config/Makefile2
-rw-r--r--devel/pkgconfig/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/ppl/Makefile2
-rw-r--r--devel/privman/Makefile2
-rw-r--r--devel/py-orbit2/Makefile2
-rw-r--r--devel/qtez/Makefile2
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/sdl12/Makefile2
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/shapelib/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--devel/swarm/Makefile2
-rw-r--r--devel/swig13/Makefile2
-rw-r--r--devel/swig20/Makefile2
-rw-r--r--devel/t1lib/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/titano/Makefile2
-rw-r--r--devel/varconf/Makefile2
-rw-r--r--devel/veepee/Makefile2
-rw-r--r--devel/vstr/Makefile2
-rw-r--r--devel/wftk/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--devel/xxl/Makefile2
-rw-r--r--devel/zthread/Makefile2
-rw-r--r--devel/zziplib/Makefile2
-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/Makefile2
-rw-r--r--dns/powerdns-devel/Makefile2
-rw-r--r--dns/powerdns/Makefile2
-rw-r--r--editors/AbiWord2/Makefile1
-rw-r--r--editors/abiword-devel/Makefile1
-rw-r--r--editors/abiword/Makefile1
-rw-r--r--editors/conglomerate/Makefile2
-rw-r--r--editors/emacs20-dl/Makefile2
-rw-r--r--editors/emacs20-mule-devel/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile2
-rw-r--r--editors/gedit2/Makefile2
-rw-r--r--editors/ghex2/Makefile2
-rw-r--r--editors/gnotepad+/Makefile2
-rw-r--r--editors/lpe/Makefile2
-rw-r--r--editors/mlview/Makefile2
-rw-r--r--editors/xemacs21-mule/Makefile2
-rw-r--r--editors/xmleditor/Makefile2
-rw-r--r--emulators/gnuboy/Makefile2
-rw-r--r--emulators/hfsplusutils/Makefile2
-rw-r--r--emulators/lib765/Makefile2
-rw-r--r--emulators/libspectrum/Makefile2
-rw-r--r--emulators/libvm68k/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/Makefile2
-rw-r--r--finance/emma/Makefile2
-rw-r--r--finance/gnofin/Makefile2
-rw-r--r--finance/grisbi/Makefile2
-rw-r--r--finance/libofx/Makefile2
-rw-r--r--finance/opale/Makefile2
-rw-r--r--finance/quantlib/Makefile2
-rw-r--r--french/med/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/bomberinstinct/Makefile2
-rw-r--r--games/bombermaze/Makefile2
-rw-r--r--games/etuxracer/Makefile2
-rw-r--r--games/euchre/Makefile2
-rw-r--r--games/freecell-solver/Makefile2
-rw-r--r--games/gcompris2/Makefile2
-rw-r--r--games/glife/Makefile2
-rw-r--r--games/gno3dtet/Makefile2
-rw-r--r--games/gnocatan/Makefile2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--games/gnomememoryblocks/Makefile2
-rw-r--r--games/gturing/Makefile2
-rw-r--r--games/kobodeluxe/Makefile4
-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/Makefile2
-rw-r--r--games/quakeforge/Makefile2
-rw-r--r--games/rtb/Makefile2
-rw-r--r--games/teg/Makefile2
-rw-r--r--games/tinymux/Makefile2
-rw-r--r--games/tractorgen/Makefile2
-rw-r--r--games/tuxracer-commercial/Makefile2
-rw-r--r--games/tuxracer/Makefile2
-rw-r--r--games/vamos/Makefile2
-rw-r--r--games/xfce4-toys/Makefile2
-rw-r--r--games/xinvaders/Makefile2
-rw-r--r--games/xpuyopuyo/Makefile2
-rw-r--r--games/xracer/Makefile2
-rw-r--r--german/ksteak/Makefile2
-rw-r--r--graphics/Coin/Makefile2
-rw-r--r--graphics/Hermes/Makefile2
-rw-r--r--graphics/ImageMagick/Makefile2
-rw-r--r--graphics/OpenEXR/Makefile2
-rw-r--r--graphics/aalib/Makefile2
-rw-r--r--graphics/autotrace/Makefile2
-rw-r--r--graphics/blender-devel/Makefile2
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/dia/Makefile2
-rw-r--r--graphics/diacanvas/Makefile2
-rw-r--r--graphics/electriceyes/Makefile2
-rw-r--r--graphics/enfle/Makefile2
-rw-r--r--graphics/entice/Makefile2
-rw-r--r--graphics/eog2/Makefile2
-rw-r--r--graphics/evas/Makefile2
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/freeglut/Makefile4
-rw-r--r--graphics/geomview/Makefile2
-rw-r--r--graphics/giflib/Makefile2
-rw-r--r--graphics/gimp1/Makefile2
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gle/Makefile2
-rw-r--r--graphics/glide3/Makefile2
-rw-r--r--graphics/gltt/Makefile2
-rw-r--r--graphics/gnofract4d/Makefile2
-rw-r--r--graphics/gnomeiconedit/Makefile2
-rw-r--r--graphics/gpdf/Makefile2
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gthumb2/Makefile2
-rw-r--r--graphics/gtkdps/Makefile2
-rw-r--r--graphics/guilib/Makefile2
-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/kimagemapeditor/Makefile2
-rw-r--r--graphics/kludge3d/Makefile2
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--graphics/libgdgeda/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/libgnomecanvasmm/Makefile2
-rw-r--r--graphics/libgnomecanvasmm26/Makefile2
-rw-r--r--graphics/libgrass5/Makefile2
-rw-r--r--graphics/libmorph/Makefile2
-rw-r--r--graphics/librsvg/Makefile2
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--graphics/libtheora/Makefile2
-rw-r--r--graphics/libungif/Makefile2
-rw-r--r--graphics/mesagl/Makefile2
-rw-r--r--graphics/nip/Makefile2
-rw-r--r--graphics/nip2/Makefile2
-rw-r--r--graphics/nurbs++/Makefile2
-rw-r--r--graphics/passepartout/Makefile2
-rw-r--r--graphics/pixie/Makefile6
-rw-r--r--graphics/pixieplus/Makefile2
-rw-r--r--graphics/plotutils/Makefile2
-rw-r--r--graphics/proj/Makefile2
-rw-r--r--graphics/pstoedit/Makefile2
-rw-r--r--graphics/qglviewer/Makefile2
-rw-r--r--graphics/qtutils/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/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-nebulus/Makefile2
-rw-r--r--graphics/xmms-xvs/Makefile2
-rw-r--r--graphics/xmorph/Makefile2
-rw-r--r--graphics/xpcd/Makefile2
-rw-r--r--graphics/yafaray/Makefile2
-rw-r--r--graphics/yafray/Makefile2
-rw-r--r--japanese/FreeWnn-lib/Makefile2
-rw-r--r--japanese/anthy/Makefile2
-rw-r--r--japanese/balsa/Makefile2
-rw-r--r--japanese/dvipdfm/Makefile2
-rw-r--r--japanese/eb/Makefile2
-rw-r--r--japanese/eb3/Makefile2
-rw-r--r--japanese/eblook/Makefile2
-rw-r--r--japanese/emacs-emcws/Makefile2
-rw-r--r--japanese/emacs20-emcws/Makefile2
-rw-r--r--japanese/emacs21-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/eterm/Makefile2
-rw-r--r--japanese/expect/Makefile2
-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/libimg/Makefile2
-rw-r--r--japanese/mecab/Makefile2
-rw-r--r--japanese/migemo/Makefile2
-rw-r--r--japanese/mutt-devel/Makefile2
-rw-r--r--japanese/mutt/Makefile2
-rw-r--r--japanese/rskkserv/Makefile3
-rw-r--r--japanese/tcl76/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/xyaku/Makefile5
-rw-r--r--java/jmp/Makefile2
-rw-r--r--java/kaffe-devel/Makefile2
-rw-r--r--java/kaffe/Makefile2
-rw-r--r--java/sablevm/Makefile2
-rw-r--r--korean/eterm/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/elk/Makefile2
-rw-r--r--lang/emacs-lisp-intro/Makefile2
-rw-r--r--lang/forth/Makefile2
-rw-r--r--lang/gcl/Makefile2
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--lang/libutils/Makefile2
-rw-r--r--lang/ml-pnet/Makefile2
-rw-r--r--lang/mono/Makefile2
-rw-r--r--lang/njs/Makefile2
-rw-r--r--lang/oo2c/Makefile2
-rw-r--r--lang/pnet-base/Makefile2
-rw-r--r--lang/pnetc/Makefile2
-rw-r--r--lang/pnetlib/Makefile2
-rw-r--r--lang/tensile/Makefile2
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/balsa2/Makefile2
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/crashecho/Makefile2
-rw-r--r--mail/cyrus/Makefile2
-rw-r--r--mail/dspam-devel/Makefile2
-rw-r--r--mail/dspam/Makefile2
-rw-r--r--mail/gmail/Makefile2
-rw-r--r--mail/gmime/Makefile2
-rw-r--r--mail/gmime2/Makefile3
-rw-r--r--mail/im/Makefile2
-rw-r--r--mail/jamlib/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--mail/libnewmail/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/perdition/Makefile2
-rw-r--r--mail/pop3lite/Makefile2
-rw-r--r--mail/qpopper/Makefile2
-rw-r--r--mail/stuphead/Makefile2
-rw-r--r--mail/sylpheed-claws/Makefile2
-rw-r--r--mail/sylpheed-gtk2/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/cln/Makefile2
-rw-r--r--math/fftw/Makefile2
-rw-r--r--math/fftw3/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/gcalctool/Makefile2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/gmp/Makefile2
-rw-r--r--math/gnumeric/Makefile2
-rw-r--r--math/gnumeric2/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/maxima/Makefile4
-rw-r--r--math/mtl/Makefile2
-rw-r--r--math/spar/Makefile2
-rw-r--r--mbone/rat/Makefile2
-rw-r--r--mbone/vat/Makefile2
-rw-r--r--mbone/vic/Makefile2
-rw-r--r--misc/afbackup/Makefile4
-rw-r--r--misc/amanda-server/Makefile1
-rw-r--r--misc/amanda25-server/Makefile1
-rw-r--r--misc/amanda26-server/Makefile1
-rw-r--r--misc/amanda32-server/Makefile1
-rw-r--r--misc/chmlib/Makefile2
-rw-r--r--misc/demoniac/Makefile2
-rw-r--r--misc/diction/Makefile2
-rw-r--r--misc/edonkey-tool-hash/Makefile2
-rw-r--r--misc/libelysium/Makefile2
-rw-r--r--misc/libmcal/Makefile2
-rw-r--r--misc/metatheme2/Makefile2
-rw-r--r--misc/misterproper/Makefile2
-rw-r--r--misc/pybliographer/Makefile2
-rw-r--r--misc/quick-lounge-applet/Makefile2
-rw-r--r--misc/talkfilters/Makefile2
-rw-r--r--misc/xfce4-iconbox/Makefile2
-rw-r--r--multimedia/acme/Makefile2
-rw-r--r--multimedia/avidemux2/Makefile2
-rw-r--r--multimedia/avifile/Makefile2
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/gstreamer-editor/Makefile2
-rw-r--r--multimedia/gstreamer-player/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile2
-rw-r--r--multimedia/libdivxdecore/Makefile2
-rw-r--r--multimedia/libdv/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/mjpegtools/Makefile2
-rw-r--r--multimedia/mpeg4ip/Makefile2
-rw-r--r--multimedia/nautilus-media/Makefile2
-rw-r--r--multimedia/quark/Makefile2
-rw-r--r--multimedia/slideshow/Makefile2
-rw-r--r--multimedia/smpeg-xmms/Makefile2
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/vic/Makefile2
-rw-r--r--multimedia/xmms-status-plugin/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/ayttm/Makefile2
-rw-r--r--net-im/fugu/Makefile2
-rw-r--r--net-im/gale/Makefile2
-rw-r--r--net-im/gnomeicu/Makefile2
-rw-r--r--net-im/gnomeicu2/Makefile2
-rw-r--r--net-im/icqlib/Makefile2
-rw-r--r--net-im/jabber-aim/Makefile2
-rw-r--r--net-im/libicq/Makefile2
-rw-r--r--net-im/libicq2000/Makefile2
-rw-r--r--net-im/licq-osd/Makefile2
-rw-r--r--net-im/loudmouth/Makefile2
-rw-r--r--net-mgmt/NeTraMet/Makefile2
-rw-r--r--net-mgmt/etherape/Makefile2
-rw-r--r--net-mgmt/ipv6calc/Makefile2
-rw-r--r--net-mgmt/libsmi/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/Makefile2
-rw-r--r--net-mgmt/nefu/Makefile2
-rw-r--r--net-mgmt/net-snmp-devel/Makefile2
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp4/Makefile2
-rw-r--r--net-mgmt/net-snmp53/Makefile2
-rw-r--r--net-mgmt/netsaint-plugins/Makefile2
-rw-r--r--net-p2p/cdonkey/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/gnunet/Makefile2
-rw-r--r--net-p2p/libfreenet/Makefile2
-rw-r--r--net/GeoIP/Makefile2
-rw-r--r--net/atmsupport/Makefile2
-rw-r--r--net/ayttm/Makefile2
-rw-r--r--net/cdonkey/Makefile2
-rw-r--r--net/crescendo/Makefile2
-rw-r--r--net/dclib/Makefile2
-rw-r--r--net/dictd/Makefile2
-rw-r--r--net/ethereal/Makefile2
-rw-r--r--net/fcptools/Makefile2
-rw-r--r--net/freeradius/Makefile2
-rw-r--r--net/freeradius2/Makefile2
-rw-r--r--net/fugu/Makefile2
-rw-r--r--net/gabber/Makefile2
-rw-r--r--net/gale/Makefile2
-rw-r--r--net/gnet-glib2/Makefile2
-rw-r--r--net/gnet/Makefile2
-rw-r--r--net/gnet2/Makefile2
-rw-r--r--net/gnome-netstatus/Makefile2
-rw-r--r--net/gnome-nettool/Makefile2
-rw-r--r--net/gnomeicu/gnomeicu/Makefile2
-rw-r--r--net/gnomeicu2/Makefile2
-rw-r--r--net/gnomenetstatus/Makefile2
-rw-r--r--net/gnomenettool/Makefile2
-rw-r--r--net/gnomenetwork/Makefile2
-rw-r--r--net/gnometelnet/Makefile2
-rw-r--r--net/gnunet/Makefile2
-rw-r--r--net/gsk/Makefile2
-rw-r--r--net/howl/Makefile2
-rw-r--r--net/icqlib/Makefile2
-rw-r--r--net/icqlib0/Makefile2
-rw-r--r--net/jabber-aim/Makefile2
-rw-r--r--net/kopete/Makefile2
-rw-r--r--net/libfreenet/Makefile2
-rw-r--r--net/libicq/Makefile2
-rw-r--r--net/libicq2000/Makefile2
-rw-r--r--net/libnet/Makefile2
-rw-r--r--net/libnet10/Makefile2
-rw-r--r--net/libnss-mysql/Makefile2
-rw-r--r--net/libosip/Makefile2
-rw-r--r--net/libosip2/Makefile2
-rw-r--r--net/libsocket++/Makefile2
-rw-r--r--net/licq-osd/Makefile2
-rw-r--r--net/linc/Makefile2
-rw-r--r--net/loudmouth/Makefile2
-rw-r--r--net/mrt/Makefile2
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/netspeed_applet/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/openldap12/Makefile2
-rw-r--r--net/ortp/Makefile2
-rw-r--r--net/ossp-sa/Makefile2
-rw-r--r--net/papaya/Makefile2
-rw-r--r--net/ppxp/Makefile2
-rw-r--r--net/pvm++/Makefile2
-rw-r--r--net/radiusclient/Makefile2
-rw-r--r--net/rrdtool/Makefile2
-rw-r--r--net/rrdtool10/Makefile2
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/sdl_net/Makefile2
-rw-r--r--net/serveez/Makefile2
-rw-r--r--net/ssldump/Makefile2
-rw-r--r--net/tn5250/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/newsfish/Makefile2
-rw-r--r--news/t-gnus/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/rapip/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-rra/Makefile2
-rw-r--r--picobsd/ssh-picobsd/Makefile2
-rw-r--r--polish/gnugadu2/Makefile2
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/foomatic-db-engine/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-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/libgnomeprint/Makefile2
-rw-r--r--print/libgnomeprint20/Makefile2
-rw-r--r--print/libijs/Makefile2
-rw-r--r--print/libpaper/Makefile2
-rw-r--r--print/libpdf++/Makefile2
-rw-r--r--print/lyx-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx15/Makefile2
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--print/panda/Makefile2
-rw-r--r--print/pdflib/Makefile2
-rw-r--r--print/pfaedit/Makefile2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--science/chemtool-devel/Makefile2
-rw-r--r--science/flounder/Makefile2
-rw-r--r--science/gchempaint/Makefile2
-rw-r--r--science/gchemutils/Makefile2
-rw-r--r--science/ghemical/Makefile1
-rw-r--r--science/hdf5-18/Makefile2
-rw-r--r--science/hdf5/Makefile2
-rw-r--r--science/xloops-ginac/Makefile2
-rw-r--r--security/beecrypt/Makefile2
-rw-r--r--security/bjorb/Makefile2
-rw-r--r--security/borzoi/Makefile2
-rw-r--r--security/clamav-devel/Makefile2
-rw-r--r--security/cryptplug/Makefile2
-rw-r--r--security/cyrus-sasl/Makefile2
-rw-r--r--security/dirmngr/Makefile2
-rw-r--r--security/fwbuilder-devel/Makefile2
-rw-r--r--security/fwbuilder/Makefile2
-rw-r--r--security/fwbuilder2/Makefile2
-rw-r--r--security/gnupg-devel/Makefile2
-rw-r--r--security/gnutls-devel/Makefile2
-rw-r--r--security/gnutls/Makefile2
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme03/Makefile2
-rw-r--r--security/heimdal/Makefile2
-rw-r--r--security/libfwbuilder-devel/Makefile2
-rw-r--r--security/libfwbuilder/Makefile2
-rw-r--r--security/libfwbuilder2/Makefile2
-rw-r--r--security/libgcrypt-devel/Makefile2
-rw-r--r--security/libgcrypt/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/libntlm/Makefile2
-rw-r--r--security/libprelude/Makefile2
-rw-r--r--security/libtasn1/Makefile2
-rw-r--r--security/mhash/Makefile2
-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/Makefile2
-rw-r--r--security/nessus-libraries/Makefile2
-rw-r--r--security/nessus/Makefile2
-rw-r--r--security/newpg/Makefile2
-rw-r--r--security/opencdk/Makefile2
-rw-r--r--security/opensc-esteid/Makefile2
-rw-r--r--security/osiris/Makefile2
-rw-r--r--security/pinentry/Makefile2
-rw-r--r--security/poc/Makefile2
-rw-r--r--security/prelude-lml/Makefile2
-rw-r--r--security/prelude-nids/Makefile2
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--security/srm/Makefile2
-rw-r--r--security/ssh/Makefile2
-rw-r--r--security/steghide/Makefile2
-rw-r--r--security/xmlsec/Makefile2
-rw-r--r--security/xmlsec1/Makefile2
-rw-r--r--sysutils/LPRng/Makefile2
-rw-r--r--sysutils/bubblemon2/Makefile2
-rw-r--r--sysutils/dar/Makefile2
-rw-r--r--sysutils/e2fsprogs/Makefile2
-rw-r--r--sysutils/fcron/Makefile2
-rw-r--r--sysutils/file/Makefile2
-rw-r--r--sysutils/ganglia-monitor-core/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile2
-rw-r--r--sysutils/gnome-pkgview/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile2
-rw-r--r--sysutils/gnomesystemmonitor/Makefile2
-rw-r--r--sysutils/k3b-kde4/Makefile2
-rw-r--r--sysutils/k3b/Makefile2
-rw-r--r--sysutils/kcube/Makefile2
-rw-r--r--sysutils/nautilus-cd-burner/Makefile2
-rw-r--r--sysutils/sjog/Makefile2
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile2
-rw-r--r--sysutils/xfce4-fsguard-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--textproc/aspell/Makefile2
-rw-r--r--textproc/c2html/Makefile2
-rw-r--r--textproc/cole/Makefile2
-rw-r--r--textproc/dico/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/jade/Makefile2
-rw-r--r--textproc/java2html/Makefile2
-rw-r--r--textproc/latte/Makefile2
-rw-r--r--textproc/libcroco/Makefile2
-rw-r--r--textproc/liblingoteach/Makefile2
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libparsifal/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++26/Makefile2
-rw-r--r--textproc/libxml/Makefile2
-rw-r--r--textproc/libxode/Makefile2
-rw-r--r--textproc/libxslt/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/sablotron/Makefile2
-rw-r--r--textproc/sagasu/Makefile2
-rw-r--r--textproc/sary/Makefile2
-rw-r--r--textproc/scrollkeeper/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/wv/Makefile2
-rw-r--r--textproc/wv2/Makefile2
-rw-r--r--textproc/xlhtml/Makefile2
-rw-r--r--textproc/xls2xml/Makefile2
-rw-r--r--textproc/xml-i18n-tools/Makefile2
-rw-r--r--textproc/xmlpp/Makefile2
-rw-r--r--ukrainian/iceb/Makefile6
-rw-r--r--www/amyc/Makefile2
-rw-r--r--www/apache-jserv/Makefile2
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache20/Makefile4
-rw-r--r--www/apache21/Makefile2
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/aria/Makefile2
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/cgicc/Makefile2
-rw-r--r--www/comclear/Makefile2
-rw-r--r--www/emacs-w3m/Makefile2
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/galeon/Makefile2
-rw-r--r--www/galeon2/Makefile2
-rw-r--r--www/glibwww/Makefile2
-rw-r--r--www/gtkhtml/Makefile2
-rw-r--r--www/harvest/Makefile2
-rw-r--r--www/libghttp/Makefile2
-rw-r--r--www/libgtkhtml/Makefile2
-rw-r--r--www/libwww/Makefile2
-rw-r--r--www/mdw/Makefile2
-rw-r--r--www/mnogosearch/Makefile2
-rw-r--r--www/mnogosearch31/Makefile2
-rw-r--r--www/mod_jk/Makefile2
-rw-r--r--www/mod_jk2/Makefile6
-rw-r--r--www/mod_webapp/Makefile2
-rw-r--r--www/nscache/Makefile2
-rw-r--r--www/oops/Makefile2
-rw-r--r--www/openvrml/Makefile2
-rw-r--r--www/peacock/Makefile2
-rw-r--r--www/scout/Makefile2
-rw-r--r--www/screem-devel/Makefile2
-rw-r--r--www/screem/Makefile2
-rw-r--r--www/tidy-devel/Makefile4
-rw-r--r--www/twhttpd/Makefile2
-rw-r--r--www/webstone-ssl/Makefile2
-rw-r--r--www/wyvern/Makefile2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile2
-rw-r--r--x11-fm/krusader/Makefile2
-rw-r--r--x11-fm/krusader2/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/fontconfig/Makefile2
-rw-r--r--x11-servers/driglide/Makefile2
-rw-r--r--x11-themes/aquaosk/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/gnome-themes/Makefile2
-rw-r--r--x11-themes/gtk-Mac2-theme/Makefile2
-rw-r--r--x11-themes/gtk-bluecurve-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-engines2/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-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/qinx/Makefile2
-rw-r--r--x11-themes/qt-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/thinice/Makefile2
-rw-r--r--x11-themes/whistlerk/Makefile2
-rw-r--r--x11-toolkits/SoXt/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile2
-rw-r--r--x11-toolkits/bakery_gnomeui/Makefile2
-rw-r--r--x11-toolkits/buffy/Makefile2
-rw-r--r--x11-toolkits/clean-theme-gtk/Makefile2
-rw-r--r--x11-toolkits/colorstep/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile2
-rw-r--r--x11-toolkits/eel2/Makefile2
-rw-r--r--x11-toolkits/efltk/Makefile2
-rw-r--r--x11-toolkits/engradient/Makefile2
-rw-r--r--x11-toolkits/erlgtk/Makefile2
-rw-r--r--x11-toolkits/fox-devel/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile2
-rw-r--r--x11-toolkits/freeglut/Makefile4
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal2/Makefile2
-rw-r--r--x11-toolkits/gdl/Makefile2
-rw-r--r--x11-toolkits/geramik/Makefile2
-rw-r--r--x11-toolkits/gevas/Makefile2
-rw-r--r--x11-toolkits/gnome--/Makefile2
-rw-r--r--x11-toolkits/gnome-look/Makefile2
-rw-r--r--x11-toolkits/gnome-themes-extras/Makefile2
-rw-r--r--x11-toolkits/gnome-themes/Makefile2
-rw-r--r--x11-toolkits/gtk--/Makefile2
-rw-r--r--x11-toolkits/gtk--2/Makefile2
-rw-r--r--x11-toolkits/gtk-Mac2-theme/Makefile2
-rw-r--r--x11-toolkits/gtk-bluecurve-theme/Makefile2
-rw-r--r--x11-toolkits/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-toolkits/gtk-engines/Makefile2
-rw-r--r--x11-toolkits/gtk-engines2/Makefile2
-rw-r--r--x11-toolkits/gtk-flat-theme/Makefile2
-rw-r--r--x11-toolkits/gtk-flat-theme2/Makefile2
-rw-r--r--x11-toolkits/gtk-industrial-theme/Makefile2
-rw-r--r--x11-toolkits/gtk-qn-x11-theme/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp-devel/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile2
-rw-r--r--x11-toolkits/gtk-smooth-engine/Makefile2
-rw-r--r--x11-toolkits/gtk-xfce-engine/Makefile2
-rw-r--r--x11-toolkits/gtk-zenith-theme/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkbe/Makefile2
-rw-r--r--x11-toolkits/gtkextra--/Makefile2
-rw-r--r--x11-toolkits/gtkextra/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkglarea--/Makefile2
-rw-r--r--x11-toolkits/gtkglarea/Makefile2
-rw-r--r--x11-toolkits/gtkglarea2/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile2
-rw-r--r--x11-toolkits/gtkglextmm/Makefile2
-rw-r--r--x11-toolkits/gtkmathview/Makefile2
-rw-r--r--x11-toolkits/gtkmm12/Makefile2
-rw-r--r--x11-toolkits/gtkmm20/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile2
-rw-r--r--x11-toolkits/gtkmm30/Makefile2
-rw-r--r--x11-toolkits/gtksourceview/Makefile2
-rw-r--r--x11-toolkits/gtkstep-pastel/Makefile2
-rw-r--r--x11-toolkits/gtkstep/Makefile2
-rw-r--r--x11-toolkits/guile-gnome/Makefile2
-rw-r--r--x11-toolkits/guile-gtk/Makefile2
-rw-r--r--x11-toolkits/icegradient/Makefile2
-rw-r--r--x11-toolkits/jx/Makefile2
-rw-r--r--x11-toolkits/lesstif/Makefile2
-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/libgnomeprintui/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile2
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile2
-rw-r--r--x11-toolkits/libxfce4gui/Makefile2
-rw-r--r--x11-toolkits/libzvt/Makefile2
-rw-r--r--x11-toolkits/movingmotif/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile2
-rw-r--r--x11-toolkits/notif2/Makefile2
-rw-r--r--x11-toolkits/paragui-devel/Makefile2
-rw-r--r--x11-toolkits/paragui/Makefile2
-rw-r--r--x11-toolkits/php-gtk/Makefile2
-rw-r--r--x11-toolkits/php-gtk2/Makefile2
-rw-r--r--x11-toolkits/py-gnome/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile2
-rw-r--r--x11-toolkits/py-gtk/Makefile2
-rw-r--r--x11-toolkits/py-gtk2/Makefile2
-rw-r--r--x11-toolkits/py-gtkglext/Makefile2
-rw-r--r--x11-toolkits/qt-bluecurve-theme/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/thinice/Makefile2
-rw-r--r--x11-toolkits/vdk/Makefile2
-rw-r--r--x11-toolkits/vdkbuilder/Makefile2
-rw-r--r--x11-toolkits/vte/Makefile2
-rw-r--r--x11-toolkits/whistlerk/Makefile2
-rw-r--r--x11-toolkits/xbae/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-wm/aquaosk/Makefile2
-rw-r--r--x11-wm/bbconf/Makefile2
-rw-r--r--x11-wm/blwm/Makefile4
-rw-r--r--x11-wm/ede/Makefile4
-rw-r--r--x11-wm/epiwm/Makefile2
-rw-r--r--x11-wm/epplets/Makefile2
-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/metacity/Makefile2
-rw-r--r--x11-wm/qinx/Makefile2
-rw-r--r--x11-wm/rox-pager/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-menueditor/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/ecore/Makefile2
-rw-r--r--x11/electricsheep/Makefile2
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-libs/Makefile2
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gnomeapplets2/Makefile2
-rw-r--r--x11/gnomedesktop/Makefile2
-rw-r--r--x11/gnomelibs/Makefile2
-rw-r--r--x11/gnomepanel/Makefile2
-rw-r--r--x11/gnomesession/Makefile2
-rw-r--r--x11/gnometerminal/Makefile2
-rw-r--r--x11/gswitchit/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/libgnome/Makefile2
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libgnomemm26/Makefile2
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/mgapdesk/Makefile4
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/mrxvt/Makefile2
-rw-r--r--x11/multi-aterm/Makefile2
-rw-r--r--x11/portoseguro/Makefile2
-rw-r--r--x11/rxvt-devel/Makefile2
-rw-r--r--x11/startup-notification/Makefile2
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/yelp/Makefile2
1131 files changed, 1144 insertions, 1164 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index e12c7547334d..3b6a1b8eac4f 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo lthack intlhack
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index b233b056490e..4426c7907e80 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GNOME accessibility toolkit (ATK)
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack glib20
CONFIGURE_ARGS= --enable-static \
--disable-gtk-doc \
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 78dfcfb082ac..99673de46d7c 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gconf2 libglade2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 0f57aebb7637..bc7bad500548 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack libgnomecanvas
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 4512bb400706..98edbc49b7b1 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNOME screen magnifier
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo lthack intlhack
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile
index 4512bb400706..98edbc49b7b1 100644
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNOME screen magnifier
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo lthack intlhack
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 8f9c007cf0b6..bca17a8ea898 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui atspi
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index 2e104f96c371..4f44d44da4ac 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GETOPT_LONG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 9a7313c83325..a0935cc6e5ee 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_AUTOCONF= 213
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION}
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f671c3df7644..0ef1b8968f96 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index f671c3df7644..0ef1b8968f96 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 512c0514e669..b453b9655635 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_GETTEXT= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index b32a233f090e..c81616774e1e 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libs/compression
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable speedy, lossless data compression library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 b32a233f090e..c81616774e1e 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libs/compression
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable speedy, lossless data compression library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index cef50f9783fb..bb1257625e55 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-glob
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -liconv"
diff --git a/archivers/sectar/Makefile b/archivers/sectar/Makefile
index ca7267fdaa66..1f33fbfa7a9b 100644
--- a/archivers/sectar/Makefile
+++ b/archivers/sectar/Makefile
@@ -16,6 +16,6 @@ COMMENT= A program to create encrypted tar archives
PLIST_FILES= bin/sectar
USE_GETOPT_LONG= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 803dd5f250df..77a84071b6b2 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 during decompression
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-shared
PORTDOCS= COPYING README
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index bd2880df8c67..58a3098d5202 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.jormas.com/~vesuri/xpk/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= The eXternal PacKer (XPK) library system
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index 4771f1bf2d37..0bf597cca3ac 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNOME applet that displays the current phase of the Moon
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomepanel gail gnomehack gnomeprefix
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index af3612997610..49dd8b230c80 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GCC= 3.2
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 86813780e1f7..be0550a2ad18 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -18,7 +18,7 @@ COMMENT= Astronomical Calculation Library
USE_GNOME= gnometarget lthack
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
post-patch:
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index b0b817b32cb6..edbda3f6c68e 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -17,7 +17,7 @@ COMMENT= MPEG audio analysis toolkit
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
post-patch:
diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index 934de81da241..9170670501e0 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 089148b1da35..bde99b7bf265 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 94aae4989c06..f1144869fa0a 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -16,7 +16,7 @@ COMMENT= Multitrack audio processing software
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 3f7bfa18e8a7..d65d9db4a220 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -21,7 +21,7 @@ USE_GETOPT_LONG= yes
USE_BZIP2= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnometarget gnomehack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFLICTS= py*-ro-*
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 5fc73cfff25f..394ce3c67b32 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
USE_X_PREFIX= yes
USE_GNOME= esound imlib gnomehack gnomeprefix
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-alsa
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 0ac042ed904d..2ed21fc85f48 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -27,7 +27,7 @@ AUTOMAKE_ARGS= --add-missing
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ARGS= --program-transform-name='' --with-mp4v2
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 77d5f808430b..eb5b2bdcfd9c 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
.endif
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ARGS= --enable-sse --enable-3dnow \
--with-libiconv-prefix="${LOCALBASE}" \
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 4792d04bc01a..bb472591e42a 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -18,7 +18,7 @@ INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_GETOPT_LONG= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 4b9e7891088c..14f830e56a5f 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 1107bf8b36f7..490e38793c1f 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libglade
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \
MAKEINFO="makeinfo --no-split"
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index f28e44f26701..7d4e57353c32 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= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 594536de48dd..da9fdf9b7b71 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 594536de48dd..da9fdf9b7b71 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index fb587c380274..4dbb4f395996 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -25,8 +25,8 @@ USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
-USE_LIBTOOL= yes
-USE_AUTOCONF= yes
+USE_LIBTOOL_VER= 13
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index fb587c380274..4dbb4f395996 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -25,8 +25,8 @@ USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
-USE_LIBTOOL= yes
-USE_AUTOCONF= yes
+USE_LIBTOOL_VER= 13
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 41b73f492a8a..ce7ee526e9ad 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= spice3:${PORTSDIR}/cad/spice
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libxml2 gnomeprefix
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 01161d8e7843..58f23198837f 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://gtkgep.republika.pl/
MAINTAINER= linimon@lonesome.com
COMMENT= A guitar effects processor for GTK
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_GNOME= gtk12
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 87b53db54364..59bf47baa2f0 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
xslt.2:${PORTSDIR}/textproc/libxslt
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE}
WRKSRC= ${WRKDIR}/icecast-${PORTVERSION}
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index b79343306d4c..cc2c6767612b 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2 \
CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
WRKSRC= ${WRKDIR}/ices-2.0-Beta2
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index f589c0d7b2e1..d6f83230e34d 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 1fc8b7a7ecb1..ca945ed637b6 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -22,7 +22,6 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
USE_LIBTOOL_VER=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 79325291d4f4..2bf124e8cb99 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 79325291d4f4..2bf124e8cb99 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING)
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index ea8fd1426677..e3846a38cb96 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -16,7 +16,7 @@ COMMENT= Portable audio output library
WANT_GNOME= yes
USE_GNOME= gnomehack pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.if defined(NOPORTDOCS)
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 624c8d6c8a7d..aed12a896293 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A library for playing audio CDs
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 681a565ad7eb..b603405b0dce 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ahze@ahze.net
COMMENT= A library to access data on a CDDB server
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack pkgconfig
INSTALL_SHLIBS= yes
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index eeea6de75e0c..e13ca74c04cb 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= asa@gascom.ru
COMMENT= ID3 tags library (part of MAD project)
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 77fe00fa5a73..f15dcba6c09c 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= asa@gascom.ru
COMMENT= Libmad library (part of MAD project)
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-debugging \
--enable-sso \
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 2f3b81057c33..0fc2ba2105ad 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -18,7 +18,7 @@ COMMENT= MikMod Sound Library
USE_REINPLACE= yes
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
MAKE_ENV= SHELL=/bin/sh
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index b5ba0a364add..013722ea447b 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Ogg bitstream library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 3dca20f162fc..f7adcddeac23 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
fftw.2:${PORTSDIR}/math/fftw
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-gcc-pipe
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 2d90c2b96e38..914b29c697f7 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 081b633d8058..a30ecfede121 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF)
USE_GNOME= gnomehack gnometarget lthack pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-justsrc --disable-gcc-pipe
INSTALLS_SHLIB= yes
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 6fd9a12933b2..7de13e26d46f 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index dab32ef3efc6..a68ac69e57ab 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
ALL_TARGET= all madtime
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 20726079b5db..35772aec2cf0 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
MODULES?= /modules
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/net-rhythmbox/Makefile b/audio/net-rhythmbox/Makefile
index 1fee78b63664..3c85d6e61f5b 100644
--- a/audio/net-rhythmbox/Makefile
+++ b/audio/net-rhythmbox/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
CONFIGURE_ARGS= --disable-lirc
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 5650b024bab3..0cc5c92bed24 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= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
MAN1= rat.1
MANCOMPRESSED= no
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index bdce962947c5..d714b4bf4051 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Cycle-based SID emulator engine
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index c53fe63c8123..e2e439268924 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c53fe63c8123..e2e439268924 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 09165dc680bc..4dc481551157 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= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= MAKEDEPEND=${TRUE}
CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 873dcecab380..7a47077ce39b 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 8cb035e52d07..c409970f61fd 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 866660bc7e1d..376bfd3bd8f1 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui gstreamerplugins
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-ignore-missing-cd
pre-everything::
diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index d8219fc5a35e..894b40650b4d 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index d8219fc5a35e..894b40650b4d 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 7657955efd75..a5bde70fd853 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
USE_SIZE= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomeprefix gnomehier gnomehack gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index b3fc8afbbcab..21d841d99731 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_GETTEXT= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-fPIC -I${LOCALBASE}/include" \
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index fb1655ed362c..85d39110137e 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${X11BASE}/lib/xmms \
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 2921e30dbbf5..97ca722aaf4a 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= yes
+USE_AUTOCONF_VER= 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 5d3514740788..1c8b5ed5ef6a 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
vorbis.3:${PORTSDIR}/audio/libvorbis
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index a21447965a55..7bf18be497d6 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -15,7 +15,7 @@ COMMENT= Utility for capturing audio streams from programs with OSS output
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.pre.mk>
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 50d3bd663d3c..2e1dc8c0a8e9 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= yes
+USE_LIBTOOL_VER= 13
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 947dc949e002..a025374a45ed 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= yes
+USE_LIBTOOL_VER= 13
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 8237a2437238..d59468493453 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index b56564e100f5..8fe7711de45b 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_REINPLACE= yes
USE_GNOME= gtk12
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
MAN1= xmixer.1
MLINKS= xmixer.1 xgmixer.1
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 4d605602bfbc..dd509e33742a 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${X11BASE}/include"
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 613023feb127..7b2e2163f4c1 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 794762ee6ba3..cf52bf674627 100644
--- a/audio/xmms-cdparanoia/Makefile
+++ b/audio/xmms-cdparanoia/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index a68e5be7c138..d11caa8f9087 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -18,7 +18,7 @@ COMMENT= XMMS Output plugin for crossfading between songs
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index ffdbc1e83d09..b78efd3479f8 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
FLAC.5:${PORTSDIR}/audio/flac
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
--with-ogg="${LOCALBASE}" \
--with-xmms-prefix="${X11BASE}"
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 2337e079987e..8f820e35039c 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 174c5ca550e9..77fba645acb1 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= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index db7ae04bf56e..0c71deb39981 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= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 35fc88a0874b..75c5b87c59f1 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GNOME= gtk12
USE_X_PREFIX= yes
-
-USE_AUTOMAKE= yes
-USE_LIBTOOL= yes
+USE_AUTOMAKE_VER= 14
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index c3292642dbcd..a3a162683886 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= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.pre.mk>
diff --git a/audio/xmms-real-random/Makefile b/audio/xmms-real-random/Makefile
index fc4cfe88a8ea..627a984fe32b 100644
--- a/audio/xmms-real-random/Makefile
+++ b/audio/xmms-real-random/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 8489a85e1bc7..f53818583a25 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index ac77d2c18823..1c8f1c52567c 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
PLIST_FILES= lib/xmms/Input/libxmms_sndfile.so
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index ede26288db50..f8ed434210f6 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -21,6 +21,6 @@ PLIST_FILES= lib/xmms/Input/libtfmx.so
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index fb1655ed362c..85d39110137e 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${X11BASE}/lib/xmms \
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index dd2ddb96af37..8e41e74727b4 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include -fPIC"
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
WANT_GNOME= yes
.include <bsd.port.pre.mk>
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index d45566b76356..a50613fa62f3 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnomehack gnometarget gtk20 lthack
WANT_GNOME= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-ipv6
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index 9c04b5abfeb4..71a14439b280 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index a1b32cd5e91a..b518ba2c3520 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
CONFIGURE_ARGS= --enable-gdgeda
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 5490996a9e51..d16c3e7201e1 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
RUN_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index f6cdfb4a6e18..08a35c14cd7d 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index f908329a9abf..d28c7657c2d5 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 5490996a9e51..d16c3e7201e1 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
RUN_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index a1b32cd5e91a..b518ba2c3520 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
LIB_DEPENDS= geda.20:${PORTSDIR}/cad/libgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
CONFIGURE_ARGS= --enable-gdgeda
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 58915d98ccaf..9d5361ee0920 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_GNOME= gtk12
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 61377b4721ed..9a2ddccb134c 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -18,7 +18,7 @@ COMMENT= gEDA tools base utility library
LIB_DEPENDS= gdgeda.6:${PORTSDIR}/graphics/libgdgeda \
guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_GNOME= gtk12 gnomehack
INSTALLS_SHLIB= yes
diff --git a/cad/qmls/Makefile b/cad/qmls/Makefile
index 0ace3051d1f4..e10cba066c3c 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= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile
index 3a86615df12d..d386a68eb1cd 100644
--- a/chinese/dictd-database/Makefile
+++ b/chinese/dictd-database/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Chinese <-> English dictd words database
BUILD_DEPENDS= ${LOCALBASE}/bin/dictzip:${PORTSDIR}/chinese/dictd
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index c36b49d106d2..9f8a466790d2 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -12,7 +12,7 @@ COMMENT= X11 terminal emulator based on rxvt/xterm that supports traditional Chi
EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure.in
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --enable-trans --enable-utmp \
--enable-xim --with-theme-update \
--with-backspace=bs --without-terminfo \
diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile
index 613c318702fb..344adb4d8264 100644
--- a/chinese/vflib/Makefile
+++ b/chinese/vflib/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION}
GNU_CONFIGURE= yes
USE_FREETYPE= yes
USE_XLIB= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-freetype \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 7dac7b408935..1976bbd5ed34 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
post-install:
gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index bcc199157377..c3a96a252b01 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcf
WRKSRC= ${WRKDIR}/xcin
USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 39339f61f88f..8ba762cc7b88 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 619cc349df63..c81a4b75d1ef 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -19,7 +19,7 @@ USE_GETOPT_LONG= yes
USE_GETTEXT= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 7c312ea79a94..746200b1f41c 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= esn@x123.info
COMMENT= Shared libraries for Amateur Radio Equipment Control Applications
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
MAN1= rigctl.1 rotctl.1
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index fa992e08e36c..657f01daf45d 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 8797548448fb..696508b8c00a 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -18,7 +18,7 @@ COMMENT= Linux Infared Remote Control
USE_XLIB= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-driver=any --disable-manage-devices
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 9bbcb8019f7b..fde6280cb640 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= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"\
diff --git a/comms/vpb2/Makefile b/comms/vpb2/Makefile
index 42cead44a331..14303e29af61 100644
--- a/comms/vpb2/Makefile
+++ b/comms/vpb2/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= dyfet@gnu.org
COMMENT= User mode API for Voicetronix 4 port analog DSP telephony cards
USE_GMAKE= yes
-USE_LIBTOOL= yes
-USE_AUTOCONF= yes
+USE_LIBTOOL_VER= 13
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index adc83fd75826..c3edb599595b 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GNOME= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/enca \
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 506963f4f4fd..28d1506c2107 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A Free Implementation of the Unicode Bidirectional Algorithm
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack pkgconfig
INSTALLS_SHLIB= yes
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 13c6fbc9847e..dd34b0097d2e 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= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnometarget
LIBTOOLFILES= configure libcharset/configure
CONFIGURE_ARGS= --enable-static \
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index d62a5738fde4..cfb65aee2959 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index dc9b70b73910..a09397ab7447 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_PERL5= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --without-included-gettext
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index f7621c14bbf6..41cffb7c8700 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index 05f30b83d75d..04309e51db93 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Disk Based Hashtables
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 05f30b83d75d..04309e51db93 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Disk Based Hashtables
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index a9f0a38aa7c8..9166cb50f1ce 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Enlightenment Database Library
BROKEN= checksum mismatch
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 8ad53d6a68e3..3be3e6c295c6 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -19,7 +19,7 @@ COMMENT= The open-source InterBase(tm) 6.0 spin-off (Classic version)
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 257
USE_GCC= 3.3
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index dc326d066c95..901a8a864e99 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOCONF_VER= 253
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index dc326d066c95..901a8a864e99 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOCONF_VER= 253
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 3038f38e7f87..e6f2627e3f21 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 355de489bf77..f431f3f46abc 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= yes
+USE_LIBTOOL_VER= 13
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 953aea160757..77b105d1a78e 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 953aea160757..77b105d1a78e 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 6af51f19c779..5cd2df612d91 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV+= LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/
OPTIONS= MYSQL "Build MySQL driver" on \
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 38a6b24a2164..01e99aebd88a 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 21150f74c3b1..d82d528e9154 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= seanc@FreeBSD.org
COMMENT= Database Independent Abstraction Layer for C
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
post-install:
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 1b5d593d1e1a..e60e39de8f66 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 3c3404d4c932..37e577e75862 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgda2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index b582f98191c3..b1e0c50fb412 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
intlhack lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 560c18768ab7..86cd0c8b36ab 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -19,7 +19,7 @@ COMMENT= An ODBC 3.x driver manager, for universal data source access
CONFLICTS= unixODBC-*
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
INIDIR= ${PREFIX}/etc/${PORTNAME}
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 9561fe279a8c..1575d17a1957 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 7159e8af6d7d..8bd1866d6a9f 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -16,7 +16,7 @@ COMMENT= High-performance distributed memory object cache system
BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
PLIST_FILES= bin/memcached
-USE_AUTOMAKE=YES
+USE_AUTOMAKE_VER= 14
USE_AUTOCONF_VER= 253
GNU_CONFIGURE= YES
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index f242b97e496a..82d26b234177 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomedb libgnomeprintui
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 6893afd7e90d..b4afc67f7892 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_SCRIPT= ../unix/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
INSTALLS_SHLIB= yes
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 475891aaf3d3..1b22e56f8b85 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -20,7 +20,7 @@ COMMENT= ODBC driver for MySQL
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-mysql-libs=${LOCALBASE}/lib/mysql \
--with-mysql-includes=${LOCALBASE}/include/mysql
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 475891aaf3d3..1b22e56f8b85 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -20,7 +20,7 @@ COMMENT= ODBC driver for MySQL
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-mysql-libs=${LOCALBASE}/lib/mysql \
--with-mysql-includes=${LOCALBASE}/include/mysql
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 58be552c6f8e..f1927d46952b 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -29,7 +29,7 @@ SLAVEDIRS= databases/mysql323-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 2d864c32fae4..ea1fc73c8930 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -29,7 +29,7 @@ SLAVEDIRS= databases/mysql40-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index e7165012f270..93ebbf69515f 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql41-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 366a0b771d3f..1567fd2de22d 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -30,7 +30,7 @@ SLAVEDIRS= databases/mysql50-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index 4c4650c5744e..2405f89d86e3 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
DOCS= AUTHORS FORMAT_DESCR NEWS README
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index fec226407f7b..c1f5d395df9c 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -16,7 +16,7 @@ COMMENT= Round Robin Database Tools
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ENV= PERL=${PERL}
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index fec226407f7b..c1f5d395df9c 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -16,7 +16,7 @@ COMMENT= Round Robin Database Tools
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ENV= PERL=${PERL}
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index cc5078817a53..bd32b921c199 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -53,7 +53,7 @@ MAKE_ENV+= TCL_VER=${TCL_V}
.endif
USE_GMAKE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= YES
USE_REINPLACE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index cc5078817a53..bd32b921c199 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -53,7 +53,7 @@ MAKE_ENV+= TCL_VER=${TCL_V}
.endif
USE_GMAKE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= YES
USE_REINPLACE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 769f056025d6..70d8e0b74da1 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -17,7 +17,7 @@ CONFLICTS= libiodbc-*
USE_GNOME= gnomehack gnometarget lthack
USE_ICONV= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-static --enable-shared \
--with-libiconv-prefix=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 7c5ed4b4f3ba..2facb556302c 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= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INFO= gcal
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 9f7e779efbdb..8550c71315ec 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYXML} \
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_PYTHON= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 3ae175752f19..21d74b79a3af 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -20,7 +20,7 @@ USE_PERL5_BUILD= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtksourceview libgnomeui \
lthack vte
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index f59dc939c8a2..bcf1ec324ccf 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -17,7 +17,7 @@ COMMENT= A programm to create labels and business cards
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 55a41b9928e0..d594482c9989 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index e746f79952fe..193dddd7560a 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 55a41b9928e0..d594482c9989 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index e746f79952fe..193dddd7560a 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 3668292f7201..93dc275d0c02 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index eda491b3ab13..41f6977990e5 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
# necesary to access the second master site by getting rid of the default switch -A
FETCH_CMD ?=/usr/bin/fetch -Rr
diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile
index 062594e36908..f79e791cb2c2 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= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack gnomeprefix libgnomeui libwnck
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index e7ded45623f1..ff6d486b8300 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GNOME= gtk20 libxml2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 7a48ee653f09..5d06038f766f 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index aea030835a1c..0841a64cb61a 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index c4a0c6a1249c..5257b0313910 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 2284fea447d5..0fa37b24407d 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= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack libidl
CONFIGURE_ARGS= --disable-indent \
--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index ae6398d24c49..9d3a7b7689bd 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= yes
+USE_LIBTOOL_VER= 13
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 6c657e3f693d..f195f43c5a36 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -16,6 +16,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/arm-aout-binutils/Makefile b/devel/arm-aout-binutils/Makefile
index 200c7ade066f..9837008fae8f 100644
--- a/devel/arm-aout-binutils/Makefile
+++ b/devel/arm-aout-binutils/Makefile
@@ -20,7 +20,7 @@ COMMENT= FSF Binutils for embedded ARM cross-development
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=arm-aout
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure intl/configure ld/configure \
libiberty/configure opcodes/configure
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 5e7062e07916..ac7597efe902 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 6c8d18e3dfc2..330e38b865c2 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 1e4857daa5c2..7273ae960350 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
USE_REINPLACE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 1e4857daa5c2..7273ae960350 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= YES
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 74e1b1c360d2..f18a5de3c57a 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=avr
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure intl/configure ld/configure \
libiberty/configure opcodes/configure
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index c3f93b7fe9c3..22b732b02432 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gc${PORTVERSION:S/.a/alpha/}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
HAS_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index d7daf81f253d..e9cd16e2fa07 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index ea44cbc326d9..7d7135716e49 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -20,7 +20,7 @@ COMMENT= A bug reporting tool for GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomeprefix gnomehack gnomedesktop intlhack
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 17ba9c98d0aa..a8aef5b79597 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -30,7 +30,7 @@ USE_PERL5_BUILD= yes
USE_XLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 b3b9c0549297..d9a5af7cb99c 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
INSTALLS_SHLIB= yes
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 30ee79ff19de..82dd99a3f493 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -30,7 +30,7 @@ DOCS= ChangeLog LICENSE README
EXAMPLES= cvsgraphwrapper.php3 mkimage.php3
NOT_FOR_ARCHS= alpha amd64 ia64
PLIST= ${WRKDIR}/pkg-plist
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-freetype2-inc=${X11BASE}/include/freetype2/freetype \
--with-freetype2-lib=${X11BASE}/lib \
diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index dcf1a3db905b..9b8048e10c74 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -16,7 +16,7 @@ COMMENT= CVS clone
LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-fork
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GETOPT_LONG=yes
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 5b54a9e431a3..09b1304f2832 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= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_PERL5= yes
diff --git a/devel/e4graph/Makefile b/devel/e4graph/Makefile
index b005720fcfbe..2e7b65ac1a79 100644
--- a/devel/e4graph/Makefile
+++ b/devel/e4graph/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/all
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-metakit=${LOCALBASE} \
--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} --enable-tcl \
--with-expat=${LOCALBASE} --enable-xml
diff --git a/devel/erlslang/Makefile b/devel/erlslang/Makefile
index 88ecb2f43849..007d2f8f2013 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= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_WRKSRC=${WRKSRC}/config
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index 1d09eb28d487..6863ebdeaf95 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -21,7 +21,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
USE_AUTOMAKE_VER=15
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 23059d88e197..e0298d756cb3 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= yes
+USE_LIBTOOL_VER= 13
ONLY_FOR_ARCHS= i386 alpha ia64
MAN3= avcall.3 callback.3 trampoline.3 trampoline_r.3 vacall.3
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index c5f005c4691f..33b9561033bc 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -18,7 +18,7 @@ COMMENT= FSU implementation of POSIX.5
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 770ae2fdfa67..b92603340b35 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
INFO= g-wrap
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 04948a9050ac..e570c9d8423a 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index dee903d004be..0683c72397e2 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 7c3fd48dc375..a946f7d1fdf1 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 gconf2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 7c3fd48dc375..a946f7d1fdf1 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gconf2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index c290e62ade36..582a25e37522 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -15,7 +15,7 @@ COMMENT= An SDL game engine library
USE_SDL= image sdl
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --program-prefix=""
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 6a84648475e4..9c3b3f6b505a 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -19,7 +19,7 @@ COMMENT= A user interface builder for GTK+/GNOME
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomeprefix gnomehack libgnomedb libgnomeui
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index 6a27382b9fe1..76b9ef3030b6 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GETOPT_LONG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 09c29a0f7531..33049fc82c8d 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 74653f48b586..398371d2fb96 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -25,7 +25,7 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 478587cd2120..2b20a7ae5edb 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 gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index d9468a2cc1d2..0c0c501e6e00 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 42be2a4c4a1c..cab5c551175a 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 4193162071f2..2179fe08f446 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomevfs2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 478587cd2120..2b20a7ae5edb 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 gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index d9468a2cc1d2..0c0c501e6e00 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnomevfs-extras/Makefile b/devel/gnomevfs-extras/Makefile
index 8bf024e76568..aef7bd903576 100644
--- a/devel/gnomevfs-extras/Makefile
+++ b/devel/gnomevfs-extras/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --without-rio500
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 42be2a4c4a1c..cab5c551175a 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \
diff --git a/devel/korelib/Makefile b/devel/korelib/Makefile
index 60ef0378822d..0442364aa59f 100644
--- a/devel/korelib/Makefile
+++ b/devel/korelib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A cross-platform C++ library for developing modular applications
USE_KDELIBS_VER=3
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index bc94405320c9..339a6a10d030 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_SDL= image sdl
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index e0e7065ca1d1..23fb9948ecb8 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= yes
+USE_LIBTOOL_VER= 13
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 3817c88cf9a2..867a80de1db8 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -15,8 +15,8 @@ DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Property library for gnome and Window Maker
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
.include <bsd.port.mk>
diff --git a/devel/libargparse/Makefile b/devel/libargparse/Makefile
index 533c7eab0664..7c23f45a8a1d 100644
--- a/devel/libargparse/Makefile
+++ b/devel/libargparse/Makefile
@@ -15,6 +15,6 @@ MASTER_SITE_SUBDIR= aqsis
MAINTAINER= ports@FreeBSD.org
COMMENT= A command line argument parser library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 9caea782e6be..fd347c5c5dd1 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 6b7373f7ebaa..cd7ea21ad706 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
USE_X_PREFIX= yes
USE_FREETYPE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 68898fa32cb1..daf610cac3d1 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 libbonobo
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index 7723212421ac..dceefaa6d20c 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://unixcode.org/downloads/libcapsinetwork/
MAINTAINER= petef@FreeBSD.org
COMMENT= Network library aimed at easy development of C++ server daemons
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index 16d0f8f1f307..41f6022b62be 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}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= # none
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index d923035e6b4d..68032f3d4758 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@freedom.ie.cycu.edu.tw
COMMENT= Foreign Function Interface
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index d923035e6b4d..68032f3d4758 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/libffi/
MAINTAINER= horance@freedom.ie.cycu.edu.tw
COMMENT= Foreign Function Interface
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index 6957504f1983..a88304f6db26 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index b115d5dc8481..f72c5a4bcdcd 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.student.lu.se/~etn97ksi/sim_home/filer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Generic Hash Table
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 2533350df5ec..e2fc89e81c56 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack libxml2 gtk20
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 40840b29ea36..39ff762c2b84 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 40840b29ea36..39ff762c2b84 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index aaf953f8e41f..7cfd1eb751c1 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack libbonobo gnomevfs2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
--disable-gtk-doc --with-gnome --with-bz2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 91f978a6dd75..d9cc0b04a598 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://osdn.dl.sourceforge.net/sourceforge/freeassociation/
MAINTAINER= joe@zircon.seattle.wa.us
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index c3a4e4410a0b..34404f64f902 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= gengetopt:${PORTSDIR}/devel/gengetopt
USE_GETTEXT= yes
USE_PERL5_BUILD= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 4382d262956d..39974868ec9f 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= yes
+USE_LIBTOOL_VER= 13
USE_BISON= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index c76019070af6..57f21664d0e5 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 011446f05095..731068e98a40 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack gnometarget
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libwww
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index d52bd0a431cc..3c2c7f8ac3d3 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_REINPLACE= yes
USE_GNOME= gnomehack pkgconfig lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GCC= 3.3
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 079f1b5013c5..78b42121eb05 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 469991c40db7..558fd6288c2b 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR= libsigc \
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 86e0ff425f5e..1c7134bf14d1 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -24,6 +24,6 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++12
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 86e0ff425f5e..1c7134bf14d1 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -24,6 +24,6 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++12
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 6d6c41fb85bd..87142e6237dc 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_OPENSSL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 6d6c41fb85bd..87142e6237dc 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_OPENSSL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 53291bfafe39..7fca8df1085a 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -20,7 +20,7 @@ COMMENT= Provides a useful interface to system statistics
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack pkgconfig lthack
MAN3= cpu_percent_usage.3 get_cpu_diff.3 get_cpu_totals.3 \
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 943b0f375c43..5bcc479247fe 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index b846e4a14918..560cb73dffdc 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive command line editing facilities
USE_SUBMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= default
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index f4e84fe0b747..3cf36e5987b2 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT= yes
USE_GNOME= glib20
USE_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 03b9579afbe1..a7cc6b707f27 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index cad8c74c54bd..db20f4ea3c6b 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -22,7 +22,7 @@ MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GNOME= gnomehack
.include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 10b52c070ce9..20b20764d70d 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -19,7 +19,7 @@ COMMENT= A library for manipulating Unicode characters and strings
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 696339577ef5..85babb41df55 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
OPTIONS= SDL_MIXER "music and sound support" off
USE_FREETYPE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index ed049af85ac1..6cc2ca9132d0 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger
INSTALLS_SHLIB= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
USE_REINPLACE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile
index 35df512b772b..9d3c1a044659 100644
--- a/devel/libvanessa_logger/Makefile
+++ b/devel/libvanessa_logger/Makefile
@@ -18,6 +18,6 @@ COMMENT= Library that provides a generic logging layer
MAN1= vanessa_logger_sample.1
INSTALLS_SHLIB= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index 268af86d727d..6146d3f3131f 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -23,7 +23,7 @@ MAN1= vanessa_socket_pipe.1
INSTALLS_SHLIB= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libzt/Makefile b/devel/libzt/Makefile
index a9599409e84f..7b63fd3517b4 100644
--- a/devel/libzt/Makefile
+++ b/devel/libzt/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of utility code for C application/server development
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 4abcaf1583f2..d7bce40ad93f 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index 911c90dd93c8..0bec45bb7c1d 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= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 481aec406c5c..6857dfc37d33 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A userspace thread library
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index 9464a6103b8a..6437d261351d 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-20011113
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --target=i386-mingw32msvc
MAN1= i386-mingw32msvc-addr2line.1 \
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index d8b9860598e4..7b00d5787858 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -33,7 +33,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
#USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 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 1dde94860602..794360defba3 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -44,7 +44,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 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 d1281215ab97..d675791afc15 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 2156fa715a3d..0bbbaae0f2e1 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 27e911632864..8e5a324a8ea4 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -25,7 +25,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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
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 3abf12d9531b..05112793e0e6 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--enable-languages=c --disable-nls
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index 3abf12d9531b..05112793e0e6 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--enable-languages=c --disable-nls
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index 02aa49024d00..4f26f26b4d90 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GDBVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//}
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
LIBTOOLFILES= configure opcodes/configure bfd/configure
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index b88953676625..7169752560a9 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index ecaae0636d6c..2c60624e1fa4 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ bindings for ORBit, a CORBA 2.2-compliant ORB
USE_BZIP2= yes
USE_GNOME= gnomehack orbit2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index 321a676168cb..06937f29cc20 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 591668882b57..093ac8041bf9 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index 262315c9bef9..313d1cea3e49 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -20,7 +20,7 @@ COMMENT= OSSP ex is a small exception handling library for use in C
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index 32ddd809bc98..57187ae3b49a 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
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 6c8387ba237d..ff1da81ec13a 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -20,7 +20,7 @@ COMMENT= OSSP val is a flexible name to value mapping library for C variables
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 9f9f18e132e9..0f0ac3dd8c9d 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -20,7 +20,7 @@ COMMENT= A flexible, full-featured and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 5d397687e5ef..3503300f27d8 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -22,7 +22,7 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
USE_SIZE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
LDFLAGS="`${PCRE_CONFIG} --libs`"
INSTALLS_SHLIB= yes
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 7159220b5185..e73fa6fcb355 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -16,7 +16,7 @@ COMMENT= A smartcard development library
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index 661db886e86e..9c6750ce3134 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 661db886e86e..9c6750ce3134 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index a3b52d06d853..908b51dfe664 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -18,7 +18,7 @@ COMMENT= A utility used to retrieve information about installed libraries
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= glib-1.2.8/configure
LIBTOOLFLAGS= --disable-ltlibs \
--disable-shared
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index a3b52d06d853..908b51dfe664 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -18,7 +18,7 @@ COMMENT= A utility used to retrieve information about installed libraries
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= glib-1.2.8/configure
LIBTOOLFLAGS= --disable-ltlibs \
--disable-shared
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index d7e8aa932efc..aabc7e3dbb4b 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= A getopt(3) like library with a number of enhancements, from Redhat
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index cdf15b5f914b..2ad0e0621575 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Posadis C++ DNS library
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 0786e346d9a1..bdbfa1d20888 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-debugging \
--enable-optimization \
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 4f9cc53d823d..136979c0558e 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org
COMMENT= Library that makes it easy for programs to use privilege separation
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_SIZE= yes
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index 6dda04869df5..5e80a5756519 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -23,6 +23,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack orbit2
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index e5c66ac5a4b1..344220b00a1a 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -19,7 +19,7 @@ USE_PERL5= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_QT_VER= 2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= QTDIR="${X11BASE}" QTEZ="${DATADIR}" MSG2QM="${MOC}"
MAKE_ENV= QTEZ="${DATADIR}"
INSTALLS_SHLIB= yes
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index f25e443b3e3e..7c0f7a3292ff 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
USE_AUTOCONF_VER= 213
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index fdcf830f3b5d..22ef7ea11a6d 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= yes
+USE_LIBTOOL_VER= 13
WANT_GNOME= yes
CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 8fa25033371c..a23e5d58deeb 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ library for SDTS related development
BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost
RUN_DEPENDS= ${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 15689471185f..20ba7c85e6fd 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://gdal.velocet.ca/pub/outgoing/
MAINTAINER= ports@FreeBSD.org
COMMENT= C API for reading and writing ArcView Shapefiles
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFILES= # none
ALL_TARGET= lib
INSTALLS_SHLIB= yes
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 6cb26d3092c7..29395a45bf2c 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 0cde51393673..8c9855b395ca 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= yes
+USE_LIBTOOL_VER= 13
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/swarm/Makefile b/devel/swarm/Makefile
index e4c2f0dbb263..cd243fb1c610 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS= i386
USE_JAVA= 1.3+
USE_GMAKE= yes
USE_XPM= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
TK_VER?= 8.4
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 5d92e3f11b47..5c22a13a9fa8 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -98,7 +98,7 @@ CONFIGURE_ARGS += --without-java
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME:U}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fpic -DPIC"
ALL_TARGET= swig runtime
PLIST_SUB+= VER="${VER}"
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 5d92e3f11b47..5c22a13a9fa8 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -98,7 +98,7 @@ CONFIGURE_ARGS += --without-java
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME:U}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fpic -DPIC"
ALL_TARGET= swig runtime
PLIST_SUB+= VER="${VER}"
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 06eaf06e05b0..6f01ebdb4015 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_X11)
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 93d306fa13fa..4f24faae0c8c 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
MANN= tclreadline.n
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 80fb24c77af3..b9be869ae160 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
USE_GNOME= gnomelibs
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
.include <bsd.port.pre.mk>
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 81778778d90a..59f7cc361677 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Configuration System for the STAGE Server
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
USE_REINPLACE= YES
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile
index 674a75acdb64..40a6e28696cd 100644
--- a/devel/veepee/Makefile
+++ b/devel/veepee/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
USE_GNOME= gnomelibs
USE_XLIB= yes
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} ${PYTHON_LIBS}"
CONFIGURE_ARGS= --with-gd-includes=${LOCALBASE}/include \
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index e749b4eb3a6c..82b86ce78f07 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index 696339577ef5..85babb41df55 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
OPTIONS= SDL_MIXER "music and sound support" off
USE_FREETYPE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index 72c50fdc9f02..424e558ca698 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -18,7 +18,7 @@ COMMENT= A general-purpose tool for parameter handling in C++
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index 62c6544e0606..14be939fc83a 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index d0b732df8ab4..184fe5bea926 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -19,7 +19,7 @@ COMMENT= A platform-independent object-oriented C++ threading library
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 89f4ab33cc35..0502862e3c5e 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index c277ccfc24f3..75f89e903609 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library to handle internationalized domain names
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \
--enable-runidn \
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index c3a4e4410a0b..34404f64f902 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= gengetopt:${PORTSDIR}/devel/gengetopt
USE_GETTEXT= yes
USE_PERL5_BUILD= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index a3cb5dbcb276..12bcc13f7e7b 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc
USE_ICONV= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_BZIP2= yes
INFO= mydns
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index a3cb5dbcb276..12bcc13f7e7b 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc
USE_ICONV= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_BZIP2= yes
INFO= mydns
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 84a3b5b0d070..f48393b8442d 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-fam
PLIST_SUB= FAM="@comment "
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index d12a244abcdf..80a6b91c5d4a 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --disable-mysql
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
LDAP_PORT?= net/openldap20-client
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= YES
USE_GCC=3.2
CONFIGURE_MODULES+= "ldap"
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index d12a244abcdf..80a6b91c5d4a 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --disable-mysql
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
LDAP_PORT?= net/openldap20-client
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= YES
USE_GCC=3.2
CONFIGURE_MODULES+= "ldap"
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 0281ac7083f2..be9c70a03eda 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -28,7 +28,6 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE= yes
USE_AUTOMAKE_VER=14
USE_AUTOCONF_VER=213
USE_GMAKE= yes
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 0281ac7083f2..be9c70a03eda 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -28,7 +28,6 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE= yes
USE_AUTOMAKE_VER=14
USE_AUTOCONF_VER=213
USE_GMAKE= yes
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 0281ac7083f2..be9c70a03eda 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -28,7 +28,6 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE= yes
USE_AUTOMAKE_VER=14
USE_AUTOCONF_VER=213
USE_GMAKE= yes
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 1bb0b88632e5..fd1e1281ddeb 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -16,7 +16,7 @@ COMMENT= GNOME2 visual XML editor with emphasis on DocBook editing
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 5170a7a21f4f..9c77f2677f54 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 dd1b0ef02f8c..7f5f7684efa4 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
EMACS_VER= 20.7
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index ecef2fdc0f08..736ac527c6a4 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PERL5= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget lthack
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 8093989166ba..d9331404264b 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \
eel2 gtksourceview
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index c1e441059a75..2c4520c651ea 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gail libgnomeprintui libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 5ca866b3851e..681c80b7ca43 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index b8b19a3bdbfb..e2a5ab696972 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= yes
+USE_LIBTOOL_VER=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 e818c9aa7e0d..36e379e6c525 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_AUTOCONF_VER= 253
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 54864abd6f5b..ece32c189874 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -43,7 +43,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_GETTEXT= yes
USE_XLIB= yes
STRIP=
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS= --with-x11 \
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 90e8967dbdc5..e3fe0e58f51e 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= yes
+USE_LIBTOOL_VER=13
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 499576ce6d03..3cffd57be488 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
USE_SDL= sdl
USE_REINPLACE= yes
USE_XLIB= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --with-sdl
diff --git a/emulators/hfsplusutils/Makefile b/emulators/hfsplusutils/Makefile
index e86deeb05bf5..23c4a37d9bc7 100644
--- a/emulators/hfsplusutils/Makefile
+++ b/emulators/hfsplusutils/Makefile
@@ -16,7 +16,7 @@ COMMENT= Utilities for accessing HFS+ filesystems
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_AUTOMAKE_VER= 15
AUTOMAKE_ARGS= --add-missing
diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile
index 04cc14c98b38..3434c56db7a7 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
DOCS= ChangeLog doc/765.txt
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 0b71b42c0a5c..8aaea834225c 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -16,7 +16,7 @@ COMMENT= Handling of ZX-Spectrum emulator files formats
USE_PERL5_BUILD= yes
USE_GNOME= glib12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_GLIB)
diff --git a/emulators/libvm68k/Makefile b/emulators/libvm68k/Makefile
index c9f56de90f8e..b7f8784ed93d 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 1dd226322418..8675083fd9c1 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XLIB= yes
USE_REINPLACE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
.if ${MACHINE_ARCH} == "alpha"
CONFIGURE_ARGS+= --disable-intp
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 64d6d413d0aa..7e73e06d85f5 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -16,7 +16,7 @@ COMMENT= Amiga emulator
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --enable-sound --enable-vidmode --enable-dga
USE_XLIB= yes
USE_GNOME= gtk12
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index ae1c5d83fe86..57f69b526d52 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -18,7 +18,7 @@ COMMENT= A visual simulator of an operating system to help understand how OSes w
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/emulators/vx68k/Makefile b/emulators/vx68k/Makefile
index 49f872f7869a..9435d5bb6b02 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
LIBTOOLFILES= configure vx68k-gtk/configure
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 03afa89c3334..82760de9734f 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= sf@FreeBSD.org
COMMENT= AliceSoft System 3.5 on X Window System
USE_REINPLACE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index f4b73d085c13..cff206a15c61 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 1dfe8acab9ec..299e0e390089 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 20f102f78ebe..8f5fb0981dca 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -25,7 +25,7 @@ USE_GNOMENG= yes
USE_GNOME= gtk12 libcapplet libxml gnomepanel orbit gdkpixbuf gnomelibs gnomeprint
USE_BISON= yes
USE_BZIP2= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index ab8213fdc333..cd98d0f4817d 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -17,7 +17,7 @@ COMMENT= OpenSource implementation of the OFX (Open Financial eXchange)
LIB_DEPENDS= osp.3:${PORTSDIR}/textproc/opensp
USE_GNOME= gnometarget lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-doxygen --disable-dot \
diff --git a/finance/opale/Makefile b/finance/opale/Makefile
index b5d2abe55aa1..3a8bcb6442d6 100644
--- a/finance/opale/Makefile
+++ b/finance/opale/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= kofficecore.2:${PORTSDIR}/editors/koffice-kde3
USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile
index 4e3321d0e43d..3d80a949523e 100644
--- a/finance/quantlib/Makefile
+++ b/finance/quantlib/Makefile
@@ -19,7 +19,7 @@ COMMENT= A comprehensive software framework for quantitative finance
WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION}
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/french/med/Makefile b/french/med/Makefile
index 320ca8bd184c..05b88d1f281e 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -23,7 +23,7 @@ EXTRACT_BEFORE_ARGS= -xf
EXTRACT_AFTER_ARGS= # empty
CONFIGURE_ARGS= --prefix=${PREFIX} --disable-shared
CONFIGURE_ENV= HDF5HOME=${LOCALBASE}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index f8085573afbe..0dae0a88bdb7 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -21,7 +21,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sumikawa@FreeBSD.org
COMMENT= A replacement ftp server for Un*x systems
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 b690332863eb..9b5e238f994d 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -18,7 +18,7 @@ PATCHFILES= connect-dos.patch realpath.patch
MAINTAINER= ache@FreeBSD.org
COMMENT= A replacement ftp server for Un*x systems
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 1c48849bc612..68354ce8ee17 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -18,7 +18,7 @@ COMMENT= Modular FTP server configurable online using SITE commands
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.if defined(WITH_SSL)
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 571f97b6627b..a73660f3ab9d 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -25,7 +25,7 @@ USE_SDL= sdl
USE_GNOME= gnometarget
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/asc/Makefile b/games/asc/Makefile
index cf44ed7c3d04..6a277762e919 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_SDL= image mm mixer sdl
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GETOPT_LONG= yes
CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \
CXXFLAGS="-D_UNICODE_BROKEN_" \
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index 748f92b7b5ad..c5bdd1c02f15 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= yes
+USE_LIBTOOL_VER=13
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 05efb340826b..1beea8c98a59 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 650fda65dc70..5fdf07a6385c 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
USE_MESA= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index 64b38d705741..dd3e4815e1f3 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= laszlof@vonostingroup.com
COMMENT= Very popular card game with variable skill levels
PLIST_FILES= bin/euchre
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_GNOME= gtk12
.include <bsd.port.mk>
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 14ccd251e745..59c1530f4b3f 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://vipe.technion.ac.il/~shlomif/freecell-solver/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A program that automatically solves games of Freecell
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN6= fc-solve-board_gen.6 fc-solve.6 \
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index e6be7bf5f296..963dd061502b 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PYTHON= yes
USE_GNOME= gnomehack lthack gnomeprefix libgnomeui pygnome2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/glife/Makefile b/games/glife/Makefile
index dee1bfac3791..42ead64abdfc 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= yes
+USE_LIBTOOL_VER=13
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 8f2c669772cc..97b05c4bc547 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index 408cc68b4827..731fd91612ac 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -17,7 +17,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 libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index a753120bfb48..3f2fdb400864 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index a753120bfb48..3f2fdb400864 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 8187fe10ae60..b9b23e56d3b9 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 8ff7b89796c2..4eec383ce2ec 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 69701d504bc8..58075c1d7cd8 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -20,12 +20,8 @@ CONFIGURE_ENV= SDL_CONFIG=${LOCALBASE}/bin/sdl11-config
CONFIGURE_ARGS+= --program-transform-name="s/$$//"
USE_SDL= image sdl
-USE_AUTOMAKE= yes
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
USE_AUTOMAKE_VER= 15
-AUTOCONF= autoconf
-ACLOCAL= aclocal
.include <bsd.port.pre.mk>
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 75d28c17e3c6..38f783da312d 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= adamw@FreeBSD.org
COMMENT= GTK2 Puzzle Bobble clone with monkeys
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix librsvg2 libgnomeui \
gstreamerplugins intlhack lthack
diff --git a/games/moon-buggy/Makefile b/games/moon-buggy/Makefile
index d93d8eecec66..8697c9863858 100644
--- a/games/moon-buggy/Makefile
+++ b/games/moon-buggy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.mathematik.uni-kl.de/~wwwstoch/voss/data/ \
MAINTAINER= ralf@akk.org
COMMENT= Drive a buggy across the moons surface
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
USE_CONFIGURE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sharedstatedir=/var/games \
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 163f15a14679..fa839e4e2063 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_MESA= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 408cc68b4827..731fd91612ac 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -17,7 +17,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 libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 03881b1f801c..2c82b015d258 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -18,7 +18,7 @@ COMMENT= First Person Shooter with many addons available
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_XLIB= yes
INSTALLS_SHLIB= yes
WANT_SDL= yes
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index dfe1356f48bf..72acf5c9f8f6 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -31,7 +31,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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_XLIB= yes
USE_REINPLACE= yes
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index d9fab11c654b..568aeacd01aa 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -16,7 +16,7 @@ COMMENT= Robot programming game for UNIX
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-debug
.include <bsd.port.pre.mk>
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 40fc1e8f235c..341a095ab4d5 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 145e7554179f..db9abfe4f713 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
WRKSRC= ${WRKDIR}/src
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index a3735534ad95..4658eae138ca 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= elfrink@introcom.nl
COMMENT= Generates ASCII tractors
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN6= tractorgen.6
PLIST_FILES= bin/tractorgen
diff --git a/games/tuxracer-commercial/Makefile b/games/tuxracer-commercial/Makefile
index 650fda65dc70..5fdf07a6385c 100644
--- a/games/tuxracer-commercial/Makefile
+++ b/games/tuxracer-commercial/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
USE_MESA= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 650fda65dc70..5fdf07a6385c 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
USE_MESA= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index b6909256dcfc..d857bde30b8c 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gnometarget lthack
USE_GL= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
INSTALLS_SHLIB= yes
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 3e463a3dbc68..7a2f5ae5f8d0 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= yes
+USE_LIBTOOL_VER=13
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 921aba068165..eded4f8215d9 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -21,7 +21,7 @@ NO_CDROM= "don't sell for profit"
USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
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 2ceaa7eb5214..90abca751663 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= yes
+USE_AUTOCONF_VER= 213
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index a4ff681eac0b..5051f62a24a2 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_XLIB= yes
USE_MESA= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
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/german/ksteak/Makefile b/german/ksteak/Makefile
index c4e00dd0de52..5bd52d8c12c4 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= steak:${PORTSDIR}/german/steak
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 48b5f15124c6..fe18082327bd 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= simage.22:${PORTSDIR}/graphics/simage \
USE_REINPLACE= yes
USE_GL= yes
USE_XLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --program-transform-name="s/x/x/" --with-pthread=yes --enable-threadsafe \
--enable-3ds-import --enable-sound --enable-html
INSTALLS_SHLIB= yes
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 9aa08680d4ec..442a69013b5e 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -16,7 +16,7 @@ COMMENT= Fast pixel formats conversion library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 5f06ed3fab0e..94b1bc5763df 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -34,7 +34,7 @@ USE_PERL5= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 10c2cc74527b..6959395f848b 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.openexr.com/downloads/
MAINTAINER= nork@FreeBSD.org
COMMENT= OpenEXR, a high dynamic-range (HDR) image file format developed by ILM
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index bd3883cb31ad..e08954930928 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_X11)
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 918f58e744a2..3afa27929dc8 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
USE_XLIB= yes
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index f5b393e6064e..c0c484a76afa 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES= bin/blender
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_PYTHON= yes
USE_SDL= sdl
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 18b637920a11..fe96f8d9e215 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PYTHON= yes
USE_GMAKE= yes
USE_GNOME= gtk12
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 8c6f027c1cfd..e3a9f31f5559 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
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 42d4a50fd32c..b8247332114e 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -17,7 +17,7 @@ COMMENT= A general drawing canvas from dia dialog editor
USE_X_PREFIX= yes
USE_GNOME= gtk12 imlib gnomehack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index ab82bd2c72fc..a3a82cdc1617 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index d289e4d8d84b..05c36fa059a8 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --enable-all-plugins \
--enable-plugins-dir \
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index db9688b596fe..99d1fc1efe5a 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= ecore.0:${PORTSDIR}/x11/ecore \
evas.6:${PORTSDIR}/graphics/evas
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 3d9c477a1b86..a1e05f9db003 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index fdbc2d62ee79..b969dc77365a 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= Imlib2.2:${PORTSDIR}/graphics/imlib2
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_FREETYPE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 67bc165e7cd0..ff3199f686eb 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index d4d5eb98189e..b7e1d9a4f1ba 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_AUTOHEADER= yes
HAS_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 177fd7dc68c0..e49244927392 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= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=${X11BASE}
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 09185b5fffb2..5858e32cb96a 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Tools and library routines for working with GIF images
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.ifdef (WITHOUT_X11)
PLIST_SUB+= X11='@comment '
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index cd9a51cb6215..3c6983c0e88c 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -35,7 +35,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 83bcccd48357..0a7915a72e5e 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= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index b6ba49b5f73e..e4db551bef2f 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 262140780929..cec768a3328b 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/Glide3
USE_X_PREFIX= yes
XFREE86_VERSION= 4
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index e532ad3530cf..e826e7e97bec 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib"
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index d2739bdfdaf4..412ecaed3666 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -18,7 +18,7 @@ COMMENT= Weird GNOME fractal generator
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 80e38dd00382..33f124307656 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 3791e9b792f2..42bcf7c518cf 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 52918d24461e..afae31604561 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_XPM= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= --add-missing
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
LDFLAGS="-L${LOCALBASE}/lib" \
TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh \
diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index a283366b851f..ca7a335a2187 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack lthack libgnomeui libgnomeprintui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index c49fd1f4d487..533ca2b613d1 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \
--with-dps-libraries=${X11BASE}/lib
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 26b5082703f7..b99cdbabc022 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= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index a0fc2dbbdca7..2157a51ea71e 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= Imlib2.2:${PORTSDIR}/graphics/imlib2 \
edb.1:${PORTSDIR}/databases/edb
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 6895933842fe..e572851e4373 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack intlhack libglade2 libartlgpl2 libgnomeprintui
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-popt \
--with-gnome-print
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}" \
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 712de12f848b..b9eab96f039b 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= lthack gnometarget
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 af98d0f09e9e..0798e25df3ad 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -20,7 +20,7 @@ COMMENT= IJG's jpeg compression utilities
WRKSRC= ${WRKDIR}/jpeg-6b
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index af98d0f09e9e..0798e25df3ad 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -20,7 +20,7 @@ COMMENT= IJG's jpeg compression utilities
WRKSRC= ${WRKDIR}/jpeg-6b
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
index 0aa9bc2addcb..a04b2c4e366f 100644
--- a/graphics/kimagemapeditor/Makefile
+++ b/graphics/kimagemapeditor/Makefile
@@ -16,7 +16,7 @@ COMMENT= KDE-based editor for HTML image maps
USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 6c3f4c7589ef..e2d95b7bce17 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -25,7 +25,7 @@ USE_GL= yes
USE_GNOME= gnometarget gtk20
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-lib-GL
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 22e236c6c5c0..59d2a190b278 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= yes
+USE_LIBTOOL_VER=13
CONFLICTS= libart-*
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 22e236c6c5c0..59d2a190b278 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= yes
+USE_LIBTOOL_VER=13
CONFLICTS= libart-*
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index fc63a80da60b..65b55b7cd0e4 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -18,7 +18,7 @@ COMMENT= GTK+ widgets to display/edit EXIF tags
LIB_DEPENDS= exif.10:${PORTSDIR}/graphics/libexif
USE_GNOME= gnomehack gtk20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index eab7e4989300..136454d254ec 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library to read digital camera file meta-data
USE_GETTEXT= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index b96345ea8307..435e438ca654 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 8b77891ffeb2..0b251b03ac0d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOMENG= yes
USE_GNOME= gnomehack libglade2 libartlgpl2
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 5099ab7c676a..38ed50587352 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 5099ab7c676a..38ed50587352 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomecanvas
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index d731ad2910e4..83ccc645e38f 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
INSTALLS_SHLIB= yes
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index df7f0ed8aec2..d1b3eb6d39ef 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -15,7 +15,7 @@ COMMENT= A library for loading (and saving) 3d models (3d modeller object files)
CONFLICTS= xmorph*
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index d90d020f848d..693c164b1f90 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 7626a1dd1ceb..0310715b0204 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20 libartlgpl2 libxml2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libtheora/Makefile b/graphics/libtheora/Makefile
index 5029ccdb7d7c..be23cde7a8d5 100644
--- a/graphics/libtheora/Makefile
+++ b/graphics/libtheora/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 09185b5fffb2..5858e32cb96a 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -17,7 +17,7 @@ COMMENT= Tools and library routines for working with GIF images
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.ifdef (WITHOUT_X11)
PLIST_SUB+= X11='@comment '
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index fdd27b2fa187..daf009313a78 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
.endif
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
CONFIGURE_ENV+= GLVER="${GLVER}" LIBS="-lm"
SUB_GL= src si-glu src-glu
diff --git a/graphics/nip/Makefile b/graphics/nip/Makefile
index d64f596406da..3b5788f9a5db 100644
--- a/graphics/nip/Makefile
+++ b/graphics/nip/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vips.0:${PORTSDIR}/graphics/vips \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_XLIB= yes
USE_REINPLACE= yes
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index d64f596406da..3b5788f9a5db 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vips.0:${PORTSDIR}/graphics/vips \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_XLIB= yes
USE_REINPLACE= yes
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index a681edf8a561..b49b22aec86c 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --program-transform-name="s/x/x/"
INSTALLS_SHLIB= yes
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 3ef68eae0c3c..76a2b36a15e2 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 1e43cb211193..6f6f60860d89 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,10 +22,10 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_AUTOHEADER= yes
-USE_AUTOMAKE= yes
-USE_LIBTOOL= yes
+USE_AUTOMAKE_VER= 14
+USE_LIBTOOL_VER= 13
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 8aab7ab717bd..13f71abeb9fc 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --program-prefix=''
USE_GMAKE= yes
USE_KDELIBS_VER=3
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/x11/kde3/Makefile.kde"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 6588ede849a0..012711749c2f 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MOTIFLIB="${MOTIFLIB}" \
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 2782b56150d4..b8caa3b515d0 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -17,7 +17,7 @@ COMMENT= Cartographic Projections library
NADFILES= proj-nad27-1.1.tar.gz
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 3f336a10d79d..cf7ed8765fbd 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= Magick++.6:${PORTSDIR}/graphics/ImageMagick \
EMF.1:${PORTSDIR}/graphics/libemf
USE_GNOME= gnometarget pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --with-libemf-include=${LOCALBASE}/include/libEMF
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index b0c14017380f..474b9ea2a154 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= yes
+USE_LIBTOOL_VER=13
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 d5a2429666f1..2c91be87f3be 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 0ac2875e5d83..c8372ed2c75a 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= usb-0.1.7:${PORTSDIR}/devel/libusb \
USE_REINPLACE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 3367f29e18dd..7d74fa6fcb3e 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -20,7 +20,7 @@ COMMENT= SDL graphics drawing primitives and other support functions
USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --includedir=${PREFIX}/include/SDL11 \
--disable-mmx
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index fe477c4349fe..415ec179b753 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_SDL= sdl
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 16ab7d6f3ead..aa17d6f45849 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -21,7 +21,7 @@ USE_SDL= sdl
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 332348982a5f..b82a5e77b632 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_REINPLACE= yes
USE_XLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --program-transform-name="s/x/x/" --with-ungif=${LOCALBASE} \
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index e9e434b3aec5..0ffe83228b33 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack libglade2 libartlgpl2
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --without-gnome-print \
--with-popt
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 7b4d9f205f6a..19232e5a700d 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -28,7 +28,7 @@ USE_X_PREFIX= yes
USE_QT_VER= 3
USE_MESA= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 ee0200755e51..cdb75c032716 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 901cdd608e3f..ef4e38a4524a 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -17,7 +17,7 @@ COMMENT= An image viewer for X
PLIST_FILES= bin/vp
USE_SDL= image
USE_GETOPT_LONG=yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 78f864dabcb3..4c7dda27de46 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_SUBMAKE= yes
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index a18c49c3a867..ba24cbf305b3 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index cdf66eaca921..12edf010b789 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -25,7 +25,7 @@ USE_BISON= yes
USE_GNOME= gtk12 libxml2
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= XMMS_CONFIG="${XMMS_CONFIG}"
.include <bsd.port.pre.mk>
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index ef235f40e79d..0004d9acf537 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= libmorph*
USE_X_PREFIX= yes
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/graphics/xpcd/Makefile b/graphics/xpcd/Makefile
index c66414db5ccc..fb92be631cf9 100644
--- a/graphics/xpcd/Makefile
+++ b/graphics/xpcd/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS= -L${LOCALBASE}/lib
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
USE_X_PREFIX= yes
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index ccc8ed83b542..6511e2acef6f 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile
index ccc8ed83b542..6511e2acef6f 100644
--- a/graphics/yafray/Makefile
+++ b/graphics/yafray/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 5aec50ec3db3..03ca3a08f988 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ ALL_TARGET= includes all
INSTALL_TARGET= install install.man
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 213
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}"
INSTALLS_SHLIB= yes
USE_BZIP2= yes
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 29ec84d58f61..ba10e3ff14fc 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Another kana-kanji conversion system
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile
index 7a66915ea1e2..29640f3d6a32 100644
--- a/japanese/balsa/Makefile
+++ b/japanese/balsa/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/balsa-0.8.0ja
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
USE_GMAKE= yes
LIBTOOLFILES= configure libmutt/configure
diff --git a/japanese/dvipdfm/Makefile b/japanese/dvipdfm/Makefile
index 289557d9507b..ee9b839e86d8 100644
--- a/japanese/dvipdfm/Makefile
+++ b/japanese/dvipdfm/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= kpsewhich:${PORTSDIR}/japanese/ptex-base \
MAN1= dvipdfm.1
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 1ab187f4ea68..97f97357fddf 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR= eb
USE_GETTEXT= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 1ab187f4ea68..97f97357fddf 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -60,7 +60,7 @@ DIST_SUBDIR= eb
USE_GETTEXT= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-nls \
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index d1ca964e34b1..9cf4f0352909 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -20,7 +20,7 @@ DOCDIR= share/doc/eblook
LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb
GNU_CONFIGURE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
CONFIGURE_ARGS= --with-eb-includes=${PREFIX}/include \
--with-eb-libraries=${PREFIX}/lib
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 866fd38f32a3..db88ab789f40 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs21
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
USE_GMAKE= YES
EMACS_VER= 21.3
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index 10fd06f16dff..70c538d6e682 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
LATEST_LINK= ja-emcws20
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
USE_GMAKE= YES
EMACS_VER= 20.7
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index 866fd38f32a3..db88ab789f40 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs21
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
USE_GMAKE= YES
EMACS_VER= 21.3
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index 04e305cbc2a9..49d60be7c89c 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= knu@FreeBSD.org
COMMENT= The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
USE_BZIP2= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
DISTFILE_HELP= ${PORTNAME}pre2-help.tar.gz
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 325bc0b5572b..8aefd808e426 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= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
DIST_SUBDIR= esecanna
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 89fe867026fc..6e0288a77224 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= yes
+USE_AUTOCONF_VER= 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 fd868187cbcf..4f66453de774 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= yes
+USE_AUTOCONF_VER= 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 dce37bd54931..68a038b05a1d 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= knu@FreeBSD.org
COMMENT= Pseudo cannaserver which wraps some other input engines
USE_REINPLACE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
CONFIGURE_ARGS= --with-piddir="${PIDDIR}"
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index 4a3871e21536..ed352ac55404 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure.in \
${.CURDIR}/files/extra-patch-src:feature.h \
${.CURDIR}/files/extra-patch-src:options.c
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --enable-trans --enable-utmp \
--enable-xim --with-theme-update \
--with-backspace=bs --without-terminfo \
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index d50d5e1d97aa..17f9dadadc96 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= yes
+USE_AUTOCONF_VER= 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/im-ja/Makefile b/japanese/im-ja/Makefile
index d75c659e76ec..6b83d3ac3629 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix gnomehack gnomepanel
GNU_CONFIGURE= yes
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index ba0d4a0fbe5c..bf889dc803e6 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1
BUILD_DEPENDS= chasen:${PORTSDIR}/japanese/chasen-base
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
post-install:
${INSTALL_DATA} ${WRKSRC}/chasenrc \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 835e9d89db1c..b5552dcb7323 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= yes
+USE_AUTOCONF_VER= 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 c92fc9156cc0..67b45276e97c 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= flathill@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/japanese/libimg/Makefile b/japanese/libimg/Makefile
index 19db7afcfc89..c227dadd56a9 100644
--- a/japanese/libimg/Makefile
+++ b/japanese/libimg/Makefile
@@ -18,7 +18,7 @@ COMMENT= Enhanced Tk adding support for many other Image formats
BUILD_DEPENDS= ${LOCALBASE}/lib/tcl8.0jp/tclIndex:${PORTSDIR}/japanese/tcl80 \
${LOCALBASE}/lib/tk8.0jp/tk.tcl:${PORTSDIR}/japanese/tk80
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
--with-tk=${PREFIX}/lib/tk${TKVERSION}jp \
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 99f7a2610594..b80fd3e6f910 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -20,7 +20,7 @@ IPADIC_PORTDIR= ${PORTSDIR}/japanese/ipadic
USE_PERL5_BUILD= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include "${.CURDIR}/Makefile.common"
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 72c764d72a7a..499ba903f05d 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT?= Japanese incremental search tool
.if !defined(EMACS_PORT_NAME)
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
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 12a276aa5680..2be83dee0094 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -45,7 +45,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
NO_LATEST_LINK= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 0eff14c8a675..4617e411f2ca 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -46,7 +46,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 049d611d0d44..5e14464f6feb 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap
${SKKJISYO_BASE}/${SKKJISYO}:${SKK_MASTERDIR}
USE_RUBY= yes
-
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
CONFIGURE_ARGS= --with-ruby="${RUBY}" \
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 5b38f292ddd8..547f62622057 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= yes
+USE_AUTOCONF_VER= 213
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index fcc059d5d41f..936f587066f5 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= yes
+USE_AUTOCONF_VER= 213
USE_XLIB= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 61f47855e652..4f5a7e45dc42 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= yes
+USE_AUTOCONF_VER= 213
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
--enable-xlibHack --enable-onTheSpot
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 637fc5d3ae3b..e35cae9c393b 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
USE_XLIB= yes
USE_XPM= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 96c2f9dd79d4..c9732a1c8ae7 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME= yes
USE_GNOME= gnometarget glib20
USE_GMAKE= yes
USE_ICONV= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index e34584f41a0c..ceb19876f3d8 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= ${EDICT_FILE}:${PORTSDIR}/japanese/edict \
USE_X_PREFIX= yes
USE_RUBY= yes
-
-USE_AUTOCONF= yes
-USE_LIBTOOL= yes
+USE_AUTOCONF_VER= 213
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \
--with-ruby="${RUBY}" \
--with-netscape="${LOCALBASE}/bin/netscape"
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index f26090f0eb36..1ee1bf035a7d 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
CFLAGS+= -DJMPDEBUG -g
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_JAVA= 1.2+
NEED_JAVAC= yes
diff --git a/java/kaffe-devel/Makefile b/java/kaffe-devel/Makefile
index 39db34069d21..83392a463c41 100644
--- a/java/kaffe-devel/Makefile
+++ b/java/kaffe-devel/Makefile
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION}
NOT_FOR_ARCHS= amd64 alpha
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_ICONV= yes
LIBTOOLFLAGS=
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 55666fcc9dab..0fdbb4e430aa 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
NOT_FOR_ARCHS= amd64
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS=
INSTALLS_SHLIB= yes
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index ed8ae7ca76bc..c1c6ce675e19 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
PATCH_WRKSRC= ${WRKDIR}
PATCH_STRIP= -p1
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= ${SABLEVMDIR}/configure ${NATIVEDIR}/configure
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 6b416aa0a515..22a68a6d8c3a 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4" LOCALBASE="${LOCALBASE}"
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 89648ad50753..40c69effcffa 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Scheme-to-C compiler
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= lthack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index d91b647680ec..0ac42dce4858 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.gtlib.cc.gatech.edu/pub/fink/
MAINTAINER= ports@FreeBSD.org
COMMENT= Compiler for the SIMULA programming language
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= cim.1
diff --git a/lang/clips/Makefile b/lang/clips/Makefile
index a91d6e1e2605..40b6e62a30ae 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= yes
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 906445f6cc5a..e3338a71e0a0 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -51,7 +51,7 @@ ONLY_FOR_ARCHS= i386
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAKEFILE= GNUmakefile
ALL_TARGET= default
WANT_GNOME= yes
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index c3be086138f9..c5d000cae84b 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= yes
+USE_LIBTOOL_VER=13
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 c6eb1e3b0da2..92d0b56702ba 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= yes
+USE_AUTOCONF_VER= 213
.include <bsd.port.mk>
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index 9f7200ef81d6..adc7336ff54c 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --disable-float
MAN1= pfe.1
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index b3fc7abd43f2..acf1dfab5d8e 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
ONLY_FOR_ARCHS= i386 sparc64
GNU_CONFIGURE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
USE_XLIB= yes
CONFIGURE_ARGS=--prefix=${PREFIX} \
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 041d1bc5b36f..b71762f6c1a6 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
PREFIX= ${LOCALBASE}/GNUstep
NO_MTREE= yes
ETCDIR= ${LOCALBASE}/etc
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-procfs
CONFIGURE_TARGET=
diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile
index 1c58a739df87..0c0fc31d339d 100644
--- a/lang/libutils/Makefile
+++ b/lang/libutils/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Support lib for Tensile/NSL
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 9241d16f0457..0f8e9c84effd 100644
--- a/lang/ml-pnet/Makefile
+++ b/lang/ml-pnet/Makefile
@@ -17,7 +17,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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
STRIP= # Nothing to be stripped.
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 32050f74934c..7b4f857387a9 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.go-mono.com/archive/
MAINTAINER= gnome@FreeBSD.org
COMMENT= An open source implementation of .NET Development Framework
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_BISON= yes
USE_GNOME= gnomehack glib20 pkgconfig
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 8599573ae27e..9c37328d3aea 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -20,7 +20,7 @@ COMMENT= NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
CONFLICTS= js-1.5.*
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.if defined(NOPORTDOCS)
USE_REINPLACE= yes
.endif
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index e4045f3a2ef2..161fdc49b678 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
MAN1= oo2c.1 oob.1 ooef.1 oocn.1 oowhereis.1
diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index ac270dfda4de..83f6f785d322 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= ffi.2:${PORTSDIR}/devel/libffi
USE_XLIB= yes
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/lang/pnetc/Makefile b/lang/pnetc/Makefile
index b8cf785f2532..689138fb7357 100644
--- a/lang/pnetc/Makefile
+++ b/lang/pnetc/Makefile
@@ -17,7 +17,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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
STRIP= # Nothing to be stripped.
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 9392146d6753..805122fd8891 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= cscc:${PORTSDIR}/lang/pnet-base \
USE_XLIB= yes
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
STRIP= # Nothing to be stripped.
diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile
index 4bc693a16ea4..f785fbbbb619 100644
--- a/lang/tensile/Makefile
+++ b/lang/tensile/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= utils.1:${PORTSDIR}/lang/libutils \
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 31e163960240..f2361534310d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomeprint gnomevfs gtkhtml gnometarget
USE_OPENLDAP= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_OPENSSL= yes
LIBTOOLFILES= configure libmutt/configure
CONFIGURE_ARGS= --enable-threads \
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 718992cfc1a0..561740a6b35a 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -26,7 +26,7 @@ USE_PERL5= yes
USE_OPENSSL= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-threads \
--enable-gtkhtml \
--disable-more-warnings \
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 1b6206c2026c..04d30b0ef0e2 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack pkgconfig gtk12
USE_REINPLACE= yes
diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile
index 1b81b3a56547..eb3993889099 100644
--- a/mail/crashecho/Makefile
+++ b/mail/crashecho/Makefile
@@ -15,7 +15,7 @@ COMMENT= An FTN JAM and *.MSG tosser
LIB_DEPENDS= jam.2:${PORTSDIR}/mail/jamlib
-USE_LIBTOOL=yes
+USE_LIBTOOL_VER= 13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= crashecho.1 \
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 8a67999e0341..bca2c76dc363 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
USE_REINPLACE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
--with-cyrus-group=cyrus \
--with-sasldir=${LOCALBASE} \
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 0e1bb304095f..6edd19c71cf7 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/
MAINTAINER= rob@debank.tv
COMMENT= A server-side bayesian spam filter
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 0e1bb304095f..6edd19c71cf7 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/
MAINTAINER= rob@debank.tv
COMMENT= A server-side bayesian spam filter
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/mail/gmail/Makefile b/mail/gmail/Makefile
index 4d3349334a93..2fed4f46f8a6 100644
--- a/mail/gmail/Makefile
+++ b/mail/gmail/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
USE_X_PREFIX= YES
USE_GMAKE= YES
#USE_GNOME= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
BROKEN= project is dead and port unmaintained
DEPRECATED= ${BROKEN}
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 3a4cd71e2f30..7b7acc24652f 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_GNOME= glib12
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 75b3933e0eb3..52205975520b 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -19,8 +19,7 @@ USE_ICONV= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= glib20 lthack
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/mail/im/Makefile b/mail/im/Makefile
index fa8460cd5e0c..431dbc54ecfc 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= kiri@FreeBSD.org
COMMENT= Set of user interfaces of Email and NetNews
USE_PERL5= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${PREFIX}/etc
# If you use RPOP instead of APOP, comment out following line.
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index aa9d0f1e91c0..9a4fac9be0e2 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= cyrilm@tower.pp.ru
COMMENT= A JAM subroutine library
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
NO_INSTALL_MANPAGES= yes
INSTALLS_SHLIB= yes
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 5d8f2facdc90..2d3ad4f1f6cd 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index b5e042fffd8b..3a157cace8c7 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -18,7 +18,7 @@ COMMENT= A mail library
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_OPENSSL= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index 523c83729c3a..99ee1be8576d 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gnutls.13:${PORTSDIR}/security/gnutls \
USE_SIZE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 0b59857542da..7731c6b906bf 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
USE_REINPLACE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_OPENSSL= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 0eb76c4c92fb..5327698869e3 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -64,7 +64,7 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE= yes # configure.in is patched by <PATCHFILES>
+USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 0eb76c4c92fb..5327698869e3 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -64,7 +64,7 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE= yes # configure.in is patched by <PATCHFILES>
+USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 51258f35e3f1..9ea1802dc9a3 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -25,7 +25,7 @@ MAN8= perdition.8
MANCOMPRESSED= no
USE_GETTEXT= yes
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR}
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 65fc901e0bfd..50576ead9700 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN5= pop3lite.conf.5
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 4f7e39f35786..042114b8bbf6 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -28,7 +28,7 @@ PATCHFILES= qpopper4.0.5-ipv6-20030313.diff.gz
PATCH_DIST_STRIP= -p1
.endif
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
USE_SIZE= yes
GNU_CONFIGURE= yes
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 040866c72577..81a47236b195 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GTK= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-threads \
--prefix=${PREFIX}
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 1b6206c2026c..04d30b0ef0e2 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack pkgconfig gtk12
USE_REINPLACE= yes
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 2a3cb0ec45f8..0af27af307e4 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_OPENSSL= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 957c03bf8f2f..70a24e240fc0 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 957c03bf8f2f..70a24e240fc0 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 957c03bf8f2f..70a24e240fc0 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 957c03bf8f2f..70a24e240fc0 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -23,7 +23,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index c5c5e6eeb7ff..8a827a33a020 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= qt-3.*
USE_BZIP2= yes
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
USE_XPM= yes
INSTALLS_SHLIB= yes
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 0b079d9d102f..1caae0673d0b 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -19,8 +19,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_AUTOMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_AUTOMAKE_VER= 15
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari=new
diff --git a/math/cln/Makefile b/math/cln/Makefile
index ea9e48cca2e3..61680cdb35aa 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man \
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index a16aff6b3bd0..b0932029fea0 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
COMMENT= Fast C routines to compute the Discrete Fourier Transform
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 a16aff6b3bd0..b0932029fea0 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
COMMENT= Fast C routines to compute the Discrete Fourier Transform
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-shared
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 869b8748ebe3..23268874b494 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -17,7 +17,7 @@ COMMENT= Advanced graphic calculator
USE_KDELIBS_VER= 3
USE_GL= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 7d676b8490b7..4c5362e6f2b2 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack lthack intlhack libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 0d464bd32d4f..e96a0872578f 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -18,7 +18,7 @@ COMMENT= Visualise multiple 2D-functions of one variable
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
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 1f4e7cc7dc58..e085ce60b8f3 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -19,7 +19,7 @@ COMMENT= A free library for arbitrary precision arithmetic
CONFLICTS= libgmp-2*
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-cxx --enable-mpfr
INSTALLS_SHLIB= yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 620672e1914c..c792e12aac44 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -28,7 +28,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-evolution --without-guile
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 0534b610a62b..76d91ad7993d 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomedb \
libgsf
USE_PYTHON= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --without-guile --with-bonobo --with-gnome-db
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 67f12d27055d..efa0edbf007f 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= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} \
--includedir=${LOCALBASE}/include/ \
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index e0eaf2f6dd4f..fe3bd6d96614 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= The GNU Scientific Library - mathematical libs
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split'
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 8ffba480933d..f4e6cc826e2e 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_QT_VER= 3
USE_KDELIBS_VER=3
USE_GMAKE= yes
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index 1f4e7cc7dc58..e085ce60b8f3 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -19,7 +19,7 @@ COMMENT= A free library for arbitrary precision arithmetic
CONFLICTS= libgmp-2*
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-cxx --enable-mpfr
INSTALLS_SHLIB= yes
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index ab2b3f38358c..420893a956a8 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index 10f4330d7a5d..9c37368e32e5 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 04ce0abf19d5..931cf88c9d77 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/${LISPPORT} \
USE_XLIB= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-posix-shell=${LOCALBASE}/bin/bash \
--with-wish=${LOCALBASE}/bin/wish8.4 \
diff --git a/math/mtl/Makefile b/math/mtl/Makefile
index d1c244ac78ef..f679be2cee13 100644
--- a/math/mtl/Makefile
+++ b/math/mtl/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-2.1.2-21
MAINTAINER= ports@FreeBSD.org
COMMENT= The Matrix Template Library
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
NO_BUILD= yes
diff --git a/math/spar/Makefile b/math/spar/Makefile
index c78cc8c33561..e7fe94a63b61 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= spar.1
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 5650b024bab3..0cc5c92bed24 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= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
MAN1= rat.1
MANCOMPRESSED= no
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 2921e30dbbf5..97ca722aaf4a 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= yes
+USE_AUTOCONF_VER= 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 d4b597362111..e48f81d4beeb 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
WRKSRC= ${WRKDIR}/vic-2.8ucl-1.1.3/vic
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_PERL5_BUILD=yes
USE_X_PREFIX= yes
CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 7a355114cf89..ec7141aa6c15 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -33,8 +33,8 @@ RUN_DEPENDS+= wish8.3:${PORTSDIR}/x11-toolkits/tk83
.else
MAKE_ARGS+= NO_GUI=yes
.endif
-USE_AUTOCONF= yes
-USE_LIBTOOL= yes
+USE_AUTOCONF_VER= 213
+USE_LIBTOOL_VER= 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 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 8ea8a21e24fe..3f688977227c 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -22,7 +22,6 @@ SLAVEDIRS= misc/amanda-client
MASTERPORTNAME= amanda-server
NO_LATEST_LINK= yes
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
USE_GMAKE= yes
PATCH_STRIP=
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index 018755dd8a2a..d6c1017bc827 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A library for dealing with Microsoft ITSS/CHM format files
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= #
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 3abc674af2bb..e71ecd33f385 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_REINPLACE= yes
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index 3929fe1036e3..8af96880d7a7 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU diction and style
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
PLIST_FILES= bin/diction bin/style share/diction/C share/diction/de \
share/diction/en
diff --git a/misc/edonkey-tool-hash/Makefile b/misc/edonkey-tool-hash/Makefile
index 1f6b58ddc313..b83d57ae8a5b 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= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
GNU_CONFIGURE= yes
diff --git a/misc/libelysium/Makefile b/misc/libelysium/Makefile
index c9020871b37a..cea4151e7af3 100644
--- a/misc/libelysium/Makefile
+++ b/misc/libelysium/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library of utility functions used by several Elysium projects
USE_GNOME= glib12
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index e8b13b377ea8..1a16fedeab00 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -19,7 +19,7 @@ COMMENT= Modular Calendar Access Library
LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
HAS_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mstore --with-icap \
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 372eeebaf331..de9deda3f612 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index db3f7582553b..cc6327e7715b 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index a2de173158da..d87b6a23468c 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 33639d26661a..fbad4806674e 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 79948e938538..7419810d691d 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -15,7 +15,7 @@ COMMENT= Set of filters to convert English text to various stereotyped dialects
CONFLICTS= jive* chef*
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index e8aaad394851..ce3b2e57388a 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile
index 3bada47f7aac..38f67697d035 100644
--- a/multimedia/acme/Makefile
+++ b/multimedia/acme/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libwnck
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 06481ae80527..d740e29dcbf7 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= \
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 65e0cc1a2aa6..2c1aa7621c7c 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -23,7 +23,7 @@ USE_SUBMAKE= yes
USE_REINPLACE= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 069261bd55d7..f33b0a626db5 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -21,7 +21,7 @@ USE_ICONV= yes
WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index 119154d7d395..e14a0592add7 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack \
gconf2 \
libglade2 \
libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
CONFIGURE_ARGS= --program-transform-name=''
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG}
diff --git a/multimedia/gstreamer-player/Makefile b/multimedia/gstreamer-player/Makefile
index 4b3c122061c3..c4489081888a 100644
--- a/multimedia/gstreamer-player/Makefile
+++ b/multimedia/gstreamer-player/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack \
gnomeprefix \
gnomedesktop
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
GNOME_DESKTOP_VERSION=2
WANT_GNOME= yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index ccabcae35824..f7f3999f2537 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack \
gnomeprefix \
pkgconfig \
gconf2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
WANT_SDL= yes
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index ccabcae35824..f7f3999f2537 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack \
gnomeprefix \
pkgconfig \
gconf2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
WANT_SDL= yes
diff --git a/multimedia/libdivxdecore/Makefile b/multimedia/libdivxdecore/Makefile
index d4a0f0c9b0c8..c0a7656da846 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
INSTALLS_SHLIB= yes
PLIST_SUB= LIB_VERSION="${LIB_VERSION}"
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index d5b8d605f309..940215f20dc5 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gtk12
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 185bd9c0ef20..4f97f6f1f0fb 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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 8f812e0ccba3..429a559568b4 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-transform-name=''
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
post-patch:
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 963dca7bbfbb..1d0661dba304 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -16,7 +16,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= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 3c6dfa7b70da..4803dd7a57c0 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= fame
MAINTAINER= ports@FreeBSD.org
COMMENT= A video encoding library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.if defined(WITH_SSE)
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index ded6101b3ee2..347087100069 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams
USE_XLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 5eaaa23ed2a5..77c2acdafb3e 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
USE_GL= yes
USE_GNOME= gnometarget gtk12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 5029ccdb7d7c..be23cde7a8d5 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 4dcc0bd8bc47..a9748549145a 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 471c1e11cbc6..2a28dbb3e2aa 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm \
USE_GNOME= gtk20
USE_GMAKE= yes
USE_SDL= sdl
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
CONFIGURE_ARGS= --datadir=${DATADIR} \
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 5e28872e345f..429f5879d59e 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack lthack intlhack nautilus2 gstreamerplugins
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index 18b9dde6f4df..56d5eb47c1c2 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xine.9:${PORTSDIR}/multimedia/libxine
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gnomeprefix gnomevfs2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile
index aea0ec4aadda..6a714eafd186 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PYTHON= yes
USE_REINPLACE= yes
USE_SDL= image ttf
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 959a1e721da2..a0b504134a36 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 1777d75a7bf8..6f297bb5e749 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= yes
+USE_LIBTOOL_VER=13
USE_SDL= sdl
INSTALLS_SHLIB= yes
CONFIGURE_ENV= GLBASE="${X11BASE}" \
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index e8580fec7602..0548a9e76927 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 0e50f055eb23..1157f3a6df9e 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WANT_SDL= yes
MAN1= avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index d4b597362111..e48f81d4beeb 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
WRKSRC= ${WRKDIR}/vic-2.8ucl-1.1.3/vic
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_PERL5_BUILD=yes
USE_X_PREFIX= yes
CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 2135b10eb18c..18ec089fea0a 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 8673b73dea28..d38950bfb421 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_X_PREFIX= yes
USE_SIZE= yes
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 91db86df2209..9ff9c96bf441 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= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index 2318ddaef72b..eaeee88df8dc 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 399e504a3f6b..c8bee4d39475 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-gl
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index b6b632fa973a..b824feef2d9c 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -30,7 +30,7 @@ USE_OPENSSL= yes
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 148b870c3396..33c03819949d 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= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 1133926979d7..d451472481d7 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \
USE_OPENSSL= yes
USE_AUTOCONF_VER=213
USE_AUTOMAKE_VER=14
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index d803657f3923..87421701e138 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index d803657f3923..87421701e138 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 9fd959b96fe4..b2dd8d12793f 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= A library required by kicq (not libicq)
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_SIZE= yes
diff --git a/net-im/jabber-aim/Makefile b/net-im/jabber-aim/Makefile
index 800b501799fa..911f0a3db740 100644
--- a/net-im/jabber-aim/Makefile
+++ b/net-im/jabber-aim/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
PLIST_FILES= lib/jabber/aimtrans.so
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 31ca46a1f2a9..2a3b12c43d0a 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= flathill@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index 341a70ef2e8b..a5485be12ec3 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 4aab35df4c4e..70507b1d9289 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -26,6 +26,6 @@ RUN_DEPENDS=${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net/licq-qt-gui
GNU_CONFIGURE=yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv"
-USE_LIBTOOL=yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 4412e40dd521..bef23628c623 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack glib20
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/net-mgmt/NeTraMet/Makefile b/net-mgmt/NeTraMet/Makefile
index 67b1b5cffe9b..eaf9e3aa59a8 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= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
.if defined(WITH_MOTIF)
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 643f0a65f201..8717b706bb7a 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -17,7 +17,7 @@ COMMENT= A graphical network traffic visualization tool for gnome
USE_GETTEXT= yes
USE_GNOME= libglade2 libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 9844131766f8..0776ee3b1c89 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= yes
+USE_LIBTOOL_VER=13
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin
diff --git a/net-mgmt/libsmi/Makefile b/net-mgmt/libsmi/Makefile
index 10b99a8a031b..9adeef4dd8f5 100644
--- a/net-mgmt/libsmi/Makefile
+++ b/net-mgmt/libsmi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
MAINTAINER= saper@system.pl
COMMENT= A library to access SMI MIB information
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GMAKE= yes
MIBDIR= ${PREFIX}/share/smi/mibs
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 043cc768075a..df4ba92bfbfe 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/cgi-bin \
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
MKDIR="${MKDIR}"
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 776e47aa4640..48bd1fa8ecd9 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} --disable-html
USE_OPENSSL= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= nefu.1
MAN4= nefu.conf.4
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 01b2b06ee171..58b18a063cdd 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -30,7 +30,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
USE_REINPLACE= yes
USE_AUTOCONF_VER=257
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_RC_SUBR= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 01b2b06ee171..58b18a063cdd 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -30,7 +30,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
USE_REINPLACE= yes
USE_AUTOCONF_VER=257
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_RC_SUBR= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 7964a2c79a1b..5896669db34b 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -21,7 +21,7 @@ COMMENT= An extendable SNMP implementation
USE_AUTOCONF_VER=213
USE_REINPLACE= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_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 01b2b06ee171..58b18a063cdd 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -30,7 +30,7 @@ RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
USE_REINPLACE= yes
USE_AUTOCONF_VER=257
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_RC_SUBR= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/netsaint-plugins/Makefile b/net-mgmt/netsaint-plugins/Makefile
index cd67ead0821d..4046b6b9731c 100644
--- a/net-mgmt/netsaint-plugins/Makefile
+++ b/net-mgmt/netsaint-plugins/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/share/netsaint/sbin \
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
MKDIR="${MKDIR}"
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_GMAKE= yes
pre-fetch:
diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile
index bf9fa6942ef1..060e5df3c239 100644
--- a/net-p2p/cdonkey/Makefile
+++ b/net-p2p/cdonkey/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 0086d6842380..ad237331c79f 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile
index 1f6b58ddc313..b83d57ae8a5b 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= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/fcptools/Makefile b/net-p2p/fcptools/Makefile
index c1276076c66f..e86750f331b7 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME:L}
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 6fda7510d9c5..ea7e4903dc82 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
USE_GETTEXT= yes
USE_SIZE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index c93d58a51175..5ff227f05cca 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet
INSTALLS_SHLIB= yes
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 91b5b147360d..40924cbcae1f 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.maxmind.com/download/geoip/api/c/
MAINTAINER= seanc@FreeBSD.org
COMMENT= Find the country that any IP address or hostname originates from
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-gnu-ld=yes
INSTALLS_SHLIB= yes
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile
index 3d7ac199ccab..54a803ecb2fc 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index b6b632fa973a..b824feef2d9c 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -30,7 +30,7 @@ USE_OPENSSL= yes
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # none
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter
diff --git a/net/cdonkey/Makefile b/net/cdonkey/Makefile
index bf9fa6942ef1..060e5df3c239 100644
--- a/net/cdonkey/Makefile
+++ b/net/cdonkey/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index c840a64695c8..5c5a7d048b0e 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --enable-compile-warnings=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index 0086d6842380..ad237331c79f 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 8f6beffbd789..aa22e24c70f0 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -23,7 +23,7 @@ MAN8= dictd.8
USE_REINPLACE= yes
USE_BISON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 4889033828b7..924a92081388 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtktest
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure epan/configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/fcptools/Makefile b/net/fcptools/Makefile
index c1276076c66f..e86750f331b7 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME:L}
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index d0249d3bf2e9..3830cdf7e5f2 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -23,7 +23,7 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_LIBTOOL= 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 d0249d3bf2e9..3830cdf7e5f2 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -23,7 +23,7 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
--localstatedir=/var \
--disable-ltdl-install \
diff --git a/net/fugu/Makefile b/net/fugu/Makefile
index 148b870c3396..33c03819949d 100644
--- a/net/fugu/Makefile
+++ b/net/fugu/Makefile
@@ -19,7 +19,7 @@ USE_OPENSSL= yes
USE_PYTHON= yes
USE_XLIB= yes
USE_X_PREFIX= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 2d580cfce893..f1f753a7a5bb 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget libglade gal
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure jabberoo/configure
CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/gale/Makefile b/net/gale/Makefile
index 1133926979d7..d451472481d7 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \
USE_OPENSSL= yes
USE_AUTOCONF_VER=213
USE_AUTOMAKE_VER=14
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index b4f130073c9f..8f0cb80cc62a 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-glib2
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index e630787bbdad..97da2dcd7cbb 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= gnet-config.1
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 54f84b4f4f20..5da600993294 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A simple network library built upon Glib-2
USE_GNOME= gnomehack glib20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 28ae03278807..2938e741bd35 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index d399e0ecde72..f84e3f4e6f10 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index d803657f3923..87421701e138 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index d803657f3923..87421701e138 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
index 28ae03278807..2938e741bd35 100644
--- a/net/gnomenetstatus/Makefile
+++ b/net/gnomenetstatus/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile
index d399e0ecde72..f84e3f4e6f10 100644
--- a/net/gnomenettool/Makefile
+++ b/net/gnomenettool/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnomenetwork/Makefile b/net/gnomenetwork/Makefile
index d399e0ecde72..f84e3f4e6f10 100644
--- a/net/gnomenetwork/Makefile
+++ b/net/gnomenetwork/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index eff8515481fd..15a6e6ca29a3 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 6fda7510d9c5..ea7e4903dc82 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
USE_GETTEXT= yes
USE_SIZE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index 4c8486d9c0bc..b68b23b8b4b6 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C library for writing servers
USE_GNOME= glib12
USE_GMAKE= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.if !defined(WITHOUT_OPENSSL)
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 1b2dc7a195fd..a68e760c9aea 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -16,7 +16,7 @@ COMMENT= Zeroconf/Rendezvous implementation
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index 9fd959b96fe4..b2dd8d12793f 100644
--- a/net/icqlib/Makefile
+++ b/net/icqlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= A library required by kicq (not libicq)
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_SIZE= yes
diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile
index d4727d04e3f9..2aba5e29f08e 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= Old branch 0.x.x of library required by kicq (used by icqmail)
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/net/jabber-aim/Makefile b/net/jabber-aim/Makefile
index 800b501799fa..911f0a3db740 100644
--- a/net/jabber-aim/Makefile
+++ b/net/jabber-aim/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
PLIST_FILES= lib/jabber/aimtrans.so
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber
diff --git a/net/kopete/Makefile b/net/kopete/Makefile
index 2ca2b03c479a..96011fa57a6c 100644
--- a/net/kopete/Makefile
+++ b/net/kopete/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-lcrypto"
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index c93d58a51175..5ff227f05cca 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet
INSTALLS_SHLIB= yes
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 31ca46a1f2a9..2a3b12c43d0a 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= flathill@FreeBSD.org
COMMENT= Library to add ICQ communication support to your software
USE_GNOME= glib12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/net/libicq2000/Makefile b/net/libicq2000/Makefile
index 341a70ef2e8b..a5485be12ec3 100644
--- a/net/libicq2000/Makefile
+++ b/net/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
USE_SIZE= yes
INSTALLS_SHLIB= yes
diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 1085bf455100..1e2c60b510bb 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -16,7 +16,7 @@ COMMENT= A C library for creating IP packets
CONFLICTS= libnet-devel-1.1.*
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION}
MAN3= libnet.3
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 1085bf455100..1e2c60b510bb 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -16,7 +16,7 @@ COMMENT= A C library for creating IP packets
CONFLICTS= libnet-devel-1.1.*
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION}
MAN3= libnet.3
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index f9379e0f6261..2cc582a90630 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_MYSQL= yes
.include <bsd.port.pre.mk>
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index eb773d3c129e..4458ee6e8397 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= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index d2fce7459548..831bf3c5ab31 100644
--- a/net/libosip2/Makefile
+++ b/net/libosip2/Makefile
@@ -16,7 +16,7 @@ COMMENT= A low layer of SIP implementation
USE_GNOME= gnometarget lthack
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ARGS= --disable-debug --disable-trace
INSTALLS_SHLIB= yes
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 00d06eae4aec..3c24ee750a2c 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -18,7 +18,7 @@ COMMENT= A C++ wrapper library to the sockets
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_AUTOMAKE_VER= 15
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INFO= socket++
diff --git a/net/licq-osd/Makefile b/net/licq-osd/Makefile
index 4aab35df4c4e..70507b1d9289 100644
--- a/net/licq-osd/Makefile
+++ b/net/licq-osd/Makefile
@@ -26,6 +26,6 @@ RUN_DEPENDS=${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net/licq-qt-gui
GNU_CONFIGURE=yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv"
-USE_LIBTOOL=yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/net/linc/Makefile b/net/linc/Makefile
index f36ac780800e..4d4f2282167e 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/loudmouth/Makefile b/net/loudmouth/Makefile
index 4412e40dd521..bef23628c623 100644
--- a/net/loudmouth/Makefile
+++ b/net/loudmouth/Makefile
@@ -17,7 +17,7 @@ COMMENT= Lightweight Jabber client library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack glib20
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index 0bbd431000f9..f118a93fb6fb 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= yes
+USE_AUTOCONF_VER= 213
MAN8= mrtd.8
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 540be173f035..7fe1f2cc5a7e 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
USE_GETTEXT= yes
USE_REINPLACE= yes
USE_GNOME= glib12 gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lltdl"
USE_GMAKE= yes
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 960643baa5cc..c2d07ed33948 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 63b6a8ce0231..37e28c1e32e4 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
PLIST_SUB+= DBDIR=${DBDIR} \
SHLIB=${PORTVERSION:S/.p/pre/}
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index 90e5181aa32f..13da886c7321 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -33,7 +33,7 @@ FORBIDDEN= ancient, unsupported, potential security issues
DEPRECATED= ${FORBIDDEN}
EXPIRATION_DATE= 2004-04-18
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --localstatedir=/var/db \
--enable-shared \
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 64ba111dff4c..40657a78f940 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
INSTALLS_SHLIB= yes
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index 4c4a77117779..b6fb4d336528 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -18,7 +18,7 @@ COMMENT= An abstraction library for the Unix socket API
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN3+= sa.3
diff --git a/net/papaya/Makefile b/net/papaya/Makefile
index 8ecdaa350cb4..5997fcd7ff82 100644
--- a/net/papaya/Makefile
+++ b/net/papaya/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk20
WANT_GNOME= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_PERL5_BUILD=yes
USE_PYTHON= yes
USE_X_PREFIX= yes
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index 407cab9aa301..8f0c75a4e564 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -39,7 +39,7 @@ RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
USE_PERL5_BUILD=yes
USE_XPM= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
.if defined(WITH_TCLJP)
CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \
--with-wish=${PREFIX}/bin/wish8.0jp \
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index d238d04f2aec..3b665a1501c9 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -20,7 +20,7 @@ COMMENT= A C++-Library for PVM
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \
--with-pvm-libs=${LOCALBASE}/lib
INSTALLS_SHLIB= yes
diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile
index 1a57ce42cd08..9f24cce7dcc8 100644
--- a/net/radiusclient/Makefile
+++ b/net/radiusclient/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= maurice@castro.aus.net
COMMENT= Client library and basic utilities for Radius authenticated login
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index fec226407f7b..c1f5d395df9c 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -16,7 +16,7 @@ COMMENT= Round Robin Database Tools
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ENV= PERL=${PERL}
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index fec226407f7b..c1f5d395df9c 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -16,7 +16,7 @@ COMMENT= Round Robin Database Tools
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ENV= PERL=${PERL}
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c21a90ac1cc0..76bd84b27dca 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -29,8 +29,8 @@ CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.*
USE_BZIP2= YES
USE_SUBMAKE= YES
USE_GMAKE= YES
-USE_LIBTOOL= YES
-USE_AUTOCONF= YES
+USE_LIBTOOL_VER=13
+USE_AUTOCONF_VER= 213
# directories
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 79884cd7b24c..6b27bf3a45b7 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 6d8dcd965894..201a297c3acc 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -25,7 +25,7 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile
index f52eda4ae75c..f164f4e642f9 100644
--- a/net/ssldump/Makefile
+++ b/net/ssldump/Makefile
@@ -18,7 +18,7 @@ USE_OPENSSL= YES
.include <bsd.port.pre.mk>
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= YES
USE_GMAKE= YES
CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} \
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 08078a067b0c..db12cebe74d4 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= 5250 Telnet protocol and Terminal
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-os-dir=no
INSTALLS_SHLIB= yes
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 4889033828b7..924a92081388 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtktest
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure epan/configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 588a71886c40..eeebea92bfb1 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 588a71886c40..eeebea92bfb1 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 2dd826215214..d4562c780181 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= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure libmutt/configure
CONFIGURE_ENV= glibpath="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/news/newsfish/Makefile b/news/newsfish/Makefile
index b983e0cc3d65..ea1b174f18ea 100644
--- a/news/newsfish/Makefile
+++ b/news/newsfish/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://download.sourceforge.net/newsfish/ \
MAINTAINER= asaddi@philosophysw.com
COMMENT= Batch USENET news reader with filter capabilities
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_GMAKE= yes
MAN1= newsfish.1
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index 4d3c70fd58da..a35cf2a00e6b 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -20,7 +20,7 @@ COMMENT= I18N Gnus using SEMI, which provides MIME capabilities
BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
HAS_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 728d15d54622..afbb535451b1 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= yes
+USE_LIBTOOL_VER=13
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 a307e723d051..28b31db57763 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
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 728d15d54622..afbb535451b1 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= yes
+USE_LIBTOOL_VER=13
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 a307e723d051..28b31db57763 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
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index acbde52bb3cf..520dfbfd2aaf 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-gtk2=yes
USE_GNOME= gtk12
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins
CFLAGS+= -I${PREFIX}/include
diff --git a/palm/libmal/Makefile b/palm/libmal/Makefile
index 655a8d0454d6..997884339249 100644
--- a/palm/libmal/Makefile
+++ b/palm/libmal/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library encapsulating malsync
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
USE_GMAKE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
HAS_CONFIGURE= YES
INSTALLS_SHLIB= libmal
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 076825c88ef2..da5a2992a2a1 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
USE_GETOPT_LONG=yes
USE_BZIP2= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_PERL5= yes
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 076825c88ef2..da5a2992a2a1 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
USE_GETOPT_LONG=yes
USE_BZIP2= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_PERL5= yes
diff --git a/palm/rapip/Makefile b/palm/rapip/Makefile
index d8fcec1ebe6d..09edd5fb2900 100644
--- a/palm/rapip/Makefile
+++ b/palm/rapip/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+= synce-serial-start:${PORTSDIR}/palm/synce-serial \
USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index a8605708500b..aa1a60259103 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index a8605708500b..aa1a60259103 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index d8fcec1ebe6d..09edd5fb2900 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+= synce-serial-start:${PORTSDIR}/palm/synce-serial \
USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 43cb209b2414..7f2e21d98f95 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386
MAN1= pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 synce-install-cab.1 synce-remove-program.1 synce-list-programs.1
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 cb09c001c3f6..f4431269b40a 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
MAN1= synce-matchmaker.1
USE_ICONV= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 e2b3857bbd74..41a66750a537 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
MAN1= synce.1
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
diff --git a/palm/synce-rra/Makefile b/palm/synce-rra/Makefile
index cb09c001c3f6..f4431269b40a 100644
--- a/palm/synce-rra/Makefile
+++ b/palm/synce-rra/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
MAN1= synce-matchmaker.1
USE_ICONV= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE}
diff --git a/picobsd/ssh-picobsd/Makefile b/picobsd/ssh-picobsd/Makefile
index b4e72eff528c..df4d2e8d3768 100644
--- a/picobsd/ssh-picobsd/Makefile
+++ b/picobsd/ssh-picobsd/Makefile
@@ -23,7 +23,7 @@ COMMENT= Secure shell client, server and remote copy (for picobsd)
NO_CDROM= "Picobsd only"
NO_PACKAGE= "This is only useful to build picobsd images"
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= YES
USE_PERL5= YES
CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index a0bab5c5a4ca..2e927dad37ef 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WANT_GNOME= yes
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 9173637f61e9..248bb77f9115 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}-${DIST_VER}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= pfaedit.1 sfddiff.1
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index d4c6fa2afef1..a2c1df69cb81 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
NO_CHECKSUM= yes # the tarball is created on the fly from CVS
CONFIGURE_ARGS= --prefix=${PREFIX}
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index c561d6ef65cd..0bb7a3ce270a 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 03af85a41dfd..281af9bf6e43 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= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnometarget
USE_REINPLACE= yes
LIBTOOLFILES= builds/unix/configure
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 546105244517..0ccf09054aa4 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gimp=no
INSTALLS_SHLIB= yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 24e27938dfe0..d534c849f669 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index 37f7727d1ccf..e695678fa96e 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -19,6 +19,6 @@ 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= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 24e27938dfe0..d534c849f669 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 546105244517..0ccf09054aa4 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= yes
+USE_LIBTOOL_VER=13
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 546105244517..0ccf09054aa4 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= yes
+USE_LIBTOOL_VER=13
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 abfc2ddc25f3..64043c1203a8 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 1c13e92efcc1..f8cb51cd89aa 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprint20/Makefile b/print/libgnomeprint20/Makefile
index 9b9429193a0f..cf24850f512d 100644
--- a/print/libgnomeprint20/Makefile
+++ b/print/libgnomeprint20/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index 5cdd713f0e41..ff0267b7e2cf 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= ijs-config.1
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index c110da3cc89b..d4b55e22b55f 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= lofi@freebsd.org
COMMENT= A library providing routines for paper size management
-USE_LIBTOOL= Yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # None, we want the libtool archives
INSTALLS_SHLIB= Yes
USE_GETOPT_LONG=Yes
diff --git a/print/libpdf++/Makefile b/print/libpdf++/Makefile
index c9da6b77181f..6bb1918f1b3e 100644
--- a/print/libpdf++/Makefile
+++ b/print/libpdf++/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.9:${PORTSDIR}/graphics/jpeg
RUN_DEPENDS= ${LOCALBASE}/include/boost/any.hpp:${PORTSDIR}/devel/boost
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 6572c58ef407..56d51dd60e53 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 6572c58ef407..56d51dd60e53 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 6572c58ef407..56d51dd60e53 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 6572c58ef407..56d51dd60e53 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 6572c58ef407..56d51dd60e53 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -29,7 +29,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/print/panda/Makefile b/print/panda/Makefile
index b685d86fbf33..b36a65f1beb1 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 47c70d97a5df..68a263fe7907 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -19,7 +19,7 @@ RESTRICTED= "many odd restrictions on usage and distribution"
LATEST_LINK?= ${PORTNAME}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= lthack
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/print/pfaedit/Makefile b/print/pfaedit/Makefile
index 9173637f61e9..248bb77f9115 100644
--- a/print/pfaedit/Makefile
+++ b/print/pfaedit/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}-${DIST_VER}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= pfaedit.1 sfddiff.1
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 99fb7ae35b87..e809e6d9480a 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index f942e742037a..a815386af72d 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= transfig:${PORTSDIR}/print/transfig
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-gtk2/
USE_REINPLACE= yes
USE_GTK= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-emf=yes
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 1d651bee3a05..fd5861bf85aa 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= yes
+USE_LIBTOOL_VER=13
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 97a1e7a84a5c..fd9314d63f89 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libgnomeprintui libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 016d698a0284..386255877b91 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libglade2 libgnomeprint libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 6ff7b1ea4960..84ef2c8d1a62 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -26,7 +26,6 @@ USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mpqc
-USE_AUTOCONF= yes
USE_AUTOCONF_VER= 253
pre-configure:
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 9b834179b3dd..63f5db57d87a 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -18,7 +18,7 @@ COMMENT= Hierarchical Data Format library (from NCSA)
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 9b834179b3dd..63f5db57d87a 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -18,7 +18,7 @@ COMMENT= Hierarchical Data Format library (from NCSA)
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure c++/configure
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-cxx --enable-production \
diff --git a/science/xloops-ginac/Makefile b/science/xloops-ginac/Makefile
index c314a2cef7d9..8e78aec1be96 100644
--- a/science/xloops-ginac/Makefile
+++ b/science/xloops-ginac/Makefile
@@ -19,7 +19,7 @@ COMMENT= A program calculating Feynman diagrams
LIB_DEPENDS= ginac-1.1.6:${PORTSDIR}/math/GiNaC
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 84d68cadfc58..f12784867802 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -19,7 +19,7 @@ COMMENT= BeeCrypt is an open source cryptography library
USE_SIZE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
post-patch:
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 298e42ccaa11..a6d0f6f3a278 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -21,7 +21,7 @@ USE_PERL5= yes
INSTALL_TARGET= install certificate
.endif
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 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 29cf0280a273..f84a398e174b 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index f5b7fe312020..5fe6dca7c31d 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_AUTOCONF_VER=257
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-dbdir=${DATADIR} \
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index ba16c3dd3c82..cfa2a08880c1 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT= A collection of plug-ins to cryptographic engines
BUILD_DEPENDS= gpgme-config:${PORTSDIR}/security/gpgme \
gpg-agent:${PORTSDIR}/security/newpg
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 4a0b1ec9b368..9b0780dfc78b 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -49,7 +49,7 @@ MAN8= sasldblistusers.8 saslpasswd.8 saslauthd1.8
USE_RC_SUBR= YES
USE_AUTOMAKE_VER=14
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
AUTOMAKE_ARGS= --add-missing --include-deps
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 9ce989370dfa..e9af4effc172 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
USE_OPENLDAP= yes
USE_GETOPT_LONG=yes
USE_AUTOMAKE_VER= 15
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
USE_GNOME= glib12 gtk12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
USE_GNOME= glib12 gtk12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
USE_GNOME= glib12 gtk12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 7343f49297ba..e316e0b5ec9e 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
dirmngr:${PORTSDIR}/security/dirmngr
USE_AUTOCONF_VER=253
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 07b474860ce2..49bc1e8f7558 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= gnutls-[0-9]*
USE_ICONV= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 8f8c576c9d71..a9f0e8e3735b 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -28,7 +28,7 @@ CONFLICTS= gnutls-devel-*
SIG_SUFFIX= .sig.asc
USE_ICONV= yes
USE_GETTEXT= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 535ddb0c63f5..ec9c8dbfd652 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library to make access to GnuPG easier
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 535ddb0c63f5..ec9c8dbfd652 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library to make access to GnuPG easier
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f56e9c7e81d1..a2be63690f36 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_OPENSSL= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GNOME= glib12
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libgcrypt-devel/Makefile b/security/libgcrypt-devel/Makefile
index bd8e3084263d..b021d44f903b 100644
--- a/security/libgcrypt-devel/Makefile
+++ b/security/libgcrypt-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= libgcrypt-1.1*
USE_REINPLACE= yes
USE_PERL5= yes
USE_GNOME= lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" \
CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include/pth" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/pth"
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index d788372a09e2..ccb001a68ff0 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -18,7 +18,7 @@ COMMENT= "General purpose crypto library based on code used in GnuPG"
CONFLICTS= libgcrypt-1.1.9*
USE_REINPLACE= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 81ae55dd6441..3881e86f0bf4 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= sergei@FreeBSD.org
COMMENT= Common error values for all GnuPG components
USE_GPG= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 37a86bbc3e6c..5f79bf6cd450 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= yes
+USE_LIBTOOL_VER=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 b2ed029caab9..f8fc1ce5d091 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN3= ident.3
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 66097f0ada37..d25f69d6d61b 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= arved@FreeBSD.org
COMMENT= "KSBA is an X.509 Library"
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 3160b50b3537..cd75d34c5cb1 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
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 15187322af65..014f6e751529 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -14,7 +14,7 @@ COMMENT= Prelude Network Intrusion Detection System librairies
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc \
--program-prefix="" --localstatedir=/var
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index e9e3b62e8008..3c7a310c0cfe 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= alpha/gnutls/libtasn1
MAINTAINER= sergei@FreeBSD.org
COMMENT= ASN.1 structure parser library
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GETOPT_LONG= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 9d1a3ceb5a61..93b5c20ea12a 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= roam@FreeBSD.org
COMMENT= "Library provides an easy way to access strong hashes such as MD5 and SHA1"
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \
--with-gnu-ld
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index bc7fbc8d23ce..3eed2734ce6b 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= nasl.2:${PORTSDIR}/security/nessus-libnasl-devel
DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-core
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WANT_GNOME= yes
.include <bsd.port.pre.mk>
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index c2ba873159a1..7e9e95e47963 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -23,7 +23,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/libnasl
USE_BISON= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= YES
MAN1= nasl.1 nasl-config.1
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index af3d0c6be80c..4b6ed06445c9 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= YES
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --sharedstatedir=${PREFIX}/etc/nessus/com \
--localstatedir=${PREFIX}/etc/nessus/var
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 9a27abe41ec2..f31f5e7367a8 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -24,7 +24,7 @@ DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-libraries
USE_BISON= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=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 9ed738b438b7..294565adef39 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= YES
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-cipher --sharedstatedir=${PREFIX}/etc/nessus/com \
--localstatedir=${PREFIX}/etc/nessus/var
.if defined(WITH_NESSUS_BPF_SHARE)
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 1e0ae59d1c45..e582c5cc1457 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= nasl.2:${PORTSDIR}/security/nessus-libnasl
DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-core
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WANT_GNOME= yes
.include <bsd.port.pre.mk>
diff --git a/security/newpg/Makefile b/security/newpg/Makefile
index 7343f49297ba..e316e0b5ec9e 100644
--- a/security/newpg/Makefile
+++ b/security/newpg/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
dirmngr:${PORTSDIR}/security/dirmngr
USE_AUTOCONF_VER=253
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 62b4d10e45b6..64f00a34ffe1 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -20,7 +20,7 @@ COMMENT= Open Crypto Development Kit
LIB_DEPENDS= gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/opensc-esteid/Makefile b/security/opensc-esteid/Makefile
index 179d9e8b0e31..2c9226fa2229 100644
--- a/security/opensc-esteid/Makefile
+++ b/security/opensc-esteid/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= pcsclite.0:${PORTSDIR}/devel/pcsc-lite
USE_OPENLDAP_VER= 20
INSTALLS_SHLIB= yes
USE_OPENSSL= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pcsclite=${LOCALBASE} \
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 3df095ce13db..028fa300bdd1 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} \
NO_CDROM= This software can not be sold.
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index ea9578710dff..f157e45e1c7a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \
USE_GETOPT_LONG=yes
USE_AUTOMAKE_VER= 15
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/security/poc/Makefile b/security/poc/Makefile
index e69622f56782..46a81ddb3c87 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= towitoko.2:${PORTSDIR}/devel/towitoko
PLIST_FILES= bin/poc
USE_GETOPT_LONG=yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 3b88bb075aab..6159154ea8c9 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+= prelude.1:${PORTSDIR}/security/libprelude \
pcre.0:${PORTSDIR}/devel/pcre
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc \
--program-prefix=""
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index ededf6bb7898..1d3d7f0d4683 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -16,7 +16,7 @@ COMMENT= Prelude Network Intrusion Detection System sensor
LIB_DEPENDS= prelude.1:${PORTSDIR}/security/libprelude
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-html-dir=${PREFIX}/share/doc \
--program-prefix=""
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 44fde7d6350d..642a137b38db 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix eel2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/security/srm/Makefile b/security/srm/Makefile
index 3e49b85b3f92..cf7d6e94f511 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= srm
MAINTAINER= kjones@antihackertoolkit.com
COMMENT= Secure rm, a utility which destroys file contents before unlinking
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
MAN1= srm.1
PLIST_FILES= bin/srm
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 594fefaf6fe7..97b5713687e5 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Secure shell client and server (remote login program)
CONFLICTS= openssh-* openssh-portable-* openssh-gssapi-* ssh2-3.*
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= YES
USE_PERL5= YES
CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 357b8f8a2eb6..0ff8e42c836d 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= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
USE_GCC= 3.3
CONFIGURE_TARGET=
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 04267d80faa0..208c51c2a1db 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 91b073c3a999..654b5cf54784 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= yes
+USE_LIBTOOL_VER=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 85c4468fcdbd..c3e0e631acdf 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= \
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index 663e9f02ed93..f4afed983fc7 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gnomeprefix gnomepanel
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 1501b4d5ace7..4d6800b58e16 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ebrandi@fugspbr.org
COMMENT= DAR is a full featured command-line backup tool, aimed for disks
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
.include <bsd.port.mk>
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 772d33dd7f04..e8328ca9d9af 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GCC= 3.3
PATCH_STRIP= -p1
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
USE_GMAKE= yes
INSTALL_TARGET= install install-libs
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index 0921229e6f28..2e704710acea 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -19,7 +19,7 @@ COMMENT= Fcron is a periodical command scheduler
NO_PACKAGE= "Runaway package build"
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_PERL5= yes
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--with-rootname=root --with-rootgroup=wheel \
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index bd64926e59fa..3527d2543f5e 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= File - determine file type
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-fsect-man5
MAN1= file.1
MAN3= libmagic.3
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 0a2f140633e0..eb887a97300c 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -29,7 +29,7 @@ LDFLAGS= -L${LOCALBASE}/lib
.if !defined (WITHOUT_GMETAD)
CONFIGURE_ARGS+= --with-gmetad
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.if defined (WITHOUT_GMETAD)
PLIST_SUB+= GMETAD="@comment "
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 8a15e07eb955..f671b006eadb 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gconf2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index c1d9d69a3d8b..3d6daaad76d3 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 78df2fb03ff9..24082cb98839 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libwnck
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 78df2fb03ff9..24082cb98839 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libwnck
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index fca76c792d63..f505f3fb5659 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index fca76c792d63..f505f3fb5659 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-k3bsetup=no
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index e6b0b75c27b1..9e0a6b3cd2c9 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -17,7 +17,7 @@ USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
post-patch:
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 430b67bd6319..f2f68f798864 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack nautilus2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/sjog/Makefile b/sysutils/sjog/Makefile
index 98b66101b9b3..bab7248dc2de 100644
--- a/sysutils/sjog/Makefile
+++ b/sysutils/sjog/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Userland daemon for Sony Vaio Jog Dial
ONLY_FOR_ARCHS= i386
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 88801a5434a4..0b65a755b75a 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -26,7 +26,7 @@ NOT_FOR_ARCHS= sparc64 alpha
USE_GNOME= gtk20
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 0b931107ae24..1ee43d4dea32 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index b2f89957942d..988f90e3759c 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= yes
+USE_LIBTOOL_VER=13
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 351b2e4739ac..057d0cbaff67 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-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= yes
+USE_LIBTOOL_VER=13
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 6bf65a57b516..d4857add6103 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 2c529f8fa80a..edf510849a5c 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 40bc5f24a30c..934eedcd496d 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 4369c95e7795..994e67b6970c 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -21,7 +21,7 @@ COMMENT?= Spelling checker with better suggestion logic than ispell
BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \
--enable-doc-dir=${DOCSDIR}
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index d140f0f0db23..92bd7fe90050 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= yes
+USE_AUTOCONF_VER= 213
MAN1= c2html.1
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 8f4705738b31..15042dc8ef2c 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/textproc/dico/Makefile b/textproc/dico/Makefile
index 556de2020c25..b83af49b3b3e 100644
--- a/textproc/dico/Makefile
+++ b/textproc/dico/Makefile
@@ -28,7 +28,7 @@ USE_REINPLACE= true
USE_ZIP= true
EXTRACT_CMD= UNZIP= unzip
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE= true
+USE_AUTOMAKE_VER= 14
USE_GMAKE= true
AUTOMAKE_ARGS= --add-missing --foreign --include-deps
MAKE_ARGS= prefix=${PREFIX}
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index ad35d5bbf802..02ea353cb236 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Dictionary/spellchecking framework
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget glib20 lthack
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 6ce12a6430bb..b5597d04249f 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
ALL_TARGET= default
INSTALLS_SHLIB= yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 6a180ca4f159..7622c1a40c1f 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 60409dcbbd44..98dde8ae2724 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 libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 60409dcbbd44..98dde8ae2724 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 libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 d72768998574..f391766f1e15 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index d72768998574..f391766f1e15 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 454a1e5466f6..153f5b0144a4 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -21,7 +21,7 @@ COMMENT= An object-oriented SGML/XML parser toolkit and DSSSL engine
RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 1e609b99efd1..83c2e4f1792c 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= yes
+USE_AUTOCONF_VER= 213
MAN1= java2html.1
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
index 2d02a275ea1f..c82e023cde31 100644
--- a/textproc/latte/Makefile
+++ b/textproc/latte/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.latte.org/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple language for marking up text in a very expressive way
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAKE_FLAGS= CONF_ARGS="--prefix=${PREFIX}"
CONFIGURE_ARGS+= --enable-shared
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 455fe9d32929..9f84b635c114 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -17,7 +17,7 @@ COMMENT= CSS2 parsing library
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gtk20 libxml2
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 1aecefdd2c0f..fb9760f523a8 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_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
.if defined(WITH_COMP)
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index a89325379dd9..1ae22016aba0 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 lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 1e7f7a4b691a..0fcb24243137 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight XML Parser
USE_GNOME= gnometarget lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 1d15a0f8b5d9..2b6cb337008c 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= yes
+USE_LIBTOOL_VER=13
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 1000e788b2e0..7298419d52ff 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -19,7 +19,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig lthack
USE_GETOPT_LONG= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index a667a9dbf373..fe2e1e8cf387 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= reed@pugetsoundtechnology.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= libgsf
INSTALLS_SHLIB= yes
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index a667a9dbf373..fe2e1e8cf387 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= reed@pugetsoundtechnology.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= libgsf
INSTALLS_SHLIB= yes
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 5c16f30e3937..c489792737a0 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 lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 5c16f30e3937..c489792737a0 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= bland@FreeBSD.org
COMMENT= XML API for C++
USE_GNOME= gnomehack lthack gnometarget libxml2 pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index f4870e3fd2f3..4c9f855803cd 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
pre-patch:
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 8896b45ad82c..7e63153a07b6 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,7 +18,7 @@ COMMENT= An XML library which wraps expat
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index ba3a9950ba24..2ca3436459da 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget libxml2
USE_REINPLACE= yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index b6105c667971..ebcbc06a375c 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ library to build and query a full text inverted index
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--without-unac
INSTALLS_SHLIB= yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index eb4cd87a46fe..af517f86c534 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
USE_REINPLACE= yes
USE_GNOME= glib12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 0a291116b85c..920579d49b1f 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -33,7 +33,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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
#LIBTOOLFLAGS= --disable-ltlibs --release-suffix
USE_REINPLACE= yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 43c58f58056f..c1e0da086abb 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_LIBTOOL= YES
+USE_LIBTOOL_VER=13
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 54ce978a95a9..730700788737 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GETTEXT= yes
USE_GMAKE= YES
USE_REINPLACE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
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 68d55b484f3a..26413ffe9af8 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= yes
+USE_AUTOCONF_VER= 213
MAN1= perl2html.1
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 9937319072e5..87bfc5eb4e82 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl \
USE_GETOPT_LONG= yes
USE_GNOME= glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
--with-curl-config=${LOCALBASE}/bin/curl-config \
--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 9937319072e5..87bfc5eb4e82 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl \
USE_GETOPT_LONG= yes
USE_GNOME= glib20 gnomehack gnometarget libxml2 lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
--with-curl-config=${LOCALBASE}/bin/curl-config \
--with-libwww-config=${LOCALBASE}/bin/libwww-config \
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 028b41a70151..16215ed9772a 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}"
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD= yes
MAN1= sabcmd.1
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index c36373bf2afd..d185c2505e0b 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,7 +17,7 @@ COMMENT= Sagasu is a GNOME tool to find strings in a set of files
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gnomeprefix libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index d2a9721ca336..98d07e205cf7 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 15
AUTOMAKE_ARGS= -a
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= sary.1 mksary.1
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 0831f8f03616..9b86e93cee85 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_BISON= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gnomehier gnometarget libxslt
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 96c2f9dd79d4..c9732a1c8ae7 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -23,7 +23,7 @@ WANT_GNOME= yes
USE_GNOME= gnometarget glib20
USE_GMAKE= yes
USE_ICONV= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index d5776ad67d63..dc480ef77df7 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx
USE_GETOPT_LONG= yes
USE_GNOME= gnometarget pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-exporter --with-libwmf=${LOCALBASE}
MAKEFILE= GNUmakefile
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index 81c3aca88425..01d645fbe20c 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= # none, we want to keep libwv2.la
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index e66cc9244108..869c709a1b3b 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= coop9211@uidaho.edu
COMMENT= Convert Excel and PowerPoint files to HTML and text
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= ppthtml.1 xlhtml.1
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 7d5ae6d65e08..88bb7d06b617 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lcole"
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index ab185ea6c61a..34c271c2a267 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= yes
+USE_LIBTOOL_VER=13
CONFLICTS= intltool-*
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index dca829c19c4b..a3b5aba14c80 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= yes
+USE_LIBTOOL_VER=13
pre-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/ukrainian/iceb/Makefile b/ukrainian/iceb/Makefile
index 91425e12ccbb..ce0bda29736d 100644
--- a/ukrainian/iceb/Makefile
+++ b/ukrainian/iceb/Makefile
@@ -18,9 +18,9 @@ USE_MYSQL= yes
WANT_MYSQL_VER= 323
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_AUTOCONF= yes
-USE_AUTOMAKE= yes
+USE_LIBTOOL_VER=13
+USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 14
USE_REINPLACE= yes
USE_BZIP2= yes
USE_GETOPT_LONG=yes
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 24836f6764b4..43aea5ae113c 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= yes
+USE_AUTOCONF_VER= 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 1691d4b6269e..bc0283bd2d2c 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= yes
+USE_LIBTOOL_VER=13
USE_PERL5= yes
JAVAVM?= ${LOCALBASE}/bin/javavm
CONFIGURE_ENV= PERL=${PERL}
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 8500ad901c3c..2ab57bcb9451 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -44,8 +44,8 @@ PATCHFILES+= httpd-2.0.48-windowsupdate.patch:clement
SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
LIBTOOL_VERSION=${LIBTOOL_VERSION}
-USE_AUTOCONF_VER?= 253
-USE_LIBTOOL= yes
+USE_AUTOCONF_VER=253
+USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
LIBTOOLFILES= configure
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 8500ad901c3c..2ab57bcb9451 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -44,8 +44,8 @@ PATCHFILES+= httpd-2.0.48-windowsupdate.patch:clement
SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
LIBTOOL_VERSION=${LIBTOOL_VERSION}
-USE_AUTOCONF_VER?= 253
-USE_LIBTOOL= yes
+USE_AUTOCONF_VER=253
+USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
LIBTOOLFILES= configure
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 6b8c6ba7d494..feeab0b46a84 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -84,7 +84,7 @@ WITH_MPM?= prefork # or worker, perchild
HTTP_PORT?= 80
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 6b8c6ba7d494..feeab0b46a84 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -84,7 +84,7 @@ WITH_MPM?= prefork # or worker, perchild
HTTP_PORT?= 80
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
diff --git a/www/aria/Makefile b/www/aria/Makefile
index 11ff95261eaa..59ef6e0fc09e 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -22,7 +22,7 @@ USE_OPENSSL= yes
USE_GETOPT_LONG=yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 1f94d4e7cb6e..549fe5c02a4d 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
USE_QT_VER= 3
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mt --program-prefix=""
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 93be91eb6f73..258b7a09b79f 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 2e30dbcc6c02..688491fd690a 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -17,7 +17,7 @@ COMMENT= "A history cleaner for Netscape Navigator and Communicator"
USE_REINPLACE= yes
WANT_GNOME= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
.include <bsd.port.pre.mk>
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 71ba7e781103..aaf3e35d8f7c 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -24,7 +24,7 @@ ICONDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
INFODIR?= info
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
ALL_TARGET= default
PLIST_SUB+= LISPDIR=${LISPDIR} \
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 6a04ab60e35f..629f82bacccd 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -42,7 +42,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
WANT_GNOME= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 15257114fcfe..17d47f960415 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -18,7 +18,7 @@ COMMENT= Simple (at the moment) html editor based on GTK+
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libxml2 libgtkhtml
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= erwin.1
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 660aa70f8aef..c6b6da7fd412 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -38,7 +38,7 @@ HEADERS_SUFX=
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack bonobo libglade gnomevfs gnometarget
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index b5900f3bd706..7f1c67b6ef73 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 7969877cee1e..4e4e2aecca06 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 335fef0aed8c..bf3ca17511fe 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 52f81e60f4f8..47021e0b62ea 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= yes
+USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
NO_MTREE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX}/${PORTNAME} --without-wish
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 01a807d10f38..537f0a6b221c 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index ab2d8109cac6..db05fa2143a4 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 72593f1590cf..0ad9196703ee 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib
USE_PERL5_BUILD=yes
diff --git a/www/mdw/Makefile b/www/mdw/Makefile
index 630e19af316e..78f6490193a4 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= yes
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
MAN1= mdw.1
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index f8fede54a6ac..e944f6eab4e2 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
MAN1= indexer.1
MAN5= indexer.conf.5
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GMAKE= yes
CONFIGURE_ARGS+=--enable-phrase \
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index f8fede54a6ac..e944f6eab4e2 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
MAN1= indexer.1
MAN5= indexer.conf.5
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GMAKE= yes
CONFIGURE_ARGS+=--enable-phrase \
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 55731201cdf4..ccd3cbb90ae3 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -40,7 +40,7 @@ APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2}
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
USE_GMAKE= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER= 13
USE_AUTOCONF_VER= 253
USE_AUTOMAKE_VER= 15
AUTOMAKE_ARGS= --add-missing
diff --git a/www/mod_jk2/Makefile b/www/mod_jk2/Makefile
index 5f951545ec76..f17b7f97df8a 100644
--- a/www/mod_jk2/Makefile
+++ b/www/mod_jk2/Makefile
@@ -23,9 +23,9 @@ APACHE_CONF= ${PREFIX}/etc/apache2
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
USE_GMAKE= YES
-USE_LIBTOOL= YES
-USE_AUTOCONF= YES
-USE_AUTOMAKE= YES
+USE_LIBTOOL_VER=13
+USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 14
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --with-apxs=${APXS}
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index 821ca9e0ee5d..e892088f2919 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
${AUTOCONF}:${PORTSDIR}/devel/autoconf
USE_APACHE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= # none
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index b8d09c4d6f63..172899ade472 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -19,7 +19,7 @@ COMMENT= Netscape cache browser
USE_X_PREFIX= yes
WANT_GNOME= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= --include-deps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 6638da27590d..280ef6ccdd05 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
OOPSVERSION= 1.5.23
USE_SUBMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
--sysconfdir=${PREFIX}/etc/oops \
--localstatedir=${OOPSVAR} \
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 35458fe27454..ec9b39650700 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_REINPLACE= yes
USE_MESA= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext"
CONFIGURE_ARGS= --without-spidermonkey --without-jdk --without-doxygen
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 8ed0fb65e841..a7bf0d615346 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -20,6 +20,6 @@ LIB_DEPENDS= gtkhtml-3.0.3:${PORTSDIR}/www/gtkhtml3
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui gtksourceview
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/www/scout/Makefile b/www/scout/Makefile
index f223573fc2ca..a525e4ea42ef 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS+= --disable-shared --enable-static
MAN1= scout.1
PLIST_FILES= bin/scout
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index ae5e79fdefd7..5c200b79c8db 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
gtksourceview
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.ifndef WITHOUT_OPENSSL
diff --git a/www/screem/Makefile b/www/screem/Makefile
index ae5e79fdefd7..5c200b79c8db 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
gtksourceview
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.ifndef WITHOUT_OPENSSL
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index a8e5d5a4336f..d5c55e46ca55 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -27,9 +27,9 @@ PLIST_SUB= SHLIB="@comment "
.else
USE_AUTOMAKE_VER= 15
AUTOMAKE_ARGS+= -a -c --foreign
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
PLIST_SUB= SHLIB=""
.endif
diff --git a/www/twhttpd/Makefile b/www/twhttpd/Makefile
index 9331c98bad36..aedb8f8d16b5 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= yes
+USE_AUTOCONF_VER= 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 bf4f213ae905..d457327b7c05 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= k_nishizawa@anet.ne.jp
COMMENT= World wide web server benchmarking with SSL support
USE_OPENSSL= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src
ALL_TARGET= install
diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index 7984c35c5e0c..aca997f48fd8 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -17,7 +17,7 @@ COMMENT= Simple/powerful/lightweight/secure/embed-able HTTP server
USE_BZIP2= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
PREFIX= ${LOCALBASE}/wyvern
CONFIGURE_ARGS= --with-ssl=yes \
--with-ssl-includes="${OPENSSLINC}" \
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index aac47152fdf3..8ae4f19159b4 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index ccfa04d300c6..44dd358ac80a 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -24,7 +24,7 @@ KDEDIR?=${LOCALBASE}/bin
CONFIGURE_TARGET=
CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= krusader.1
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index ccfa04d300c6..44dd358ac80a 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -24,7 +24,7 @@ KDEDIR?=${LOCALBASE}/bin
CONFIGURE_TARGET=
CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
MAN1= krusader.1
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 4c6d468b6bf6..f8bc598d8723 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/mi
PLIST_SUB+= LOCALBASE=${LOCALBASE}
USE_GNOME= gtk20 pkgconfig libxml2 gnomevfs2
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
HAS_CONFIGURE= yes
MAN1= rox.1
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index e0abfadc3e3f..ddcab41cb642 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= yes
+USE_AUTOCONF_VER= 213
HAS_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 41468c166e64..7869249c60e9 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ryan@transaeris.com
COMMENT= GNOME file and desktop manager
WRKSRC= ${WRKDIR}/velocity-0.1.0
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= libgnomeui gnomedesktop librsvg2
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index ff15d1bf6a45..f7ef9aa153da 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -30,7 +30,7 @@ USE_GNOME= gtk20
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 46a7103c5ebe..8f4a2891968b 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_GMAKE= yes
PREFIX?= ${X11BASE}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack pkgconfig
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 0260a4121100..cc07b4717ff0 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
XFREE86_VERSION= 4
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 14
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
diff --git a/x11-themes/aquaosk/Makefile b/x11-themes/aquaosk/Makefile
index 8b167877f1bc..eb283d1afe89 100644
--- a/x11-themes/aquaosk/Makefile
+++ b/x11-themes/aquaosk/Makefile
@@ -20,7 +20,7 @@ IGNORE= ${BROKEN}
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_KDEBASE_VER=3
USE_BZIP2= yes
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 56b7957a51bc..299e4f7f8577 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index ee0810415a25..ba3508d47566 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= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 7db38d9bd853..5960d026f05d 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 4011c1b94098..0e5df60266bb 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 349dd1d8c0fc..5fffee21d57e 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= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index aac376529b8e..ec1122302055 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 5177e24a67a9..76cfbb684f31 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -19,7 +19,7 @@ COMMENT= More themes for the GNOME 2 desktop environment
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 669d70605bea..c4e6ffbabcf0 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolk
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack metacity libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 7e6dbacc8ebe..6321c29d0fef 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index bf246ad89ddf..70da1e042be4 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
RH_SUBVERSION= 1
THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 114f9a735e3a..ae5b21f17c02 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= yes
+USE_LIBTOOL_VER=13
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 248c3beb3e5d..be7905fbdfef 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
THEMES= metal notif pixmap raleigh redmond95
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index f5cf2885aac8..dbde4b8854eb 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -19,7 +19,7 @@ COMMENT= Theme engine for the gtk+-2.0 toolkit
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20
PLIST_SUB= VERSION=2.2.0
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index dbaaff416d10..f19f50fea524 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index b3321428d2a5..5428eaaa7f2c 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 168957c55f8b..851fa2d7b52e 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= yes
+USE_LIBTOOL_VER=13
XIMIAN_SUBVERSION= 0
XIMIAN_DISTVERSION= 6.2
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index 454cb5473f28..4b06292d1cce 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index 1a8dcfbd7d94..8fbae7800c5a 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= yes
+USE_LIBTOOL_VER=13
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 5512b395de2c..95dd8c98e91f 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -20,7 +20,7 @@ COMMENT= An XFCE engine for GTK 2.0
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 32bd4aa6d9ad..47e7dd10f2c2 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 5a9fa5960908..0e6452a1c111 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 69af2d0719bd..8ff1279a0b3a 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 25db45056ac3..45152a994b6c 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index ca6ff875584d..40c6dec63f42 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 8f35ca6a6cb1..f7ac0716eb39 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
GTKVERSION= 1.2
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 088bd7014b32..ae9aff8450a8 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -16,7 +16,7 @@ COMMENT= A QNX Photon like window decoration and widget style for KDE
USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 55bd818938f6..2761e99bfd96 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -19,7 +19,7 @@ COMMENT= Bluecurve unified-look theme for QT3 from RedHat 8.0
EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
#LIBTOOLFILES= # none
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index 708c13c9cbad..5754b7ffcc4a 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 5b5d2fe1fea7..9055f339939e 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index a8a5276aeb5c..8b92521a67c1 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= Coin:${PORTSDIR}/graphics/Coin
USE_MESA= yes
USE_MOTIF= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 a2e3ff10d947..8f059746d48e 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intltool gnometarget
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/bakery_gnomeui/Makefile b/x11-toolkits/bakery_gnomeui/Makefile
index 2198aeb582c3..22b1de6c6e1a 100644
--- a/x11-toolkits/bakery_gnomeui/Makefile
+++ b/x11-toolkits/bakery_gnomeui/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile
index 56b7957a51bc..299e4f7f8577 100644
--- a/x11-toolkits/buffy/Makefile
+++ b/x11-toolkits/buffy/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile
index ee0810415a25..ba3508d47566 100644
--- a/x11-toolkits/clean-theme-gtk/Makefile
+++ b/x11-toolkits/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= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile
index 7db38d9bd853..5960d026f05d 100644
--- a/x11-toolkits/colorstep/Makefile
+++ b/x11-toolkits/colorstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 8d90e1620eb3..a0f133712450 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= rsvg.1:${PORTSDIR}/graphics/librsvg
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomevfs
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 4d428aeebb75..f8016503bc62 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 6926342571a7..b89961849fb5 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -30,7 +30,7 @@ USE_MYSQL= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile
index 4011c1b94098..0e5df60266bb 100644
--- a/x11-toolkits/engradient/Makefile
+++ b/x11-toolkits/engradient/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/erlgtk/Makefile b/x11-toolkits/erlgtk/Makefile
index aaca6f33e32e..90a5138cd06e 100644
--- a/x11-toolkits/erlgtk/Makefile
+++ b/x11-toolkits/erlgtk/Makefile
@@ -23,7 +23,7 @@ PLIST_SUB= VERSION="${PORTVERSION}"
CONFIGURE_WRKSRC=${WRKSRC}/config
GNU_CONFIGURE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
.if defined(WITH_GTK2)
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 02ab9cc48408..8012b35f0506 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -33,7 +33,7 @@ USE_GL= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
#USE_MOTIF= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 02ab9cc48408..8012b35f0506 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -33,7 +33,7 @@ USE_GL= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
#USE_MOTIF= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
index d4d5eb98189e..b7e1d9a4f1ba 100644
--- a/x11-toolkits/freeglut/Makefile
+++ b/x11-toolkits/freeglut/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER= 14
USE_AUTOHEADER= yes
HAS_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 6a60581c3974..b3f446447233 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs
GNOME_HTML_DIR= ${PREFIX}/share/doc/gal
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 04df2088ba41..b55e0f4538c4 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier libgnomeui libgnomeprintui
GNOME_HTML_DIR= ${PREFIX}/share/doc/gal2
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 6c872aa7d347..da5647f208fb 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/geramik/Makefile b/x11-toolkits/geramik/Makefile
index 349dd1d8c0fc..5fffee21d57e 100644
--- a/x11-toolkits/geramik/Makefile
+++ b/x11-toolkits/geramik/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${X11BASE}/lib/gtk/themes/engines/libqtpixmap.so:${PORTSDIR}/x11-to
WRKSRC= ${WRKDIR}/Geramik-${PORTVERSION}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gevas/Makefile b/x11-toolkits/gevas/Makefile
index 9779788621a2..4af17e4fb56d 100644
--- a/x11-toolkits/gevas/Makefile
+++ b/x11-toolkits/gevas/Makefile
@@ -18,7 +18,7 @@ COMMENT= GTK+ bindings for Evas canvas library
LIB_DEPENDS= evas.6:${PORTSDIR}/graphics/evas
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
post-install:
diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index 0bda91200c66..b27cd843f4ec 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile
index aac376529b8e..ec1122302055 100644
--- a/x11-toolkits/gnome-look/Makefile
+++ b/x11-toolkits/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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-themes-extras/Makefile b/x11-toolkits/gnome-themes-extras/Makefile
index 5177e24a67a9..76cfbb684f31 100644
--- a/x11-toolkits/gnome-themes-extras/Makefile
+++ b/x11-toolkits/gnome-themes-extras/Makefile
@@ -19,7 +19,7 @@ COMMENT= More themes for the GNOME 2 desktop environment
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index 669d70605bea..c4e6ffbabcf0 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolk
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack metacity libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index dac1149980df..7258f8bcdf2c 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 1e10e10d8864..d8b654fb425f 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile
index 7e6dbacc8ebe..6321c29d0fef 100644
--- a/x11-toolkits/gtk-Mac2-theme/Makefile
+++ b/x11-toolkits/gtk-Mac2-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile
index bf246ad89ddf..70da1e042be4 100644
--- a/x11-toolkits/gtk-bluecurve-theme/Makefile
+++ b/x11-toolkits/gtk-bluecurve-theme/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
RH_SUBVERSION= 1
THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
diff --git a/x11-toolkits/gtk-cleanice-engine/Makefile b/x11-toolkits/gtk-cleanice-engine/Makefile
index 114f9a735e3a..ae5b21f17c02 100644
--- a/x11-toolkits/gtk-cleanice-engine/Makefile
+++ b/x11-toolkits/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= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20
THEME= cleanice-theme-1.2.7
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 248c3beb3e5d..be7905fbdfef 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -17,7 +17,7 @@ COMMENT= Theme engine for gtk+ toolkits
USE_X_PREFIX= yes
USE_GNOME= imlib
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
THEMES= metal notif pixmap raleigh redmond95
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index f5cf2885aac8..dbde4b8854eb 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -19,7 +19,7 @@ COMMENT= Theme engine for the gtk+-2.0 toolkit
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20
PLIST_SUB= VERSION=2.2.0
diff --git a/x11-toolkits/gtk-flat-theme/Makefile b/x11-toolkits/gtk-flat-theme/Makefile
index dbaaff416d10..f19f50fea524 100644
--- a/x11-toolkits/gtk-flat-theme/Makefile
+++ b/x11-toolkits/gtk-flat-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-flat-theme2/Makefile b/x11-toolkits/gtk-flat-theme2/Makefile
index b3321428d2a5..5428eaaa7f2c 100644
--- a/x11-toolkits/gtk-flat-theme2/Makefile
+++ b/x11-toolkits/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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-toolkits/gtk-industrial-theme/Makefile b/x11-toolkits/gtk-industrial-theme/Makefile
index 168957c55f8b..851fa2d7b52e 100644
--- a/x11-toolkits/gtk-industrial-theme/Makefile
+++ b/x11-toolkits/gtk-industrial-theme/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
XIMIAN_SUBVERSION= 0
XIMIAN_DISTVERSION= 6.2
diff --git a/x11-toolkits/gtk-qn-x11-theme/Makefile b/x11-toolkits/gtk-qn-x11-theme/Makefile
index 454cb5473f28..4b06292d1cce 100644
--- a/x11-toolkits/gtk-qn-x11-theme/Makefile
+++ b/x11-toolkits/gtk-qn-x11-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index f3aba637d21c..b950652ff13c 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono \
gst-launch:${PORTSDIR}/multimedia/gstreamer
RUN_DEPENDS+= ${BUILD_DEPENDS}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile
index f3aba637d21c..b950652ff13c 100644
--- a/x11-toolkits/gtk-sharp/Makefile
+++ b/x11-toolkits/gtk-sharp/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono \
gst-launch:${PORTSDIR}/multimedia/gstreamer
RUN_DEPENDS+= ${BUILD_DEPENDS}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index f3aba637d21c..b950652ff13c 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono \
gst-launch:${PORTSDIR}/multimedia/gstreamer
RUN_DEPENDS+= ${BUILD_DEPENDS}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index f3aba637d21c..b950652ff13c 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono \
gst-launch:${PORTSDIR}/multimedia/gstreamer
RUN_DEPENDS+= ${BUILD_DEPENDS}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/gtk-smooth-engine/Makefile b/x11-toolkits/gtk-smooth-engine/Makefile
index 1a8dcfbd7d94..8fbae7800c5a 100644
--- a/x11-toolkits/gtk-smooth-engine/Makefile
+++ b/x11-toolkits/gtk-smooth-engine/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= amistry@am-productions.biz
COMMENT= Flexible GTK Theme Engine
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnometarget
WANT_GNOME= yes
CONFIGURE_ENV= X11BASE="${X11BASE}"
diff --git a/x11-toolkits/gtk-xfce-engine/Makefile b/x11-toolkits/gtk-xfce-engine/Makefile
index 5512b395de2c..95dd8c98e91f 100644
--- a/x11-toolkits/gtk-xfce-engine/Makefile
+++ b/x11-toolkits/gtk-xfce-engine/Makefile
@@ -20,7 +20,7 @@ COMMENT= An XFCE engine for GTK 2.0
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_X_PREFIX= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-zenith-theme/Makefile b/x11-toolkits/gtk-zenith-theme/Makefile
index 32bd4aa6d9ad..47e7dd10f2c2 100644
--- a/x11-toolkits/gtk-zenith-theme/Makefile
+++ b/x11-toolkits/gtk-zenith-theme/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/zenith-1.0
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index bdb7fa4df4f0..1b0cd70f33a1 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 70a54c73713a..e5462e44ed34 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -41,7 +41,7 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack atk pango
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 70a54c73713a..e5462e44ed34 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -41,7 +41,7 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack atk pango
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
index 5a9fa5960908..0e6452a1c111 100644
--- a/x11-toolkits/gtkbe/Makefile
+++ b/x11-toolkits/gtkbe/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/GTKBeEngine
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra--/Makefile b/x11-toolkits/gtkextra--/Makefile
index b7c355c9fc2b..23a55aed8387 100644
--- a/x11-toolkits/gtkextra--/Makefile
+++ b/x11-toolkits/gtkextra--/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
CONFIGURE_ENV= PERL="${PERL}"
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 42dc770a0081..8c4d3821bd84 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 42dc770a0081..8c4d3821bd84 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gtk12
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index e9e6dc83b796..a1876a631338 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-lib-GL
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 5b34123fbef9..9dcd5af65133 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -17,7 +17,7 @@ COMMENT= An OpenGL widget for the GTK+ GUI toolkit
USE_X_PREFIX= yes
USE_GL= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-lib-GL
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -lstdc++"
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index f5f6e02bfec7..530b58a73a9b 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 9a7bc9f786a4..672166e1fc25 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_GL= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 922481c5b948..ef5371db0118 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index be21be827422..63530f219cbe 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
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 dac1149980df..7258f8bcdf2c 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 1e10e10d8864..d8b654fb425f 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 1e10e10d8864..d8b654fb425f 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 1e10e10d8864..d8b654fb425f 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 10cf9d299f23..d66a991c4924 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -18,7 +18,7 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
index 69af2d0719bd..8ff1279a0b3a 100644
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ b/x11-toolkits/gtkstep-pastel/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
index 25db45056ac3..45152a994b6c 100644
--- a/x11-toolkits/gtkstep/Makefile
+++ b/x11-toolkits/gtkstep/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 8d3abeb293f3..cb2c5ce16e47 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 e0a6e701ba52..d67c088e63e2 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/icegradient/Makefile b/x11-toolkits/icegradient/Makefile
index ca6ff875584d..40c6dec63f42 100644
--- a/x11-toolkits/icegradient/Makefile
+++ b/x11-toolkits/icegradient/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.5
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/jx/Makefile b/x11-toolkits/jx/Makefile
index 1b8eea43aaa6..92ad504a4cba 100644
--- a/x11-toolkits/jx/Makefile
+++ b/x11-toolkits/jx/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 063073164320..2ad4c3d0cbfa 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -21,7 +21,7 @@ MANUAL_PACKAGE_BUILD= do not want to install during interactive build
USE_AUTOCONF_VER= 253
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= aclocal.m4 test/aclocal.m4
CONFIGURE_ARGS+= --enable-static --enable-shared --enable-production
CONFIGURE_ARGS+= --disable-build-Xlt --disable-build-Xbae
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 48e717f6a488..080da5e1872c 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 f2801a24d7c4..51085771ab6b 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 d539c60e9c42..ef59eb3fad17 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -24,7 +24,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=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 49734801e7c0..dda4ab248728 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomecanvas libgnome
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 c07258c17afe..58868aa4175f 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 gnomeprefix libbonoboui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index d6097f68135c..2f1fd9566193 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= yes
+USE_LIBTOOL_VER=13
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 5ef5e8f52057..449e8de063c6 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -22,7 +22,7 @@ USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 4c5f620aae6a..f221c12df2f6 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -25,7 +25,7 @@ USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 8331881e847c..4660796c0c02 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 8331881e847c..4660796c0c02 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index c2ad571beda1..e3790e959d0c 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CFLAGS+= -fPIC
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 31883048f649..4ecc85dd4741 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index a3aff2bfdcf7..e8d0dcc183c7 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 543f2a3d17e8..02b1f20613ad 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util
USE_GNOME= gtk20
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 254abea13a1c..873b4306e730 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 e41fabd58207..c86e919b1723 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index eabf450422bd..9441652d1502 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
index 8f35ca6a6cb1..f7ac0716eb39 100644
--- a/x11-toolkits/notif2/Makefile
+++ b/x11-toolkits/notif2/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
GTKVERSION= 1.2
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index ca357dcbba49..9dc4eebcdbd6 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= physfs-1.0.0:${PORTSDIR}/devel/physfs \
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 ca357dcbba49..9dc4eebcdbd6 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= physfs-1.0.0:${PORTSDIR}/devel/physfs \
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 bcc3fdf00f45..58a33b99b841 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -17,7 +17,7 @@ COMMENT= An extension to use gtk in PHP-applications
# Don't call autoconf directly, ./buildconf does this
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 15
USE_AUTOCONF_VER= 253
LIBTOOLFILES= # none
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index bcc3fdf00f45..58a33b99b841 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -17,7 +17,7 @@ COMMENT= An extension to use gtk in PHP-applications
# Don't call autoconf directly, ./buildconf does this
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 15
USE_AUTOCONF_VER= 253
LIBTOOLFILES= # none
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 704cb91bded2..766b74d69d5a 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= configure pygtk/configure
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--with-gnome-config=${X11BASE}/bin/gnome-config \
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 955a8ea97380..1f48fe292245 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack libgnomeprintui libgtkhtml gnomepanel libzvt nautilus2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 47f80c0e60cd..9efef50ecbb8 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index b266bb53c6e1..0441160aef46 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libglade2
USE_PYTHON= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gtk
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index e283214b7634..ec50505f7b0d 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= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/qt-bluecurve-theme/Makefile b/x11-toolkits/qt-bluecurve-theme/Makefile
index 55bd818938f6..2761e99bfd96 100644
--- a/x11-toolkits/qt-bluecurve-theme/Makefile
+++ b/x11-toolkits/qt-bluecurve-theme/Makefile
@@ -19,7 +19,7 @@ COMMENT= Bluecurve unified-look theme for QT3 from RedHat 8.0
EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
#LIBTOOLFILES= # none
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index 9f3e275499bb..2686c19d70c9 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -22,7 +22,7 @@ PLIST_SUB= GTK1=""
PLIST_SUB= GTK1="@comment "
.endif
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WRKSRC= ${WRKDIR}/${DISTNAME:S/7043-//}
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index a5b6d84a7377..9ea2ac9004a0 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 20224a452e64..b7e0476f78e7 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -18,7 +18,7 @@ COMMENT= Qt toolkit library for Coin
LIB_DEPENDS= Coin.41:${PORTSDIR}/graphics/Coin
USE_QT_VER= 3
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV+= QTDIR=${QT_PREFIX} CXXFLAGS="-pthread"
CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${X11BASE}
# avoid renaming of soqt-config and soqt-config.1
diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile
index 708c13c9cbad..5754b7ffcc4a 100644
--- a/x11-toolkits/thinice/Makefile
+++ b/x11-toolkits/thinice/Makefile
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
.include <bsd.port.mk>
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 2645c512718d..9bb65948dd9e 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GNOME= gnometarget gtk20
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index dea8917fbe85..a0e449d9423a 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GNOME= gnometarget gtk20
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-opt=no
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index e2756ea119c6..160c117ffdc4 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= yes
+USE_LIBTOOL_VER=13
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/whistlerk/Makefile b/x11-toolkits/whistlerk/Makefile
index 5b5d2fe1fea7..9055f339939e 100644
--- a/x11-toolkits/whistlerk/Makefile
+++ b/x11-toolkits/whistlerk/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gtk-theme-WhistlerK
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 58c6810901e4..e2d567423af3 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -17,7 +17,7 @@ DISTNAME= Xbae-${PORTVERSION}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_MOTIF= yes
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 2a2882362753..497cd14ca0d6 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
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
LIBTOOLFILES= # none
USE_MOTIF= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/aquaosk/Makefile b/x11-wm/aquaosk/Makefile
index 8b167877f1bc..eb283d1afe89 100644
--- a/x11-wm/aquaosk/Makefile
+++ b/x11-wm/aquaosk/Makefile
@@ -20,7 +20,7 @@ IGNORE= ${BROKEN}
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_KDEBASE_VER=3
USE_BZIP2= yes
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index 0dd471c9c719..61e35227a048 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= stijn@win.tue.nl
COMMENT= Configurator for the Blackbox window manager
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index afbd93e88a3f..d9527032b928 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -17,8 +17,8 @@ COMMENT= Portuguese derivative of qvwm, simplified to conserve resources
RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage
-USE_AUTOCONF= yes
-USE_AUTOMAKE= yes
+USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 14
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
MAN1= blwm.1x
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 29ce1bcaa72e..31097e49a4f4 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= efltk.2:${PORTSDIR}/x11-toolkits/efltk
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
-USE_AUTOMAKE= yes
+USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 14
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index 55d0a1317f82..d69dc522a89d 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -26,7 +26,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= yes
+USE_AUTOCONF_VER= 213
USE_X_PREFIX= yes
post-extract:
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 29f70caffc64..6ac3f7f49e71 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 564c947926be..93d5733fb610 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PYTHON= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 5c74635ef303..2c950952be3a 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -17,7 +17,7 @@ COMMENT= Standard library for Window Maker dock apps
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index b9e33a955827..9e19691c5c12 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= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="${CPPFLAGS}" \
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 179edc959e7e..389226446b2e 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix intlhack gnomehack lthack gnomehier gconf2 libglade2
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/qinx/Makefile b/x11-wm/qinx/Makefile
index 088bd7014b32..ae9aff8450a8 100644
--- a/x11-wm/qinx/Makefile
+++ b/x11-wm/qinx/Makefile
@@ -16,7 +16,7 @@ COMMENT= A QNX Photon like window decoration and widget style for KDE
USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/x11-wm/rox-pager/Makefile b/x11-wm/rox-pager/Makefile
index 606892e500c7..184fc39509dd 100644
--- a/x11-wm/rox-pager/Makefile
+++ b/x11-wm/rox-pager/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= olgeni@FreeBSD.org
COMMENT= Pager for the ROX desktop
USE_GNOME= gtk20 pkgconfig libxml2 libwnck
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
HAS_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 7f4dc373213b..e324ab29ad62 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -30,7 +30,7 @@ USE_XPM= yes
USE_REINPLACE= yes
WANT_GNOME= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= X11BASE=${X11BASE} \
LIBS="-L${LOCALBASE}/lib -lintl" \
CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 01177334c1c0..11bf8b360472 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 752ea13e6ac8..75673d3b6a94 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/xfce4-menueditor/Makefile b/x11-wm/xfce4-menueditor/Makefile
index 511b7d207349..d9c723052a13 100644
--- a/x11-wm/xfce4-menueditor/Makefile
+++ b/x11-wm/xfce4-menueditor/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES= bin/xfce4-menueditor
USE_GNOME= gtk20 libxml2
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-cvs
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index d0d9316428a6..8b1e38c95067 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
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 ac781159fe87..3968e855b857 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 6a2b2b93ad65..4f5ff173cd68 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= yes
+USE_LIBTOOL_VER=13
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 e99dc166f304..d9e0be26a3bf 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= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 0d7fe42de142..328ad7d7a7c3 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A core event abstraction library
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
post-install:
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index effa7e877163..21547afc0aa7 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_SDL= sdl
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 221e26834ae4..51659ad89bc1 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= Imlib2.2:${PORTSDIR}/graphics/imlib2 \
ast.2:${PORTSDIR}/devel/libast
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS?=--enable-trans --enable-utmp \
--enable-xim --with-theme-update \
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index db27b728ff33..ca1d3573a6ff 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 4a2b9e645a97..bfd82d8dd2ec 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -25,7 +25,7 @@ GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
--with-kde-datadir=${LOCALBASE}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 5dcf2df11f44..12b1940143c1 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
LIBTOOLFILES= configure libart_lgpl/configure
CONFIGURE_ARGS= --disable-test-gnome
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 150031ded142..56398c8c4dd0 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \
intlhack
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-kde-docdir=${LOCALBASE}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 95613c391825..6dbda489a1a5 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index f9c591ea09bb..d9e6311b68f2 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index db27b728ff33..ca1d3573a6ff 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 4a2b9e645a97..bfd82d8dd2ec 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -25,7 +25,7 @@ GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
--with-kde-datadir=${LOCALBASE}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 5dcf2df11f44..12b1940143c1 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
LIBTOOLFILES= configure libart_lgpl/configure
CONFIGURE_ARGS= --disable-test-gnome
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 150031ded142..56398c8c4dd0 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \
intlhack
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-kde-docdir=${LOCALBASE}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 95613c391825..6dbda489a1a5 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index f9c591ea09bb..d9e6311b68f2 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 45a49f4608af..fa99c6d347e1 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/XFree86-4-
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index d35bf80d0d1c..056ea42083a4 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WRKSRC= ${WRKDIR}/${PORTNAME}-6.3.1
INSTALLS_SHLIB= yes
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 8b46c3fccbf1..3bceeaf46855 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
WRKSRC= ${WRKDIR}/${PORTNAME}-6.0.1
INSTALLS_SHLIB= yes
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 9ad26a3b560d..1d093ff76f70 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -21,7 +21,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomehack pkgconfig
INSTALLS_SHLIB= yes
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 4e2142317a7d..3ee1261ccdef 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= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 61515e70c8c0..d0c8a6399b0f 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
MAN3= Xcursor.3
INSTALLS_SHLIB= yes
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 6c1939a6241b..1aa2c98d9fce 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= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index dfaac02d7e11..2fcc2f4cfc2b 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 872be57791b3..834e5f96ef2b 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= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index f88398e27802..328c3bc9ef20 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index cf1ff0b7fba1..25a56674f6e3 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -24,7 +24,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index e34a276e7413..23ede460d3d7 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -26,7 +26,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index d5ca2b849b9e..d1de784a1db1 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -27,7 +27,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index de70655aef35..d37ea37ed771 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -25,7 +25,7 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 635f0eec8b80..db28208248d6 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier esound gnomevfs2 libxslt
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index d0c811dc8728..8a260fc26686 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_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index d0c811dc8728..8a260fc26686 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnome
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 851f72bfa3f8..2f0e35f6b2f9 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack libxml2
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --disable-doxygen
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 4dc85bd6d7f5..8ae59194108c 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -18,10 +18,8 @@ COMMENT= Matrox Powerdesk for *nix
USE_X_PREFIX= YES
USE_GNOME= gtk12
-
USE_GMAKE= YES
-
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER= 213
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2c1f0e284ace..46fd6721538f 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -17,7 +17,7 @@ COMMENT= Multilingual X11 terminal emulator
USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-imagelib=gdk-pixbuf1 --enable-utmp
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 979ab490fcce..c5a3c8fd4d71 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= esn@x123.info
COMMENT= A multi terminal based on aterm
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 979ab490fcce..c5a3c8fd4d71 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= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 832d40128f2d..91b96069cda9 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= yes
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_X_PREFIX= yes
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index a5fdc3ec4b5c..b7a505a737f5 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -21,7 +21,7 @@ DISTNAME= rxvt-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= A low memory usage xterm replacement that supports color
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_PERL5_BUILD=yes
USE_X_PREFIX= yes
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index f6d172e09095..247dbd8a1c07 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier pkgconfig
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 4063e20121fe..2267f67e7419 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index fb9bc1596cd7..297cb3c6887c 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"