aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2005-11-15 14:52:12 +0800
committerade <ade@FreeBSD.org>2005-11-15 14:52:12 +0800
commit8d9d5197561118544281733430b48b0b60884450 (patch)
tree45e5dcd7c2206fce8b01186555aac96b6292c602 /devel
parent081b17449bd91bcac5390cd0d8a63ed3914df51d (diff)
downloadfreebsd-ports-gnome-8d9d5197561118544281733430b48b0b60884450.tar.gz
freebsd-ports-gnome-8d9d5197561118544281733430b48b0b60884450.tar.zst
freebsd-ports-gnome-8d9d5197561118544281733430b48b0b60884450.zip
Mass-conversion to the USE_AUTOTOOLS New World Order. The code present
in bsd.autotools.mk essentially makes this a no-op given that all the old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in exactly the same way as USE_AUTOTOOLS itself. Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME team -- all GNOME 2.12.x ports use it. Preliminary documentation can be found at: http://people.FreeBSD.org/~ade/autotools.txt which is in the process of being SGMLized before introduction into the Porters Handbook. Light blue touch-paper. Run.
Diffstat (limited to 'devel')
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/ac-archive/Makefile2
-rw-r--r--devel/adacurses/Makefile2
-rw-r--r--devel/alf/Makefile2
-rw-r--r--devel/allegro-devel/Makefile2
-rw-r--r--devel/allegro/Makefile2
-rw-r--r--devel/anjuta/Makefile2
-rw-r--r--devel/apr/Makefile4
-rw-r--r--devel/apr0/Makefile4
-rw-r--r--devel/apr1/Makefile4
-rw-r--r--devel/apr2/Makefile4
-rw-r--r--devel/arm-elf-binutils/Makefile2
-rw-r--r--devel/arm-elf-gcc295/Makefile2
-rw-r--r--devel/atlas-devel/Makefile2
-rw-r--r--devel/atlas/Makefile2
-rw-r--r--devel/autogen/Makefile2
-rw-r--r--devel/automake110/Makefile2
-rw-r--r--devel/automake14/Makefile2
-rw-r--r--devel/automake15/Makefile2
-rw-r--r--devel/automake19/Makefile2
-rw-r--r--devel/avr-binutils/Makefile2
-rw-r--r--devel/avr-gcc-3/Makefile2
-rw-r--r--devel/avr-gcc/Makefile2
-rw-r--r--devel/boehm-gc/Makefile2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/clanlib-devel/Makefile2
-rw-r--r--devel/clint/Makefile2
-rw-r--r--devel/commoncpp/Makefile2
-rw-r--r--devel/cstringbuffer/Makefile2
-rw-r--r--devel/cvsnt/Makefile2
-rw-r--r--devel/cvsutils/Makefile3
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/ddd/Makefile2
-rw-r--r--devel/desktop-file-utils/Makefile2
-rw-r--r--devel/directfb/Makefile2
-rw-r--r--devel/dotconf++/Makefile2
-rw-r--r--devel/e4graph/Makefile2
-rw-r--r--devel/eboxy/Makefile2
-rw-r--r--devel/eet/Makefile2
-rw-r--r--devel/epm/Makefile2
-rw-r--r--devel/erlslang/Makefile2
-rw-r--r--devel/fam/Makefile4
-rw-r--r--devel/ffcall/Makefile2
-rw-r--r--devel/florist/Makefile2
-rw-r--r--devel/g-wrap/Makefile2
-rw-r--r--devel/gamin/Makefile4
-rw-r--r--devel/gaul/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gconfmm26/Makefile2
-rw-r--r--devel/gcvs/Makefile3
-rw-r--r--devel/gengameng/Makefile2
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/glademm/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/gnome-build/Makefile2
-rw-r--r--devel/gnome-crash/Makefile2
-rw-r--r--devel/gnomebuild/Makefile2
-rw-r--r--devel/gnomecrash/Makefile2
-rw-r--r--devel/gnulibiberty/Makefile2
-rw-r--r--devel/gtkmozedit/Makefile2
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/guikachu/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/jakelib2/Makefile2
-rw-r--r--devel/jclassinfo/Makefile2
-rw-r--r--devel/jep/Makefile2
-rw-r--r--devel/judy/Makefile2
-rw-r--r--devel/klassmodeler/Makefile2
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/leoarg/Makefile2
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libPropList/Makefile2
-rw-r--r--devel/libassa/Makefile2
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbegemot/Makefile5
-rw-r--r--devel/libbinio/Makefile2
-rw-r--r--devel/libbnr/Makefile2
-rw-r--r--devel/libbonobo/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libcapsinetwork/Makefile2
-rw-r--r--devel/libconfuse/Makefile2
-rw-r--r--devel/libcwd/Makefile2
-rw-r--r--devel/libdaemon/Makefile2
-rw-r--r--devel/libdsp/Makefile2
-rw-r--r--devel/libevent/Makefile2
-rw-r--r--devel/libffi-devel/Makefile2
-rw-r--r--devel/libffi/Makefile2
-rw-r--r--devel/libfs++/Makefile2
-rw-r--r--devel/libghthash/Makefile2
-rw-r--r--devel/libgii/Makefile2
-rw-r--r--devel/libgiigic/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libglademm24/Makefile2
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libmusclecard/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/liboil/Makefile2
-rw-r--r--devel/libol/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopendaap/Makefile2
-rw-r--r--devel/libopensync/Makefile2
-rw-r--r--devel/libopensync022/Makefile2
-rw-r--r--devel/libpeak/Makefile2
-rw-r--r--devel/libredblack/Makefile2
-rw-r--r--devel/libshbuf/Makefile2
-rw-r--r--devel/libsigc++/Makefile2
-rw-r--r--devel/libsigc++12/Makefile2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libsigcx/Makefile2
-rw-r--r--devel/libstatgrab/Makefile2
-rw-r--r--devel/libstrfunc/Makefile2
-rw-r--r--devel/libstroke/Makefile2
-rw-r--r--devel/libtap/Makefile2
-rw-r--r--devel/libtecla/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libukcprog/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/libusb/Makefile2
-rw-r--r--devel/libzt/Makefile2
-rw-r--r--devel/libzvbi/Makefile2
-rw-r--r--devel/log4c/Makefile2
-rw-r--r--devel/log4cplus/Makefile2
-rw-r--r--devel/log4cxx/Makefile4
-rw-r--r--devel/lwp/Makefile2
-rw-r--r--devel/m17n-lib/Makefile2
-rw-r--r--devel/mico/Makefile2
-rw-r--r--devel/mingw-binutils/Makefile2
-rw-r--r--devel/mingw-gcc/Makefile2
-rw-r--r--devel/mingw32-binutils/Makefile2
-rw-r--r--devel/mingw32-gcc/Makefile2
-rw-r--r--devel/mipsel-linux-binutils/Makefile2
-rw-r--r--devel/mipsel-linux-gcc/Makefile2
-rw-r--r--devel/msp430-binutils/Makefile2
-rw-r--r--devel/msp430-gcc/Makefile2
-rw-r--r--devel/msp430-gcc3/Makefile2
-rw-r--r--devel/msp430-gdb/Makefile2
-rw-r--r--devel/ncnf/Makefile2
-rw-r--r--devel/obby/Makefile2
-rw-r--r--devel/ocaml-sdl/Makefile2
-rw-r--r--devel/openzz/Makefile2
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--devel/ossp-al/Makefile2
-rw-r--r--devel/ossp-cfg/Makefile2
-rw-r--r--devel/ossp-ex/Makefile2
-rw-r--r--devel/ossp-l2/Makefile2
-rw-r--r--devel/ossp-val/Makefile2
-rw-r--r--devel/ossp-var/Makefile2
-rw-r--r--devel/ossp-xds/Makefile2
-rw-r--r--devel/pcre++/Makefile2
-rw-r--r--devel/pcre/Makefile2
-rw-r--r--devel/pcsc-lite/Makefile2
-rw-r--r--devel/physfs-devel/Makefile2
-rw-r--r--devel/physfs/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/prepstools/Makefile2
-rw-r--r--devel/privman/Makefile2
-rw-r--r--devel/pwlib/Makefile2
-rw-r--r--devel/pwlib152/Makefile2
-rw-r--r--devel/py-orbit2/Makefile2
-rw-r--r--devel/rapidsvn/Makefile3
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/rpc2/Makefile2
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/rvm/Makefile2
-rw-r--r--devel/sdl12/Makefile2
-rw-r--r--devel/sdlmm/Makefile2
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/shapelib/Makefile2
-rw-r--r--devel/shmap/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--devel/str/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--devel/subversion-devel/Makefile2
-rw-r--r--devel/subversion-freebsd/Makefile2
-rw-r--r--devel/subversion/Makefile2
-rw-r--r--devel/subversion16/Makefile2
-rw-r--r--devel/swig13/Makefile3
-rw-r--r--devel/swig20/Makefile3
-rw-r--r--devel/sysconftool/Makefile4
-rw-r--r--devel/t1lib/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/titano/Makefile2
-rw-r--r--devel/vstr/Makefile2
-rw-r--r--devel/wftk/Makefile2
-rw-r--r--devel/xfc/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--devel/xxl/Makefile2
-rw-r--r--devel/yasm/Makefile3
-rw-r--r--devel/zthread/Makefile2
-rw-r--r--devel/zziplib/Makefile2
198 files changed, 199 insertions, 222 deletions
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index f81f39bc26cf..cbadb7e5e6f4 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib12 gnometarget
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure popt/configure libIDL/configure
CONFIGURE_ARGS= --disable-indent
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 2cd9f8d195bc..6d80885b8336 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libidl
CONFIGURE_ARGS= --disable-indent \
--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile
index 84aac97486c7..bdbcffbf5c44 100644
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@@ -17,7 +17,7 @@ COMMENT= A set of useful GNU autoconf macros
USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index c27c7fe35d73..dfbbf915dbe5 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -18,7 +18,7 @@ COMMENT= Curses library for Ada
BUILD_DEPENDS= gnat:${PORTSDIR}/lang/gnat
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \
--disable-termcap --includedir=${PREFIX}/include/ncurses \
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index 4daf731dd183..270296831fbb 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
USE_PYTHON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index a79a9cc48081..b335d86222bb 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= yes
USE_XLIB= yes
WANT_GNOME= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
.include "Makefile.man"
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index a79a9cc48081..b335d86222bb 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE= yes
USE_XLIB= yes
WANT_GNOME= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
.include "Makefile.man"
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index b03226a64d6e..851e106c7230 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 65cf1a5c9bfb..3011b911b8a0 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -28,9 +28,7 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-WANT_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index e22327eef2fe..000576a66b55 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNU binutils for vanilla ARM cross-development
USE_BZIP2= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --target=${PKGNAMEPREFIX:S/-$//}
CONFIGURE_ARGS= --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index fd6f18fd3516..0826d41f1952 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
CONFIGURE_ARGS+= --with-cpu="${DEFAULT_CPU}"
.endif
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure etc/configure gcc/configure libiberty/configure \
libobjc/configure texinfo/configure \
texinfo/testsuite/configure
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index fdc847091b49..a35ec17001ad 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 442dd4d9780d..7b237b51e40d 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index b3e1a956ca1c..82801c0b1522 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-libguile=yes --with-libxml2=yes
INSTALLS_SHLIB= yes
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 7fb11d447301..49a152e11a0c 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.9)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
BUILD_VERSION= 19
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 51d78810ff49..f444adab3a81 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.4)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=213
+USE_AUTOTOOLS= autoconf:213:env
BUILD_VERSION= 14
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index c4bb29f020f3..15b5ddf2b3f1 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.5)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
BUILD_VERSION= 15
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 7fb11d447301..49a152e11a0c 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNU Standards-compliant Makefile generator (1.9)
RUN_DEPENDS= ${AUTOCONF_DEPENDS}
-WANT_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259:env
BUILD_VERSION= 19
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index cfc6c690a028..cc073f6662af 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --target=avr
.if (${MACHINE_ARCH} == "amd64")
MACHINE_ARCH= x86_64
.endif
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure intl/configure ld/configure \
libiberty/configure opcodes/configure
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 8974c68607d9..f892b180c6d3 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
-USE_AUTOHEADER_VER= 213
+USE_AUTOTOOLS= autoheader:213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 8974c68607d9..f892b180c6d3 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
-USE_AUTOHEADER_VER= 213
+USE_AUTOTOOLS= autoheader:213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 27ad6386d377..71ea539eeac3 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gc${PORTVERSION:S/.a/alpha/}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= lthack
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 4d49dac7448f..e31b9de53492 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack bonobo gconf
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 2654fc10c08d..c85d98133b0e 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -32,7 +32,7 @@ USE_PERL5_BUILD= yes
USE_XLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index 9ad906faa9e5..b09e099fb185 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -19,7 +19,7 @@ COMMENT= A static source code checker for C++
USE_PYTHON= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
INSTALLS_SHLIB= yes
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 8c1cc04493c0..b914aa4c6ab0 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --without-libxml2
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
USE_GCC= 3.4
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_cv_path_DOXYGEN=no
diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile
index 24fd31dd9e8b..4ca5db2a6220 100644
--- a/devel/cstringbuffer/Makefile
+++ b/devel/cstringbuffer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= # disappeared
MAINTAINER= ports@FreeBSD.org
COMMENT= File-like IO for strings
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= csb.3
MANCOMPRESSED= no
diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index d12330d5de69..32300a9f649e 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -15,7 +15,7 @@ COMMENT= CVS clone
CONFLICTS= cvs-1*
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_RC_SUBR= cvslockd.sh
CONFIGURE_ARGS= --enable-fork\
--disable-odbc --disable-postgres\
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index 77f829751f62..9f2575f8e917 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
USE_PERL5= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=15
-USE_AUTOCONF_VER=253
+USE_AUTOTOOLS= automake:15 autoconf:253
AUTOMAKE_ARGS= --add-missing
MAN1= cvsutils.1
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b23b2c6b95cc..087851ffaa27 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS?= expat.5:${PORTSDIR}/textproc/expat2
USE_GNOME?= gnomehack glib20 libxml2
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index e07ac7408988..71cfae09928e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_XPM= yes
USE_MOTIF= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CFLAGS+= -Wno-deprecated
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index aa82cc292570..f38051d0f0b5 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
USE_GNOME= glib20
WANT_GNOME= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 2a9163efbe02..de0fe2b2af50 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_SDL= sdl
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_PERL5= yes
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index b018b8bd9841..6b041ffe6e1a 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mark_sf@kikg.ifmo.ru
COMMENT= Configuration file parser written in C++
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/e4graph/Makefile b/devel/e4graph/Makefile
index bd5d67d18cff..8629a6377f61 100644
--- a/devel/e4graph/Makefile
+++ b/devel/e4graph/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/all
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-metakit=${LOCALBASE} \
--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} --enable-tcl \
--with-expat=${LOCALBASE} --enable-xml
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 21379be62620..f2b497b00f13 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -21,7 +21,7 @@ USE_SDL= sdl gui mixer
USE_GNOME= gnometarget libxml2 lthack
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-lirc
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 1fceaf0a59a4..2174a9227bd3 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -15,7 +15,7 @@ COMMENT= Enlightenment Data Handling Library
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index 4646b04f92cb..35b861faa36c 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -25,7 +25,7 @@ PATCH_SITES+= http://installation.openoffice.org/
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
MAN1= epm.1 epminstall.1 mkepmlist.1 setup.1
MAN5= epm.list.5 setup.types.5
diff --git a/devel/erlslang/Makefile b/devel/erlslang/Makefile
index cb6b0f518bbd..0469b24add64 100644
--- a/devel/erlslang/Makefile
+++ b/devel/erlslang/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
PLIST_SUB= VERSION="${PORTVERSION}"
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
GNU_CONFIGURE= yes
CONFIGURE_WRKSRC=${WRKSRC}/config
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index baa69560b01c..ab80520bb557 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -20,9 +20,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
-USE_AUTOMAKE_VER=15
-USE_AUTOCONF_VER=253
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13:inc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 9ad178132915..33ac81836f11 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Foreign function call libraries
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
NOT_FOR_ARCHS= sparc64
MAN3= avcall.3 callback.3 trampoline.3 trampoline_r.3 vacall.3
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index 61a5c6f7ceeb..3fb4d60637d1 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -18,7 +18,7 @@ COMMENT= FSU implementation of POSIX.5, the POSIX Ada binding
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-threads
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 7bdeb9c306d6..f4c362665a01 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
INFO= g-wrap
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
USE_GNOME= gtk12
INSTALLS_SHLIB= yes
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index ae4d0a759ea7..f406dab7cdaf 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -25,9 +25,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
CONFLICTS= fam-[0-9]*
.if defined(GAMIN_SLAVE)
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
.else
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.endif
post-patch:
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 1821d90f7673..4982381f5f5c 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}"
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 20c04be60e90..c63d0ffdd033 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index cb0df3f4d786..9dd0e730cb01 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gconf2
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index b760c9bff718..02f79289496f 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack gconf2
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 670d0aae9610..ae1493fc822d 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -32,8 +32,7 @@ MAN1= cvs.1
MAN5= cvs.5
MAN8= cvsbug.8
INFO= cvs cvsclient
-WANT_AUTOMAKE_VER= 14
-WANT_AUTOCONF_VER= 213
+USE_AUTOTOOLS= automake:14:env autoconf:213:env
post-install:
install-info ${PREFIX}/info/cvs.info ${PREFIX}/info/dir
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 6b5e38f314fc..b58a5c45b1a5 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -16,7 +16,7 @@ COMMENT= An SDL game engine library
USE_SDL= image sdl
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --program-prefix=""
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 6dcf502d60dc..86c3f4c4fe92 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNU gettext package
USE_ICONV= yes
LIBTOOLFILES= autoconf-lib-link/configure gettext-runtime/configure \
gettext-runtime/libasprintf/configure gettext-tools/configure
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= ACLOCAL="${TRUE}" \
AUTOCONF="${TRUE}" \
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index f5932cd9653c..56a4362eea09 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG= yes
PLIST_FILES= bin/glade-- bin/glademm-embed
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 3d304ef18dca..9a73b994d39c 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 426c682238b1..3825e854771c 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 0c0c501e6e00..0cc94b211705 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -19,7 +19,7 @@ COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 426c682238b1..3825e854771c 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack lthack gnometarget libgnomeui gnomevfs2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index 0c0c501e6e00..0cc94b211705 100644
--- a/devel/gnomecrash/Makefile
+++ b/devel/gnomecrash/Makefile
@@ -19,7 +19,7 @@ COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index 9f40b3568dd5..be6c7af033b0 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/libiberty
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-install-libiberty
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFLICTS= freelibiberty-*
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index 9ed2524cb8ac..e267534e801e 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_REINPLACE= yes
WITH_MOZILLA?= firefox
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
.include <bsd.port.pre.mk>
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 228c971a2fa4..0562eae43dbc 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE= yes
USE_SDL= sdl image
USE_GMAKE= yes
USE_GCC= 3.2+
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-allegro
INSTALLS_SHLIB= yes
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 6af026024671..cfc0019f0abb 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index f5b0ff66762a..9946f85849ba 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -17,7 +17,7 @@ COMMENT= Multi-platform helper library for networking and security applications
OPTIONS= SSLDEBUG "Enable gwenhywfar SSL debug (if SSL enabled)" off \
MEMDEBUG "Enable memory debugger statistic" off
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_OPENSSL= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index a7e881c5179c..a10efd92da5b 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -18,7 +18,7 @@ COMMENT= A small C++ tools library based on STL
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/jakelib2/Makefile b/devel/jakelib2/Makefile
index 19e6ce20c4cc..97124aad9ef8 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A cross platform C++ class library with a Java-like API
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index 6b59eacb20c4..35d5421c80d9 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -18,7 +18,7 @@ COMMENT= Shows information about Java class, dependencies and more
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_GNOME= pkgconfig gnomehack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 05e6e951c645..3069f5e91775 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}
USE_JAVA= yes
JAVA_VERSION= 1.2+
USE_PYTHON= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= jep.1
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index 6253d6eae039..71b3dac060a8 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= General purpose dynamic array
GNU_CONFIGURE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= YES
INSTALLS_SHLIB= YES
USE_REINPLACE= YES
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index 33194399fce4..5f74c868cb78 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config
USE_GNOME= gnometarget
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= WXWINDOWS="yes"
PLIST_FILES= bin/klassmodeler
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 1702e87c3374..b70583aad8fe 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_SDL= image sdl
USE_GNOME= gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/leoarg/Makefile b/devel/leoarg/Makefile
index 2e9a550c1eb6..6fcadc8b635e 100644
--- a/devel/leoarg/Makefile
+++ b/devel/leoarg/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A class for parsing command lines
USE_GNOME= gnometarget lthack
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --disable-static
INSTALLS_SHLIB= yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 302a6d79785f..e2ee9b36348e 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_BISON= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 95c141863f1a..684e4d3af028 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -15,7 +15,7 @@ DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Property library for gnome and Window Maker
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 857bc9c500b6..11b67ae01745 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -17,7 +17,7 @@ COMMENT= An C++ networking library and application framework
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
CONFIGURE_ARGS= --disable-html-docs --disable-static
INSTALLS_SHLIB= yes
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index d02928453bc0..8448fa523504 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index b80835572016..dd13749923d9 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
USE_X_PREFIX= yes
USE_GNOME= gnomehack
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index 3c1c2d384619..395870c5fa10 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -16,12 +16,9 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= automake:19:env autoconf:259:env libltdl:15 libtool:15:env
INSTALLS_SHLIB= yes
-WANT_AUTOCONF_VER= 259
-WANT_AUTOMAKE_VER= 19
-WANT_LIBTOOL_VER= 15
MAN1= cstrc.1 frame.1 getfields.1 intro.1 panic.1 prstat.1 readline.1 \
rpoll.1 strnchr.1 strnlen.1 strsave.1 strtrimsp.1 verb.1 xalloc.1
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index 106a99bdec88..c51d645c7495 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Binary I/O stream class library
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GCC= 3.4+
diff --git a/devel/libbnr/Makefile b/devel/libbnr/Makefile
index 55ce44734afa..ff9ce18c6ad4 100644
--- a/devel/libbnr/Makefile
+++ b/devel/libbnr/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://dspam.nuclearelephant.com/sources/extras/ \
MAINTAINER= itetcu@people.tecnik93.com
COMMENT= GPL implementation of the Bayesian Noise Reduction algorithm
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 8231b2581e73..63c3c7ab7e8f 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index b4063737c3fd..1d47b4306a1a 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack libbonobo
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index 0a79e6506096..3699fd161221 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/
MAINTAINER= petef@FreeBSD.org
COMMENT= Network library aimed at easy development of C++ server daemons
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile
index 7c26475aa102..1c127be0e2ee 100644
--- a/devel/libconfuse/Makefile
+++ b/devel/libconfuse/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck
.endif
USE_ICONV= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS+= --disable-nls
CFLAGS+= -I${WRKSRC}/src
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 768e134df1fb..d0f2edd36478 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-threading
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GETOPT_LONG=yes
diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile
index 0fab73ad4e23..6fe68d2eaa66 100644
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= Lightweight C library that eases the writing of UNIX daemons
CONFIGURE_ARGS= --disable-lynx
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index d52cb0ea826d..92a4f9ad2c15 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -19,7 +19,7 @@ COMMENT= C++ class library of common digital signal processing functions
WRKSRC= ${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:env
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
INLINE_VER="${INLINE_VER}"
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 0905d21d167b..7b409e9686a3 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= petef@FreeBSD.org
COMMENT= Provides an API to execute callback functions on certain events
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index bb38cd9258c7..b02cbb0429cc 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/libffi/
MAINTAINER= horance@freera.net
COMMENT= Foreign Function Interface
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index bb38cd9258c7..b02cbb0429cc 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://sources.redhat.com/pub/libffi/
MAINTAINER= horance@freera.net
COMMENT= Foreign Function Interface
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= # empty
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index 919e56cc96a3..3c9ae20dc7c4 100644
--- a/devel/libfs++/Makefile
+++ b/devel/libfs++/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library which provides a file_iterator class
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index 49aebf8a8945..3390b770cf23 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Generic Hash Table
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index dee3338d6b18..75514e7fef48 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -19,7 +19,7 @@ COMMENT= GGI API for input sources
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
MAN1= mhub.1
diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile
index 66e553fb2b88..9b7ebc2280b2 100644
--- a/devel/libgiigic/Makefile
+++ b/devel/libgiigic/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gii.0:${PORTSDIR}/devel/libgii
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8764ec9d0b56..6d7d3ac2658a 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libxml2 gtk20
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index d523df80ec08..a8148bf5cf9f 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 71b3832ca523..8a3732f65227 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack libglade2
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 0dadef5824d1..2e543fe38692 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= freeassociation
MAINTAINER= joe@zircon.seattle.wa.us
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
INSTALLS_SHLIB= yes
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 67c8e7ecc1b5..e9274b5b8a95 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -15,7 +15,7 @@ COMMENT= Library for parsing RFC2425 MIME Directory Profile information
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
USE_BISON= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libmusclecard/Makefile b/devel/libmusclecard/Makefile
index 474480a82a0b..74001029d205 100644
--- a/devel/libmusclecard/Makefile
+++ b/devel/libmusclecard/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --enable-muscledropdir=${LOCALBASE}/lib/pcsc/services
USE_REINPLACE= yes
USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
MAN8= bundleTool.8
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 52971a4793b2..fd51065209f6 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-1.1:${PORTSDIR}/devel/dbus \
USE_GNOME= gnomehack gnometarget intlhack glib20
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 4f8b6de75306..a350a3a9a4df 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -15,7 +15,7 @@ COMMENT= Library of optimized inner loops
USE_GNOME= glib20
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GCC= 3.4
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index d7f687733610..901a768ce7f5 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= vince@blue-box.net
COMMENT= Library needed by syslog-ng
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
USE_GCC= 3.3+
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 0acd08f0f557..98d022fe1aaa 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libwww
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index 108a5122182b..92dd826b796d 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -16,7 +16,7 @@ COMMENT= C lib used to connect to iTunes(R) music shares
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= libopendaap.3
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 9e77a929b7cb..447ba3f165ae 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_GNOME= gnomehack glib20 libxml2
USE_REINPLACE= yes
diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile
index 9e77a929b7cb..447ba3f165ae 100644
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
USE_GNOME= gnomehack glib20 libxml2
USE_REINPLACE= yes
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index 86dc6ad860a4..3c9e1c8d4692 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -18,7 +18,7 @@ COMMENT= Parallel Events and Asynchronous tasKing Library
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= CFLAGS="${CFLAGS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}"
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index 9f5410268e62..5c00abc13d40 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library that provides the red-black balanced tree algorithm
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 64e9ce1c5076..d4dbcf877503 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library for Shared Buffer IPC
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 71b8da065f94..cbd321ab79df 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libsigc \
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 2ca2a68581f0..3105b2364963 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -23,6 +23,6 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++12
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 7a5501e23508..3411313c5744 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
LATEST_LINK= libsigc++20
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
PLIST_SUB= VERSION="2.0" API_VERSION="2.0"
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 9aa2028f363e..58ad6ec61ea2 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -19,7 +19,7 @@ COMMENT= An extension of libSigC++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 5d86e518ed0c..7219c4dc788a 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -22,7 +22,7 @@ COMMENT= Provides a useful interface to system statistics
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnometarget pkgconfig
MAN3= sg_get_cpu_percents.3 sg_get_cpu_stats.3 \
diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile
index 24a05f6cc1bc..a487df609721 100644
--- a/devel/libstrfunc/Makefile
+++ b/devel/libstrfunc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= vlm@lionet.info
COMMENT= Handles CGI forms, MIME, templates, date conversions, etc
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=""
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index bf637d775261..e0edacb335fa 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -16,7 +16,7 @@ COMMENT= A stroke translation library
USE_XLIB= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libtap/Makefile b/devel/libtap/Makefile
index f47ce8c0f9b7..b8a4861d81ec 100644
--- a/devel/libtap/Makefile
+++ b/devel/libtap/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= nik@FreeBSD.org
COMMENT= Library implementing the Test Anything Protocol
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= tap.3
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index f244e6065928..6649428faab8 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive command line editing facilities
USE_SUBMAKE= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= default
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 087dbc8d026f..d3b17495e691 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index e64a548cdfef..7a69710709da 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator file types library
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index 0881fb82f9cd..01e4e31b02b9 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -24,7 +24,7 @@ MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= gnomehack gnometarget pkgconfig lthack
.include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 73e35dd9bee3..606b51abfb92 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for manipulating Unicode characters and strings
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 917c5fb9547f..dee4ad1c9581 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -18,6 +18,6 @@ COMMENT= Library giving userland programs access to USB devices
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-docs
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/libzt/Makefile b/devel/libzt/Makefile
index b717ecd74e68..36b3b182e84a 100644
--- a/devel/libzt/Makefile
+++ b/devel/libzt/Makefile
@@ -17,7 +17,7 @@ DEPRECATED= mastersite disappeared, no longer maintained by author
EXPIRATION_DATE=2005-12-31
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
USE_GETOPT_LONG= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 72f9f40157b2..d062aef05b03 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
USE_GETTEXT= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index 90abb92caf83..15b5f86cfc8c 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Logging for C Library
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index b349e2d40293..b7b1786654ae 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= petri.totterman@hmv.fi
COMMENT= A logging library for C++
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 3ebaa263ae8e..ac53c52272e3 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -28,10 +28,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost
CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
.endif
-USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= automake:15 autoconf:253 libtool:13
AUTOMAKE_ARGS= --add-missing
-USE_LIBTOOL_VER=13
LIBTOOL_VARS= --force --automake
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index cedb6fb14938..a9eab1b8fe03 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A userspace thread library
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 5e24c6b3a91b..9ab537dcc4bb 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
USE_XLIB= yes
USE_GNOME= gnometarget libxml2 pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index b085c2da1b4c..de5b04d835e1 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
#CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} \
# CXXFLAGS="${CXXFLAGS}" CPP=${CPP}
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index fe7160a14095..e96af66b060d 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-20011113
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --target=i386-mingw32msvc
MAN1= i386-mingw32msvc-addr2line.1 \
diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index e0e34fe104d0..d3430023c3e5 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/i386-mingw32msvc/bin/as:${PORTSDIR}/devel/mingw-binuti
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}-20010828
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env
USE_GMAKE= yes
USE_REINPLACE= yes
WITHOUT_CPU_CFLAGS= yes
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 4c6b99c711c6..7f7da1f6efc2 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -36,7 +36,7 @@ PATCH_DIST_STRIP= -p1
#USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--disable-nls --disable-win32-registry \
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 66f0a5600ead..235dc0c2d335 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--enable-languages=c,c++,f77,objc,java \
--with-gcc --with-gnu-ld --with-gnu-as \
diff --git a/devel/mipsel-linux-binutils/Makefile b/devel/mipsel-linux-binutils/Makefile
index 38ea58d075fd..9cc8fe654661 100644
--- a/devel/mipsel-linux-binutils/Makefile
+++ b/devel/mipsel-linux-binutils/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} --with-gnu-ld --with-gnu-as \
--with-gcc --without-x11
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure ld/configure opcodes/configure
MAN1= ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/mipsel-linux-gcc/Makefile b/devel/mipsel-linux-gcc/Makefile
index 8574fedd3a04..6dc4e488eaf1 100644
--- a/devel/mipsel-linux-gcc/Makefile
+++ b/devel/mipsel-linux-gcc/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
ONLY_FOR_ARCHS= i386 alpha
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_PERL5= yes
LIBTOOLFILES= configure gcc/configure
MAN1= ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 \
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 9d68b857a1d6..46c8e6e91574 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \
gas/configure gprof/configure ld/configure opcodes/configure
MAN1= ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 14110629496b..421731e64ebc 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--enable-languages=c --disable-nls \
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index 14110629496b..421731e64ebc 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--with-gcc --with-gnu-ld --with-gnu-as \
--enable-languages=c --disable-nls \
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index bb94decf6bf7..17dda033e70e 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GDBVERSION}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//}
MAKE_ENV= PATH=${PREFIX}/bin:${PATH}
LIBTOOLFILES= configure opcodes/configure bfd/configure
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 670bd31b22c0..82f44198fb7d 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -18,7 +18,7 @@ COMMENT= Generic configuration management library
LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc
INSTALLS_SHLIB= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= YES
post-patch:
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 67a00faf9f5a..7f9b951c402d 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --without-howl
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.if !defined(WITHOUT_NLS)
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index de983b2403cd..6f239355e73c 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
lablgl:${PORTSDIR}/graphics/ocaml-lablgl
USE_SDL= sdl ttf image mixer
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-findlib
USE_GMAKE= yes
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index cd1c58c5bd4e..62cbdfc5ba27 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -19,7 +19,7 @@ COMMENT= An interpreted dynamic parser
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 2fbab01b70c8..3e387ed87065 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ bindings for ORBit, a CORBA 2.2-compliant ORB
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack orbit2
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
post-patch:
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index 12c124715a10..3d96635d8b17 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
check: build
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 37e075c8d4be..b397d9697079 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3= cfg.3
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index d6803a41e673..38f338d6d836 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -18,7 +18,7 @@ COMMENT= OSSP ex is a small exception handling library for use in C
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index 1da7776cb570..e4a9b6886548 100644
--- a/devel/ossp-l2/Makefile
+++ b/devel/ossp-l2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A C library for a flexible and sophisticated Unix logging facility
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= l2-config.1 l2tool.1
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 5984e542f2fc..b4cbe3d6427b 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
MAN1= val-config.1
MAN3= val.3
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 2de614bc03fa..a1f5cfadefe8 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -18,7 +18,7 @@ COMMENT= A flexible, full-featured and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-xds/Makefile b/devel/ossp-xds/Makefile
index 7874c3b4a209..a81953e81b68 100644
--- a/devel/ossp-xds/Makefile
+++ b/devel/ossp-xds/Makefile
@@ -17,7 +17,7 @@ COMMENT= A generic and extensible framework for serialization
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= xds-config.1
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 333ff01dffa8..5b8f89032b6c 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -20,7 +20,7 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
LDFLAGS="`${PCRE_CONFIG} --libs`"
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 0450e15eb1c5..e9700ed80197 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -19,7 +19,7 @@ COMMENT= Perl Compatible Regular Expressions library
CONFLICTS?= pcre-utf8-[0-9]*
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index af96dd7af0e2..bdeba71c2af3 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -18,7 +18,7 @@ COMMENT= A smartcard development library
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
WRKSRC= ${WRKDIR}/pcsc-lite-1.2.9-beta7
INSTALLS_SHLIB= yes
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index f9efa96a2f76..1d32a588989e 100644
--- a/devel/physfs-devel/Makefile
+++ b/devel/physfs-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
NO_LATEST_LINK= yes
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 633aa106cc41..a18880e1e83a 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_GNOME= gnometarget
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 25763585cb0e..4c66b10e70a6 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -21,7 +21,7 @@ COMMENT= A getopt(3) like library with a number of enhancements, from Redhat
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 1fb2c12a8e14..73ea812dbd79 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -17,7 +17,7 @@ COMMENT= Posadis C++ DNS library
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 72e4a149d0fa..b06751d847d5 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -20,7 +20,7 @@ USE_PGSQL= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gtk20 gconf2 glib20 libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 2ca409b0b1a7..0879d9099823 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library that makes it easy for programs to use privilege separation
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 378dbaced7ee..f9bee15d41c6 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ENV= OSRELEASE=${OSVERSION}
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/pwlib152/Makefile b/devel/pwlib152/Makefile
index 378dbaced7ee..f9bee15d41c6 100644
--- a/devel/pwlib152/Makefile
+++ b/devel/pwlib152/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
CONFIGURE_ENV= OSRELEASE=${OSVERSION}
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index df8e9d777339..3e731036b13e 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack orbit2
USE_PYTHON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config
.include <bsd.port.mk>
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index f4b2c4c6133a..3ea4467a316a 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS= apr-1-config:${PORTSDIR}/devel/apr-svn \
${SVNDEP}:${PORTSDIR}/devel/subversion
USE_X_PREFIX= yes
-USE_LIBTOOL_VER= 15
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259 libtool:15
CONFIGURE_ARGS= --with-wx-config=${WXCONFIG} \
--with-apr-config=apr-1-config \
--with-apu-config=apu-1-config
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 0164d090f47e..93a2197a681a 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -19,7 +19,7 @@ COMMENT= A complete regular expressions C++ solution
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index ee894c8c54d7..a4041b4da412 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -15,7 +15,7 @@ COMMENT= An interprocess communication library
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 0d78b51209f9..58f10e7f3b6d 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -17,7 +17,7 @@ COMMENT= A utility C++ class library for daemons, clients, servers and more
USE_GNOME= pkgconfig
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLBASE}/include \
--with-ssl-libs=-L${OPENSSLBASE}/lib --disable-pcre
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index ac3c30712919..4a1e6a519dbb 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -18,6 +18,6 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.mk>
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index eb027f970554..c5ba077105f7 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
WANT_GNOME= yes
CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index d4232a6e6dfe..576335df004d 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer)
USE_SDL= sdl
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 0c5c2d170428..d62d36fa90a5 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= boost_thread.3:${PORTSDIR}/devel/boost
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index d14171473fca..ee2aadc95171 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://dl.maptools.org/dl/shapelib/
MAINTAINER= ports@FreeBSD.org
COMMENT= C API for reading and writing ArcView Shapefiles
-WANT_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:env
ALL_TARGET= lib
INSTALLS_SHLIB= yes
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index e9e92476a7a9..417ed0300c0c 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -18,7 +18,7 @@ COMMENT= Shared-memory-based hashmaps
LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 8649300907c8..ac5566c92955 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOME= gnomehack glib12 libxml
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/str/Makefile b/devel/str/Makefile
index 38319008d286..4768579934db 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -16,7 +16,7 @@ COMMENT= Generic String Library
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= str-config.1
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 63fb3c3a51d0..3873c22f92fa 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -17,7 +17,7 @@ COMMENT= A scanner/parser generator
USE_ICONV= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index c35ccc4fdfed..a6f918355178 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 925aa51f004d..49fb4d3197e5 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= xride@x12.dk
COMMENT= Simplified Wrapper and Interface Generator
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env libtool:13
VER= ${PORTVERSION:R}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -108,7 +108,6 @@ CONFIGURE_ARGS+= --without-java
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC -DPIC"
ALL_TARGET= swig
PLIST_SUB+= VER="${VER}"
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 925aa51f004d..49fb4d3197e5 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= xride@x12.dk
COMMENT= Simplified Wrapper and Interface Generator
-WANT_AUTOCONF_VER=253
+USE_AUTOTOOLS= autoconf:253:env libtool:13
VER= ${PORTVERSION:R}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -108,7 +108,6 @@ CONFIGURE_ARGS+= --without-java
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_LIBTOOL_VER= 13
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC -DPIC"
ALL_TARGET= swig
PLIST_SUB+= VER="${VER}"
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index b43bfcba2bf5..b7cc4b7aca7e 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -18,9 +18,7 @@ USE_BZIP2= yes
USE_PERL5= yes
HAS_CONFIGURE= yes
-USE_AUTOMAKE_VER= 19
-USE_ACLOCAL_VER= 19
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:259
MAN1= sysconftool.1 sysconftoolcheck.1
MAN7= sysconftool.7
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 744d93deba64..b6348623c5ed 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
ALL_TARGET= without_doc
INSTALLS_SHLIB= yes
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index d1a9dd5ba365..50f0679d0e50 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tclreadline
MAINTAINER= darius@dons.net.au
COMMENT= GNU readline for TCL
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
MANN= tclreadline.n
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 4efbc4b006c2..dab3d66fbcce 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE= yes
USE_GNOME= gnomelibs libglade
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
.include <bsd.port.pre.mk>
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index 05a27dbbbc2e..db56450cc5fc 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= robert@rs.tarrant.tx.us
COMMENT= General purpose string library for C
GNU_CONFIGURE= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index 0101b00e9092..d946c4d0b132 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
OPTIONS= SDL_MIXER "music and sound support" off
USE_FREETYPE= yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 440e20769cb3..7e3d5763bdfb 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -22,7 +22,7 @@ USE_GETTEXT= yes
USE_GCC= 3.4+
USE_GNOME= glib20 gtk20 atk pango pkgconfig libglade2 gnomehack
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index b1f4f18f6989..64b8ca0fba13 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A general-purpose tool for parameter handling in C++
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index ba13623d2180..67ae0e62bb4d 100644
--- a/devel/xxl/Makefile
+++ b/devel/xxl/Makefile
@@ -15,7 +15,7 @@ COMMENT= C and C++ that provides exception handling and asset management
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-threads
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 6145ac5539a4..6092ec450ed2 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -16,8 +16,7 @@ COMMENT= A complete rewrite of the NASM assembler
USE_REINPLACE= yes
USE_ICONV= yes
-USE_LIBLTDL= yes
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS= autoconf:259 libltdl:15
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 34f0842dc736..a50e82a6f8b5 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A platform-independent object-oriented C++ threading library
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-ftime --disable-static
USE_GMAKE= yes
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 577babbf6580..c89cc827e12e 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
USE_GNOME= gnomehack
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}