46 files changed, 345 insertions, 82 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 3a4625fe3415..e1b759ba48c7 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -48,10 +48,10 @@ EXTRA_PATCHES+=		${FILESDIR}/exp-apr-kqueue.patch
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
-			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			LIBTOOL_M4=${LIBTOOL_M4} \
 			AUTOHEADER=${AUTOHEADER}
 USE_ICONV=		yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=		autoconf:262 libtool:22
 USE_PERL5=		yes
 USE_RC_SUBR=		apache2.sh
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
diff --git a/www/apache20/files/patch-libtool22 b/www/apache20/files/patch-libtool22
new file mode 100644
index 000000000000..b6c6c3265fbf
--- /dev/null
+++ b/www/apache20/files/patch-libtool22
@@ -0,0 +1,179 @@
+--- configure.in.orig	2009-07-08 14:58:50.000000000 -0500
++++ configure.in	2009-07-08 15:03:21.000000000 -0500
+@@ -172,7 +172,7 @@
+       LIBTOOL="$my_libtool \$(LTFLAGS)"
+       libtoolversion=`$my_libtool --version`
+       case $libtoolversion in
+-          *1.[[45]]*)
++          *1.[[45]]* | *[[2-9]].[[0-9]]*)
+               SH_LIBTOOL='$(LIBTOOL)'
+               SHLTCFLAGS="-prefer-pic"
+               LTCFLAGS="-prefer-non-pic -static"
+--- srclib/apr/buildconf.orig	2009-07-08 15:04:26.000000000 -0500
++++ srclib/apr/buildconf	2009-07-08 15:10:46.000000000 -0500
+@@ -23,7 +23,7 @@
+ #
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize`
++libtoolize="${LIBTOOLIZE}"
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+@@ -35,29 +35,47 @@
+ # Note: APR supplies its own config.guess and config.sub -- we do not
+ #       rely on libtool's versions
+ #
+-echo "Copying libtool helper files ..."
++echo "buildconf: copying libtool helper files using $libtoolize"
+ 
+ # Remove any libtool files so one can switch between libtool 1.3
+ # and libtool 1.4 by simply rerunning the buildconf script.
+-(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
+ 
+-$libtoolize --copy --automake
+-
+-ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+-
+-if [ ! -f $ltfile ]; then
++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
++IFS=.; set $lt_version; IFS=' '
++if test "$1" = "1"; then
++  $libtoolize --copy --automake
++  if [ -f libtool.m4 ]; then 
++    ltfile=`pwd`/libtool.m4
++  else
++   ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
++                   < $libtoolize`"
++   ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
++   # Expecting the code above to be very portable, but just in case...
++   if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
++     ltpath=`dirname $libtoolize`
++     ltfile=${LIBTOOL_M4}
++   fi
++  fi
++  if [ ! -f $ltfile ]; then
+     echo "$ltfile not found"
+     exit 1
++  fi
++  # Do we need this anymore?
++  echo "buildconf: Using libtool.m4 at ${ltfile}."
++  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
++fi
++if test "$1" = "2"; then
++  $libtoolize --copy
++  # Wouldn't it just be better to define top_builddir??
++  mv build/libtool.m4 build/libtool.m4.$$
++  cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
++  rm build/libtool.m4.$$
+ fi
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
+-
+-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+-
+-# This is just temporary until people's workspaces are cleared -- remove
+-# any old aclocal.m4 left over from prior build so it doesn't cause errors.
+-rm -f aclocal.m4
++# Clean up any leftovers
++rm -f aclocal.m4 libtool.m4
+ 
+ #
+ # Generate the autoconf header and ./configure
+--- srclib/apr/configure.in.orig	2009-07-08 15:12:05.000000000 -0500
++++ srclib/apr/configure.in	2009-07-08 15:13:28.000000000 -0500
+@@ -7,6 +7,7 @@
+ AC_INIT(build/apr_common.m4)
+ AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
+ AC_CONFIG_AUX_DIR(build)
++AC_CONFIG_MACRO_DIR(build)
+ 
+ dnl 
+ dnl Include our own M4 macros along with those for libtool
+@@ -16,6 +17,11 @@
+ sinclude(build/apr_threads.m4)
+ sinclude(build/apr_hints.m4)
+ sinclude(build/libtool.m4)
++sinclude(build/ltsugar.m4)
++sinclude(build/argz.m4)
++sinclude(build/ltoptions.m4)
++sinclude(build/ltversion.m4)
++sinclude(build/lt~obsolete.m4)
+ 
+ dnl Save user-defined environment settings for later restoration
+ dnl
+@@ -98,6 +104,8 @@
+ dnl preload section from invoking the macro to get compiler info.
+ AC_PROG_CC
+ 
++AC_PROG_SED
++
+ dnl Preload
+ APR_PRELOAD
+ 
+@@ -137,6 +145,11 @@
+ AC_ARG_ENABLE(experimental-libtool,[  --experimental-libtool Use experimental custom libtool (not included in source distribution)],
+   [experimental_libtool=$enableval],[experimental_libtool=no])
+ 
++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
++if test "x$Xsed" = "x"; then
++  Xsed="$SED -e 1s/^X//"
++fi
++
+ case $host in
+ *os2*)
+     # Use a custom-made libtool replacement
+--- acinclude.m4.orig	2009-07-10 16:18:04.000000000 -0500
++++ acinclude.m4	2009-07-10 16:21:02.000000000 -0500
+@@ -169,13 +169,17 @@
+ 
+   if test -z "$module_standalone"; then
+     if test -z "$2"; then
+-      libname="mod_$1.la"
++      # The filename of a convenience library must have a "lib" prefix:
++      libname="libmod_$1.la"
+       BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+       modpath_static="$modpath_static $libname"
+       cat >>$modpath_current/modules.mk<<EOF
+ $libname: $objects
+ 	\$(MOD_LINK) $objects $5
+ EOF
++      if test ! -z "$5"; then
++        APR_ADDTO(AP_LIBS, [$5])
++      fi
+     else
+       apache_need_shared=yes
+       libname="mod_$1.la"
+--- build/library.mk.orig	2009-07-10 16:22:02.000000000 -0500
++++ build/library.mk	2009-07-10 16:22:22.000000000 -0500
+@@ -19,4 +19,4 @@
+ LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
+ 
+ $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
+-	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
++	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
+--- build/rules.mk.in.orig	2009-07-10 16:23:23.000000000 -0500
++++ build/rules.mk.in	2009-07-10 16:23:54.000000000 -0500
+@@ -45,7 +45,7 @@
+ 
+ LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+ SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
+-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+ 
+ # Cross compile commands
+ 
+--- build/special.mk.orig	2009-07-10 16:25:08.000000000 -0500
++++ build/special.mk	2009-07-10 16:26:19.000000000 -0500
+@@ -26,7 +26,7 @@
+ install-modules:
+ 	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir);
+ 	@builtin='$(BUILTIN_LIBS)'; \
+-	has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
++	has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \
+ 	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
+ 		list='$(shared)'; \
+ 		for i in $$list; do \
diff --git a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh
index 0f870848790c..aad61705b316 100644
--- a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh
+++ b/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh
@@ -14,7 +14,7 @@
  
  ltpath=`dirname $libtoolize`
 -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
++ltfile=${LIBTOOL_M4}
  echo "Incorporating $ltfile into aclocal.m4 ..."
  echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
  echo "dnl edits here will be lost" >> aclocal.m4
diff --git a/www/apache20/files/patch-srclib:apr:buildconf b/www/apache20/files/patch-srclib:apr:buildconf
deleted file mode 100644
index 484f86afa37b..000000000000
--- a/www/apache20/files/patch-srclib:apr:buildconf
+++ /dev/null
@@ -1,28 +0,0 @@
---- srclib/apr/buildconf	Tue Jun 17 20:44:25 2003
-+++ srclib/apr/buildconf	Tue Mar  9 07:53:27 2004
-@@ -60,7 +60,7 @@
- #
- build/buildcheck.sh || exit 1
- 
--libtoolize=`build/PrintPath glibtoolize libtoolize`
-+libtoolize=${LIBTOOLIZE}
- if [ "x$libtoolize" = "x" ]; then
-     echo "libtoolize not found in path"
-     exit 1
-@@ -81,14 +81,14 @@
- $libtoolize --copy --automake
- 
- ltpath=`dirname $libtoolize`
--ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
- 
- if [ ! -f $ltfile ]; then
-     echo "$ltfile not found"
-     exit 1
- fi
- 
--echo "buildconf: Using libtool.m4 at ${ltfile}."
-+echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}."
- 
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- 
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index ee10d5fc0246..1f497dbef6ed 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -36,13 +36,13 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
-			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			LIBTOOL_M4=${LIBTOOL_M4} \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_APACHE=		common22
 USE_BZIP2=		yes
 USE_ICONV=		yes
-USE_AUTOTOOLS=		autoconf:262 libtool:15
+USE_AUTOTOOLS=		autoconf:262 libtool:22
 USE_PERL5=		yes
 USE_RC_SUBR=		apache22 htcacheclean
 LIBTOOLFILES=		configure
diff --git a/www/apache22/files/patch-libtool22 b/www/apache22/files/patch-libtool22
new file mode 100644
index 000000000000..079843239e13
--- /dev/null
+++ b/www/apache22/files/patch-libtool22
@@ -0,0 +1,122 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 025_libtool_2.x_fixes.dpatch by  <jsw@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update build system to work with libtool 2.x
+## DP:
+## DP: This corresponds to upstream revisions:
+## DP:   733052
+## DP:   742752
+## DP:   748902
+## DP:   757363
+diff --git a/buildconf b/buildconf
+index bc0e9fd..11554ed 100755
+--- srclib/apr/buildconf
++++ srclib/apr/buildconf
+@@ -35,17 +35,20 @@ fi
+ # Note: APR supplies its own config.guess and config.sub -- we do not
+ #       rely on libtool's versions
+ #
+-echo "Copying libtool helper files ..."
++echo "buildconf: copying libtool helper files using $libtoolize"
+ 
+ # Remove any libtool files so one can switch between libtool 1.3
+ # and libtool 1.4 by simply rerunning the buildconf script.
+-(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
+-
+-$libtoolize --copy --automake
+-
+-if [ -f libtool.m4 ]; then 
+-   ltfile=`pwd`/libtool.m4
+-else
++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
++
++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
++IFS=.; set $lt_version; IFS=' '
++if test "$1" = "1"; then
++  $libtoolize --copy --automake
++  if [ -f libtool.m4 ]; then 
++    ltfile=`pwd`/libtool.m4
++  else
+    ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+                    < $libtoolize`"
+    ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
+@@ -54,21 +57,21 @@ else
+      ltpath=`dirname $libtoolize`
+      ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+    fi
+-fi
+-  
+-if [ ! -f $ltfile ]; then
++  fi
++  if [ ! -f $ltfile ]; then
+     echo "$ltfile not found"
+     exit 1
++  fi
++  # Do we need this anymore?
++  echo "buildconf: Using libtool.m4 at ${ltfile}."
++  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ fi
+-
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
+-
+-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+-
+-# libtool.m4 from 1.6 requires ltsugar.m4
+-if [ -f ltsugar.m4 ]; then
+-   rm -f build/ltsugar.m4
+-   mv ltsugar.m4 build/ltsugar.m4
++if test "$1" = "2"; then
++  $libtoolize --copy
++  # Wouldn't it just be better to define top_builddir??
++  mv build/libtool.m4 build/libtool.m4.$$
++  cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
++  rm build/libtool.m4.$$
+ fi
+ 
+ # Clean up any leftovers
+diff --git a/configure.in b/configure.in
+index 46b4b32..2ac1439 100644
+--- srclib/apr/configure.in
++++ srclib/apr/configure.in
+@@ -9,6 +9,7 @@ AC_PREREQ(2.50)
+ AC_INIT(build/apr_common.m4)
+ AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
+ AC_CONFIG_AUX_DIR(build)
++AC_CONFIG_MACRO_DIR(build)
+ 
+ dnl 
+ dnl Include our own M4 macros along with those for libtool
+@@ -20,6 +21,10 @@ sinclude(build/apr_win32.m4)
+ sinclude(build/apr_hints.m4)
+ sinclude(build/libtool.m4)
+ sinclude(build/ltsugar.m4)
++sinclude(build/argz.m4)
++sinclude(build/ltoptions.m4)
++sinclude(build/ltversion.m4)
++sinclude(build/lt~obsolete.m4)
+ 
+ dnl Hard-coded inclusion at the tail end of apr_private.h:
+ AH_BOTTOM([
+@@ -117,6 +122,8 @@ dnl can only be used once within a configure script, so this prevents a
+ dnl preload section from invoking the macro to get compiler info.
+ AC_PROG_CC
+ 
++AC_PROG_SED
++
+ dnl Preload
+ APR_PRELOAD
+ 
+@@ -160,6 +167,11 @@ echo "performing libtool configuration..."
+ AC_ARG_ENABLE(experimental-libtool,[  --enable-experimental-libtool Use experimental custom libtool],
+   [experimental_libtool=$enableval],[experimental_libtool=no])
+ 
++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
++if test "x$Xsed" = "x"; then
++  Xsed="$SED -e 1s/^X//"
++fi
++
+ case $host in
+ *-os2*)
+     # Use a custom-made libtool replacement
diff --git a/www/apache22/files/patch-srclib-apr-buildconf b/www/apache22/files/patch-srclib-apr-buildconf
index 61d311890e74..f8638d7f4634 100644
--- a/www/apache22/files/patch-srclib-apr-buildconf
+++ b/www/apache22/files/patch-srclib-apr-buildconf
@@ -14,19 +14,10 @@
     if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
       ltpath=`dirname $libtoolize`
 -     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-+     ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
++     ltfile=${LIBTOOL_M4}
     fi
  fi
    
-@@ -61,7 +61,7 @@
-     exit 1
- fi
- 
--echo "buildconf: Using libtool.m4 at ${ltfile}."
-+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
- 
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- 
 @@ -87,8 +87,11 @@
  # Remove autoconf 2.5x's cache directory
  rm -rf autom4te*.cache
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index fd9206df2419..4724fdae041a 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An implementation of an ICAP server
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	c_icap
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/c_icap
 
 SUB_FILES=	pkg-install pkg-deinstall
diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist
index b4388b20d40a..ac5968016df1 100644
--- a/www/c-icap/pkg-plist
+++ b/www/c-icap/pkg-plist
@@ -48,7 +48,6 @@ lib/c_icap/srv_url_check.a
 lib/c_icap/srv_url_check.so
 lib/c_icap/srv_url_check.la
 @dirrm lib/c_icap
-lib/libicapapi.a
 lib/libicapapi.la
 lib/libicapapi.so.0
 lib/libicapapi.so
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 31b6dee18b26..9cd1d03551fa 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	A C++ class library for writing CGI applications
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index dd121adc9e1d..3cecb64b1d5d 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-devkit
 MAINTAINER=	kimelto@gmail.com
 COMMENT=	FastCGI Development Kit
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 5d2099bf9287..25060746a15c 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	C library for the Flickr API
 
 LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget ltverhack libxml2 pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/www/flood/Makefile b/www/flood/Makefile
index e87858dd7b8a..c205a6ffc6b0 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		apr-1:${PORTSDIR}/devel/apr
 
 WRKSRC=		${WRKDIR}/httpd-test/flood
-USE_AUTOTOOLS=	autoconf:262 libtool:15:env
+USE_AUTOTOOLS=	autoconf:262 libtool:22:env
 CONFIGURE_ARGS=	--disable-shared \
 	--with-apr=${LOCALBASE}/bin/apr-1-config \
 	--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 3e348e7da6f9..174d89834093 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library for people wanting to use libwww with gtk/gnome
 
 LIB_DEPENDS=	wwwzip.1:${PORTSDIR}/www/libwww
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index f28bc4d34356..0df923b5e9d3 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-gconf=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 41f06c67ec25..5beddfa0c5e4 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -29,7 +29,7 @@ USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 3ef267b6b539..eff5d9cadb39 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack \
 		libgnomeprintui
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 63f2ea1f9034..71c28ca46377 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Collect information from all over the Internet
 
 USE_BZIP2=		yes
 USE_PERL5=		yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure src/gatherer/curl/configure
 USE_LDCONFIG=	yes
 NO_MTREE=		yes
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 63eec65be749..439034c54de5 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 4bff4b5f4d9f..39226a9da290 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -28,7 +28,7 @@ PREFIX=		${KDE_PREFIX}
 USE_BZIP2=	yes
 USE_XORG=	xpm
 USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 
 .include <${.CURDIR}/../../x11/kde3/Makefile.kde>
 .include <bsd.port.mk>
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index daecfa813ad6..31ca90b0f6bd 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Generic Apache2 Request Library
 USE_APACHE=	2.0+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 305655e055e5..fabd867be594 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME http client library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index c07ce37c06b5..161f8dd59982 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 34e87f3aaa80..f0e2c50077c8 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	The W3C Reference Library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index dba187732ba2..6a1ee62f3410 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A secure, fast, compliant, and very flexible Web Server
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	aclocal:110 autoconf:262 autoheader:262 automake:110 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoconf:262 autoheader:262 automake:110 libtool:22
 ACLOCAL_ARGS=	--force
 GNU_CONFIGURE=	yes
 USE_GNOME=	lthack pkgconfig
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 9002790ab54c..8bc1bb9cd6fa 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -20,7 +20,7 @@ MAN5=		indexer.conf.5
 USE_LDCONFIG=	yes
 USE_GNOME=	lthack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=--enable-shared \
 		--sysconfdir=${PREFIX}/etc/mnogosearch \
 		--localstatedir=/var/mnogosearch \
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index ee7002a4903a..fe6df6659b85 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
 MAKE_JOBS_SAFE=  yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_APACHE=	2.2
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index 89b1e052d537..b1e1266aa194 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Apache module for loading C++ objects as handlers
 MAKE_JOBS_SAFE=  yes
 
 USE_APACHE=	2.0+
-USE_AUTOTOOLS=	autoconf:262 autoheader:262 libtool:15 automake:19 aclocal:19
+USE_AUTOTOOLS=	autoconf:262 autoheader:262 libtool:22 automake:19 aclocal:19
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 2ef1af9a17aa..767d9f41ffa7 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 USE_APACHE=	2.0+
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--man=${PREFIX}/man
 
 MAN8=		mod_mono.8
diff --git a/www/mod_transform/Makefile b/www/mod_transform/Makefile
index be3ae5871ac2..c4fb55a139d8 100644
--- a/www/mod_transform/Makefile
+++ b/www/mod_transform/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An XSLT and XIncludes Filter module for Apache 2.0
 MAKE_JOBS_SAFE=  yes
 
 USE_APACHE=	2.0
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 HAS_CONFIGURE=	yes
 USE_GNOME=	libxslt
 
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index bf66c0647970..08a0ca7bad92 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/apr:configure
 
 USE_APACHE=	yes
 USE_PYTHON_BUILD=yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/www/neon26/Makefile b/www/neon26/Makefile
index 042da6554659..818d8e913549 100644
--- a/www/neon26/Makefile
+++ b/www/neon26/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	neon28-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .if defined(WITHOUT_NLS)
diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index 7504543ff6c8..1cfef3f5e149 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	neon26-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .ifndef WITHOUT_OPENSSL
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 7504543ff6c8..1cfef3f5e149 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	neon26-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .ifndef WITHOUT_OPENSSL
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index f252d9985ce0..b860b7eecc8a 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
 RUN_DEPENDS=	osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit
 
 USE_GNOME=	gnomehack gnometarget libglade2
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index a1248f3f775f..3343f021101e 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	osb-nrcore>=0.5.2:${PORTSDIR}/www/osb-nrcore
 
 USE_GNOME=	gnomehack gnometarget gtk20 librsvg2
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index eda66f1da6f4..52969601b681 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore
 
 USE_XORG=	x11 xt
 USE_GNOME=	gnomehack gnometarget gtk20
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index 41ef2ac45fbc..a6d5225c0b75 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A PHP Extension to help debugging a PHP script
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PHP=	yes
 USE_PHPIZE=	yes
 WITH_PHP_MOD=	yes
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 13c240c1e6f6..4cb30f32cab0 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -20,7 +20,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CRYPTKEY?=	11152, 368, 192, 1281, 62
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PHP=	zlib
 USE_PHPIZE=	yes
 IGNORE_WITH_PHP=4
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 67fcea6691ad..f605acd791b1 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -18,7 +18,7 @@ JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 USE_OPENSSL=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 
 # Customizable settings
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 29fa17b7e67b..c4d46e4d1ada 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	Securely execute PHP scripts under Apache
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:110:env automake:110:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	aclocal:110:env automake:110:env autoconf:262:env libtool:22:env
 
 # Maintainer has not tested suPHP 0.6.x on Apache 1.3.
 USE_APACHE=	2.0+
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index b4b677c41f60..911592443d7e 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Flash rendering plugin
 
 LIB_DEPENDS=	swfdec-0.8:${PORTSDIR}/graphics/swfdec
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-plugin-dir="${WEBPLUGINS_DIR}"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 95e6559e772a..f96bb5d1c73f 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://swish-e.org/distribution/
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	Simple web indexing for humans - enhanced
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index f44675cbf10c..3b1288dfbfbf 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 PLIST_SUB=	SHLIB="@comment " NSHLIB=""
 CONFLICTS=	tidy-20000804* tidy-lib-[0-9]*
 .else
-USE_AUTOTOOLS=	automake:15 autoconf:262 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:262 libtool:22
 AUTOMAKE_ARGS+=	-a -c --foreign
 USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIB="" NSHLIB="@comment "
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 48a4c9846b9e..3ca4dd05bb4d 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libxslt
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:15
+USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ac_cv_path_DOLT_BASH=""
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 884defa0c6ad..3679a5c4caf0 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 MAKE_JOBS_SAFE=  yes
 
 USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/wsdl
 USE_LDCONFIG=	yes