aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
commit789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch)
treedc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /devel
parentd1a9e827c98542eb35619dffa314cba50fb08b58 (diff)
downloadports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.tar.gz
ports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile4
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/ace/Makefile2
-rw-r--r--devel/alf/Makefile2
-rw-r--r--devel/anjuta/Makefile2
-rw-r--r--devel/apr/Makefile2
-rw-r--r--devel/apr0/Makefile2
-rw-r--r--devel/apr1/Makefile2
-rw-r--r--devel/apr2/Makefile2
-rw-r--r--devel/argp-standalone/Makefile2
-rw-r--r--devel/argtable/Makefile2
-rw-r--r--devel/atlas-devel/Makefile2
-rw-r--r--devel/atlas/Makefile2
-rw-r--r--devel/autotools/Makefile2
-rw-r--r--devel/bglibs/Makefile2
-rw-r--r--devel/boehm-gc/Makefile2
-rw-r--r--devel/bullet/Makefile2
-rw-r--r--devel/c_c++_reference/Makefile2
-rw-r--r--devel/cdialog/Makefile2
-rw-r--r--devel/clanlib/Makefile2
-rw-r--r--devel/clint/Makefile2
-rw-r--r--devel/clint/pkg-plist1
-rw-r--r--devel/cppunit/Makefile2
-rw-r--r--devel/cstringbuffer/Makefile2
-rw-r--r--devel/dbus-glib/Makefile2
-rw-r--r--devel/dbus-sharp/Makefile2
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/devhelp/Makefile2
-rw-r--r--devel/directfb/Makefile2
-rw-r--r--devel/dotconf++/Makefile2
-rw-r--r--devel/dotconf/Makefile2
-rw-r--r--devel/eboxy/Makefile2
-rw-r--r--devel/elfio/Makefile4
-rw-r--r--devel/entity/Makefile2
-rw-r--r--devel/fam/Makefile2
-rw-r--r--devel/flatzebra/Makefile2
-rw-r--r--devel/flowdesigner/Makefile2
-rw-r--r--devel/gamin/Makefile2
-rw-r--r--devel/gaul/Makefile5
-rw-r--r--devel/gaul/files/patch-Makefile.in (renamed from devel/gaul/files/patch-Makefile.am)8
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gengameng/Makefile2
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/gflags/Makefile2
-rw-r--r--devel/glade3/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/glibmm/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--devel/goffice04/Makefile2
-rw-r--r--devel/goffice06/Makefile2
-rw-r--r--devel/goffice1/Makefile2
-rw-r--r--devel/gpsim/Makefile2
-rw-r--r--devel/gtkmozedit/Makefile2
-rw-r--r--devel/guichan/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/jrtplib/Makefile2
-rw-r--r--devel/json-glib/Makefile2
-rw-r--r--devel/kcachegrind/Makefile2
-rw-r--r--devel/kdbg/Makefile2
-rw-r--r--devel/kdesdk3/Makefile2
-rw-r--r--devel/kdevelop/Makefile2
-rw-r--r--devel/klassmodeler/Makefile2
-rw-r--r--devel/kprof/Makefile2
-rw-r--r--devel/kscope/Makefile2
-rw-r--r--devel/kxl/Makefile2
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/lasi/Makefile3
-rw-r--r--devel/libPropList/Makefile2
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbegemot/Makefile7
-rw-r--r--devel/libbegemot/pkg-plist1
-rw-r--r--devel/libbinio/Makefile2
-rw-r--r--devel/libbnr/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libcapsinetwork/Makefile2
-rw-r--r--devel/libchipcard-kde/Makefile2
-rw-r--r--devel/libchipcard/Makefile2
-rw-r--r--devel/libconfuse/Makefile2
-rw-r--r--devel/libcwd/Makefile2
-rw-r--r--devel/libdaemon/Makefile2
-rw-r--r--devel/libdnsres/Makefile6
-rw-r--r--devel/libdsp/Makefile2
-rw-r--r--devel/libfs++/Makefile2
-rw-r--r--devel/libftdi/Makefile2
-rw-r--r--devel/libgdata/Makefile2
-rw-r--r--devel/libghthash/Makefile2
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libgutenfetch/Makefile2
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libltdl15/pkg-plist6
-rw-r--r--devel/libltdl22/Makefile (renamed from devel/libltdl15/Makefile)13
-rw-r--r--devel/libltdl22/pkg-descr (renamed from devel/libltdl15/pkg-descr)0
-rw-r--r--devel/libltdl22/pkg-plist9
-rw-r--r--devel/libltdl24/Makefile27
-rw-r--r--devel/libltdl24/pkg-descr9
-rw-r--r--devel/libltdl24/pkg-plist9
-rw-r--r--devel/libmaa/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/libnotifymm/Makefile2
-rw-r--r--devel/liboil/Makefile2
-rw-r--r--devel/libol/Makefile2
-rw-r--r--devel/libole2/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopendaap/Makefile2
-rw-r--r--devel/libpeak/Makefile2
-rw-r--r--devel/libphish/Makefile2
-rw-r--r--devel/libpperl/Makefile2
-rw-r--r--devel/libredblack/Makefile2
-rw-r--r--devel/librelp/Makefile2
-rw-r--r--devel/libshbuf/Makefile2
-rw-r--r--devel/libsigc++/Makefile2
-rw-r--r--devel/libsigc++12/Makefile2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libsigcx/Makefile2
-rw-r--r--devel/libsigsegv/Makefile2
-rw-r--r--devel/libsoup/Makefile2
-rw-r--r--devel/libsoup22/Makefile2
-rw-r--r--devel/libstrfunc/Makefile2
-rw-r--r--devel/libstroke/Makefile2
-rw-r--r--devel/libtap/Makefile2
-rw-r--r--devel/libthai/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libtifiles2/Makefile2
-rw-r--r--devel/libtool15/distinfo3
-rw-r--r--devel/libtool15/files/patch-libltdl-Makefile.in14
-rw-r--r--devel/libtool15/files/patch-libltdl-acinclude.m48
-rw-r--r--devel/libtool15/files/patch-ltdl.m48
-rw-r--r--devel/libtool15/pkg-plist27
-rw-r--r--devel/libtool22/Makefile (renamed from devel/libtool15/Makefile)5
-rw-r--r--devel/libtool22/distinfo3
-rw-r--r--devel/libtool22/files/patch-libltdl-Makefile.in22
-rw-r--r--devel/libtool22/files/patch-libltdl_config_ltmain.sh (renamed from devel/libtool15/files/patch-ltmain.sh)52
-rw-r--r--devel/libtool22/pkg-descr (renamed from devel/libtool15/pkg-descr)0
-rw-r--r--devel/libtool22/pkg-plist56
-rw-r--r--devel/libtool24/Makefile24
-rw-r--r--devel/libtool24/distinfo3
-rw-r--r--devel/libtool24/files/patch-libltdl-Makefile.in22
-rw-r--r--devel/libtool24/files/patch-libltdl_config_ltmain.sh103
-rw-r--r--devel/libtool24/pkg-descr8
-rw-r--r--devel/libtool24/pkg-plist56
-rw-r--r--devel/libukcprog/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/libusb/Makefile4
-rw-r--r--devel/libvanessa_adt/Makefile2
-rw-r--r--devel/libvanessa_logger/Makefile2
-rw-r--r--devel/libvanessa_socket/Makefile2
-rw-r--r--devel/libvc/Makefile2
-rw-r--r--devel/libytnef/Makefile2
-rw-r--r--devel/lmdbg/Makefile2
-rw-r--r--devel/log4c/Makefile2
-rw-r--r--devel/log4cplus/Makefile2
-rw-r--r--devel/log4cpp/Makefile3
-rw-r--r--devel/log4cxx/Makefile2
-rw-r--r--devel/log4shib/Makefile2
-rw-r--r--devel/m17n-lib/Makefile2
-rw-r--r--devel/memcheck/Makefile2
-rw-r--r--devel/mimir/Makefile2
-rw-r--r--devel/mq4cpp/Makefile2
-rw-r--r--devel/ncnf/Makefile2
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/ois/Makefile2
-rw-r--r--devel/open-beagle/Makefile2
-rw-r--r--devel/openzz/Makefile2
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--devel/pcre++/Makefile2
-rw-r--r--devel/php-java-bridge/Makefile6
-rw-r--r--devel/physfs-devel/Makefile2
-rw-r--r--devel/physfs/Makefile2
-rw-r--r--devel/pikdev/Makefile2
-rw-r--r--devel/piklab/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/ppl/Makefile2
-rw-r--r--devel/prepstools/Makefile2
-rw-r--r--devel/present/Makefile2
-rw-r--r--devel/privman/Makefile2
-rw-r--r--devel/py-dbus/Makefile2
-rw-r--r--devel/py-subversion/pkg-plist8
-rw-r--r--devel/raknet/Makefile2
-rw-r--r--devel/rapidsvn/Makefile2
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/rlog/Makefile2
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/safestr/Makefile2
-rw-r--r--devel/sdl12/Makefile2
-rw-r--r--devel/sdlmm/Makefile2
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/shapelib/Makefile2
-rw-r--r--devel/shmap/Makefile2
-rw-r--r--devel/silc-toolkit/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--devel/spatialindex/Makefile2
-rw-r--r--devel/stringencoders/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--devel/subversion/Makefile.common2
-rw-r--r--devel/subversion16/Makefile.common2
-rw-r--r--devel/swig13/Makefile2
-rw-r--r--devel/swig20/Makefile2
-rw-r--r--devel/t1lib/Makefile2
-rw-r--r--devel/ta-lib/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/thrift/Makefile2
-rw-r--r--devel/towitoko/Makefile2
-rw-r--r--devel/umem/Makefile2
-rw-r--r--devel/upnp/Makefile2
-rw-r--r--devel/vstr/Makefile2
-rw-r--r--devel/wand-libconfig/Makefile2
-rw-r--r--devel/xlslib/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--devel/xxl/Makefile2
-rw-r--r--devel/zthread/Makefile2
224 files changed, 615 insertions, 306 deletions
diff --git a/devel/Makefile b/devel/Makefile
index be463d831e84..a9394b3c0211 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -680,7 +680,7 @@
SUBDIR += liblogging
SUBDIR += liblouis
SUBDIR += liblouisxml
- SUBDIR += libltdl15
+ SUBDIR += libltdl22
SUBDIR += libmaa
SUBDIR += libmatheval
SUBDIR += libmba
@@ -744,7 +744,7 @@
SUBDIR += libticalcs
SUBDIR += libtifiles
SUBDIR += libtifiles2
- SUBDIR += libtool15
+ SUBDIR += libtool22
SUBDIR += libublio
SUBDIR += libukcprog
SUBDIR += libunicode
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index e3bffecfa22f..c1e7a0529148 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack libidl ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index cd1333313381..af9009d15f2b 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -18,7 +18,7 @@ COMMENT= The Adaptive Communication Environment for C++
CONFLICTS= ace+tao-5*
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index e5a4a293066a..e28881dc287c 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= largefiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_PYTHON= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index dcd5ec03500e..e2915e1163f5 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
neato:${PORTSDIR}/graphics/graphviz \
p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
- libtool:${PORTSDIR}/devel/libtool15 \
+ libtool:${PORTSDIR}/devel/libtool22 \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
exctags:${PORTSDIR}/devel/ctags
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index cc4368e93ed5..225915059d8d 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -31,7 +31,7 @@ APR_VERSION= 1.3.6
APU_VERSION= 1.3.8
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env
+USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index cc4368e93ed5..225915059d8d 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -31,7 +31,7 @@ APR_VERSION= 1.3.6
APU_VERSION= 1.3.8
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env
+USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index cc4368e93ed5..225915059d8d 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -31,7 +31,7 @@ APR_VERSION= 1.3.6
APU_VERSION= 1.3.8
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env
+USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index cc4368e93ed5..225915059d8d 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -31,7 +31,7 @@ APR_VERSION= 1.3.6
APU_VERSION= 1.3.8
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env
+USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 1a141a617517..6ff4d69a5efe 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sem@FreeBSD.org
COMMENT= Standalone version of arguments parsing functions from GLIBC
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:15
+USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:22
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 38c52274f637..72a53736278c 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= corky1951@comcast.net
COMMENT= An ANSI C library for parsing GNU style command line arguments
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
MAN3= argtable2.3
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index 583b4f5fce8e..335dfa84b3da 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_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GNOME= gnomehack
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index bcca38a9cd36..9c1880146158 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A C++ reference implementation of the Atlas protocol
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GNOME= gnomehack
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index fc811947cfe0..d80d49d71f64 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -13,7 +13,7 @@ DISTFILES= # none
MAINTAINER= ade@FreeBSD.org
COMMENT= Autotools meta-port
-RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool15
+RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool22
PLIST_FILES= share/${PORTNAME}
NO_BUILD= yes
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index a8aba246d81c..e76a6e9fb52c 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -18,7 +18,7 @@ COMMENT= One stop library package by Bruce Guenter
NOT_FOR_ARCHS= alpha
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:15:env
+USE_AUTOTOOLS= libtool:22:env
LDFLAGS?= -s
BGLIBS_INC= ${PREFIX}/include/${PORTNAME}
BGLIBS_LIB= ${PREFIX}/lib/${PORTNAME}
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 2c5426da4537..6edebf1077e8 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gc${PORTVERSION:S/.a/alpha/}
MAINTAINER= stas@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index aaf07921d5bf..5ce0f77f3e74 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -18,7 +18,7 @@ COMMENT= 3D collision detection and rigid body dynamics library
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
-USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:22:env
GNU_CONFIGURE= yes
USE_DOS2UNIX= yes
USE_GL= glu glut
diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile
index 3656d2e0b82a..e18ae7ff2fe0 100644
--- a/devel/c_c++_reference/Makefile
+++ b/devel/c_c++_reference/Makefile
@@ -18,7 +18,7 @@ COMMENT= C/C++ reference manual for KDevelop
RUN_DEPENDS= kdevelop:${PORTSDIR}/devel/kdevelop
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_KDELIBS_VER= 3
USE_GMAKE= yes
diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index a47dd0b320c0..316e18978b15 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= scjamorim@bsd.com.br
COMMENT= An enhanced version of 'dialog' to work with ncurses
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} --with-libtool
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 257cc5c57e7b..ecab6bac00a4 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \
WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION}
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index e23d3a8a49d8..1c850263bc5c 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A static source code checker for C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/clint/pkg-plist b/devel/clint/pkg-plist
index 81410e76cfc3..e4bcbf1c7d51 100644
--- a/devel/clint/pkg-plist
+++ b/devel/clint/pkg-plist
@@ -1,7 +1,6 @@
bin/clint
include/clint/exceptions.h
include/clint/python.h
-lib/clint/python.a
lib/clint/python.la
lib/clint/python.so
lib/clint/python.so.0
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 884048668f37..87c0b2945858 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF
MAINTAINER= yzlin@FreeBSD.org
COMMENT= C++ port of the JUnit framework for unit testing
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile
index 4738cbddd07e..40d64b3a1d44 100644
--- a/devel/cstringbuffer/Makefile
+++ b/devel/cstringbuffer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= # disappeared
MAINTAINER= ports@FreeBSD.org
COMMENT= File-like IO for strings
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAN3= csb.3
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index fb816bb51ffc..14c5539a8a33 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
USE_GNOME= gnomehack glib20 ltverhack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
--disable-doxygen-docs \
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 5110022c6ec9..8b5212260689 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -23,7 +23,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
USE_GNOME= gnomehack gnometarget gtksharp10
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --enable-mono \
--disable-python \
--disable-gcj \
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 488aa5fdd2d2..6b9dffbe4eb5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_GNOME?= gnomehack libxml2 ltverhack
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS=--localstatedir=/var \
--with-test-socket-dir=${WRKDIR} \
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index bfe792a84495..a55316e6b9f5 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -23,7 +23,7 @@ USE_XORG= x11
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 35297d9a8283..f69ec8ae68a2 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index a22a40a2a189..d00132affad5 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mark_sf@kikg.ifmo.ru
COMMENT= Configuration file parser written in C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index a4aa71551ec1..5a8210dc95a9 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.azzit.de/dotconf/download/v1.1/
MAINTAINER= clement@FreeBSD.org
COMMENT= A simple, powerful configuration-file parser
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 68f92dc9d1c7..9cd3ab7fca0f 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -20,7 +20,7 @@ USE_BISON= build
USE_BZIP2= yes
USE_SDL= sdl gui mixer
USE_GNOME= gnometarget libxml2 lthack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-lirc
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index e7bab3508d32..01c69399a82f 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -17,12 +17,12 @@ DISTNAME= ${PORTNAME:U}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= C++ library for reading and generating files in the ELF binary format
-BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool15
+BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool22
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:15
+USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:22
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
diff --git a/devel/entity/Makefile b/devel/entity/Makefile
index ca20d9462ae4..21e77ed174e9 100644
--- a/devel/entity/Makefile
+++ b/devel/entity/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= python:${PORTSDIR}/lang/python
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-tcl=no
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME= gtk12
USE_LDCONFIG= ${PREFIX}/lib/entity/clib
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index f4dd4fe2b4fb..f209e87d6867 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -17,7 +17,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:15
+USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:22
AUTOMAKE_ARGS= -c -a
USE_GMAKE= yes
USE_GNOME= gnometarget
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index adf1e4a38cc2..d9ab5d83767c 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -17,7 +17,7 @@ COMMENT= A generic game engine for 2D double-buffering animation
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_SDL= sdl mixer image
USE_GNOME= pkgconfig
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index fb10b96354c0..c1f186078b9d 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
USE_GNOME= gnomehack gnometarget libgnomeui libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
LIBTOOLFILES= ${CONFIGURE_SCRIPT} FuzzyEngine/configure \
HMM/configure NNet/configure \
VQ/configure audio_blocks/configure \
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index d9791e74daa7..489468d721ec 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A file and directory monitoring system
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME?= gnomehack _glib20
USE_LDCONFIG= yes
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index a149175fe69f..8ffe4aed7f29 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= automake:19 libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -31,7 +31,4 @@ USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure
-run-autotools::
- (cd ${WRKSRC} ; ${ACLOCAL} ; ${AUTOMAKE})
-
.include <bsd.port.mk>
diff --git a/devel/gaul/files/patch-Makefile.am b/devel/gaul/files/patch-Makefile.in
index 067456489e7f..f7b3be56e226 100644
--- a/devel/gaul/files/patch-Makefile.am
+++ b/devel/gaul/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- ./Makefile.am.orig 2009-01-19 02:10:49.000000000 -0500
-+++ ./Makefile.am 2009-01-19 02:11:12.000000000 -0500
-@@ -30,7 +30,7 @@
+--- Makefile.in.orig 2009-07-13 13:34:54.000000000 -0500
++++ Makefile.in 2009-07-13 13:35:06.000000000 -0500
+@@ -235,7 +235,7 @@
+
# require automake 1.4
AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = util src tests debian .
+SUBDIRS = util src .
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 4bcf80eb9305..283c76b2f621 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -20,7 +20,7 @@ COMMENT= A configuration database system for GNOME
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 6e0d15e5a9f2..d10f2f895b1b 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -30,7 +30,7 @@ USE_GETTEXT= yes
USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
referencehack intlhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index b3abac48664d..ceb877a1ffd6 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for gconf2 API library
LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gconf2
GNU_CONFIGURE= yes
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index e324772a4d2f..36753b241cb2 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/FreeBSD/distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= An SDL game engine library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_SDL= image sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 9e0c8e68dc9c..4886ad73267f 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_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= ACLOCAL="${TRUE}" \
AUTOCONF="${TRUE}" \
AUTOMAKE="${TRUE}" \
diff --git a/devel/gflags/Makefile b/devel/gflags/Makefile
index cbf5c4b6d4d6..a4f23f8c7300 100644
--- a/devel/gflags/Makefile
+++ b/devel/gflags/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= leeym@FreeBSD.org
COMMENT= Commandline flags module for C++
PROJECTHOST= google-gflags
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index eae29af5e72d..dec2186541c5 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -24,7 +24,7 @@ WANT_GNOME= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index b8cdb4764a3f..5d166bc00a86 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6727ffe0d1e1..21f8013d99ab 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -32,7 +32,7 @@ USE_BZIP2= yes
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig ltverhack
USE_GMAKE= yes
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 5b90225cbd40..a933b8da6341 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -29,7 +29,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 8f77627ddbf0..d40d6deef01b 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
ltverhack referencehack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_OPENSSL= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-openssl \
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index cc9b57cea849..dcf8d2604e01 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index cfd0cbd3d5f9..72c06d4836c5 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile
index b1f705735ef0..35715c704578 100644
--- a/devel/goffice06/Makefile
+++ b/devel/goffice06/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 773656250464..9ada33279e5b 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index c3d1e3b34b77..54389530a5a3 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index ab93cd17d00f..bc1903afde35 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Text editor widget based on Mozilla's editing functionality
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 2a678df22bef..7498e1879e11 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= mva@FreeBSD.org
COMMENT= A small, efficient C++ GUI library designed for games
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 6d7356f74807..70ab9463ab08 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls
OPTIONS= MEMDEBUG "Enable memory debugger statistic" off \
PORTDOCS "Install documentation (requires doxygen)" off
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index de79f00cb4ef..63ce32312250 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_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
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 36b3644734c0..182b203b8430 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -16,7 +16,7 @@ COMMENT= A cross platform C++ class library with a Java-like API
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index 9378dea97d21..213655586512 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Shows information about Java class, dependencies and more
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/jrtplib/Makefile b/devel/jrtplib/Makefile
index 677244b124a0..26f18a0df509 100644
--- a/devel/jrtplib/Makefile
+++ b/devel/jrtplib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://research.edm.uhasselt.be/jori/jrtplib/
MAINTAINER= hopet@ics.muni.cz
COMMENT= Object-oriented RTP library written in C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 450c41e6de33..37d5331423db 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -18,7 +18,7 @@ COMMENT= JSON (RFC 4627) interface for Glib
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 7d1a561f84eb..92870700ea26 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -18,7 +18,7 @@ COMMENT= Profiling Visualization Tool
ONLY_FOR_ARCHS= i386 amd64
CONFLICTS= kdesdk3-[0-9]*
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_KDELIBS_VER=3
INSTALLS_ICONS= yes
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index a2a4aa2029f0..780fe897de57 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -16,7 +16,7 @@ COMMENT= A graphical user interface around gdb using KDE
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-kde-version=3
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 665f21035c7e..62e7ec31058c 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -28,7 +28,7 @@ USE_PERL5= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_BDB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 3d8418c3e2b4..c1d9e41a39b3 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -40,7 +40,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
USE_BDB= yes
-USE_AUTOTOOLS= libtool:15 autotools:run
+USE_AUTOTOOLS= libtool:22 autotools:run
_NO_KDE_FINAL= yes
CONFIGURE_ARGS+=--with-qtdoc-dir=${LOCALBASE}/share/doc/qt/html \
--with-db-includedir=${BDB_INCLUDE_DIR} \
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index 4a8266f75f2f..acbe310ac109 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -19,7 +19,7 @@ COMMENT= A tool for visually creating and documenting classes
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gnometarget
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= WXWINDOWS="yes"
USE_WX= 2.4
diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile
index e9b27934c402..79e98a6cf5b9 100644
--- a/devel/kprof/Makefile
+++ b/devel/kprof/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= pmarquis@pobox.com
COMMENT= A profiling tool for KDE
USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= KDB2HTML=${PREFIX}/bin/kdb2html
USE_GMAKE= yes
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 58b327bb8fff..442ced87884b 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -24,7 +24,7 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME}
USE_BISON= build
USE_KDEBASE_VER=3
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
INSTALLS_ICONS= yes
diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile
index b0b5ee938ce6..e3e3716cecaa 100644
--- a/devel/kxl/Makefile
+++ b/devel/kxl/Makefile
@@ -15,7 +15,7 @@ DISTNAME= KXL-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A visual, sound library for games
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_XORG= xpm x11
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 9a3813e47219..09c61eb11f07 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_SDL= image sdl
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 1d7cc983f31e..4b73a11bbb44 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lasi
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= libLASi-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= lme@FreeBSD.org
COMMENT= C++ stream output interface for creating Postscript documents
USE_GNOME= pango pkgconfig
-USE_AUTOTOOLS= libltdl:15
+USE_AUTOTOOLS= libltdl:22
PKG_CONFIG_PATH= ${PREFIX}/libdata/pkgconfig
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 6d1c08ce61dd..8fdb76d863b1 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -16,7 +16,7 @@ DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Property library for gnome and Window Maker
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index e3e6ec78b846..a3d1a22805ce 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -18,7 +18,7 @@ COMMENT= Devel Library to share image and audio files between projects
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
USE_GETTEXT= yes
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 666c1e11181b..cf19b3ef4f13 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library of assorted spiffy things
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack
USE_EFL= imlib2
GNU_CONFIGURE= yes
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index b68645bd3ac7..faffaa5fa33c 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbegemot
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://people.freebsd.org/~harti/libbegemot/
DISTNAME= libbegemot-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:262:env libltdl:15 libtool:15:env
+USE_AUTOTOOLS= automake:19:env autoconf:262:env libltdl:22 libtool:22
USE_LDCONFIG= yes
@@ -28,6 +28,9 @@ MLINKS= xalloc.1 xrealloc.1
run-autotools::
@(cd ${CONFIGURE_WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl/)
@(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
+ @${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+ -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+ ${WRKSRC}/configure
post-install:
.for i in ${MAN1}
diff --git a/devel/libbegemot/pkg-plist b/devel/libbegemot/pkg-plist
index 0945347caaef..f749de5af648 100644
--- a/devel/libbegemot/pkg-plist
+++ b/devel/libbegemot/pkg-plist
@@ -1,4 +1,5 @@
lib/libbegemot.a
+lib/libbegemot.la
lib/libbegemot.so
lib/libbegemot.so.1
include/begemot.h
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index 851f8ee4633d..f4207403baa4 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Binary I/O stream class library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/libbnr/Makefile b/devel/libbnr/Makefile
index c6274c909847..5acc47e99bfa 100644
--- a/devel/libbnr/Makefile
+++ b/devel/libbnr/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://dspam.nuclearelephant.com/sources/extras/ \
MAINTAINER= itetcu@FreeBSD.org
COMMENT= GPL implementation of the Bayesian Noise Reduction algorithm
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 7418c36cf251..b5954060c2dc 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack libbonobo
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index 18ee9b774034..39e957e870ab 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/
MAINTAINER= ports@FreeBSD.org
COMMENT= Network library aimed at easy development of C++ server daemons
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile
index a9aab91b7102..528d764c9f4b 100644
--- a/devel/libchipcard-kde/Makefile
+++ b/devel/libchipcard-kde/Makefile
@@ -18,7 +18,7 @@ COMMENT= KDE tools for LibChipCard
LIB_DEPENDS= chipcard.20:${PORTSDIR}/devel/libchipcard:install
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS+= --with-distri=freebsd --with-kde3-prefix=${LOCALBASE}\
--with-applnk-dir=${PREFIX}/share/applnk/Utilities
USE_KDELIBS_VER= 3
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 8d55d89db9cc..8002ad9d86b8 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library for easy access to chipcards
LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile
index 3f48e0655b4e..3844be0b68bb 100644
--- a/devel/libconfuse/Makefile
+++ b/devel/libconfuse/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck
.endif
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 14fa90150200..5d0182fa3036 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= The C++ Debugging Support Library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --disable-threading --disable-pch --disable-location
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile
index 8dc7de1de51d..120a8c8b4e35 100644
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight C library that eases the writing of UNIX daemons
CONFIGURE_ARGS= --disable-lynx
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gnometarget ltverhack
USE_LDCONFIG= yes
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index 140b3d0e347b..bd7c2ecec066 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -17,8 +17,9 @@ COMMENT= Provides a non-blocking thread-safe API for resolving DNS names
BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
+CONFIGURE_ARGS=--with-libevent=${LOCALBASE}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
@@ -28,6 +29,7 @@ MLINKS= dnsres.3 dnsres_init.3 dnsres.3 dnsres_gethostbyname.3 \
dnsres.3 dnsres_getaddrinfo.3
post-patch:
- @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=, ; s|top_buildir|top_builddir|g' \
+ ${WRKSRC}/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index 546070c1598d..cec92bd8f5f9 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ class library of common digital signal processing functions
WRKSRC= ${WRKDIR}/libdsp-src-${PORTVERSION}/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-USE_AUTOTOOLS= libtool:15:env
+USE_AUTOTOOLS= libtool:22:env
USE_GMAKE= yes
MAKE_ENV= MKDIR="${MKDIR}" INLINE_VER="${INLINE_VER}"
MAKEFILE= Makefile.BSD
diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile
index eb581fbacbfd..07d6abf709fe 100644
--- a/devel/libfs++/Makefile
+++ b/devel/libfs++/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= . archive
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library which provides a file_iterator class
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index 3c59be202987..3fddd24ce07c 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/
MAINTAINER= o.davydenko@gmail.com
COMMENT= A library (using libusb) to talk to FTDI chips
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
USE_LDCONFIG= yes
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index cdfda30e8440..d0d65267908c 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= intltool
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index 8aed6eed0a02..d8fce11e085d 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
MAINTAINER= gahr@FreeBSD.org
COMMENT= Generic Hash Table
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --datarootdir=${PREFIX}
USE_LDCONFIG= yes
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 37a6199c9835..59311e1bee65 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -18,7 +18,7 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 03ccdd00f3d1..7c394a344af5 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_XORG= x11 sm
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 033b138061c9..f75b15c27f30 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
--without-bonobo
CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 44e00260a610..261e52bda9ff 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack intlhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index a94777d65dca..3f1c785a575a 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library that allows application developers to connect to PG
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 270c7edc179c..e993d8d57927 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@freebsd.org
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/devel/libltdl15/pkg-plist b/devel/libltdl15/pkg-plist
deleted file mode 100644
index c1b675bb6aef..000000000000
--- a/devel/libltdl15/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/libltdl15/Attic/pkg-plist,v 1.1 2003-07-02 18:52:29 ade Exp $
-include/ltdl.h
-lib/libltdl.a
-lib/libltdl.la
-lib/libltdl.so
-lib/libltdl.so.4
diff --git a/devel/libltdl15/Makefile b/devel/libltdl22/Makefile
index 0c0a63af1df2..06e5f7c48884 100644
--- a/devel/libltdl15/Makefile
+++ b/devel/libltdl22/Makefile
@@ -6,17 +6,22 @@
#
PORTNAME= libltdl
-MASTERDIR= ${.CURDIR}/../../devel/libtool15
+MASTERDIR= ${.CURDIR}/../../devel/libtool22
COMMENT= System independent dlopen wrapper
+USE_GNOME= ltverhack
USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:22
+LIBTOOLFILES= libltdl/configure
CONFIGURE_ARGS= --enable-ltdl-install
-BUILD_WRKSRC= ${WRKSRC}/libltdl
-INSTALL_WRKSRC= ${WRKSRC}/libltdl
+
+CONFIGURE_WRKSRC=${WRKSRC}/libltdl
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= libltdl15
+LATEST_LINK= libltdl22
INFO= # empty
.include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl15/pkg-descr b/devel/libltdl22/pkg-descr
index e57b99f21a5c..e57b99f21a5c 100644
--- a/devel/libltdl15/pkg-descr
+++ b/devel/libltdl22/pkg-descr
diff --git a/devel/libltdl22/pkg-plist b/devel/libltdl22/pkg-plist
new file mode 100644
index 000000000000..bd6781079532
--- /dev/null
+++ b/devel/libltdl22/pkg-plist
@@ -0,0 +1,9 @@
+include/libltdl/lt_dlloader.h
+include/libltdl/lt_error.h
+include/libltdl/lt_system.h
+include/ltdl.h
+lib/libltdl.a
+lib/libltdl.la
+lib/libltdl.so
+lib/libltdl.so.7
+@dirrm include/libltdl
diff --git a/devel/libltdl24/Makefile b/devel/libltdl24/Makefile
new file mode 100644
index 000000000000..06e5f7c48884
--- /dev/null
+++ b/devel/libltdl24/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for: libltdl
+# Date created: 23 January 2002
+# Whom: Jeremy Norris <ishmael27x@yahoo.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libltdl
+MASTERDIR= ${.CURDIR}/../../devel/libtool22
+
+COMMENT= System independent dlopen wrapper
+
+USE_GNOME= ltverhack
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:22
+LIBTOOLFILES= libltdl/configure
+CONFIGURE_ARGS= --enable-ltdl-install
+
+CONFIGURE_WRKSRC=${WRKSRC}/libltdl
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+LATEST_LINK= libltdl22
+INFO= # empty
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl24/pkg-descr b/devel/libltdl24/pkg-descr
new file mode 100644
index 000000000000..e57b99f21a5c
--- /dev/null
+++ b/devel/libltdl24/pkg-descr
@@ -0,0 +1,9 @@
+This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
+
+It supports the following dlopen interfaces:
+* dlopen (Solaris, Linux and various BSD flavors)
+* shl_load (HP-UX)
+* LoadLibrary (Win16 and Win32)
+* load_add_on (BeOS)
+* GNU DLD (emulates dynamic linking for static libraries)
+* libtool's dlpreopen
diff --git a/devel/libltdl24/pkg-plist b/devel/libltdl24/pkg-plist
new file mode 100644
index 000000000000..bd6781079532
--- /dev/null
+++ b/devel/libltdl24/pkg-plist
@@ -0,0 +1,9 @@
+include/libltdl/lt_dlloader.h
+include/libltdl/lt_error.h
+include/libltdl/lt_system.h
+include/ltdl.h
+lib/libltdl.a
+lib/libltdl.la
+lib/libltdl.so
+lib/libltdl.so.7
+@dirrm include/libltdl
diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile
index a02670a639f7..07da469dc612 100644
--- a/devel/libmaa/Makefile
+++ b/devel/libmaa/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
ALL_TARGET= lib
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 6de68b83e1a9..7b48168d5855 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -14,7 +14,7 @@ COMMENT= Library for parsing RFC2425 MIME Directory Profile information
USE_GNOME= gnometarget
USE_BISON= build
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
regression-test:
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 7eeb4c327c88..5ebd4d5e0fcc 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --without-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libnotifymm/Makefile b/devel/libnotifymm/Makefile
index 022a9746526a..37eea4609fd5 100644
--- a/devel/libnotifymm/Makefile
+++ b/devel/libnotifymm/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= pkgconfig gnomehack gnomeprefix ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/libnotify `pkg-config --cflags glibmm-2.4 libnotify gtkmm-2.4`"
USE_LDCONFIG= yes
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 572e29246da4..cfdd3f303d4a 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Library of optimized inner loops
USE_GNOME= pkgconfig gnomehack gnometarget ltverhack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--disable-glib
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index 63c45100cea3..ced6b77a9789 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.balabit.com/downloads/files/libol/0.3/
MAINTAINER= araujo@FreeBSD.org
COMMENT= Library needed by syslog-ng
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 10dc61305b30..4e03e8eef450 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Support library for OLE functions (MS-Excel) for gnumeric
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME= glib12
GNU_CONFIGURE= yes
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 705ee552a163..3a14030007df 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
tcl84.1:${PORTSDIR}/lang/tcl84 \
wwwcore.1:${PORTSDIR}/www/libwww
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack gnometarget
GNU_CONFIGURE= yes
diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index 0abddf9ec736..f13ef07644bd 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://crazney.net/programs/itunes/files/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= C lib used to connect to iTunes(R) music shares
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index cc26b93c0482..40832acc7f92 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -24,6 +24,6 @@ USE_GNOME= gnometarget
MAKE_ARGS= CFLAGS="${CFLAGS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
.include <bsd.port.mk>
diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile
index 6748fd3f2fac..9ef92ae947f9 100644
--- a/devel/libphish/Makefile
+++ b/devel/libphish/Makefile
@@ -16,7 +16,7 @@ COMMENT= A cross-platform library to interact with the Open Phishing Database
BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/libpperl/Makefile b/devel/libpperl/Makefile
index 95da97bdde34..6ac7db30f159 100644
--- a/devel/libpperl/Makefile
+++ b/devel/libpperl/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library easing embedding perl interpreters into C programs
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index 5f130617410f..bb626ccee9ea 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library that provides the red-black balanced tree algorithm
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile
index d81f1faa34cc..07ef0d46d0e1 100644
--- a/devel/librelp/Makefile
+++ b/devel/librelp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Reliable event logging protocol library
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
PLIST_FILES= include/${PORTNAME}.h \
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index e7b65f9787b7..71daa8997df2 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for Shared Buffer IPC
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 22bcdddfc44f..4037059b6021 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -18,7 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index d5537594c84c..0d1bd33d80b1 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -21,7 +21,7 @@ COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
LATEST_LINK= libsigc++12
USE_LDCONFIG= yes
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 91fe6e6fec2a..d45a5276e872 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -16,7 +16,7 @@ COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GMAKE= yes
LATEST_LINK= libsigc++20
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index e361563f6fb8..a48cbf3e96b6 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
USE_GNOME= gnomehack gnometarget gtk20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
ac_cv_path_DOXYGEN=""
USE_LDCONFIG= yes
diff --git a/devel/libsigsegv/Makefile b/devel/libsigsegv/Makefile
index 518d948b54a6..9447ce6725dd 100644
--- a/devel/libsigsegv/Makefile
+++ b/devel/libsigsegv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= libsigsegv
MAINTAINER= perky@FreeBSD.org
COMMENT= Handling page faults in user mode
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 87540b3370d7..a1dad327df6a 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 3384aa48080c..89c8b815b328 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -23,7 +23,7 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile
index 6a7d6ba5f415..c3e54c109b8b 100644
--- a/devel/libstrfunc/Makefile
+++ b/devel/libstrfunc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= vlm@lionet.info
COMMENT= Handles CGI forms, MIME, templates, date conversions, etc
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --program-prefix=""
MAN3= \
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index f59dfee372c6..8d9486e7302e 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -16,7 +16,7 @@ COMMENT= A stroke translation library
USE_XORG= x11
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
WANT_GNOME= yes
USE_LDCONFIG= yes
diff --git a/devel/libtap/Makefile b/devel/libtap/Makefile
index 9a6f6a7cefb4..f8527f2d5f40 100644
--- a/devel/libtap/Makefile
+++ b/devel/libtap/Makefile
@@ -16,7 +16,7 @@ DISTNAME= tap-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library implementing the Test Anything Protocol
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index f90117b8f9a7..283f0db27c86 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -17,7 +17,7 @@ COMMENT= Thai language support library
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15
+USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= all check
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 83b14b9a18eb..9d0289434941 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
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 60f7bfc61de0..c92b27728b39 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator file types library
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 0daf22fa0932..8526d43bd93b 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator file types library
LIB_DEPENDS= ticonv.3:${PORTSDIR}/converters/libticonv
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack pkgconfig
USE_LDCONFIG= yes
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
deleted file mode 100644
index b2248ec76640..000000000000
--- a/devel/libtool15/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libtool-1.5.26.tar.gz) = aa9c5107f3ec9ef4200eb6556f3b3c29
-SHA256 (libtool-1.5.26.tar.gz) = 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
-SIZE (libtool-1.5.26.tar.gz) = 2961939
diff --git a/devel/libtool15/files/patch-libltdl-Makefile.in b/devel/libtool15/files/patch-libltdl-Makefile.in
deleted file mode 100644
index 9d7f7886a9d5..000000000000
--- a/devel/libtool15/files/patch-libltdl-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- libltdl/Makefile.in.orig Sun Dec 18 14:13:58 2005
-+++ libltdl/Makefile.in Wed Feb 28 07:51:13 2007
-@@ -267,7 +267,2 @@
-
--$(top_srcdir)/configure: $(am__configure_deps)
-- cd $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--
- config.h: stamp-h1
-@@ -282,3 +277,2 @@
- $(srcdir)/config-h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
diff --git a/devel/libtool15/files/patch-libltdl-acinclude.m4 b/devel/libtool15/files/patch-libltdl-acinclude.m4
deleted file mode 100644
index 90dcbc2e40fe..000000000000
--- a/devel/libtool15/files/patch-libltdl-acinclude.m4
+++ /dev/null
@@ -1,8 +0,0 @@
---- libltdl/acinclude.m4.orig Sun Dec 18 14:13:49 2005
-+++ libltdl/acinclude.m4 Tue Jan 30 17:30:22 2007
-@@ -6526,2 +6526,5 @@
- ;;
-+ freebsd*)
-+ libltdl_cv_sys_dlopen_deplibs=yes
-+ ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
diff --git a/devel/libtool15/files/patch-ltdl.m4 b/devel/libtool15/files/patch-ltdl.m4
deleted file mode 100644
index e48e12f3223f..000000000000
--- a/devel/libtool15/files/patch-ltdl.m4
+++ /dev/null
@@ -1,8 +0,0 @@
---- ltdl.m4.orig Sun Dec 18 13:53:17 2005
-+++ ltdl.m4 Tue Jan 30 17:32:06 2007
-@@ -129,2 +129,5 @@
- ;;
-+ freebsd*)
-+ libltdl_cv_sys_dlopen_deplibs=yes
-+ ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
deleted file mode 100644
index b198e3d307fa..000000000000
--- a/devel/libtool15/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $FreeBSD$
-bin/libtool
-bin/libtoolize
-share/aclocal/libtool.m4
-share/aclocal/ltdl.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/install-sh
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config-h.in
-share/libtool/libltdl/config.guess
-share/libtool/libltdl/config.sub
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.ac
-share/libtool/libltdl/install-sh
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/ltmain.sh
-share/libtool/libltdl/missing
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
diff --git a/devel/libtool15/Makefile b/devel/libtool22/Makefile
index 98537fd8f4c4..5819e34e3f23 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool22/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME?= libtool
-PORTVERSION= 1.5.26
+PORTVERSION= 2.2.6a
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
DISTNAME= libtool-${PORTVERSION}
-MAINTAINER= ade@FreeBSD.org
+MAINTAINER= kwm@FreeBSD.org
COMMENT?= Generic shared library support script
+WRKSRC= ${WRKDIR}/libtool-${PORTVERSION:S|a||}
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --disable-ltdl-install
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
diff --git a/devel/libtool22/distinfo b/devel/libtool22/distinfo
new file mode 100644
index 000000000000..817aaa0e67ce
--- /dev/null
+++ b/devel/libtool22/distinfo
@@ -0,0 +1,3 @@
+MD5 (libtool-2.2.6a.tar.gz) = 8ca1ea241cd27ff9832e045fe9afe4fd
+SHA256 (libtool-2.2.6a.tar.gz) = eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796
+SIZE (libtool-2.2.6a.tar.gz) = 2870524
diff --git a/devel/libtool22/files/patch-libltdl-Makefile.in b/devel/libtool22/files/patch-libltdl-Makefile.in
new file mode 100644
index 000000000000..c7f7983138e7
--- /dev/null
+++ b/devel/libtool22/files/patch-libltdl-Makefile.in
@@ -0,0 +1,22 @@
+--- libltdl/Makefile.in.orig 2008-09-07 19:56:34.000000000 +0200
++++ libltdl/Makefile.in 2009-05-12 10:38:05.000000000 +0200
+@@ -385,11 +385,6 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+@@ -400,7 +395,6 @@
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config-h.in: $(am__configure_deps)
+- cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool22/files/patch-libltdl_config_ltmain.sh
index dbfac1c8e3a7..8dc8434921eb 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool22/files/patch-libltdl_config_ltmain.sh
@@ -1,7 +1,10 @@
---- ltmain.sh.orig Sun Dec 18 14:14:54 2005
-+++ ltmain.sh Mon Feb 20 17:37:04 2006
-@@ -228,2 +228,16 @@
+--- libltdl/config/ltmain.sh.orig 2009-06-29 12:36:19.000000000 -0500
++++ libltdl/config/ltmain.sh 2009-06-29 12:57:44.000000000 -0500
+@@ -1010,6 +1010,21 @@
+ func_infer_tag ()
{
+ $opt_debug
++
+ # FreeBSD-specific: where we install compilers with non-standard names
+ tag_compilers_CC="*cc cc* *gcc gcc*"
+ tag_compilers_CXX="*c++ c++* *g++ g++*"
@@ -17,7 +20,11 @@
+ fi
+
if test -n "$available_tags" && test -z "$tagname"; then
-@@ -268,3 +282,18 @@
+ CC_quoted=
+ for arg in $CC; do
+@@ -1042,7 +1057,22 @@
+ break
+ ;;
esac
- fi
+
@@ -37,11 +44,36 @@
+ fi
+ fi
done
-@@ -1606,2 +1635,3 @@
- finalize_command="$finalize_command $arg"
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+@@ -2528,6 +2558,9 @@
+ ;;
+ esac
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+@@ -4584,6 +4617,7 @@
+ *" $arg "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ esac
+ deplibs="$deplibs $arg"
continue
-@@ -2103,2 +2133,25 @@
+ ;;
+
+@@ -5073,13 +5107,30 @@
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags $deplib"
+- if test "$linkmode" = lib ; then
+- case "$new_inherited_linker_flags " in
+- *" $deplib "*) ;;
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+- esac
+- fi
fi
+
+ case $linkmode in
@@ -67,9 +99,5 @@
+ esac # linkmode
+
continue
-@@ -4706,2 +4759,5 @@
- esac
-+ ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
;;
+ -l*)
diff --git a/devel/libtool15/pkg-descr b/devel/libtool22/pkg-descr
index 1dea88bf6d51..1dea88bf6d51 100644
--- a/devel/libtool15/pkg-descr
+++ b/devel/libtool22/pkg-descr
diff --git a/devel/libtool22/pkg-plist b/devel/libtool22/pkg-plist
new file mode 100644
index 000000000000..d4bbdd78ca36
--- /dev/null
+++ b/devel/libtool22/pkg-plist
@@ -0,0 +1,56 @@
+bin/libtool
+bin/libtoolize
+share/aclocal/argz.m4
+share/aclocal/libtool.m4
+share/aclocal/ltdl.m4
+share/aclocal/ltoptions.m4
+share/aclocal/ltsugar.m4
+share/aclocal/ltversion.m4
+share/aclocal/lt~obsolete.m4
+share/libtool/config/compile
+share/libtool/config/config.guess
+share/libtool/config/config.sub
+share/libtool/config/depcomp
+share/libtool/config/install-sh
+share/libtool/config/ltmain.sh
+share/libtool/config/missing
+share/libtool/libltdl/COPYING.LIB
+share/libtool/libltdl/Makefile.am
+share/libtool/libltdl/Makefile.in
+share/libtool/libltdl/Makefile.inc
+share/libtool/libltdl/README
+share/libtool/libltdl/aclocal.m4
+share/libtool/libltdl/argz.c
+share/libtool/libltdl/argz_.h
+share/libtool/libltdl/config-h.in
+share/libtool/libltdl/configure
+share/libtool/libltdl/configure.ac
+share/libtool/libltdl/libltdl/lt__alloc.h
+share/libtool/libltdl/libltdl/lt__dirent.h
+share/libtool/libltdl/libltdl/lt__glibc.h
+share/libtool/libltdl/libltdl/lt__private.h
+share/libtool/libltdl/libltdl/lt__strl.h
+share/libtool/libltdl/libltdl/lt_dlloader.h
+share/libtool/libltdl/libltdl/lt_error.h
+share/libtool/libltdl/libltdl/lt_system.h
+share/libtool/libltdl/libltdl/slist.h
+share/libtool/libltdl/loaders/dld_link.c
+share/libtool/libltdl/loaders/dlopen.c
+share/libtool/libltdl/loaders/dyld.c
+share/libtool/libltdl/loaders/load_add_on.c
+share/libtool/libltdl/loaders/loadlibrary.c
+share/libtool/libltdl/loaders/preopen.c
+share/libtool/libltdl/loaders/shl_load.c
+share/libtool/libltdl/lt__alloc.c
+share/libtool/libltdl/lt__dirent.c
+share/libtool/libltdl/lt__strl.c
+share/libtool/libltdl/lt_dlloader.c
+share/libtool/libltdl/lt_error.c
+share/libtool/libltdl/ltdl.c
+share/libtool/libltdl/ltdl.h
+share/libtool/libltdl/slist.c
+@dirrm share/libtool/libltdl/loaders
+@dirrm share/libtool/libltdl/libltdl
+@dirrm share/libtool/libltdl
+@dirrm share/libtool/config
+@dirrm share/libtool
diff --git a/devel/libtool24/Makefile b/devel/libtool24/Makefile
new file mode 100644
index 000000000000..5819e34e3f23
--- /dev/null
+++ b/devel/libtool24/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: libtool
+# Date created: 6 May 1998
+# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
+#
+# $FreeBSD$
+#
+
+PORTNAME?= libtool
+PORTVERSION= 2.2.6a
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= libtool
+DISTNAME= libtool-${PORTVERSION}
+
+MAINTAINER= kwm@FreeBSD.org
+COMMENT?= Generic shared library support script
+
+WRKSRC= ${WRKDIR}/libtool-${PORTVERSION:S|a||}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS?= --disable-ltdl-install
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
+INFO?= libtool
+
+.include <bsd.port.mk>
diff --git a/devel/libtool24/distinfo b/devel/libtool24/distinfo
new file mode 100644
index 000000000000..817aaa0e67ce
--- /dev/null
+++ b/devel/libtool24/distinfo
@@ -0,0 +1,3 @@
+MD5 (libtool-2.2.6a.tar.gz) = 8ca1ea241cd27ff9832e045fe9afe4fd
+SHA256 (libtool-2.2.6a.tar.gz) = eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796
+SIZE (libtool-2.2.6a.tar.gz) = 2870524
diff --git a/devel/libtool24/files/patch-libltdl-Makefile.in b/devel/libtool24/files/patch-libltdl-Makefile.in
new file mode 100644
index 000000000000..c7f7983138e7
--- /dev/null
+++ b/devel/libtool24/files/patch-libltdl-Makefile.in
@@ -0,0 +1,22 @@
+--- libltdl/Makefile.in.orig 2008-09-07 19:56:34.000000000 +0200
++++ libltdl/Makefile.in 2009-05-12 10:38:05.000000000 +0200
+@@ -385,11 +385,6 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+@@ -400,7 +395,6 @@
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config-h.in: $(am__configure_deps)
+- cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+
diff --git a/devel/libtool24/files/patch-libltdl_config_ltmain.sh b/devel/libtool24/files/patch-libltdl_config_ltmain.sh
new file mode 100644
index 000000000000..8dc8434921eb
--- /dev/null
+++ b/devel/libtool24/files/patch-libltdl_config_ltmain.sh
@@ -0,0 +1,103 @@
+--- libltdl/config/ltmain.sh.orig 2009-06-29 12:36:19.000000000 -0500
++++ libltdl/config/ltmain.sh 2009-06-29 12:57:44.000000000 -0500
+@@ -1010,6 +1010,21 @@
+ func_infer_tag ()
+ {
+ $opt_debug
++
++ # FreeBSD-specific: where we install compilers with non-standard names
++ tag_compilers_CC="*cc cc* *gcc gcc*"
++ tag_compilers_CXX="*c++ c++* *g++ g++*"
++ base_compiler=`set -- "$@"; echo $1`
++
++ # If $tagname isn't set, then try to infer if the default "CC" tag applies
++ if test -z "$tagname"; then
++ for zp in $tag_compilers_CC; do
++ case $base_compiler in
++ $zp) tagname="CC"; break;;
++ esac
++ done
++ fi
++
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+@@ -1042,7 +1057,22 @@
+ break
+ ;;
+ esac
+- fi
++
++ # FreeBSD-specific: try compilers based on inferred tag
++ if test -z "$tagname"; then
++ eval "tag_compilers=\$tag_compilers_${z}"
++ if test -n "$tag_compilers"; then
++ for zp in $tag_compilers; do
++ case $base_compiler in
++ $zp) tagname=$z; break;;
++ esac
++ done
++ if test -n "$tagname"; then
++ break
++ fi
++ fi
++ fi
++ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+@@ -2528,6 +2558,9 @@
+ ;;
+ esac
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+@@ -4584,6 +4617,7 @@
+ *" $arg "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ esac
++ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+@@ -5073,13 +5107,30 @@
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags $deplib"
+- if test "$linkmode" = lib ; then
+- case "$new_inherited_linker_flags " in
+- *" $deplib "*) ;;
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+- esac
+- fi
+ fi
++
++ case $linkmode in
++ lib)
++ deplibs="$deplib $deplibs"
++ test "$pass" = conv && continue
++ newdependency_libs="$deplib $newdependency_libs"
++ ;;
++ prog)
++ if test "$pass" = conv; then
++ deplibs="$deplib $deplibs"
++ continue
++ fi
++ if test "$pass" = scan; then
++ deplibs="$deplib $deplibs"
++ else
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ fi
++ ;;
++ *)
++ ;;
++ esac # linkmode
++
+ continue
+ ;;
+ -l*)
diff --git a/devel/libtool24/pkg-descr b/devel/libtool24/pkg-descr
new file mode 100644
index 000000000000..1dea88bf6d51
--- /dev/null
+++ b/devel/libtool24/pkg-descr
@@ -0,0 +1,8 @@
+This is GNU Libtool, a generic library support script. Libtool hides
+the complexity of using shared libraries behind a consistent, portable
+interface.
+
+To use libtool, add the new generic library building commands to your
+Makefile, Makefile.in, or Makefile.am.
+
+WWW: http://www.gnu.org/software/libtool/
diff --git a/devel/libtool24/pkg-plist b/devel/libtool24/pkg-plist
new file mode 100644
index 000000000000..d4bbdd78ca36
--- /dev/null
+++ b/devel/libtool24/pkg-plist
@@ -0,0 +1,56 @@
+bin/libtool
+bin/libtoolize
+share/aclocal/argz.m4
+share/aclocal/libtool.m4
+share/aclocal/ltdl.m4
+share/aclocal/ltoptions.m4
+share/aclocal/ltsugar.m4
+share/aclocal/ltversion.m4
+share/aclocal/lt~obsolete.m4
+share/libtool/config/compile
+share/libtool/config/config.guess
+share/libtool/config/config.sub
+share/libtool/config/depcomp
+share/libtool/config/install-sh
+share/libtool/config/ltmain.sh
+share/libtool/config/missing
+share/libtool/libltdl/COPYING.LIB
+share/libtool/libltdl/Makefile.am
+share/libtool/libltdl/Makefile.in
+share/libtool/libltdl/Makefile.inc
+share/libtool/libltdl/README
+share/libtool/libltdl/aclocal.m4
+share/libtool/libltdl/argz.c
+share/libtool/libltdl/argz_.h
+share/libtool/libltdl/config-h.in
+share/libtool/libltdl/configure
+share/libtool/libltdl/configure.ac
+share/libtool/libltdl/libltdl/lt__alloc.h
+share/libtool/libltdl/libltdl/lt__dirent.h
+share/libtool/libltdl/libltdl/lt__glibc.h
+share/libtool/libltdl/libltdl/lt__private.h
+share/libtool/libltdl/libltdl/lt__strl.h
+share/libtool/libltdl/libltdl/lt_dlloader.h
+share/libtool/libltdl/libltdl/lt_error.h
+share/libtool/libltdl/libltdl/lt_system.h
+share/libtool/libltdl/libltdl/slist.h
+share/libtool/libltdl/loaders/dld_link.c
+share/libtool/libltdl/loaders/dlopen.c
+share/libtool/libltdl/loaders/dyld.c
+share/libtool/libltdl/loaders/load_add_on.c
+share/libtool/libltdl/loaders/loadlibrary.c
+share/libtool/libltdl/loaders/preopen.c
+share/libtool/libltdl/loaders/shl_load.c
+share/libtool/libltdl/lt__alloc.c
+share/libtool/libltdl/lt__dirent.c
+share/libtool/libltdl/lt__strl.c
+share/libtool/libltdl/lt_dlloader.c
+share/libtool/libltdl/lt_error.c
+share/libtool/libltdl/ltdl.c
+share/libtool/libltdl/ltdl.h
+share/libtool/libltdl/slist.c
+@dirrm share/libtool/libltdl/loaders
+@dirrm share/libtool/libltdl/libltdl
+@dirrm share/libtool/libltdl
+@dirrm share/libtool/config
+@dirrm share/libtool
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index e596c7c5c980..2492bf4c2840 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -21,7 +21,7 @@ COMMENT= Generally useful low level routines
NO_CDROM= License (see source) does not permit selling for profit
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index f09858a54120..9808f171fe1e 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for manipulating Unicode characters and strings
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index fef64e7d2fb4..f8f7faccf671 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -34,9 +34,9 @@ CONFIGURE_ARGS= --disable-build-docs
PLIST_SUB= SGML="@comment "
.endif
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
post-patch:
@${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' ${WRKSRC}/configure
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index 16fd765765c7..e937ee58e001 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger
USE_LDCONFIG= YES
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile
index 345002246d95..c78a805e19c5 100644
--- a/devel/libvanessa_logger/Makefile
+++ b/devel/libvanessa_logger/Makefile
@@ -15,7 +15,7 @@ DISTNAME= vanessa_logger-${PORTVERSION}
MAINTAINER= thomas@bsdunix.ch
COMMENT= Library that provides a generic logging layer
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index 678fab625b06..eba2aec85418 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
MAN1= vanessa_socket_pipe.1
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile
index 5ad41602c464..444dd84ee7fb 100644
--- a/devel/libvc/Makefile
+++ b/devel/libvc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= rolo
MAINTAINER= ports@FreeBSD.org
COMMENT= A vCard library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_BISON= build
GNU_CONFIGURE= yes
diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile
index 416e3bc41ade..0a39e5c1d459 100644
--- a/devel/libytnef/Makefile
+++ b/devel/libytnef/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= delphus@gmail.com
COMMENT= Unpack data in MS Outlook TNEF format
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
PORTDOCS= AUTHORS NEWS README
diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile
index c39c5184ffa8..d89a50c47367 100644
--- a/devel/lmdbg/Makefile
+++ b/devel/lmdbg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Lightweight malloc debugger
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
post-install:
.if !defined(NOPORTDOCS)
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index c390055217cb..f5235012d20e 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Logging for C Library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 867abb404619..7a4e89f145e4 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -16,7 +16,7 @@ DISTFILES= log4cplus-${PORTVERSION}.tar.gz log4cplus-${PORTVERSION}-docs.tar.gz
MAINTAINER= petri.totterman@hmv.fi
COMMENT= A logging library for C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 475ed9531b41..9a8e220d1f52 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -14,12 +14,11 @@ MASTER_SITES= SF
MAINTAINER= clsung@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-pthreads --disable-html-docs
-MAKE_ENV+= RM=${RM}
USE_LDCONFIG= yes
.include "Makefile.man"
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index b90ee33105a2..edf374182a11 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -29,7 +29,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-lib
CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
.endif
-USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15
+USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22
AUTOMAKE_ARGS= --add-missing
LIBTOOL_VARS= --force --automake
diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile
index 5cc4b5d75ca8..bf55e6cee07b 100644
--- a/devel/log4shib/Makefile
+++ b/devel/log4shib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://shibboleth.internet2.edu/downloads/${PORTNAME}/${DISTVERSIO
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnometarget gnomehack
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 562fe3a5ad84..5e401edc9971 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE= yes
USE_XORG= xaw xft xt
USE_GNOME= gnometarget libxml2 pkgconfig
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
USE_LDCONFIG= yes
diff --git a/devel/memcheck/Makefile b/devel/memcheck/Makefile
index 6f3ca207be7f..7a399c306172 100644
--- a/devel/memcheck/Makefile
+++ b/devel/memcheck/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://hald.dnsalias.net/projects/memcheck/
MAINTAINER= demon@FreeBSD.org
COMMENT= Memory Allocation Checker
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/mimir/Makefile b/devel/mimir/Makefile
index 710a9fd3bb50..50019597991b 100644
--- a/devel/mimir/Makefile
+++ b/devel/mimir/Makefile
@@ -15,7 +15,7 @@ COMMENT= Data-structure library used by the Elan Programming Environment
MAN1= dcg.1
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/mq4cpp/Makefile b/devel/mq4cpp/Makefile
index a393632934a0..767b3e64a3dd 100644
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= vanilla@FreeBSD.org
COMMENT= Message Queuing for C++
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index eb9fb76fc66d..0bacca44bc67 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -17,7 +17,7 @@ COMMENT= Generic configuration management library
LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= YES
GNU_CONFIGURE= yes
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 43e9f3099f3d..7efffc17a8d2 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -19,7 +19,7 @@ COMMENT= Object Activation Framework for GNOME
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 715786b65eec..f69d5ed7f1ce 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -18,7 +18,7 @@ COMMENT= Object Oriented Input System
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:15:env aclocal:19:env autoheader:262:env automake:19:env autoconf:262:env
+USE_AUTOTOOLS= libtool:22:env aclocal:19:env autoheader:262:env automake:19:env autoconf:262:env
USE_XORG= x11 xaw
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index 7810e482820c..b74a75a96b53 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An Evolutionary Computation Framework
CONFLICTS= beagle-[0-9]*
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --enable-optimization --with-zlib=/usr
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index 38cd00906f70..618f40fee90f 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -19,7 +19,7 @@ COMMENT= An interpreted dynamic parser
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 504b51b32389..bd8976e7c770 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack ltverhack orbit2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS =.*\)test\(.*\)|\1\2|' ${WRKSRC}/Makefile.in
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index fd0b2d71575b..1daf3c49cbf4 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile
index 8679c0e20e36..6802c8a8736b 100644
--- a/devel/php-java-bridge/Makefile
+++ b/devel/php-java-bridge/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= PHP module wich connects the PHP object with the Java/ECMA 335 object
-USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env
+USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_JAVA= yes
@@ -36,16 +36,12 @@ post-install:
${PREFIX}/lib/php/${PHP_EXT_DIR}
${INSTALL_PROGRAM} ${WRKSRC}/modules/RunJavaBridge \
${PREFIX}/lib/php/${PHP_EXT_DIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/modules/libnatcJavaBridge.a \
- ${PREFIX}/lib/php/${PHP_EXT_DIR}
${INSTALL_PROGRAM} ${WRKSRC}/modules/libnatcJavaBridge.so \
${PREFIX}/lib/php/${PHP_EXT_DIR}
${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/JavaBridge.jar" \
>> ${TMPPLIST}
${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/RunJavaBridge" \
>> ${TMPPLIST}
- ${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/libnatcJavaBridge.a" \
- >> ${TMPPLIST}
${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/libnatcJavaBridge.so" \
>> ${TMPPLIST}
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index b12b3589e010..9915b09ec559 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_CMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
NO_LATEST_LINK= yes
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index df8366be128f..d94cc022a0e4 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= A library to provide abstract access to various archives
USE_CMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
patch-autotools:
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index a54f1989c0e3..089767eac1ca 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index d889f42f9672..3f6dbbe09e0c 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=piklab
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE IDE for microcontroller development
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_KDELIBS_VER=3
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index b859671cf284..2486716feea7 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
MAN3= popt.3
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 8435d9515819..a0c22fea415b 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= posadis
MAINTAINER= ports@FreeBSD.org
COMMENT= Posadis C++ DNS library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index f16c9a5d4ceb..a254e7282fe4 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
LIBTOOLFILES= configure Watchdog/configure
USE_GCC= 4.2+
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index a365f0a832cf..a2d1c2fed99a 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -16,7 +16,7 @@ COMMENT= Problem reporting system
RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_PGSQL= yes
USE_GMAKE= yes
USE_GNOME= gtk20 gconf2 glib20 libgnomeui
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 039a411c9fee..fbcb4e2d4f97 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library for reading Microsoft PowerPoint(tm) documents
LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice1
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/devel/privman/Makefile b/devel/privman/Makefile
index 0c725b5fd492..2ebcaf34bce3 100644
--- a/devel/privman/Makefile
+++ b/devel/privman/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.isso.sparta.com/opensource/privman/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= Library that makes it easy for programs to use privilege separation
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 06ab780d8902..68fb903b89a4 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_GNOME= gnomehack gnometarget
USE_PYTHON= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${PYTHON_INCLUDEDIR}"
CONFIGURE_ARGS= --docdir=${DOCSDIR}
diff --git a/devel/py-subversion/pkg-plist b/devel/py-subversion/pkg-plist
index 478521e0d6d1..297499a1a5c4 100644
--- a/devel/py-subversion/pkg-plist
+++ b/devel/py-subversion/pkg-plist
@@ -4,28 +4,20 @@ lib/libsvn_swig_py-1.so
lib/libsvn_swig_py-1.so.0
%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libsvn/_client.a
%%PYTHON_SITELIBDIR%%/libsvn/_client.la
%%PYTHON_SITELIBDIR%%/libsvn/_client.so
-%%PYTHON_SITELIBDIR%%/libsvn/_core.a
%%PYTHON_SITELIBDIR%%/libsvn/_core.la
%%PYTHON_SITELIBDIR%%/libsvn/_core.so
-%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
-%%PYTHON_SITELIBDIR%%/libsvn/_diff.a
%%PYTHON_SITELIBDIR%%/libsvn/_diff.la
%%PYTHON_SITELIBDIR%%/libsvn/_diff.so
-%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
-%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
-%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
-%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
%%PYTHON_SITELIBDIR%%/libsvn/client.py
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index a1b6b47c07e0..d0d36f758079 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -20,7 +20,7 @@ COMMENT= Networking API that provides reliable UDP primarily for online games
USE_ZIP= yes
NO_WRKSUBDIR= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:262 autoconf:262 automake:110 libtool:15
+USE_AUTOTOOLS= aclocal:110 autoheader:262 autoconf:262 automake:110 libtool:22
AUTOMAKE_ARGS= --add-missing
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \
-I ${LOCALBASE}/share/aclocal \
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index b0298097e32a..efcc23ecea3f 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -23,7 +23,7 @@ USE_WX= 2.6
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:262 libtool:15 automake:19
+USE_AUTOTOOLS= autoconf:262 libtool:22 automake:19
CONFIGURE_TARGET=
CONFIGURE_ARGS= --with-apr-config=apr-1-config \
--with-apu-config=apu-1-config \
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 0edd34e4c2eb..f899f4d0f9cb 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A complete regular expressions C++ solution
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre"
diff --git a/devel/rlog/Makefile b/devel/rlog/Makefile
index 541526df0594..630a1399c659 100644
--- a/devel/rlog/Makefile
+++ b/devel/rlog/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= trasz@FreeBSD.org
COMMENT= A flexible message logging facility for C++
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 6611519cda77..5eaf485acb7e 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -16,7 +16,7 @@ COMMENT= A utility C++ class library for daemons, clients, servers and more
USE_GNOME= gnometarget pkgconfig
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
PTHREADLIB="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLINC} \
diff --git a/devel/safestr/Makefile b/devel/safestr/Makefile
index e55f1b3ddf18..947d23aac774 100644
--- a/devel/safestr/Makefile
+++ b/devel/safestr/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xxl.2:${PORTSDIR}/devel/xxl:install
CONFIGURE_ARGS= --with-xxl=${LOCALBASE}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 298b1a72772b..c3a3640ccaaf 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -18,7 +18,7 @@ COMMENT= Cross-platform multimedia development API
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 81ccb5c7431a..8c94c7677693 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -17,7 +17,7 @@ DISTNAME= SDLmm-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer)
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 7478df019e84..9e5c5e704706 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ library for SDTS related development
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index e0f07e1b9304..259400b3936a 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://dl.maptools.org/dl/shapelib/ \
MAINTAINER= sunpoet@sunpoet.net
COMMENT= C API for reading and writing ArcView Shapefiles
-USE_AUTOTOOLS= libtool:15:env
+USE_AUTOTOOLS= libtool:22:env
USE_LDCONFIG= yes
OPTIONS= PROJ4 "Cartographic Projections library" off
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index 7d1b10d363cd..d6ef7906d19a 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_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index 42083004f76e..5f6d2683208f 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -24,7 +24,7 @@ COMMENT= Secure Internet Live Conferencing (SILC) network toolkit
CONFLICTS= silc-client-1.1.* silc-irssi-client-1.1.*
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 619359d2716a..133ef1d7b8a4 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -17,7 +17,7 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GNOME= gnomehack glib12 libxml
USE_LDCONFIG= yes
diff --git a/devel/spatialindex/Makefile b/devel/spatialindex/Makefile
index 2ce3ea603994..3fee14dade34 100644
--- a/devel/spatialindex/Makefile
+++ b/devel/spatialindex/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.edu-linux.org/down/
MAINTAINER= wenheping@gmail.com
COMMENT= A General Framework for Developing Spatial Indices
-USE_AUTOTOOLS= libtool:15:env
+USE_AUTOTOOLS= libtool:22:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile
index bd736f3ad01a..5c0e5a3ee3a9 100644
--- a/devel/stringencoders/Makefile
+++ b/devel/stringencoders/Makefile
@@ -17,6 +17,6 @@ COMMENT= Collection of high performance c-string transformations
USE_PERL5= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
.include <bsd.port.mk>
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index e02d383420f3..a6bcb207f807 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.speculate.de/styx/
MAINTAINER= ports@FreeBSD.org
COMMENT= A scanner/parser generator
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index be40cf906998..6b1d825a444a 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -15,7 +15,7 @@ DIST_SUBDIR= subversion
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index be40cf906998..6b1d825a444a 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -15,7 +15,7 @@ DIST_SUBDIR= subversion
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --with-ssl
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 9addab550e53..73604f90e64d 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-USE_AUTOTOOLS= autoconf:262:env libtool:15
+USE_AUTOTOOLS= autoconf:262:env libtool:22
MAN1= ccache-swig.1
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9addab550e53..73604f90e64d 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-USE_AUTOTOOLS= autoconf:262:env libtool:15
+USE_AUTOTOOLS= autoconf:262:env libtool:22
MAN1= ccache-swig.1
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index b067b766a01b..34922f4ebae7 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
ALL_TARGET= without_doc
USE_LDCONFIG= yes
diff --git a/devel/ta-lib/Makefile b/devel/ta-lib/Makefile
index b1b74ad4f8f4..260201630ed5 100644
--- a/devel/ta-lib/Makefile
+++ b/devel/ta-lib/Makefile
@@ -17,7 +17,7 @@ COMMENT= A UNIX, POSIX Library for Technical Analysis
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
post-patch:
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 461ff42ce461..f81ab3026f55 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GNU readline for TCL
USE_TCL= 82+
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MANN= tclreadline.n
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index fab6a89c8073..c3635faaaf13 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \
event-1.4:${PORTSDIR}/devel/libevent
USE_AUTOTOOLS= autoconf:262:env autoheader:262:env aclocal:19:env \
- automake:19:env libtool:15:env
+ automake:19:env libtool:22:env
USE_GNOME= pkgconfig
USE_BZIP2= yes
USE_GCC= 4.2+
diff --git a/devel/towitoko/Makefile b/devel/towitoko/Makefile
index 9625be502034..d3799fa16e96 100644
--- a/devel/towitoko/Makefile
+++ b/devel/towitoko/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.geocities.com/cprados/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= UNIX driver for Towitoko smartcard readers
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/umem/Makefile b/devel/umem/Makefile
index e1570ddfd2e6..1cc2a7a5f6ef 100644
--- a/devel/umem/Makefile
+++ b/devel/umem/Makefile
@@ -15,7 +15,7 @@ COMMENT= A port of the Solaris memory allocator
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
ONLY_FOR_ARCHS= i386 amd64
post-patch:
diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index dd35027c2c1f..287ba5a2cc2a 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -17,7 +17,7 @@ COMMENT= Universal Plug and Play Software Development Kit
CONFLICTS= upnp-1.0.*
USE_BZIP2= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_DOS2UNIX= yes
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index d310700a5caa..a3b1d6153f31 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= General purpose string library for C
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile
index ef79e6e17405..46e9d93032b2 100644
--- a/devel/wand-libconfig/Makefile
+++ b/devel/wand-libconfig/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= wand-
MAINTAINER= matt@peterson.org
COMMENT= C library for parsing config files
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/devel/xlslib/Makefile b/devel/xlslib/Makefile
index 78324da40dce..98ec820b5d8b 100644
--- a/devel/xlslib/Makefile
+++ b/devel/xlslib/Makefile
@@ -16,7 +16,7 @@ COMMENT= A C++ library for generation of Excel(TM) files
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*src\).*|\1|' \
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index d223e36d47a4..a4eae62e0916 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_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile
index 6089c32324e3..a030116b9311 100644
--- a/devel/xxl/Makefile
+++ b/devel/xxl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.zork.org/software/
MAINTAINER= stas@FreeBSD.org
COMMENT= C/C++ library for exception handling and asset management
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index bfd0778b96fb..67a02c561ae4 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
COMMENT= A platform-independent object-oriented C++ threading library
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-ftime --disable-static
USE_GMAKE= yes