-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.

-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:	marcus and kwm
Pointyhat-exp:	a few times by pav
Tested by:	pgollucci, "Romain Tartière" <romain@blogreen.org>, and
		a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:	marcus
Approved by:	portmgr

1512 files changed, 3822 insertions, 3421 deletions

diff --git a/MOVED b/MOVED
index febe0cffacf7..76799780d8c9 100644
--- a/MOVED
+++ b/MOVED
@@ -4128,3 +4128,5 @@ security/smtpmap||2009-07-28|Has expired: depends on GCC 2.95 which has not been
 devel/boost|devel/boost-libs|2009-07-28|Boost ports were split and sliced
 devel/boost-python|devel/boost-python-libs|2009-07-28|Boost ports were split and sliced
 www/xpi-firegpg||2009-07-31|Removed
+devel/libtool15|devel/libtool22|2009-08-02|Update to libtool22
+devel/libltdl15|devel/libltdl22|2009-08-02|Update to libltdl22
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index 4fe59ce24b62..e09fcaea8fe1 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -175,10 +175,10 @@ BUILD_DEPENDS+=		${AUTOCONF_DEPENDS}
 #---------------------------------------------------------------------------
 
 # Convenience function to save people having to depend directly on
-# devel/libltdl15
+# devel/libltdl22
 #
 .if defined(AUTOTOOL_libltdl)
-LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl15
+LIB_DEPENDS+=	ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if defined(AUTOTOOL_libtool)
@@ -202,7 +202,7 @@ LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize
 LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
 LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
 LIBTOOL_M4=			${LOCALBASE}/share/aclocal/libtool.m4
-LTMAIN=				${LIBTOOL_SHAREDIR}/ltmain.sh
+LTMAIN=				${LIBTOOL_SHAREDIR}/config/ltmain.sh
 LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4}
 
 LIBTOOL_DEPENDS=	${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}
diff --git a/UPDATING b/UPDATING
index fe031db10104..28fd705c4055 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,22 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20090802:
+  AFFECTS: users of devel/libtool15 and devel/libltdl15
+  AUTHOR: mezz@FreeBSD.org
+
+  The devel/libtool15 and devel/libltdl15 have been moved to libtool22 and
+  libltdl22 then updated to 2.2.6a. You will need to run portmaster or
+  portupgrade:
+
+  portmaster -o devel/libtool22 libtool-1.5\*
+  portmaster -o devel/libltdl22 libltdl-1.5\*
+
+  Same way as for portupgrade by replace from 'portmaster' to 'portupgrade'.
+  After that, you will need to rebuild all ports that depend on libltdl, since
+  all ports' PORTREVISION has been bump so you can run with '-a' of either
+  portmaster or portupgrade.
+
 20090801:
   AFFECTS: users of x11-drivers/xf86-video-nouveau
   AUTHOR: rnoland@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 73747e615ba0..1ddee5de38bd 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 801ef1c0b591..98345e7a5714 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -20,7 +20,7 @@ USE_XORG=	xfixes xdamage ice xcomposite sm
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
 USE_GMAKE=	yes
 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/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
index 90fa1927c3d3..9f2814ea3874 100644
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@@ -21,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_XORG=	xtst
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index 9725dabc15ad..66b2a7156c9a 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A program for back up of directories or files
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile
index cad8e9def996..cdbf48838538 100644
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 3a1e714e8d80..f0bd6afdf877 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
@@ -19,7 +19,7 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/archivers/libcomprex/files/patch-Makefile.in b/archivers/libcomprex/files/patch-Makefile.in
deleted file mode 100644
index 1a68fb3fb821..000000000000
--- a/archivers/libcomprex/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Mar  6 13:30:58 2003
-+++ Makefile.in	Tue Oct 28 13:55:01 2003
-@@ -126,7 +126,7 @@
- modlibdir = @modlibdir@
- sedpath = @sedpath@
- 
--@DYNAMIC_MODS_TRUE@LIBLTDLDIR = libltdl
-+@DYNAMIC_MODS_TRUE@LIBLTDLDIR =
- 
- SUBDIRS = debian docs intl $(LIBLTDLDIR) modules libcomprex po tests
- 
diff --git a/archivers/libcomprex/files/patch-libcomprex::Makefile.in b/archivers/libcomprex/files/patch-libcomprex::Makefile.in
deleted file mode 100644
index 7ed62a5a53f2..000000000000
--- a/archivers/libcomprex/files/patch-libcomprex::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- libcomprex/Makefile.in.orig	Thu Mar  6 13:33:01 2003
-+++ libcomprex/Makefile.in	Tue Oct 28 13:56:41 2003
-@@ -161,7 +161,7 @@
- 	utils.c
- 
- 
--libcomprex_la_LIBADD = @DLLDFLAGS@ $(LIBLTDL) $(STATIC_LINK_LIBS)
-+libcomprex_la_LIBADD = @DLLDFLAGS@ -lltdl $(STATIC_LINK_LIBS)
- 
- libcomprex_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-@@ -169,8 +169,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" \
--	$(INCLTDL)
-+	-DCOMPREX_LIBDIR=\""$(libdir)/comprex"\"
- 
- subdir = libcomprex
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index 273c3a25d65c..693501480550 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Decompress data compressed with PKWARE Data Compression Library
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index 39dec10b05de..3d8f8b1f75f6 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}alpha
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A library for Microsoft compression formats
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 2b9c08d310b9..f467762f16d3 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -26,7 +26,7 @@ OPTIONS=	LIBSYNCE	"Build with libsynce support"			on \
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_ICONV=	yes
diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index 35bf326e1d32..13f57282c2e8 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -16,7 +16,7 @@ COMMENT?=	LZRTF compression library
 
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index ca5138ff3dd2..d7a8807bbe01 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 56ad60beca8e..3a7407165779 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 9ecb943fa05f..08eabde03ebf 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	rpm-4.* rpm-5.*
 
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:15
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:22
 CONFIGURE_ARGS=	--with-glob
 USE_LDCONFIG=	yes
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 04337d653d0f..7d68a2f7fc7a 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure db3/configure db/dist/configure popt/configure \
 		beecrypt/configure
 USE_GMAKE=	yes
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 590a599fa746..2a7a56089cf4 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen \
 .endif
 
 DB_VERSION?=	45
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	configure db3/configure db/dist/configure \
 		file/configure zlib/configure xar/configure
 USE_GMAKE=	yes
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 5f9511728c61..3d2baece1c8e 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A data compression library with low memory usage
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index a4065b06025d..521bf67432a4 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=synce
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Extract data from InstallShield CAB files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_LDCONFIG=	yes
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 0b5e22bd577d..8de486d85138 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://vesuri.jormas.com/xpk/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The eXternal PacKer (XPK) library system
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index eaeb8ab5d74d..495142620a05 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Scriptable space flight simulator for X
 LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG=	x11 xt xext xmu xi
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index e4f53d7590ab..4d5070dcfa0a 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 
 USE_RC_SUBR=	gpsd
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index cecd000bea89..0da694afe5c9 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index a60532f59bdf..151aba42e900 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Astronomical julian date calculator
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 9c8f2dbde6d8..b93599f39650 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Astronomical Calculation Library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnometarget lthack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index ab3c6f191a18..0509f16e48a3 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
 		nova:${PORTSDIR}/astro/libnova
 RUN_DEPENDS=	${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--datadir=${DATADIR}
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 894632e1d90a..d2901dd628ef 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gsl.13:${PORTSDIR}/math/gsl \
 USE_QT_VER=	3
 USE_GL=		gl
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I macros -I ${LOCALBASE}/share/aclocal
 CONFIGURE_ENV=	ac_cv_c_inline=no
 USE_LDCONFIG=	yes
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 46ff6d2392b1..0f95ea0749f9 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:S/M/m/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MPEG audio analysis toolkit
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile
index 9ae86c3f74ef..ed8c3d5ec9a7 100644
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@@ -25,7 +25,7 @@ PLUGIN=		ffmpeg_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index b3af1ba8b34d..e489db73a32c 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -25,7 +25,7 @@ PLUGIN=		jack_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile
index 8d1b22a55b76..741f35b59096 100644
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@@ -24,7 +24,7 @@ PLUGIN=		mpc_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile
index e214721e5dc7..8ad45f05eef2 100644
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@@ -26,7 +26,7 @@ PLUGIN=		mpeg_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile
index 668218e8a41f..2008dd616b1c 100644
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@@ -24,7 +24,7 @@ PLUGIN=		oss_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile
index df16b68fa2d7..e3fdbd248b96 100644
--- a/audio/akode-plugins-pulseaudio/Makefile
+++ b/audio/akode-plugins-pulseaudio/Makefile
@@ -25,7 +25,7 @@ PLUGIN=		polyp_sink
 PORTNAMESUFX=	pulseaudio
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile
index f0a6be11fc5f..da7c4bf0faa1 100644
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@@ -25,7 +25,7 @@ PLUGIN=		src_resampler
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index 1817fa198e66..864870e4ed50 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -29,7 +29,7 @@ PLUGIN=		xiph_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index fc3767295e41..17b469f140b4 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -28,7 +28,7 @@ OPTIONS=	FFMPEG "FFMPEG decoder plugin" off \
 		XIPH "FLAC/Speex/Vorbis decoder plugin" on
 
 USE_AUTOTOOLS=	libltdl
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 55b8a682a194..0f7897f24366 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Markus Brueffer <markus@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.10
@@ -24,7 +25,7 @@ MIN_OPTIONS_VER=	${PORTNAME}-1.4.1
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_SDL=	sdl
 USE_RUBY=	yes
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 92f26b906bc0..5fac640aa557 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -41,7 +41,6 @@ lib/libamarok.la
 lib/libamarok.so
 lib/libamarok.so.0
 lib/ruby_lib/http11.rb
-lib/ruby_lib/libhttp11.a
 lib/ruby_lib/libhttp11.la
 lib/ruby_lib/libhttp11.so
 lib/ruby_lib/libhttp11.so.0
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index fc3c0a9585ee..57ee91a10f1b 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -28,7 +28,7 @@ PREFIX=		${KDE_PREFIX}
 WANT_GNOME=	yes
 USE_QT_VER=	3
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 QTCPPFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/aube/Makefile b/audio/aube/Makefile
index a8bc8e619eeb..144f919cf161 100644
--- a/audio/aube/Makefile
+++ b/audio/aube/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_GNOME=	imlib
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 1eff19e97f35..9a70d8676e4b 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	lib${PKGNAMEPREFIX}${PORTNAME}.so
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 56082790c742..8914a9b4cf46 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -23,7 +23,7 @@ COMMENT=	A modplug-based plugin for beep-media-player
 LIB_DEPENDS?=	beep.2:${PORTSDIR}/multimedia/beep-media-player
 LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 PLUGDIR?=	lib/bmp/Input
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 23e874045fa9..ce2e9d84fc47 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	libbmp-mpc.so
 PLIST_FILES=	${PLUGDIR}/${PLUGFILE}
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index ba168587bb82..556b95738a62 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	lib/bmp/Input/libwma.so \
 		lib/bmp/Input/libwma.a
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/ccaudio/Makefile b/audio/ccaudio/Makefile
index 61fd65b9edcf..5879dc930253 100644
--- a/audio/ccaudio/Makefile
+++ b/audio/ccaudio/Makefile
@@ -16,7 +16,9 @@ COMMENT=	C++ class framework for manipulating audio files
 
 LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp
 
-USE_AUTOTOOLS=	libtool:15
+BROKEN=		Does not build with libtool 2.2.
+
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index c085ffff2518..3721afb41e02 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp
 
 CONFLICTS=	ccaudio-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnometarget gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist
index 06cc6633cde2..60c4730c9c3d 100644
--- a/audio/ccaudio2/pkg-plist
+++ b/audio/ccaudio2/pkg-plist
@@ -1,13 +1,10 @@
 bin/audiotool
 bin/tonetool
 include/cc++/audio2.h
-lib/ccaudio2-%%CCVERSION%%/adpcm.a
 lib/ccaudio2-%%CCVERSION%%/adpcm.la
 lib/ccaudio2-%%CCVERSION%%/adpcm.so
-lib/ccaudio2-%%CCVERSION%%/g711.a
 lib/ccaudio2-%%CCVERSION%%/g711.la
 lib/ccaudio2-%%CCVERSION%%/g711.so
-lib/ccaudio2-%%CCVERSION%%/oki.a
 lib/ccaudio2-%%CCVERSION%%/oki.la
 lib/ccaudio2-%%CCVERSION%%/oki.so
 lib/libccaudio2-%%CCVERSION%%.so
@@ -18,4 +15,3 @@ lib/libccaudio2.so
 libdata/pkgconfig/libccaudio2.pc
 @dirrmtry include/cc++
 @dirrm lib/ccaudio2-%%CCVERSION%%
-
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 89bf18d9f5a9..3bad75893c48 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvda-author
 PORTVERSION=	09.05
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 43e575039e84..07a9e3432358 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A sound library for enlightenment package
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gnomehack
 USE_LDCONFIG=	yes
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 2ad076885ae5..e3ea1329eecb 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 7883179ce2df..223bd5636c6e 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index f9431f3bbdc2..36892fd4fe32 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -18,7 +18,7 @@ COMMENT?=	A command line player for .nsf and .hes audio files
 
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 41910b4ff8b1..d8d1ec7c4d5e 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Free lossless audio codec
 
 LIB_DEPENDS=	ogg.6:${PORTSDIR}/audio/libogg
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sse \
 		--with-ogg="${LOCALBASE}" \
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index 3bbee5e91335..951e56c88fec 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -16,7 +16,7 @@ COMMENT=	The OpenAL Utility Toolkit
 
 LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index cbfa93813971..226ebbdd47c5 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glame
 PORTVERSION=	2.0.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio gnome
 MASTER_SITES=	SF
 
@@ -24,7 +24,7 @@ USE_XORG=	xbitmaps x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index f59ec7eca642..a0ffe6b0c3e8 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 			ao:${PORTSDIR}/audio/libao
 
 USE_GNOME=		gnomehack gnomeprefix
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index acac2bc28daf..ba73c487da10 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:15
+USE_AUTOTOOLS=	autoconf:213 libtool:22
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 03b7433128e4..ef5013ea882f 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -22,7 +22,7 @@ USE_XORG=	x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui vte
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index 518b63071dbc..30ebc496beb2 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
 CFLAGS:=	${CFLAGS} -O2
 USE_GSTREAMER=	yes good
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 OPTIONS=	MP3 "mp3 files support" on \
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 94836e2eead2..63dc4078538f 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 951f22db8d3e..ad9dd2483665 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -31,7 +31,7 @@ USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
 USE_LDCONFIG=	yes
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index bd831df3a7c5..35350635d454 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	k3b:${PORTSDIR}/sysutils/k3b
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	${PREFIX}/lib/kde3
 
 post-patch:
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 9f11f9722df5..cd167bce7f5e 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/audio/kirocker/Makefile b/audio/kirocker/Makefile
index d5f1a176acbc..e9c4b6743f2a 100644
--- a/audio/kirocker/Makefile
+++ b/audio/kirocker/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Kicker applet for displaying Amarok info
 RUN_DEPENDS=	amarok:${PORTSDIR}/audio/amarok
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_KDELIBS_VER=3
 INSTALLS_ICONS=	yes
 
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 6d974e060b31..96ce92f653cf 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//:S/./-/}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fast MP3 encoder kit
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 5d6c6c94a470..35333db2ebfb 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	a52dec-${PORTVERSION:S/.b/b/}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A free library for decoding ATSC A/52 streams, aka AC-3
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 9cdcfb651731..fd7b6c6c2603 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -17,7 +17,7 @@ COMMENT=	AdLib emulator library supporting many formats
 
 LIB_DEPENDS=	binio.1:${PORTSDIR}/devel/libbinio
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 7639b7e2c67a..80bafaadfeb0 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -24,7 +24,7 @@ RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index a51daefd71dc..ec3d13202b69 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -23,7 +23,7 @@ RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index fb26dd1d4bd9..e90efdfe5701 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Portable audio output library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 1d640eee7002..54a458904fd3 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	audiofile-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A sound library for SGI audio file
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 13a1d9f532c7..827f9b310a47 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 CONFIGURE_ARGS=	--disable-lynx
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 879742516dde..cf1ae1d21e42 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	A library for playing audio CDs
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/libdssialsacompat/Makefile b/audio/libdssialsacompat/Makefile
index c369b4f835be..3c7f1b4620c8 100644
--- a/audio/libdssialsacompat/Makefile
+++ b/audio/libdssialsacompat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.smbolton.com/linux/
 MAINTAINER=	freebsd-ports@coreland.ath.cx
 COMMENT=	Alsa compatibility library to build DSSI
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 3f0a9374f533..07f1002dad51 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Libmad library (part of MAD project)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index f1f55bbdcf50..30b5362121eb 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	david@trucs.org
 COMMENT=	MikMod Sound Library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 6bb0c059e229..559d811beb1d 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmp3splt
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mp3splt
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 93fbc74f5128..27f6a13f5547 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Abstraction around libmpdclient
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig glib20 gnomehack
 USE_LDCONFIG=	yes
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index 8c0f3fcd1832..048b9659e042 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library, API for communicating with Creative and Dell audio players
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index 100b433462cb..16c18e63cf20 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -14,19 +14,26 @@ DISTNAME=	${PORTNAME}src-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates three-dimensional coherent noise
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool15
-
 USE_ZIP=	yes
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:22:env
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-O3 -fomit-frame-pointer
 WRKSRC=		${WRKDIR}/noise
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e 's|include lib:|include:|g' \
+		${WRKSRC}/Makefile
+
 do-install:
-	@${CP} -R ${WRKSRC}/lib/${PORTNAME}.* ${PREFIX}/lib/
+	@${CP} -R ${WRKSRC}/src/${PORTNAME}.* ${PREFIX}/lib/
+	@${CP} -R ${WRKSRC}/src/.libs/${PORTNAME}.so.* ${PREFIX}/lib/
 	@${INSTALL} -d ${PREFIX}/include/noise
 	@${CP} -R ${WRKSRC}/include/ ${PREFIX}/include/noise/
 	@${RM} -f ${PREFIX}/include/noise/Makefile
-	@${LN} -sf ${PREFIX}/lib/libnoise.so.0.3 ${PREFIX}/lib/libnoise.so.0
+#	This line is here to preserve the old behavior of the port.
+	@${LN} -sf ${PREFIX}/lib/libnoise.so.0 ${PREFIX}/lib/libnoise.so.0.3
 
 .include <bsd.port.mk>
diff --git a/audio/libnoise/files/patch-src_Makefile b/audio/libnoise/files/patch-src_Makefile
new file mode 100644
index 000000000000..6bf567fbb7d4
--- /dev/null
+++ b/audio/libnoise/files/patch-src_Makefile
@@ -0,0 +1,19 @@
+--- src/Makefile.orig	2004-10-24 21:21:12.000000000 +0200
++++ src/Makefile	2009-07-16 11:31:48.000000000 +0200
+@@ -12,12 +12,12 @@
+ 

+ # hooks for future makefiles being able to make multiple SOs, or older SOs

+ libnoise: libnoise.so libnoise.a libnoise.la

+-libnoise.so: libnoise.so.0

+-libnoise.so.0: libnoise.so.0.3

++#libnoise.so: libnoise.so.0

++#libnoise.so.0: libnoise.so.0.3

+ 

+ # Real build targets

+-libnoise.so.0.3: $(OBJECTS)

+-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)

++libnoise: $(OBJECTS)

++	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -o $@.la $(OBJECTS:.o=.lo) -rpath %%LOCALBASE%%/lib

+ 

+ libnoise.a: $(OBJECTS)

+ 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)

diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index f1a38cd1cbf6..e43237fc02d4 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		curl.5:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 9060625ef436..3e835ae80556 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile
index 70dc0735a15d..4c8b63290931 100644
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Simple Ogg API
 
 LIB_DEPENDS=	ogg.6:${PORTSDIR}/audio/libogg
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index db8b88d930cf..0559b216bd99 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		fftw3.5:${PORTSDIR}/math/fftw3
 
 USE_GNOME=	gnomehack pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gcc-pipe
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index 7b1e39fbeaa2..f49603f0e673 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Connect and transmit data to an Icecast media streaming server
 
 CONFLICTS=	libshout2-*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 9e4dcd3dec51..efdcc56daba7 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator library to play SID music files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index a1ede1c5cbd6..81bd7e03bf07 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	builders/hardsid-builder/configure \
 		builders/resid-builder/configure \
 		libsidplay/configure \
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index 4cd8a0d84c75..4fc15c6f0a67 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USE_AUTOTOOLS=	automake:15 autoconf:262 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:262 libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 966db21f0060..45c0f45e039e 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 7f6dd8f0aa4e..101938f798e9 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 USE_LDCONFIG=	yes
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 3af8a20e8955..b6eb372b09af 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Audio compression codec library
 
 LIB_DEPENDS=	ogg.6:${PORTSDIR}/audio/libogg
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index c34954e9f4e2..cc0d7e2a5d5d 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-3.99-u4-b5
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Monkey's Audio lossless codec
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 2a972edb0aa5..5b47a2e02acf 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3splt
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index dfd78c5710f5..64c0b2cd5193 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -27,7 +27,7 @@ USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
 USE_LDCONFIG=	yes
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 849531f3b961..4fef38ec302f 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpg123
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF \
 		http://www.mpg123.de/download/
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 4b1bdff3f0f4..1a9c71fa86b3 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpiosh
 PORTVERSION=	0.7.1.p2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/mpio
 DISTNAME=	mpio-${PORTVERSION:S|.p|_pre|}
@@ -18,10 +19,11 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 
 .include <bsd.port.pre.mk>
 
@@ -31,16 +33,6 @@ LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
 .endif
 
-patch-autotools:
-	${DO_NADA}
-
-#
-# Get rid of .la and static library files
-#
-post-configure:
-	@${REINPLACE_CMD} -E -e \
-	    '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
-
 post-patch:
 .if ${OSVERSION} >= 800069
 	${RM} -f ${WRKSRC}/configure
diff --git a/audio/mpiosh/pkg-plist b/audio/mpiosh/pkg-plist
index 7531bd270a5e..8263c7ef5f4f 100644
--- a/audio/mpiosh/pkg-plist
+++ b/audio/mpiosh/pkg-plist
@@ -1,9 +1,11 @@
 bin/mpiologo
 bin/mpiosh
 etc/mpio/mpioshrc
-lib/libmpio.so
-lib/libmpio.so.1
 include/mpio/defs.h
 include/mpio/mpio.h
+lib/libmpio.a
+lib/libmpio.la
+lib/libmpio.so
+lib/libmpio.so.1
 @dirrm include/mpio
 @dirrm etc/mpio
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 62d12adddefa..d9bb651939f0 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_GNOME=	glib20
-USE_AUTOTOOLS=	automake:110 aclocal:110 libtool:15
+USE_AUTOTOOLS=	automake:110 aclocal:110 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lpthread"
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 849f012a94d5..03f4e785f2b1 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A 3D positional spatialized sound library
 
 CONFLICTS=	openal-soft-[0-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-capture
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index 48ddd8d5f19e..14fdd929b226 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A command line player for .spc and .zst files
 
 ONLY_FOR_ARCHS=	i386	# contains x86 asm code
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	README
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index a73994f9619a..1e634213e85d 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	sphinxfe.0:${PORTSDIR}/audio/sphinxbase
 
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 7471af1e22ee..6064209564c2 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.2 2009/04/18 19:59:03 marcus Exp $
+#   $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.5 2009/07/20 21:26:40 marcus Exp $
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.14
-PORTREVISION=	7
+PORTVERSION=	0.9.15
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -19,20 +19,23 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		oil-0.3.0:${PORTSDIR}/devel/liboil \
 		speexdsp.1:${PORTSDIR}/audio/speex \
 		dbus-1.3:${PORTSDIR}/devel/dbus \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+		gdbm.3:${PORTSDIR}/databases/gdbm \
+		execinfo:${PORTSDIR}/devel/libexecinfo
 
 USE_GNOME=	gnometarget gnomehack glib20 intltool ltverhack
-USE_XORG=	x11 sm
+USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+USE_AUTOTOOLS=	libltdl:22 libtool:22
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		OPENSSL_CFLAGS="-I/usr/include" \
+		OPENSSL_LIBS="-lcrypto -lssl" \
 		LIBS="-lm -lintl"
 
 CONFIGURE_ARGS=	--localstatedir=/var \
@@ -43,7 +46,7 @@ OPTIONS=	JACK "JACK audio support" Off \
 		HAL "Enable HAL support" On \
 		GCONF "Enable GConf support" On
 
-PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
 MAN1=		esdcompat.1 pabrowse.1 pacat.1 pacmd.1 pactl.1 padsp.1 \
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 5594f9d76c7b..3a94651289a0 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.14.tar.gz) = 0ed1115222d1d8c64cc14961cccb2eb0
-SHA256 (pulseaudio-0.9.14.tar.gz) = e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5
-SIZE (pulseaudio-0.9.14.tar.gz) = 1303077
+MD5 (pulseaudio-0.9.15.tar.gz) = 4510364eeab219fd100bd1b373b1a002
+SHA256 (pulseaudio-0.9.15.tar.gz) = 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
+SIZE (pulseaudio-0.9.15.tar.gz) = 1704374
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..0be2eaa8c063
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2009-07-19 14:49:35.000000000 -0400
++++ src/Makefile.in	2009-07-19 14:56:39.000000000 -0400
+@@ -2668,7 +2668,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_C
+ libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \
+ 	-avoid-version $(am__append_17)
+ libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \
+-	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(am__append_19) \
++	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) -lexecinfo $(am__append_19) \
+ 	$(am__append_23)
+ 
+ ###################################
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index 77ba7306a63c..b8291f56dda2 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -1,5 +1,5 @@
---- src/daemon/default.pa.in.orig	2008-08-19 17:25:03.000000000 -0400
-+++ src/daemon/default.pa.in	2008-09-28 19:48:14.000000000 -0400
+--- src/daemon/default.pa.in.orig	2009-07-19 14:58:14.000000000 -0400
++++ src/daemon/default.pa.in	2009-07-19 14:58:41.000000000 -0400
 @@ -22,10 +22,10 @@
  .nofail
  
@@ -15,3 +15,12 @@
  
  .fail
  
+@@ -101,7 +101,7 @@ load-module module-rescue-streams
+ load-module module-always-sink
+ 
+ ### Automatically suspend sinks/sources that become idle for too long
+-load-module module-suspend-on-idle
++#load-module module-suspend-on-idle
+ 
+ ### If autoexit on idle is enabled we want to make sure we only quit
+ ### when no local session needs us anymore.
diff --git a/audio/pulseaudio/files/patch-src_modules_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
index 97cf10e4dde1..a723999af7fd 100644
--- a/audio/pulseaudio/files/patch-src_modules_module-oss.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
@@ -1,21 +1,21 @@
---- src/modules/module-oss.c.orig	2009-07-10 02:51:21.000000000 -0400
-+++ src/modules/module-oss.c	2009-07-10 02:52:05.000000000 -0400
-@@ -1204,10 +1204,12 @@ int pa__init(pa_module*m) {
-         use_mmap = 0;
+--- src/modules/oss/module-oss.c.orig	2009-04-13 17:11:32.000000000 -0400
++++ src/modules/oss/module-oss.c	2009-07-19 14:24:25.000000000 -0400
+@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) {
+         use_mmap = FALSE;
      }
  
 +#ifndef __FreeBSD__
      if (use_mmap && mode == O_WRONLY) {
          pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
-         use_mmap = 0;
+         use_mmap = FALSE;
      }
 +#endif
  
      if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
          pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1385,7 +1387,7 @@ int pa__init(pa_module*m) {
+@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) {
+     if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
          pa_bool_t do_close = TRUE;
-         u->mixer_devmask = 0;
  
 -        if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
 +        if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
diff --git a/audio/pulseaudio/files/patch-src_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
index bf44d4fdd729..5fe7ec3294d1 100644
--- a/audio/pulseaudio/files/patch-src_modules_oss-util.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
@@ -1,5 +1,5 @@
---- src/modules/oss-util.c.orig	2007-11-08 21:45:25.000000000 -0500
-+++ src/modules/oss-util.c	2008-01-09 17:00:45.000000000 -0500
+--- src/modules/oss/oss-util.c.orig	2007-11-08 21:45:25.000000000 -0500
++++ src/modules/oss/oss-util.c	2008-01-09 17:00:45.000000000 -0500
 @@ -44,6 +44,22 @@
  
  #include "oss-util.h"
@@ -23,15 +23,3 @@
  int pa_oss_open(const char *device, int *mode, int* pcaps) {
      int fd = -1;
      int caps;
-@@ -300,7 +316,11 @@ static int get_device_number(const char 
-     int r;
- 
-     if (!(p = rp = pa_readlink(dev))) {
-+#ifdef ENOLINK
-         if (errno != EINVAL && errno != ENOLINK) {
-+#else
-+        if (errno != EINVAL) {
-+#endif
-             r = -1;
-             goto finish;
-         }
diff --git a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
new file mode 100644
index 000000000000..2dbcad26ab0d
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
@@ -0,0 +1,12 @@
+--- src/modules/rtp/rtsp_client.c.orig	2009-07-19 14:38:38.000000000 -0400
++++ src/modules/rtp/rtsp_client.c	2009-07-19 14:39:46.000000000 -0400
+@@ -23,6 +23,9 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
deleted file mode 100644
index c8d657481d62..000000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/tests/rtstutter.c.orig	2008-07-26 17:10:17.000000000 -0400
-+++ src/tests/rtstutter.c	2008-07-26 17:12:26.000000000 -0400
-@@ -42,6 +42,7 @@ static int msec_lower, msec_upper;
- static void* work(void *p) PA_GCC_NORETURN;
- 
- static void* work(void *p) {
-+#ifndef __FreeBSD__
-     cpu_set_t mask;
-     struct sched_param param;
- 
-@@ -83,6 +84,7 @@ static void* work(void *p) {
-         } while (now.tv_sec < end.tv_sec ||
-                  (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec));
-     }
-+#endif
- }
- 
- int main(int argc, char*argv[]) {
diff --git a/audio/pulseaudio/files/patch-ubuntu-bundle b/audio/pulseaudio/files/patch-ubuntu-bundle
index 34e0819b97f1..65df94565aef 100644
--- a/audio/pulseaudio/files/patch-ubuntu-bundle
+++ b/audio/pulseaudio/files/patch-ubuntu-bundle
@@ -1,1668 +1,893 @@
-From 121bfc9f1916395e5216927ec3a9e0bbd742395a Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd@debian.org>
-Date: Sun, 19 Oct 2008 13:39:50 +0100
-Subject: [PATCH] load module gconf earlier
+From 876624e3147cf3deac847b11bde4b04988971eee Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sun, 19 Apr 2009 19:02:16 +0200
+Subject: [PATCH 02/28] util: if NULL is passed to pa_path_get_filename() just hand it through
 
 ---
- src/daemon/default.pa.in |   19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
+ src/pulse/util.c |    3 ++-
+ src/pulse/util.h |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 7032038..41322c6 100755
---- src/daemon/default.pa.in
-+++ src/daemon/default.pa.in
-@@ -72,6 +72,16 @@ load-module module-native-protocol-unix
- #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
- #load-module module-rtp-send source=rtp.monitor
- 
-+### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-+### Please keep in mind that the modules configured by paprefs might conflict with manually
-+### loaded modules.
-+.ifexists module-gconf@PA_SOEXT@
-+.nofail
-+load-module module-gconf
-+.fail
-+.endif
-+
-+
- ### Automatically restore the volume of streams and devices
- load-module module-stream-restore
- load-module module-device-restore
-@@ -96,15 +106,6 @@ load-module module-console-kit
- ### Enable positioned event sounds
- load-module module-position-event-sounds
- 
--### Load additional modules from GConf settings. This can be configured with the paprefs tool.
--### Please keep in mind that the modules configured by paprefs might conflict with manually
--### loaded modules.
--.ifexists module-gconf@PA_SOEXT@
--.nofail
--load-module module-gconf
--.fail
--.endif
--
- # X11 modules should not be started from default.pa so that one daemon
- # can be shared by multiple sessions.
- 
-Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in
-===================================================================
---- src/daemon/daemon.conf.in	2009-03-07 05:01:11.000000000 -0500
-+++ src/daemon/daemon.conf.in	2009-03-07 05:01:54.000000000 -0500
-@@ -46,7 +46,7 @@
- ; log-target = auto
- ; log-level = notice
- 
--; resample-method = speex-float-3
-+resample-method = src-linear
- ; disable-remixing = no
- ; disable-lfe-remixing = yes
- 
-@@ -72,5 +72,5 @@
- ; default-sample-rate = 44100
- ; default-sample-channels = 2
- 
--; default-fragments = 4
--; default-fragment-size-msec = 25
-+default-fragments = 8
-+default-fragment-size-msec = 10
-Index: pulseaudio-0.9.13/src/daemon/default.pa.in
-===================================================================
---- src/daemon/default.pa.in	2009-01-06 22:58:47.000000000 -0500
-+++ src/daemon/default.pa.in	2009-01-06 22:59:15.000000000 -0500
-@@ -29,6 +29,9 @@
- 
- .fail
+diff --git src/pulse/util.c src/pulse/util.c
+index 54a188d..6f1e40a 100644
+--- src/pulse/util.c
++++ src/pulse/util.c
+@@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) {
+ char *pa_path_get_filename(const char *p) {
+     char *fn;
+ 
+-    pa_assert(p);
++    if (!p)
++        return NULL;
+ 
+     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
+         return fn+1;
+diff --git src/pulse/util.h src/pulse/util.h
+index f6dd40c..ad85653 100644
+--- src/pulse/util.h
++++ src/pulse/util.h
+@@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l);
+ char *pa_get_binary_name(char *s, size_t l);
+ 
+ /** Return a pointer to the filename inside a path (which is the last
+- * component). */
++ * component). If passed NULL will return NULL. */
+ char *pa_path_get_filename(const char *p);
+ 
+ /** Wait t milliseconds */
+From 7f17882bae9d2b694f440d28dc9bb3fcf133fa1a Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 May 2009 04:13:15 +0200
+Subject: [PATCH 08/28] endian: fix LE/BE order for 24 bit accessor functions
+
+---
+ src/pulsecore/endianmacros.h |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git src/pulsecore/endianmacros.h src/pulsecore/endianmacros.h
+index 2257937..2b18cf8 100644
+--- src/pulsecore/endianmacros.h
++++ src/pulsecore/endianmacros.h
+@@ -45,27 +45,27 @@
+ #define PA_UINT32_SWAP(x) ( (uint32_t) ( ((uint32_t) (x) >> 24) | ((uint32_t) (x) << 24) | (((uint32_t) (x) & 0xFF00) << 8) | ((((uint32_t) (x)) >> 8) & 0xFF00) ) )
+ #endif
  
-+### Automatically suspend sinks/sources that become idle for too long
-+load-module module-suspend-on-idle
-+
- ### Automatically restore the volume of streams and devices
- load-module module-stream-restore
- load-module module-device-restore
-@@ -95,9 +98,6 @@
- ### Make sure we always have a sink around, even if it is a null sink.
- load-module module-always-sink
- 
--### Automatically suspend sinks/sources that become idle for too long
--load-module module-suspend-on-idle
--
- ### If autoexit on idle is enabled we want to make sure we only quit
- ### when no local session needs us anymore.
- load-module module-console-kit
-Index: pulseaudio-0.9.13/src/pulsecore/sink-input.c
-===================================================================
---- src/pulsecore/sink-input.c	2008-12-28 23:33:28.000000000 -0500
-+++ src/pulsecore/sink-input.c	2008-12-28 23:35:20.000000000 -0500
-@@ -292,8 +292,6 @@
-         pa_assert_se(i->sink->n_corked -- >= 1);
-     else if (i->state != PA_SINK_INPUT_CORKED && state == PA_SINK_INPUT_CORKED)
-         i->sink->n_corked++;
--
--    pa_sink_update_status(i->sink);
+-static inline uint32_t PA_READ24LE(const uint8_t *p) {
++static inline uint32_t PA_READ24BE(const uint8_t *p) {
+     return
+         ((uint32_t) p[0] << 16) |
+         ((uint32_t) p[1] << 8) |
+         ((uint32_t) p[2]);
  }
  
- /* Called from main context */
-@@ -331,6 +329,8 @@
-             pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED], ssync);
-     }
- 
-+    pa_sink_update_status(i->sink);
-+
-     return 0;
+-static inline uint32_t PA_READ24BE(const uint8_t *p) {
++static inline uint32_t PA_READ24LE(const uint8_t *p) {
+     return
+         ((uint32_t) p[2] << 16) |
+         ((uint32_t) p[1] << 8) |
+         ((uint32_t) p[0]);
  }
  
-@@ -381,6 +381,8 @@
-         pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], i);
-     }
- 
-+    pa_sink_update_status(i->sink);
-+
-     i->sink = NULL;
-     pa_sink_input_unref(i);
+-static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) {
++static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) {
+     p[0] = (uint8_t) (u >> 16);
+     p[1] = (uint8_t) (u >> 8);
+     p[2] = (uint8_t) u;
  }
-@@ -442,6 +444,8 @@
  
-     pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index);
-     pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_PUT], i);
-+
-+    pa_sink_update_status(i->sink);
+-static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) {
++static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) {
+     p[2] = (uint8_t) (u >> 16);
+     p[1] = (uint8_t) (u >> 8);
+     p[0] = (uint8_t) u;
+From 11c17636d1d6c7eb4d6278869d3fa91715433ab2 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sun, 19 Apr 2009 19:04:50 +0200
+Subject: [PATCH 09/28] log: print file name only when we have it
+
+---
+ src/pulsecore/log.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git src/pulsecore/log.c src/pulsecore/log.c
+index 60ea9c5..919ebe1 100644
+--- src/pulsecore/log.c
++++ src/pulsecore/log.c
+@@ -285,7 +285,7 @@ void pa_log_levelv_meta(
+ 
+     if ((_flags & PA_LOG_PRINT_META) && file && line > 0 && func)
+         pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func);
+-    else if (_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE))
++    else if ((_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE)) && file)
+         pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file));
+     else
+         location[0] = 0;
+From 977f59368ba55fac3fe21d7549bc0552daf07d91 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 21 Apr 2009 21:24:33 +0200
+Subject: [PATCH 13/28] mutex: when we fail to fill in mutex into static mutex ptr free it again
+
+---
+ src/pulsecore/mutex-posix.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git src/pulsecore/mutex-posix.c src/pulsecore/mutex-posix.c
+index b3e5256..0ff4bee 100644
+--- src/pulsecore/mutex-posix.c
++++ src/pulsecore/mutex-posix.c
+@@ -153,6 +153,8 @@ pa_mutex* pa_static_mutex_get(pa_static_mutex *s, pa_bool_t recursive, pa_bool_t
+     if ((pa_atomic_ptr_cmpxchg(&s->ptr, NULL, m)))
+         return m;
+ 
++    pa_mutex_free(m);
++
+     /* Him, filling in failed, so someone else must have filled in
+      * already */
+     pa_assert_se(m = pa_atomic_ptr_load(&s->ptr));
+From 776b0817f79b475c9725b53c185484b5e3ff6fbb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 26 May 2009 22:30:36 +0200
+Subject: [PATCH 14/28] oss: don't deadlock when we try to resume an OSS device that lacks a mixer
+
+---
+ src/modules/oss/module-oss.c |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git src/modules/oss/module-oss.c src/modules/oss/module-oss.c
+index 9f7863f..aa5f918 100644
+--- src/modules/oss/module-oss.c
++++ src/modules/oss/module-oss.c
+@@ -477,6 +477,7 @@ static void build_pollfd(struct userdata *u) {
+     pollfd->revents = 0;
  }
  
- /* Called from main context */
-Index: pulseaudio-0.9.13/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2008-12-28 23:35:05.000000000 -0500
-+++ src/pulsecore/sink.c	2008-12-28 23:35:20.000000000 -0500
-@@ -990,7 +990,9 @@
-     unsigned ret;
++/* Called from IO context */
+ static int suspend(struct userdata *u) {
+     pa_assert(u);
+     pa_assert(u->fd >= 0);
+@@ -526,6 +527,7 @@ static int suspend(struct userdata *u) {
+     return 0;
+ }
  
-     pa_sink_assert_ref(s);
--    pa_assert(PA_SINK_IS_LINKED(s->state));
-+
-+    if (!PA_SINK_IS_LINKED(s->state))
-+        return 0;
++/* Called from IO context */
+ static int unsuspend(struct userdata *u) {
+     int m;
+     pa_sample_spec ss, *ss_original;
+@@ -616,10 +618,10 @@ static int unsuspend(struct userdata *u) {
  
-     ret = pa_idxset_size(s->inputs);
-     pa_assert(ret >= s->n_corked);
-Index: pulseaudio-0.9.13/src/pulsecore/source-output.c
-===================================================================
---- src/pulsecore/source-output.c	2008-12-28 23:35:05.000000000 -0500
-+++ src/pulsecore/source-output.c	2008-12-28 23:35:20.000000000 -0500
-@@ -246,7 +246,6 @@
-     else if (o->state != PA_SOURCE_OUTPUT_CORKED && state == PA_SOURCE_OUTPUT_CORKED)
-         o->source->n_corked++;
+     build_pollfd(u);
  
--    pa_source_update_status(o->source);
- }
+-    if (u->sink)
+-        pa_sink_get_volume(u->sink, TRUE, FALSE);
+-    if (u->source)
+-        pa_source_get_volume(u->source, TRUE);
++    if (u->sink && u->sink->get_volume)
++        u->sink->get_volume(u->sink);
++    if (u->source && u->source->get_volume)
++        u->source->get_volume(u->source);
  
- /* Called from main context */
-@@ -264,6 +263,8 @@
-     if (state != PA_SOURCE_OUTPUT_UNLINKED)
-         pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED], o);
+     pa_log_info("Resumed successfully...");
  
-+    pa_source_update_status(o->source);
-+
-     return 0;
+@@ -631,6 +633,7 @@ fail:
+     return -1;
  }
  
-@@ -302,6 +303,8 @@
-         pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], o);
++/* Called from IO context */
+ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
+     struct userdata *u = PA_SINK(o)->userdata;
+     int ret;
+From b8e05f113a44f46a91d3343e3e4a1eb15c98e1c9 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 29 Apr 2009 04:13:07 +0200
+Subject: [PATCH 15/28] simple-protocol: don't hit an assert when we call connection_unlink() early
+
+---
+ src/pulsecore/protocol-simple.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git src/pulsecore/protocol-simple.c src/pulsecore/protocol-simple.c
+index 44fe597..776d74b 100644
+--- src/pulsecore/protocol-simple.c
++++ src/pulsecore/protocol-simple.c
+@@ -130,7 +130,7 @@ static void connection_unlink(connection *c) {
+         c->io = NULL;
      }
  
-+    pa_source_update_status(o->source);
-+
-     o->source = NULL;
-     pa_source_output_unref(o);
+-    pa_assert_se(pa_idxset_remove_by_data(c->protocol->connections, c, NULL) == c);
++    pa_idxset_remove_by_data(c->protocol->connections, c, NULL);
+     c->protocol = NULL;
+     connection_unref(c);
  }
-@@ -353,6 +356,8 @@
+From bee02ee03fc82f447a358a564a4d922c0f29cfcf Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 29 Apr 2009 01:46:12 +0200
+Subject: [PATCH 16/28] idxset: add enumeration macro PA_IDXSET_FOREACH
+
+---
+ src/pulsecore/idxset.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git src/pulsecore/idxset.h src/pulsecore/idxset.h
+index 7531ea3..6b9ff47 100644
+--- src/pulsecore/idxset.h
++++ src/pulsecore/idxset.h
+@@ -103,4 +103,8 @@ unsigned pa_idxset_size(pa_idxset*s);
+ /* Return TRUE of the idxset is empty */
+ pa_bool_t pa_idxset_isempty(pa_idxset *s);
  
-     pa_subscription_post(o->source->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_NEW, o->index);
-     pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_PUT], o);
 +
-+    pa_source_update_status(o->source);
- }
- 
- /* Called from main context */
-Index: pulseaudio-0.9.13/src/pulsecore/source.c
-===================================================================
---- src/pulsecore/source.c	2008-12-28 23:35:05.000000000 -0500
-+++ src/pulsecore/source.c	2008-12-28 23:35:20.000000000 -0500
-@@ -637,7 +637,9 @@
-     unsigned ret;
- 
-     pa_source_assert_ref(s);
--    pa_assert(PA_SOURCE_IS_LINKED(s->state));
++#define PA_IDXSET_FOREACH(e, s, idx) \
++    for ((e) = pa_idxset_first((s), &(idx)); (e); (e) = pa_idxset_next((s), &(idx)))
 +
-+    if (!PA_SOURCE_IS_LINKED(s->state))
-+        return 0;
- 
-     ret = pa_idxset_size(s->outputs);
-     pa_assert(ret >= s->n_corked);
-Index: pulseaudio-0.9.13/src/pulsecore/sample-util.c
-===================================================================
---- src/pulsecore/sample-util.c	2009-01-03 18:30:13.000000000 -0500
-+++ src/pulsecore/sample-util.c	2009-01-03 18:30:30.000000000 -0500
-@@ -777,7 +777,7 @@
-     return (l/fs) * fs;
- }
- 
--int pa_frame_aligned(size_t l, const pa_sample_spec *ss) {
-+pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) {
-     size_t fs;
- 
-     pa_assert(ss);
-Index: pulseaudio-0.9.13/src/pulsecore/sample-util.h
-===================================================================
---- src/pulsecore/sample-util.h	2009-01-03 18:30:13.000000000 -0500
-+++ src/pulsecore/sample-util.h	2009-01-03 18:30:30.000000000 -0500
-@@ -71,7 +71,7 @@
- 
- size_t pa_frame_align(size_t l, const pa_sample_spec *ss) PA_GCC_PURE;
- 
--int pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE;
-+pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE;
- 
- void pa_interleave(const void *src[], unsigned channels, void *dst, size_t ss, unsigned n);
- void pa_deinterleave(const void *src, void *dst[], unsigned channels, size_t ss, unsigned n);
-Index: pulseaudio-0.9.13/src/pulsecore/once.c
-===================================================================
---- src/pulsecore/once.c	2009-01-03 18:47:32.000000000 -0500
-+++ src/pulsecore/once.c	2009-01-03 18:48:07.000000000 -0500
-@@ -28,13 +28,13 @@
- 
- #include "once.h"
- 
--int pa_once_begin(pa_once *control) {
-+pa_bool_t pa_once_begin(pa_once *control) {
-     pa_mutex *m;
- 
-     pa_assert(control);
- 
-     if (pa_atomic_load(&control->done))
--        return 0;
-+        return FALSE;
- 
-     pa_atomic_inc(&control->ref);
- 
-@@ -50,15 +50,17 @@
-              * wait until it is unlocked */
-             pa_mutex_lock(m);
- 
-+            pa_assert(pa_atomic_load(&control->done));
-+
-             pa_once_end(control);
--            return 0;
-+            return FALSE;
-         }
- 
-         pa_assert_se(m = pa_mutex_new(FALSE, FALSE));
-         pa_mutex_lock(m);
- 
-         if (pa_atomic_ptr_cmpxchg(&control->mutex, NULL, m))
--            return 1;
-+            return TRUE;
- 
-         pa_mutex_unlock(m);
-         pa_mutex_free(m);
-@@ -91,4 +93,3 @@
-         pa_once_end(control);
-     }
- }
--
-Index: pulseaudio-0.9.13/src/pulsecore/once.h
-===================================================================
---- src/pulsecore/once.h	2009-01-03 18:47:43.000000000 -0500
-+++ src/pulsecore/once.h	2009-01-03 18:48:07.000000000 -0500
-@@ -38,7 +38,7 @@
+ #endif
+From b7eff401100af0de381fba66293d21aca7ff36fa Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 17 Apr 2009 20:30:09 +0200
+Subject: [PATCH 17/28] rescue-streams: when one stream move fails try to continue with the remaining ones
+
+---
+ src/modules/module-rescue-streams.c |   16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git src/modules/module-rescue-streams.c src/modules/module-rescue-streams.c
+index 4f616e0..7c99a9b 100644
+--- src/modules/module-rescue-streams.c
++++ src/modules/module-rescue-streams.c
+@@ -77,12 +77,10 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
      }
  
- /* Not to be called directly, use the macros defined below instead */
--int pa_once_begin(pa_once *o);
-+pa_bool_t pa_once_begin(pa_once *o);
- void pa_once_end(pa_once *o);
- 
- #define PA_ONCE_BEGIN                                                   \
-Index: pulseaudio-0.9.13/src/pulsecore/protocol-native.c
-===================================================================
---- src/pulsecore/protocol-native.c	2009-01-15 17:25:43.000000000 -0500
-+++ src/pulsecore/protocol-native.c	2009-01-15 17:25:56.000000000 -0500
-@@ -3933,7 +3933,7 @@
+     while ((i = pa_idxset_first(sink->inputs, NULL))) {
+-        if (pa_sink_input_move_to(i, target, FALSE) < 0) {
++        if (pa_sink_input_move_to(i, target, FALSE) < 0)
+             pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
+-            return PA_HOOK_OK;
+-        }
+-
+-        pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
++        else
++            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
      }
  
-     CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
--    CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID);
-+    CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name) || *name == 0, tag, PA_ERR_INVALID);
-     CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID);
-     CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID);
-     CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID);
-@@ -3942,6 +3942,8 @@
  
-         if (idx == PA_INVALID_INDEX && name && !*name) {
+@@ -121,12 +119,10 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
+     pa_assert(target != source);
  
-+            pa_log_debug("%s all sinks", b ? "Suspending" : "Resuming");
-+
-             if (pa_sink_suspend_all(c->protocol->core, b) < 0) {
-                 pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID);
-                 return;
-@@ -3967,6 +3969,8 @@
+     while ((o = pa_idxset_first(source->outputs, NULL))) {
+-        if (pa_source_output_move_to(o, target, FALSE) < 0) {
++        if (pa_source_output_move_to(o, target, FALSE) < 0)
+             pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
+-            return PA_HOOK_OK;
+-        }
+-
+-        pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
++        else
++            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
+     }
  
-         if (idx == PA_INVALID_INDEX && name && !*name) {
  
-+            pa_log_debug("%s all sources", b ? "Suspending" : "Resuming");
-+
-             if (pa_source_suspend_all(c->protocol->core, b) < 0) {
-                 pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID);
-                 return;
-Index: pulseaudio-0.9.14/src/pulsecore/asyncq.c
-===================================================================
---- src/pulsecore/asyncq.c	2009-01-31 15:19:57.000000000 -0500
-+++ src/pulsecore/asyncq.c	2009-01-31 15:20:05.000000000 -0500
-@@ -163,14 +163,14 @@
-     return 0;
+From 79510a3b15652b04bffbb798221d27e8d16f4ce2 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 May 2009 04:12:24 +0200
+Subject: [PATCH 18/28] sample: correctly pass s24-32 formats
+
+---
+ src/pulse/sample.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git src/pulse/sample.c src/pulse/sample.c
+index 1e67b03..ed7b1b0 100644
+--- src/pulse/sample.c
++++ src/pulse/sample.c
+@@ -231,13 +231,13 @@ pa_sample_format_t pa_parse_sample_format(const char *format) {
+     else if (strcasecmp(format, "s24re") == 0)
+         return PA_SAMPLE_S24RE;
+     else if (strcasecmp(format, "s24-32le") == 0)
+-        return PA_SAMPLE_S24LE;
++        return PA_SAMPLE_S24_32LE;
+     else if (strcasecmp(format, "s24-32be") == 0)
+-        return PA_SAMPLE_S24BE;
++        return PA_SAMPLE_S24_32BE;
+     else if (strcasecmp(format, "s24-32ne") == 0 || strcasecmp(format, "s24-32") == 0)
+-        return PA_SAMPLE_S24NE;
++        return PA_SAMPLE_S24_32NE;
+     else if (strcasecmp(format, "s24-32re") == 0)
+-        return PA_SAMPLE_S24RE;
++        return PA_SAMPLE_S24_32RE;
+ 
+     return -1;
  }
+From 397f517aafda4efd00532ba7f19e7045aa853c2a Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 May 2009 04:14:40 +0200
+Subject: [PATCH 19/28] sample-util: fix iteration loop when adjusting volume of s24 samples
+
+---
+ src/pulsecore/sample-util.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c
+index 3a9b384..a3e490b 100644
+--- src/pulsecore/sample-util.c
++++ src/pulsecore/sample-util.c
+@@ -831,9 +831,9 @@ void pa_volume_memchunk(
  
--static pa_bool_t flush_postq(pa_asyncq *l) {
-+static pa_bool_t flush_postq(pa_asyncq *l, pa_bool_t wait) {
-     struct localq *q;
- 
-     pa_assert(l);
- 
-     while ((q = l->last_localq)) {
- 
--        if (push(l, q->data, FALSE) < 0)
-+        if (push(l, q->data, wait) < 0)
-             return FALSE;
- 
-         l->last_localq = q->prev;
-@@ -187,7 +187,7 @@
- int pa_asyncq_push(pa_asyncq*l, void *p, pa_bool_t wait) {
-     pa_assert(l);
- 
--    if (!flush_postq(l))
-+    if (!flush_postq(l, wait))
-         return -1;
- 
-     return push(l, p, wait);
-@@ -199,8 +199,9 @@
-     pa_assert(l);
-     pa_assert(p);
- 
--    if (pa_asyncq_push(l, p, FALSE) >= 0)
--        return;
-+    if (flush_postq(l, FALSE))
-+        if (pa_asyncq_push(l, p, FALSE) >= 0)
-+            return;
- 
-     /* OK, we couldn't push anything in the queue. So let's queue it
-      * locally and push it later */
-@@ -299,7 +300,7 @@
+             calc_linear_integer_volume(linear, volume);
  
-     for (;;) {
+-            e = (uint8_t*) ptr + c->length/3;
++            e = (uint8_t*) ptr + c->length;
  
--        if (flush_postq(l))
-+        if (flush_postq(l, FALSE))
-             break;
+-            for (channel = 0, d = ptr; d < e; d++) {
++            for (channel = 0, d = ptr; d < e; d += 3) {
+                 int64_t t;
  
-         if (pa_fdsem_before_poll(l->read_fdsem) >= 0) {
-Index: pulseaudio-0.9.14/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2009-01-31 15:24:30.000000000 -0500
-+++ src/pulsecore/sink.c	2009-01-31 15:24:55.000000000 -0500
-@@ -641,7 +641,7 @@
+                 t = (int64_t)((int32_t) (PA_READ24NE(d) << 8));
+@@ -854,9 +854,9 @@ void pa_volume_memchunk(
  
-     pa_assert(length > 0);
+             calc_linear_integer_volume(linear, volume);
  
--    n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0;
-+    n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS);
+-            e = (uint8_t*) ptr + c->length/3;
++            e = (uint8_t*) ptr + c->length;
  
-     if (n == 0) {
+-            for (channel = 0, d = ptr; d < e; d++) {
++            for (channel = 0, d = ptr; d < e; d += 3) {
+                 int64_t t;
  
-@@ -684,8 +684,7 @@
-         result->index = 0;
+                 t = (int64_t)((int32_t) (PA_READ24RE(d) << 8));
+From 55244f7a07335115caf2b9cc57aecc0f8cd08030 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 May 2009 04:14:02 +0200
+Subject: [PATCH 20/28] sample-util: properly allocate silence block for s24-32 formats
+
+---
+ src/pulsecore/sample-util.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c
+index a3e490b..dda3883 100644
+--- src/pulsecore/sample-util.c
++++ src/pulsecore/sample-util.c
+@@ -1181,6 +1181,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
+             case PA_SAMPLE_S32BE:
+             case PA_SAMPLE_S24LE:
+             case PA_SAMPLE_S24BE:
++            case PA_SAMPLE_S24_32LE:
++            case PA_SAMPLE_S24_32RE:
+             case PA_SAMPLE_FLOAT32LE:
+             case PA_SAMPLE_FLOAT32BE:
+                 cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0);
+@@ -1189,6 +1191,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
+                 cache->blocks[PA_SAMPLE_S32BE] = pa_memblock_ref(b);
+                 cache->blocks[PA_SAMPLE_S24LE] = pa_memblock_ref(b);
+                 cache->blocks[PA_SAMPLE_S24BE] = pa_memblock_ref(b);
++                cache->blocks[PA_SAMPLE_S24_32LE] = pa_memblock_ref(b);
++                cache->blocks[PA_SAMPLE_S24_32BE] = pa_memblock_ref(b);
+                 cache->blocks[PA_SAMPLE_FLOAT32LE] = pa_memblock_ref(b);
+                 cache->blocks[PA_SAMPLE_FLOAT32BE] = pa_memblock_ref(b);
+                 break;
+From 100af7efac584be9f229f4daf663dbb939f5d929 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 May 2009 04:22:08 +0200
+Subject: [PATCH 21/28] sconv: fix a few minor conversion issues
+
+---
+ src/pulsecore/sconv-s16le.c |   10 +++++-----
+ src/pulsecore/sconv.c       |    2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git src/pulsecore/sconv-s16le.c src/pulsecore/sconv-s16le.c
+index 307ce7b..43b8cb3 100644
+--- src/pulsecore/sconv-s16le.c
++++ src/pulsecore/sconv-s16le.c
+@@ -370,7 +370,7 @@ void pa_sconv_s24_32le_to_s16ne(unsigned n, const uint32_t *a, int16_t *b) {
+     pa_assert(b);
+ 
+     for (; n > 0; n--) {
+-        *b = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8) >> 16);
++        *b = (int16_t) (((int32_t) (UINT32_FROM(*a) << 8)) >> 16);
+         a++;
+         b++;
      }
- 
--    if (s->thread_info.state == PA_SINK_RUNNING)
--        inputs_drop(s, info, n, result);
-+    inputs_drop(s, info, n, result);
- 
-     pa_sink_unref(s);
- }
-@@ -715,7 +714,7 @@
- 
-     pa_assert(length > 0);
- 
--    n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0;
-+    n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS);
- 
-     if (n == 0) {
-         if (target->length > length)
-@@ -764,8 +763,7 @@
-         pa_memblock_release(target->memblock);
+@@ -416,8 +416,8 @@ void pa_sconv_s24_32le_to_float32ne(unsigned n, const uint32_t *a, float *b) {
+     pa_assert(b);
+ 
+     for (; n > 0; n--) {
+-        int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8));
+-        *b = ((float) s) / 0x7FFFFFFF;
++        int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
++        *b = (float) s / (float) 0x7FFFFFFF;
+         a ++;
+         b ++;
      }
- 
--    if (s->thread_info.state == PA_SINK_RUNNING)
--        inputs_drop(s, info, n, target);
-+    inputs_drop(s, info, n, target);
- 
-     pa_sink_unref(s);
+@@ -428,8 +428,8 @@ void pa_sconv_s24_32le_to_float32re(unsigned n, const uint32_t *a, float *b) {
+     pa_assert(b);
+ 
+     for (; n > 0; n--) {
+-        int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8));
+-        float k = ((float) s) / 0x7FFFFFFF;
++        int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
++        float k = (float) s / (float) 0x7FFFFFFF;
+         *b = PA_FLOAT32_SWAP(k);
+         a ++;
+         b ++;
+diff --git src/pulsecore/sconv.c src/pulsecore/sconv.c
+index 29a9a45..d89f428 100644
+--- src/pulsecore/sconv.c
++++ src/pulsecore/sconv.c
+@@ -75,7 +75,7 @@ static void u8_from_s16ne(unsigned n, const int16_t *a, uint8_t *b) {
+     pa_assert(b);
+ 
+     for (; n > 0; n--, a++, b++)
+-        *b = (uint8_t) (*a / 0x100 + 0x80);
++        *b = (uint8_t) ((uint16_t) *a >> 8) + (uint8_t) 0x80U;
  }
-Index: pulseaudio-0.9.14/src/pulsecore/source.c
-===================================================================
---- src/pulsecore/source.c	2009-01-31 15:24:30.000000000 -0500
-+++ src/pulsecore/source.c	2009-01-31 15:24:55.000000000 -0500
-@@ -428,9 +428,6 @@
-     pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state));
-     pa_assert(chunk);
- 
--    if (s->thread_info.state != PA_SOURCE_RUNNING)
--        return;
--
-     if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) {
-         pa_memchunk vchunk = *chunk;
- 
-@@ -469,9 +466,6 @@
-     pa_assert(o->thread_info.direct_on_input);
-     pa_assert(chunk);
- 
--    if (s->thread_info.state != PA_SOURCE_RUNNING)
--        return;
--
-     if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) {
-         pa_memchunk vchunk = *chunk;
- 
-Index: pulseaudio-0.9.14/src/modules/module-device-restore.c
-===================================================================
---- src/modules/module-device-restore.c	2009-01-31 15:47:31.000000000 -0500
-+++ src/modules/module-device-restore.c	2009-01-31 15:47:55.000000000 -0500
-@@ -98,14 +98,14 @@
-     pa_log_info("Synced.");
- }
- 
--static struct entry* read_entry(struct userdata *u, char *name) {
-+static struct entry* read_entry(struct userdata *u, const char *name) {
-     datum key, data;
-     struct entry *e;
- 
-     pa_assert(u);
-     pa_assert(name);
  
--    key.dptr = name;
-+    key.dptr = (char*) name;
-     key.dsize = (int) strlen(name);
- 
-     data = gdbm_fetch(u->gdbm_file, key);
-@@ -235,13 +235,22 @@
-     if ((e = read_entry(u, name))) {
- 
-         if (u->restore_volume) {
--            pa_log_info("Restoring volume for sink %s.", new_data->name);
--            pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
-+
-+            if (!new_data->volume_is_set) {
-+                pa_log_info("Restoring volume for sink %s.", new_data->name);
-+                pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
-+            } else
-+                pa_log_debug("Not restoring volume for sink %s, because already set.", new_data->name);
-+
-         }
+ /* float32 */
+From 1ab53c43c17943d49fc80c86ef2b513354eddc63 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 14 May 2009 03:52:13 +0200
+Subject: [PATCH 23/28] rescue: make we don't end up in an endless loop when we can't move a sink input
+
+---
+ src/modules/module-rescue-streams.c |   38 +++++++++++++++++++---------------
+ 1 files changed, 21 insertions(+), 17 deletions(-)
+
+diff --git src/modules/module-rescue-streams.c src/modules/module-rescue-streams.c
+index 7c99a9b..c22711a 100644
+--- src/modules/module-rescue-streams.c
++++ src/modules/module-rescue-streams.c
+@@ -31,6 +31,7 @@
+ #include <pulsecore/modargs.h>
+ #include <pulsecore/log.h>
+ #include <pulsecore/namereg.h>
++#include <pulsecore/core-util.h>
  
-         if (u->restore_muted) {
--            pa_log_info("Restoring mute state for sink %s.", new_data->name);
--            pa_sink_new_data_set_muted(new_data, e->muted);
-+
-+            if (!new_data->muted_is_set) {
-+                pa_log_info("Restoring mute state for sink %s.", new_data->name);
-+                pa_sink_new_data_set_muted(new_data, e->muted);
-+            } else
-+                pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name);
-         }
+ #include "module-rescue-streams-symdef.h"
  
-         pa_xfree(e);
-@@ -263,13 +272,21 @@
-     if ((e = read_entry(u, name))) {
+@@ -49,6 +50,7 @@ struct userdata {
  
-         if (u->restore_volume) {
--            pa_log_info("Restoring volume for source %s.", new_data->name);
--            pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
-+
-+            if (!new_data->volume_is_set) {
-+                pa_log_info("Restoring volume for source %s.", new_data->name);
-+                pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
-+            } else
-+                pa_log_debug("Not restoring volume for source %s, because already set.", new_data->name);
-         }
+ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
+     pa_sink_input *i;
++    uint32_t idx;
+     pa_sink *target;
  
-         if (u->restore_muted) {
--            pa_log_info("Restoring mute state for source %s.", new_data->name);
--            pa_source_new_data_set_muted(new_data, e->muted);
-+
-+            if (!new_data->muted_is_set) {
-+                pa_log_info("Restoring mute state for source %s.", new_data->name);
-+                pa_source_new_data_set_muted(new_data, e->muted);
-+            } else
-+                pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name);
-         }
- 
-         pa_xfree(e);
-Index: pulseaudio-0.9.14/src/modules/module-oss.c
-===================================================================
---- src/modules/module-oss.c	2009-01-31 16:09:19.000000000 -0500
-+++ src/modules/module-oss.c	2009-01-31 16:13:16.000000000 -0500
-@@ -121,7 +121,7 @@
-     int mixer_fd;
-     int mixer_devmask;
- 
--    int nfrags, frag_size;
-+    int nfrags, frag_size, orig_frag_size;
- 
-     pa_bool_t use_mmap;
-     unsigned out_mmap_current, in_mmap_current;
-@@ -536,7 +536,7 @@
+     pa_assert(c);
+@@ -58,15 +60,14 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
+     if (c->state == PA_CORE_SHUTDOWN)
+         return PA_HOOK_OK;
+ 
+-    if (!pa_idxset_size(sink->inputs)) {
++    if (pa_idxset_size(sink->inputs) <= 0) {
+         pa_log_debug("No sink inputs to move away.");
+         return PA_HOOK_OK;
      }
  
-     if (u->nfrags >= 2 && u->frag_size >= 1)
--        if (pa_oss_set_fragments(u->fd, u->nfrags, u->frag_size) < 0) {
-+        if (pa_oss_set_fragments(u->fd, u->nfrags, u->orig_frag_size) < 0) {
-             pa_log_warn("Resume failed, couldn't set original fragment settings.");
-             goto fail;
-         }
-@@ -601,10 +601,10 @@
- 
-     build_pollfd(u);
- 
--    if (u->sink)
--        sink_get_volume(u->sink);
--    if (u->source)
--        source_get_volume(u->source);
-+    if (u->sink && u->sink->get_volume)
-+        u->sink->get_volume(u->sink);
-+    if (u->source && u->source->get_volume)
-+        u->source->get_volume(u->source);
- 
-     pa_log_info("Resumed successfully...");
- 
-@@ -877,7 +877,7 @@
- 
- /*        pa_log("loop");    */
- 
--        if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
-+        if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state))
-             if (u->sink->thread_info.rewind_requested)
-                 pa_sink_process_rewind(u->sink, 0);
- 
-@@ -1144,7 +1144,7 @@
-     struct userdata *u = NULL;
-     const char *dev;
-     int fd = -1;
--    int nfrags, frag_size;
-+    int nfrags, orig_frag_size, frag_size;
-     int mode, caps;
-     pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE;
-     pa_sample_spec ss;
-@@ -1201,14 +1201,14 @@
- 
-     if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) {
-         pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode.");
--        use_mmap = 0;
-+        use_mmap = FALSE;
-     }
+     if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK)) || target == sink) {
+-        uint32_t idx;
  
- #ifndef __FreeBSD__
-     if (use_mmap && mode == O_WRONLY) {
-         pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
--        use_mmap = 0;
-+        use_mmap = FALSE;
-     }
- #endif
+-        for (target = pa_idxset_first(c->sinks, &idx); target; target = pa_idxset_next(c->sinks, &idx))
++        PA_IDXSET_FOREACH(target, c->sinks, idx)
+             if (target != sink)
+                 break;
  
-     if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
-@@ -1216,6 +1216,7 @@
- 
-     pa_log_info("Device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
- 
-+    orig_frag_size = frag_size;
-     if (nfrags >= 2 && frag_size >= 1)
-         if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0)
-             goto fail;
-@@ -1235,6 +1236,7 @@
-     m->userdata = u;
-     u->fd = fd;
-     u->mixer_fd = -1;
-+    u->mixer_devmask = 0;
-     u->use_getospace = u->use_getispace = TRUE;
-     u->use_getodelay = TRUE;
-     u->mode = mode;
-@@ -1242,6 +1244,7 @@
-     u->device_name = pa_xstrdup(dev);
-     u->in_nfrags = u->out_nfrags = (uint32_t) (u->nfrags = nfrags);
-     u->out_fragment_size = u->in_fragment_size = (uint32_t) (u->frag_size = frag_size);
-+    u->orig_frag_size = orig_frag_size;
-     u->use_mmap = use_mmap;
-     u->rtpoll = pa_rtpoll_new();
-     pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
-@@ -1383,7 +1386,6 @@
- 
-     if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
-         pa_bool_t do_close = TRUE;
--        u->mixer_devmask = 0;
- 
-         if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
-             pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
-@@ -1409,6 +1411,7 @@
-         if (do_close) {
-             pa_close(u->mixer_fd);
-             u->mixer_fd = -1;
-+            u->mixer_devmask = 0;
+@@ -76,20 +77,24 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
          }
      }
  
-Index: pulseaudio-0.9.14/src/modules/oss-util.c
-===================================================================
---- src/modules/oss-util.c	2009-01-31 16:09:19.000000000 -0500
-+++ src/modules/oss-util.c	2009-01-31 16:12:37.000000000 -0500
-@@ -241,6 +241,8 @@
-     int arg;
-     arg = ((int) nfrags << 16) | simple_log2(frag_size);
+-    while ((i = pa_idxset_first(sink->inputs, NULL))) {
++    pa_assert(target != sink);
++
++    PA_IDXSET_FOREACH(i, sink->inputs, idx) {
+         if (pa_sink_input_move_to(i, target, FALSE) < 0)
+-            pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
++            pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index,
++                        pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
+         else
+-            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
++            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index,
++                        pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
+     }
  
-+    pa_log_debug("Asking for %i fragments of size %i (requested %i)", nfrags, 1 << simple_log2(frag_size), frag_size);
-+
-     if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) {
-         pa_log("SNDCTL_DSP_SETFRAGMENT: %s", pa_cstrerror(errno));
-         return -1;
-Index: pulseaudio-0.9.14/src/pulse/volume.c
-===================================================================
---- src/pulse/volume.c	2009-01-31 16:22:02.000000000 -0500
-+++ src/pulse/volume.c	2009-01-31 16:22:50.000000000 -0500
-@@ -304,7 +304,7 @@
-         p == PA_CHANNEL_POSITION_LFE;
+-
+     return PA_HOOK_OK;
  }
  
--pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to) {
-+pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to) {
-     int a, b;
-     pa_cvolume result;
- 
-Index: pulseaudio-0.9.14/src/pulse/volume.h
-===================================================================
---- src/pulse/volume.h	2009-01-31 16:22:02.000000000 -0500
-+++ src/pulse/volume.h	2009-01-31 16:23:21.000000000 -0500
-@@ -207,7 +207,7 @@
- #endif
- 
- /** Remap a volume from one channel mapping to a different channel mapping. \since 0.9.12 */
--pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to);
-+pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to);
- 
- /** Return non-zero if the specified volume is compatible with
-  * the specified sample spec. \since 0.9.13 */
-Index: pulseaudio-0.9.14/src/modules/module-esound-sink.c
-===================================================================
---- src/modules/module-esound-sink.c	2009-01-31 16:25:18.000000000 -0500
-+++ src/modules/module-esound-sink.c	2009-01-31 16:25:40.000000000 -0500
-@@ -168,7 +168,7 @@
-             w = pa_bytes_to_usec((uint64_t) u->offset + u->memchunk.length, &u->sink->sample_spec);
- 
-             *((pa_usec_t*) data) = w > r ? w - r : 0;
--            break;
-+            return 0;
-         }
- 
-         case SINK_MESSAGE_PASS_SOCKET: {
-Index: pulseaudio-0.9.14/src/pulsecore/ltdl-helper.c
-===================================================================
---- src/pulsecore/ltdl-helper.c	2009-02-04 18:50:11.000000000 -0500
-+++ src/pulsecore/ltdl-helper.c	2009-02-04 18:50:21.000000000 -0500
-@@ -42,7 +42,9 @@
-     pa_assert(handle);
-     pa_assert(symbol);
- 
--    if ((f = ((pa_void_func_t) (size_t) lt_dlsym(handle, symbol))))
-+    *(void**) &f = lt_dlsym(handle, symbol);
-+
-+    if (f)
-         return f;
+ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void* userdata) {
+     pa_source_output *o;
+     pa_source *target;
++    uint32_t idx;
  
-     if (!module)
-@@ -57,7 +59,7 @@
-         if (!isalnum(*c))
-             *c = '_';
- 
--    f = (pa_void_func_t) (size_t) lt_dlsym(handle, sn);
-+    *(void**) &f = lt_dlsym(handle, sn);
-     pa_xfree(sn);
- 
-     return f;
-Index: pulseaudio-0.9.14/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2009-02-04 19:05:00.000000000 -0500
-+++ src/pulsecore/sink.c	2009-02-04 19:05:50.000000000 -0500
-@@ -467,6 +467,9 @@
-     s->thread_info.rewind_nbytes = 0;
-     s->thread_info.rewind_requested = FALSE;
- 
-+    if (s->thread_info.state == PA_SINK_SUSPENDED)
-+        return;
-+
-     if (nbytes > 0)
-         pa_log_debug("Processing rewind...");
- 
-@@ -476,7 +479,7 @@
+     pa_assert(c);
+     pa_assert(source);
+@@ -98,15 +103,14 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
+     if (c->state == PA_CORE_SHUTDOWN)
+         return PA_HOOK_OK;
+ 
+-    if (!pa_idxset_size(source->outputs)) {
++    if (pa_idxset_size(source->outputs) <= 0) {
+         pa_log_debug("No source outputs to move away.");
+         return PA_HOOK_OK;
      }
  
-     if (nbytes > 0)
--        if (s->monitor_source && PA_SOURCE_IS_OPENED(s->monitor_source->thread_info.state))
-+        if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state))
-             pa_source_process_rewind(s->monitor_source, nbytes);
- }
+     if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE)) || target == source) {
+-        uint32_t idx;
  
-@@ -556,7 +559,7 @@
-         /* Drop read data */
-         pa_sink_input_drop(i, result->length);
+-        for (target = pa_idxset_first(c->sources, &idx); target; target = pa_idxset_next(c->sources, &idx))
++        PA_IDXSET_FOREACH(target, c->sources, idx)
+             if (target != source && !target->monitor_of == !source->monitor_of)
+                 break;
  
--        if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source))) {
-+        if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) {
+@@ -118,19 +122,20 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
  
-             if (pa_hashmap_size(i->thread_info.direct_outputs) > 0) {
-                 void *ostate = NULL;
-@@ -612,7 +615,7 @@
-         }
+     pa_assert(target != source);
+ 
+-    while ((o = pa_idxset_first(source->outputs, NULL))) {
++    PA_IDXSET_FOREACH(o, source->outputs, idx) {
+         if (pa_source_output_move_to(o, target, FALSE) < 0)
+-            pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
++            pa_log_info("Failed to move source output %u \"%s\" to %s.", o->index,
++                        pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name);
+         else
+-            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
++            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index,
++                        pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name);
      }
  
--    if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source)))
-+    if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state))
-         pa_source_post(s->monitor_source, result);
+-
+     return PA_HOOK_OK;
  }
  
-@@ -623,7 +626,7 @@
-     size_t block_size_max;
- 
-     pa_sink_assert_ref(s);
--    pa_assert(PA_SINK_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
-     pa_assert(pa_frame_aligned(length, &s->sample_spec));
-     pa_assert(result);
+ int pa__init(pa_module*m) {
+-    pa_modargs *ma = NULL;
++    pa_modargs *ma;
+     struct userdata *u;
  
-@@ -632,6 +635,13 @@
-     pa_assert(!s->thread_info.rewind_requested);
-     pa_assert(s->thread_info.rewind_nbytes == 0);
+     pa_assert(m);
+@@ -153,10 +158,9 @@ void pa__done(pa_module*m) {
  
-+    if (s->thread_info.state == PA_SINK_SUSPENDED) {
-+        result->memblock = pa_memblock_ref(s->silence.memblock);
-+        result->index = s->silence.index;
-+        result->length = PA_MIN(s->silence.length, length);
-+        return;
-+    }
-+
-     if (length <= 0)
-         length = pa_frame_align(MIX_BUFFER_LENGTH, &s->sample_spec);
- 
-@@ -696,7 +706,7 @@
-     size_t length, block_size_max;
- 
-     pa_sink_assert_ref(s);
--    pa_assert(PA_SINK_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
-     pa_assert(target);
-     pa_assert(target->memblock);
-     pa_assert(target->length > 0);
-@@ -707,6 +717,11 @@
-     pa_assert(!s->thread_info.rewind_requested);
-     pa_assert(s->thread_info.rewind_nbytes == 0);
- 
-+    if (s->thread_info.state == PA_SINK_SUSPENDED) {
-+        pa_silence_memchunk(target, &s->sample_spec);
-+        return;
-+    }
-+
-     length = target->length;
-     block_size_max = pa_mempool_block_size_max(s->core->mempool);
-     if (length > block_size_max)
-@@ -774,7 +789,7 @@
-     size_t l, d;
- 
-     pa_sink_assert_ref(s);
--    pa_assert(PA_SINK_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
-     pa_assert(target);
-     pa_assert(target->memblock);
-     pa_assert(target->length > 0);
-@@ -804,7 +819,7 @@
- /* Called from IO thread context */
- void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result) {
-     pa_sink_assert_ref(s);
--    pa_assert(PA_SINK_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
-     pa_assert(length > 0);
-     pa_assert(pa_frame_aligned(length, &s->sample_spec));
-     pa_assert(result);
-@@ -830,7 +845,7 @@
- 
-     /* The returned value is supposed to be in the time domain of the sound card! */
- 
--    if (!PA_SINK_IS_OPENED(s->state))
-+    if (s->state == PA_SINK_SUSPENDED)
-         return 0;
- 
-     if (!(s->flags & PA_SINK_LATENCY))
-@@ -1342,6 +1357,9 @@
-     pa_sink_assert_ref(s);
-     pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
- 
-+    if (s->thread_info.state == PA_SINK_SUSPENDED)
-+        return;
-+
-     if (nbytes == (size_t) -1)
-         nbytes = s->thread_info.max_rewind;
- 
-@@ -1403,7 +1421,7 @@
-     pa_sink_assert_ref(s);
-     pa_assert(PA_SINK_IS_LINKED(s->state));
- 
--    if (!PA_SINK_IS_OPENED(s->state))
-+    if (s->state == PA_SINK_SUSPENDED)
-         return 0;
+     pa_assert(m);
  
-     pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
-Index: pulseaudio-0.9.14/src/pulsecore/source.c
-===================================================================
---- src/pulsecore/source.c	2009-02-04 19:05:00.000000000 -0500
-+++ src/pulsecore/source.c	2009-02-04 19:05:50.000000000 -0500
-@@ -406,7 +406,10 @@
-     void *state = NULL;
- 
-     pa_source_assert_ref(s);
--    pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state));
-+
-+    if (s->thread_info.state == PA_SOURCE_SUSPENDED)
-+        return;
- 
-     if (nbytes <= 0)
+-    if (!m->userdata)
++    if (!(u = m->userdata))
          return;
-@@ -425,9 +428,12 @@
-     void *state = NULL;
  
-     pa_source_assert_ref(s);
--    pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state));
-     pa_assert(chunk);
- 
-+    if (s->thread_info.state == PA_SOURCE_SUSPENDED)
-+        return;
-+
-     if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) {
-         pa_memchunk vchunk = *chunk;
- 
-@@ -461,11 +467,14 @@
- /* Called from IO thread context */
- void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk *chunk) {
-     pa_source_assert_ref(s);
--    pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state));
-+    pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state));
-     pa_source_output_assert_ref(o);
-     pa_assert(o->thread_info.direct_on_input);
-     pa_assert(chunk);
- 
-+    if (s->thread_info.state == PA_SOURCE_SUSPENDED)
-+        return;
-+
-     if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) {
-         pa_memchunk vchunk = *chunk;
- 
-@@ -491,7 +500,7 @@
-     pa_source_assert_ref(s);
-     pa_assert(PA_SOURCE_IS_LINKED(s->state));
- 
--    if (!PA_SOURCE_IS_OPENED(s->state))
-+    if (s->state == PA_SOURCE_SUSPENDED)
-         return 0;
- 
-     if (!(s->flags & PA_SOURCE_LATENCY))
-@@ -882,7 +891,7 @@
-     pa_source_assert_ref(s);
-     pa_assert(PA_SOURCE_IS_LINKED(s->state));
- 
--    if (!PA_SOURCE_IS_OPENED(s->state))
-+    if (s->state == PA_SOURCE_SUSPENDED)
-         return 0;
- 
-     pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
-Index: pulseaudio-0.9.14/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2009-02-04 19:19:17.000000000 -0500
-+++ src/pulsecore/sink.c	2009-02-04 19:19:24.000000000 -0500
-@@ -464,6 +464,11 @@
-     pa_sink_assert_ref(s);
-     pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
- 
-+    /* If nobody requested this and this is actually no real rewind
-+     * then we can short cut this */
-+    if (!s->thread_info.rewind_requested && nbytes <= 0)
-+        return;
-+
-     s->thread_info.rewind_nbytes = 0;
-     s->thread_info.rewind_requested = FALSE;
- 
-Index: pulseaudio-0.9.14/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2009-02-04 19:21:36.000000000 -0500
-+++ src/pulsecore/sink.c	2009-02-04 19:21:54.000000000 -0500
-@@ -1235,6 +1235,10 @@
-         case PA_SINK_MESSAGE_SET_STATE:
+-    u = m->userdata;
+     if (u->sink_slot)
+         pa_hook_slot_free(u->sink_slot);
+     if (u->source_slot)
+From c41d9c71667de6d6e9aab077ac58b7371594bbef Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 8 May 2009 01:56:21 +0200
+Subject: [PATCH 24/28] core: introduce pa_{sink,source}_set_fixed_latency()
+
+This allows us to forward the fixed latency directly from the sink to
+the monitor source withut having to wait for pa_sink_put().
+---
+ src/modules/alsa/alsa-sink.c                    |    4 ++--
+ src/modules/alsa/alsa-source.c                  |    4 ++--
+ src/modules/bluetooth/module-bluetooth-device.c |   12 ++++++------
+ src/modules/module-pipe-sink.c                  |    2 +-
+ src/modules/module-pipe-source.c                |    2 +-
+ src/modules/module-sine-source.c                |    3 +--
+ src/modules/oss/module-oss.c                    |    4 ++--
+ src/pulsecore/sink.c                            |   16 ++++++++++++++++
+ src/pulsecore/sink.h                            |    1 +
+ src/pulsecore/source.c                          |   15 +++++++++++++++
+ src/pulsecore/source.h                          |    1 +
+ 11 files changed, 48 insertions(+), 16 deletions(-)
+
+diff --git src/modules/alsa/alsa-sink.c src/modules/alsa/alsa-sink.c
+index a544b58..94e15df 100644
+--- src/modules/alsa/alsa-sink.c
++++ src/modules/alsa/alsa-sink.c
+@@ -473,7 +473,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle
+             u->since_start += frames * u->frame_size;
+ 
+ #ifdef DEBUG_TIMING
+-            pa_log_debug("Wrote %lu bytes", (unsigned long) (frames * u->frame_size));
++            pa_log_debug("Wrote %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes);
+ #endif
  
-             s->thread_info.state = PA_PTR_TO_UINT(userdata);
-+
-+            if (s->thread_info.state == PA_SINK_SUSPENDED)
-+                s->thread_info.rewind_requested = FALSE;
-+
-             return 0;
+             if ((size_t) frames * u->frame_size >= n_bytes)
+@@ -1730,7 +1730,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+         pa_log_info("Time scheduling watermark is %0.2fms",
+                     (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
+     } else
+-        u->sink->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
++        pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->hwbuf_size, &ss));
+ 
+     reserve_update(u);
+ 
+diff --git src/modules/alsa/alsa-source.c src/modules/alsa/alsa-source.c
+index 5d8e349..c2f905a 100644
+--- src/modules/alsa/alsa-source.c
++++ src/modules/alsa/alsa-source.c
+@@ -455,7 +455,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled
+             u->read_count += frames * u->frame_size;
+ 
+ #ifdef DEBUG_TIMING
+-            pa_log_debug("Read %lu bytes", (unsigned long) (frames * u->frame_size));
++            pa_log_debug("Read %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes);
+ #endif
  
-         case PA_SINK_MESSAGE_DETACH:
-Index: pulseaudio-0.9.14/src/utils/pacmd.c
-===================================================================
---- src/utils/pacmd.c	2009-02-04 19:35:26.000000000 -0500
-+++ src/utils/pacmd.c	2009-02-04 19:35:33.000000000 -0500
-@@ -47,16 +47,16 @@
-     int fd = -1;
-     int ret = 1, i;
-     struct sockaddr_un sa;
--    char ibuf[256], obuf[256];
-+    char ibuf[PIPE_BUF], obuf[PIPE_BUF];
-     size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
--    fd_set ifds, ofds;
-     char *cli;
-+    pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
- 
-     setlocale(LC_ALL, "");
-     bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR);
- 
-     if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) {
--        pa_log("No PulseAudio daemon running");
-+        pa_log("No PulseAudio daemon running, or not running as session daemon.");
-         goto fail;
+             if ((size_t) frames * u->frame_size >= n_bytes)
+@@ -1582,7 +1582,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
+         pa_log_info("Time scheduling watermark is %0.2fms",
+                     (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
+     } else
+-        u->source->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
++        pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->hwbuf_size, &ss));
+ 
+     reserve_update(u);
+ 
+diff --git src/modules/bluetooth/module-bluetooth-device.c src/modules/bluetooth/module-bluetooth-device.c
+index 90f6486..3465b80 100644
+--- src/modules/bluetooth/module-bluetooth-device.c
++++ src/modules/bluetooth/module-bluetooth-device.c
+@@ -1608,9 +1608,9 @@ static int add_sink(struct userdata *u) {
+         u->sink->parent.process_msg = sink_process_msg;
+ 
+         pa_sink_set_max_request(u->sink, u->block_size);
+-        u->sink->fixed_latency =
+-            (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) +
+-            pa_bytes_to_usec(u->block_size, &u->sample_spec);
++        pa_sink_set_fixed_latency(u->sink,
++                                  (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) +
++                                  pa_bytes_to_usec(u->block_size, &u->sample_spec));
      }
  
-@@ -99,15 +99,47 @@
+     if (u->profile == PROFILE_HSP) {
+@@ -1659,9 +1659,9 @@ static int add_source(struct userdata *u) {
+         u->source->userdata = u;
+         u->source->parent.process_msg = source_process_msg;
+ 
+-        u->source->fixed_latency =
+-            (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) +
+-            pa_bytes_to_usec(u->block_size, &u->sample_spec);
++        pa_source_set_fixed_latency(u->source,
++                                    (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) +
++                                    pa_bytes_to_usec(u->block_size, &u->sample_spec));
      }
  
-     ibuf_index = ibuf_length = obuf_index = obuf_length = 0;
-+    ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE;
- 
-+    if (argc > 1) {
-+        for (i = 1; i < argc; i++) {
-+            size_t k;
-+
-+            k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i]));
-+            memcpy(ibuf + ibuf_length, argv[1], k);
-+            ibuf_length += k;
-+
-+            if (ibuf_length < sizeof(ibuf)) {
-+                ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n';
-+                ibuf_length++;
-+            }
-+        }
- 
--    FD_ZERO(&ifds);
--    FD_SET(0, &ifds);
--    FD_SET(fd, &ifds);
+     if (u->profile == PROFILE_HSP) {
+diff --git src/modules/module-pipe-sink.c src/modules/module-pipe-sink.c
+index 9d3e55d..304d01c 100644
+--- src/modules/module-pipe-sink.c
++++ src/modules/module-pipe-sink.c
+@@ -293,7 +293,7 @@ int pa__init(pa_module*m) {
+     pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
+     pa_sink_set_rtpoll(u->sink, u->rtpoll);
+     pa_sink_set_max_request(u->sink, PIPE_BUF);
+-    u->sink->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec);
++    pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec));
+ 
+     u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
+     pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+diff --git src/modules/module-pipe-source.c src/modules/module-pipe-source.c
+index df72d79..6ed4fbf 100644
+--- src/modules/module-pipe-source.c
++++ src/modules/module-pipe-source.c
+@@ -277,7 +277,7 @@ int pa__init(pa_module*m) {
+ 
+     pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
+     pa_source_set_rtpoll(u->source, u->rtpoll);
+-    u->source->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec);
++    pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec));
+ 
+     u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
+     pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+diff --git src/modules/module-sine-source.c src/modules/module-sine-source.c
+index a5f1ce7..a6e15d8 100644
+--- src/modules/module-sine-source.c
++++ src/modules/module-sine-source.c
+@@ -264,8 +264,7 @@ int pa__init(pa_module*m) {
+ 
+     pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
+     pa_source_set_rtpoll(u->source, u->rtpoll);
+-    u->source->fixed_latency = u->block_usec;
 -
--    FD_ZERO(&ofds);
-+        ibuf_eof = TRUE;
-+    }
++    pa_source_set_fixed_latency(u->source, u->block_usec);
+ 
+     if (!(u->thread = pa_thread_new(thread_func, u))) {
+         pa_log("Failed to create thread.");
+diff --git src/modules/oss/module-oss.c src/modules/oss/module-oss.c
+index aa5f918..d6f549c 100644
+--- src/modules/oss/module-oss.c
++++ src/modules/oss/module-oss.c
+@@ -1328,8 +1328,8 @@ int pa__init(pa_module*m) {
+ 
+         pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
+         pa_source_set_rtpoll(u->source, u->rtpoll);
++        pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec));
+         u->source->refresh_volume = TRUE;
+-        u->source->fixed_latency = pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec);
+ 
+         if (use_mmap)
+             u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
+@@ -1390,8 +1390,8 @@ int pa__init(pa_module*m) {
+ 
+         pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
+         pa_sink_set_rtpoll(u->sink, u->rtpoll);
++        pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec));
+         u->sink->refresh_volume = TRUE;
+-        u->sink->fixed_latency = pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec);
+ 
+         pa_sink_set_max_request(u->sink, u->out_hwbuf_size);
+ 
+diff --git src/pulsecore/sink.c src/pulsecore/sink.c
+index c99f9a8..2225886 100644
+--- src/pulsecore/sink.c
++++ src/pulsecore/sink.c
+@@ -2054,6 +2054,22 @@ void pa_sink_set_latency_range_within_thread(pa_sink *s, pa_usec_t min_latency,
+     pa_source_set_latency_range_within_thread(s->monitor_source, min_latency, max_latency);
+ }
  
-     for (;;) {
-+        fd_set ifds, ofds;
++/* Called from main thread, before the sink is put */
++void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency) {
++    pa_sink_assert_ref(s);
 +
-+        if (ibuf_eof &&
-+            obuf_eof &&
-+            ibuf_length <= 0 &&
-+            obuf_length <= 0)
-+            break;
++    pa_assert(pa_sink_get_state(s) == PA_SINK_INIT);
 +
-+        FD_ZERO(&ifds);
-+        FD_ZERO(&ofds);
++    if (latency < ABSOLUTE_MIN_LATENCY)
++        latency = ABSOLUTE_MIN_LATENCY;
 +
-+        if (obuf_length > 0)
-+            FD_SET(1, &ofds);
-+        else if (!obuf_eof)
-+            FD_SET(fd, &ifds);
++    if (latency > ABSOLUTE_MAX_LATENCY)
++        latency = ABSOLUTE_MAX_LATENCY;
 +
-+        if (ibuf_length > 0)
-+            FD_SET(fd, &ofds);
-+        else if (!ibuf_eof)
-+            FD_SET(0, &ifds);
++    s->fixed_latency = latency;
++    pa_source_set_fixed_latency(s->monitor_source, latency);
++}
 +
-         if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
-             pa_log(_("select(): %s"), strerror(errno));
-             goto fail;
-@@ -118,15 +150,16 @@
-             assert(!ibuf_length);
- 
-             if ((r = read(0, ibuf, sizeof(ibuf))) <= 0) {
--                if (r == 0)
--                    break;
--
--                pa_log(_("read(): %s"), strerror(errno));
--                goto fail;
-+                if (r < 0) {
-+                    pa_log(_("read(): %s"), strerror(errno));
-+                    goto fail;
-+                }
-+
-+                ibuf_eof = TRUE;
-+            } else {
-+                ibuf_length = (size_t) r;
-+                ibuf_index = 0;
-             }
--
--            ibuf_length = (size_t) r;
--            ibuf_index = 0;
-         }
- 
-         if (FD_ISSET(fd, &ifds)) {
-@@ -134,15 +167,16 @@
-             assert(!obuf_length);
- 
-             if ((r = read(fd, obuf, sizeof(obuf))) <= 0) {
--                if (r == 0)
--                    break;
--
--                pa_log(_("read(): %s"), strerror(errno));
--                goto fail;
-+                if (r < 0) {
-+                    pa_log(_("read(): %s"), strerror(errno));
-+                    goto fail;
-+                }
-+
-+                obuf_eof = TRUE;
-+            } else {
-+                obuf_length = (size_t) r;
-+                obuf_index = 0;
-             }
--
--            obuf_length = (size_t) r;
--            obuf_index = 0;
-         }
- 
-         if (FD_ISSET(1, &ofds)) {
-@@ -170,28 +204,26 @@
- 
-             ibuf_length -= (size_t) r;
-             ibuf_index += obuf_index;
--
-         }
- 
--        FD_ZERO(&ifds);
--        FD_ZERO(&ofds);
--
--        if (obuf_length <= 0)
--            FD_SET(fd, &ifds);
--        else
--            FD_SET(1, &ofds);
-+        if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
-+            close(0);
-+            shutdown(fd, SHUT_WR);
-+            ibuf_closed = TRUE;
-+        }
- 
--        if (ibuf_length <= 0)
--            FD_SET(0, &ifds);
--        else
--            FD_SET(fd, &ofds);
-+        if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
-+            shutdown(fd, SHUT_RD);
-+            close(1);
-+            obuf_closed = TRUE;
-+        }
-     }
- 
-     ret = 0;
- 
- fail:
-     if (fd >= 0)
--        close(fd);
-+        pa_close(fd);
- 
-     return ret;
+ /* Called from main context */
+ size_t pa_sink_get_max_rewind(pa_sink *s) {
+     size_t r;
+diff --git src/pulsecore/sink.h src/pulsecore/sink.h
+index 352282b..e33b3cf 100644
+--- src/pulsecore/sink.h
++++ src/pulsecore/sink.h
+@@ -229,6 +229,7 @@ void pa_sink_set_rtpoll(pa_sink *s, pa_rtpoll *p);
+ void pa_sink_set_max_rewind(pa_sink *s, size_t max_rewind);
+ void pa_sink_set_max_request(pa_sink *s, size_t max_request);
+ void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency);
++void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency);
+ 
+ void pa_sink_detach(pa_sink *s);
+ void pa_sink_attach(pa_sink *s);
+diff --git src/pulsecore/source.c src/pulsecore/source.c
+index 0baaed1..e8deaf7 100644
+--- src/pulsecore/source.c
++++ src/pulsecore/source.c
+@@ -1280,6 +1280,21 @@ void pa_source_set_latency_range_within_thread(pa_source *s, pa_usec_t min_laten
+     pa_source_invalidate_requested_latency(s);
  }
-Index: pulseaudio-0.9.14/src/modules/rtp/module-rtp-recv.c
-===================================================================
---- src/modules/rtp/module-rtp-recv.c	2009-02-06 18:04:53.000000000 -0500
-+++ src/modules/rtp/module-rtp-recv.c	2009-02-06 18:07:32.000000000 -0500
-@@ -453,7 +453,7 @@
-     data.module = u->module;
-     pa_sink_input_new_data_set_sample_spec(&data, &sdp_info->sample_spec);
- 
--    s->sink_input = pa_sink_input_new(u->module->core, &data, 0);
-+    s->sink_input = pa_sink_input_new(u->module->core, &data, PA_SINK_INPUT_VARIABLE_RATE);
-     pa_sink_input_new_data_done(&data);
- 
-     if (!s->sink_input) {
-Index: pulseaudio-0.9.14/src/modules/module-suspend-on-idle.c
-===================================================================
---- src/modules/module-suspend-on-idle.c	2009-02-12 18:28:26.000000000 -0500
-+++ src/modules/module-suspend-on-idle.c	2009-02-13 01:37:53.000000000 -0500
-@@ -158,6 +158,9 @@
-     pa_sink_input_assert_ref(s);
-     pa_assert(u);
  
-+    if (!s->sink)
-+        return PA_HOOK_OK;
++/* Called from main thread, before the source is put */
++void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency) {
++    pa_source_assert_ref(s);
 +
-     if (pa_sink_used_by(s->sink) <= 0) {
-         struct device_info *d;
-         if ((d = pa_hashmap_get(u->device_infos, s->sink)))
-@@ -172,6 +175,9 @@
-     pa_source_output_assert_ref(s);
-     pa_assert(u);
- 
-+    if (!s->source)
-+        return PA_HOOK_OK;
++    pa_assert(pa_source_get_state(s) == PA_SOURCE_INIT);
 +
-     if (pa_source_used_by(s->source) <= 0) {
-         struct device_info *d;
-         if ((d = pa_hashmap_get(u->device_infos, s->source)))
-Index: pulseaudio-0.9.14/src/pulse/channelmap.c
-===================================================================
---- src/pulse/channelmap.c	2009-02-13 22:55:36.000000000 -0500
-+++ src/pulse/channelmap.c	2009-02-13 22:55:44.000000000 -0500
-@@ -216,10 +216,10 @@
- 
-                 case 6:
-                     m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
--                    m->map[1] = PA_CHANNEL_POSITION_SIDE_LEFT;
-+                    m->map[1] = PA_CHANNEL_POSITION_REAR_LEFT;
-                     m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
-                     m->map[3] = PA_CHANNEL_POSITION_FRONT_RIGHT;
--                    m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT;
-+                    m->map[4] = PA_CHANNEL_POSITION_REAR_RIGHT;
-                     m->map[5] = PA_CHANNEL_POSITION_LFE;
-                     return m;
- 
-Index: pulseaudio-0.9.14/src/pulse/scache.c
-===================================================================
---- src/pulse/scache.c	2009-02-13 22:58:05.000000000 -0500
-+++ src/pulse/scache.c	2009-02-13 22:58:26.000000000 -0500
-@@ -66,10 +66,8 @@
-     pa_tagstruct_put_channel_map(t, &s->channel_map);
-     pa_tagstruct_putu32(t, (uint32_t) length);
- 
--    if (s->context->version >= 13) {
--        pa_init_proplist(s->proplist);
-+    if (s->context->version >= 13)
-         pa_tagstruct_put_proplist(t, s->proplist);
--    }
- 
-     pa_pstream_send_tagstruct(s->context->pstream, t);
-     pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_create_stream_callback, s, NULL);
-Index: pulseaudio-0.9.14/src/pulse/gccmacro.h
-===================================================================
---- src/pulse/gccmacro.h	2009-02-13 23:07:17.000000000 -0500
-+++ src/pulse/gccmacro.h	2009-02-13 23:09:29.000000000 -0500
-@@ -85,7 +85,7 @@
- #endif
- 
- #ifndef PA_GCC_PACKED
--#ifdef __GNUCC__
-+#ifdef __GNUC__
- #define PA_GCC_PACKED __attribute__ ((packed))
- #else
- /** Structure shall be packed in memory **/
-@@ -105,7 +105,7 @@
- #endif
- 
- #ifndef PA_GCC_MALLOC
--#ifdef __GNUCC__
-+#ifdef __GNUC__
- #define PA_GCC_MALLOC __attribute__ ((malloc))
- #else
- /** Macro for usage of GCC's malloc attribute */
-Index: pulseaudio-0.9.14/src/pulsecore/shm.c
-===================================================================
---- src/pulsecore/shm.c	2009-02-13 23:07:17.000000000 -0500
-+++ src/pulsecore/shm.c	2009-02-13 23:09:29.000000000 -0500
-@@ -70,14 +70,14 @@
- 
- /* We now put this SHM marker at the end of each segment. It's
-  * optional, to not require a reboot when upgrading, though */
--struct shm_marker PA_GCC_PACKED {
-+struct shm_marker {
-     pa_atomic_t marker; /* 0xbeefcafe */
-     pa_atomic_t pid;
-     uint64_t _reserved1;
-     uint64_t _reserved2;
-     uint64_t _reserved3;
-     uint64_t _reserved4;
--};
-+} PA_GCC_PACKED;
- 
- static char *segment_name(char *fn, size_t l, unsigned id) {
-     pa_snprintf(fn, l, "/pulse-shm-%u", id);
-Index: pulseaudio-0.9.14/src/pulsecore/memblock.c
-===================================================================
---- src/pulsecore/memblock.c	2009-02-18 16:40:03.000000000 -0500
-+++ src/pulsecore/memblock.c	2009-02-18 16:40:13.000000000 -0500
-@@ -57,7 +57,7 @@
- 
- #define PA_MEMEXPORT_SLOTS_MAX 128
- 
--#define PA_MEMIMPORT_SLOTS_MAX 128
-+#define PA_MEMIMPORT_SLOTS_MAX 160
- #define PA_MEMIMPORT_SEGMENTS_MAX 16
- 
- struct pa_memblock {
-Index: pulseaudio-0.9.14/src/pulse/context.c
-===================================================================
---- src/pulse/context.c	2009-02-18 16:45:34.000000000 -0500
-+++ src/pulse/context.c	2009-02-18 16:46:22.000000000 -0500
-@@ -332,8 +332,7 @@
- 
-     pa_assert(p);
-     pa_assert(chunk);
--    pa_assert(chunk->memblock);
--    pa_assert(chunk->length);
-+    pa_assert(chunk->length > 0);
-     pa_assert(c);
-     pa_assert(PA_REFCNT_VALUE(c) >= 1);
- 
-@@ -341,11 +340,11 @@
- 
-     if ((s = pa_dynarray_get(c->record_streams, channel))) {
- 
--        pa_assert(seek == PA_SEEK_RELATIVE);
--        pa_assert(offset == 0);
--
--        pa_memblockq_seek(s->record_memblockq, offset, seek);
--        pa_memblockq_push_align(s->record_memblockq, chunk);
-+        if (chunk->memblock) {
-+            pa_memblockq_seek(s->record_memblockq, offset, seek);
-+            pa_memblockq_push_align(s->record_memblockq, chunk);
-+        } else
-+            pa_memblockq_seek(s->record_memblockq, offset+chunk->length, seek);
- 
-         if (s->read_callback) {
-             size_t l;
-Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c
-===================================================================
---- src/pulsecore/protocol-native.c	2009-02-18 16:45:34.000000000 -0500
-+++ src/pulsecore/protocol-native.c	2009-02-18 16:46:22.000000000 -0500
-@@ -4075,17 +4075,20 @@
-     if (playback_stream_isinstance(stream)) {
-         playback_stream *ps = PLAYBACK_STREAM(stream);
- 
--        if (seek != PA_SEEK_RELATIVE || offset != 0)
--            pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL);
--
--        pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
-+        if (chunk->memblock) {
-+            if (seek != PA_SEEK_RELATIVE || offset != 0)
-+                pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL);
++    if (latency < ABSOLUTE_MIN_LATENCY)
++        latency = ABSOLUTE_MIN_LATENCY;
 +
-+            pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
-+        } else
-+            pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset+chunk->length, NULL, NULL);
- 
-     } else {
-         upload_stream *u = UPLOAD_STREAM(stream);
-         size_t l;
- 
-         if (!u->memchunk.memblock) {
--            if (u->length == chunk->length) {
-+            if (u->length == chunk->length && chunk->memblock) {
-                 u->memchunk = *chunk;
-                 pa_memblock_ref(u->memchunk.memblock);
-                 u->length = 0;
-@@ -4101,17 +4104,22 @@
-         if (l > chunk->length)
-             l = chunk->length;
- 
--
-         if (l > 0) {
--            void *src, *dst;
-+            void *dst;
-             dst = pa_memblock_acquire(u->memchunk.memblock);
--            src = pa_memblock_acquire(chunk->memblock);
- 
--            memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length,
--                   (uint8_t*) src+chunk->index, l);
-+            if (chunk->memblock) {
-+                void *src;
-+                src = pa_memblock_acquire(chunk->memblock);
-+
-+                memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length,
-+                       (uint8_t*) src + chunk->index, l);
++    if (latency > ABSOLUTE_MAX_LATENCY)
++        latency = ABSOLUTE_MAX_LATENCY;
 +
-+                pa_memblock_release(chunk->memblock);
-+            } else
-+                pa_silence_memory((uint8_t*) dst + u->memchunk.index + u->memchunk.length, l, &u->sample_spec);
- 
-             pa_memblock_release(u->memchunk.memblock);
--            pa_memblock_release(chunk->memblock);
- 
-             u->memchunk.length += l;
-             u->length -= l;
-Index: pulseaudio-0.9.14/src/pulsecore/pstream.c
-===================================================================
---- src/pulsecore/pstream.c	2009-02-18 16:45:34.000000000 -0500
-+++ src/pulsecore/pstream.c	2009-02-18 16:48:15.000000000 -0500
-@@ -832,8 +832,7 @@
-                                           ntohl(p->read.shm_info[PA_PSTREAM_SHM_INDEX]),
-                                           ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH])))) {
- 
--                    pa_log_warn("Failed to import memory block.");
--                    return -1;
-+                    pa_log_debug("Failed to import memory block.");
-                 }
- 
-                 if (p->recieve_memblock_callback) {
-@@ -842,7 +841,7 @@
- 
-                     chunk.memblock = b;
-                     chunk.index = 0;
--                    chunk.length = pa_memblock_get_length(b);
-+                    chunk.length = b ? pa_memblock_get_length(b) : ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH]);
- 
-                     offset = (int64_t) (
-                             (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
-@@ -857,7 +856,8 @@
-                             p->recieve_memblock_callback_userdata);
-                 }
- 
--                pa_memblock_unref(b);
-+                if (b)
-+                    pa_memblock_unref(b);
-             }
- 
-             goto frame_done;
-Index: pulseaudio-0.9.14/src/pulsecore/core-error.c
-===================================================================
---- src/pulsecore/core-error.c	2009-03-05 17:12:02.000000000 -0500
-+++ src/pulsecore/core-error.c	2009-03-05 17:12:16.000000000 -0500
-@@ -47,6 +47,9 @@
-     char *translated, *t;
-     char errbuf[128];
- 
-+    if (errnum < 0)
-+        errnum = -errnum;
-+
-     if ((t = PA_STATIC_TLS_GET(cstrerror)))
-         pa_xfree(t);
- 
-Index: pulseaudio-0.9.14/src/pulse/error.c
-===================================================================
---- src/pulse/error.c	2009-03-05 17:12:34.000000000 -0500
-+++ src/pulse/error.c	2009-03-05 17:12:54.000000000 -0500
-@@ -66,7 +66,10 @@
- 
-     pa_init_i18n();
- 
--    if (error < 0 || error >= PA_ERR_MAX)
-+    if (error < 0)
-+        error = -error;
-+
-+    if (error >= PA_ERR_MAX)
-         return NULL;
- 
-     return _(errortab[error]);
-Index: pulseaudio-0.9.14/src/pulsecore/sink.c
-===================================================================
---- src/pulsecore/sink.c	2009-02-19 18:45:44.000000000 -0500
-+++ src/pulsecore/sink.c	2009-02-19 18:46:04.000000000 -0500
-@@ -1557,6 +1557,9 @@
- 
-     pa_sink_assert_ref(s);
- 
-+    pa_assert(!min_latency || !max_latency ||
-+              min_latency <= max_latency);
-+
-     s->thread_info.min_latency = min_latency;
-     s->thread_info.max_latency = max_latency;
- 
-Index: pulseaudio-0.9.14/src/pulsecore/source.c
-===================================================================
---- src/pulsecore/source.c	2009-02-19 18:46:57.000000000 -0500
-+++ src/pulsecore/source.c	2009-02-19 18:47:08.000000000 -0500
-@@ -994,6 +994,9 @@
- 
-     pa_source_assert_ref(s);
- 
-+    pa_assert(!min_latency || !max_latency ||
-+              min_latency <= max_latency);
++    s->fixed_latency = latency;
++}
 +
-     s->thread_info.min_latency = min_latency;
-     s->thread_info.max_latency = max_latency;
+ /* Called from main thread */
+ size_t pa_source_get_max_rewind(pa_source *s) {
+     size_t r;
+diff --git src/pulsecore/source.h src/pulsecore/source.h
+index b502c22..2978f57 100644
+--- src/pulsecore/source.h
++++ src/pulsecore/source.h
+@@ -210,6 +210,7 @@ void pa_source_set_rtpoll(pa_source *s, pa_rtpoll *p);
  
-Index: pulseaudio-0.9.14/src/utils/paplay.c
-===================================================================
---- src/utils/paplay.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/utils/paplay.c	2009-02-19 19:25:10.000000000 -0500
-@@ -400,7 +400,10 @@
-     pa_context_set_state_callback(context, context_state_callback, NULL);
- 
-     /* Connect the context */
--    pa_context_connect(context, server, 0, NULL);
-+    if (pa_context_connect(context, server, 0, NULL) < 0) {
-+        fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context)));
-+        goto quit;
-+    }
+ void pa_source_set_max_rewind(pa_source *s, size_t max_rewind);
+ void pa_source_set_latency_range(pa_source *s, pa_usec_t min_latency, pa_usec_t max_latency);
++void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency);
  
-     /* Run the main loop */
-     if (pa_mainloop_run(m, &ret) < 0) {
-Index: pulseaudio-0.9.14/src/utils/pactl.c
-===================================================================
---- src/utils/pactl.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/utils/pactl.c	2009-02-19 19:25:10.000000000 -0500
-@@ -561,6 +561,7 @@
-         pa_xfree(d);
-         fprintf(stderr, _("Premature end of file\n"));
-         quit(1);
-+        return;
-     }
- 
-     pa_stream_write(s, d, length, pa_xfree, 0, PA_SEEK_RELATIVE);
-@@ -925,7 +926,10 @@
-     }
- 
-     pa_context_set_state_callback(context, context_state_callback, NULL);
--    pa_context_connect(context, server, 0, NULL);
-+    if (pa_context_connect(context, server, 0, NULL) < 0) {
-+        fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context)));
-+        goto quit;
-+    }
- 
-     if (pa_mainloop_run(m, &ret) < 0) {
-         fprintf(stderr, _("pa_mainloop_run() failed.\n"));
-Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c
-===================================================================
---- src/pulsecore/protocol-native.c	2009-02-19 19:25:10.000000000 -0500
-+++ src/pulsecore/protocol-native.c	2009-02-19 19:25:11.000000000 -0500
-@@ -2472,7 +2472,10 @@
-         if (!(name = pa_proplist_gets(p, PA_PROP_EVENT_ID)))
-             name = pa_proplist_gets(p, PA_PROP_MEDIA_NAME);
- 
--    CHECK_VALIDITY(c->pstream, name && pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID);
-+    if (!name || !pa_namereg_is_valid_name(name)) {
-+        pa_proplist_free(p);
-+        CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID);
-+    }
- 
-     s = upload_stream_new(c, &ss, &map, name, length, p);
-     pa_proplist_free(p);
-@@ -3426,24 +3429,29 @@
-         }
-     }
- 
--    CHECK_VALIDITY(c->pstream, mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE, tag, PA_ERR_INVALID);
-+    if (!(mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE)) {
-+        pa_proplist_free(p);
-+        CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID);
+ void pa_source_detach(pa_source *s);
+ void pa_source_attach(pa_source *s);
+From c73733777f11080373264ed4e992c6860809898e Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 8 May 2009 02:02:36 +0200
+Subject: [PATCH 25/28] core: cache requested latency only when we are running, not while we are still constructing
+
+---
+ src/pulsecore/sink.c   |    7 +++++--
+ src/pulsecore/source.c |    7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git src/pulsecore/sink.c src/pulsecore/sink.c
+index 2225886..161b7c9 100644
+--- src/pulsecore/sink.c
++++ src/pulsecore/sink.c
+@@ -1867,8 +1867,11 @@ pa_usec_t pa_sink_get_requested_latency_within_thread(pa_sink *s) {
+     if (result != (pa_usec_t) -1)
+         result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency);
+ 
+-    s->thread_info.requested_latency = result;
+-    s->thread_info.requested_latency_valid = TRUE;
++    if (PA_SINK_IS_LINKED(s->thread_info.state)) {
++        /* Only cache if properly initialized */
++        s->thread_info.requested_latency = result;
++        s->thread_info.requested_latency_valid = TRUE;
 +    }
  
-     if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST) {
-         playback_stream *s;
- 
-         s = pa_idxset_get_by_index(c->output_streams, idx);
--        CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
--        CHECK_VALIDITY(c->pstream, playback_stream_isinstance(s), tag, PA_ERR_NOENTITY);
--
-+        if (!s || !playback_stream_isinstance(s)) {
-+            pa_proplist_free(p);
-+            CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY);
-+        }
-         pa_proplist_update(s->sink_input->proplist, mode, p);
-         pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->sink_input->index);
- 
-     } else if (command == PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST) {
-         record_stream *s;
- 
--        s = pa_idxset_get_by_index(c->record_streams, idx);
--        CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
--
-+        if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) {
-+            pa_proplist_free(p);
-+            CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY);
-+        }
-         pa_proplist_update(s->source_output->proplist, mode, p);
-         pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->source_output->index);
-     } else {
-@@ -3454,6 +3462,7 @@
-     }
- 
-     pa_pstream_send_simple_ack(c->pstream, tag);
-+    pa_proplist_free(p);
+     return result;
  }
+diff --git src/pulsecore/source.c src/pulsecore/source.c
+index e8deaf7..8a4c8c4 100644
+--- src/pulsecore/source.c
++++ src/pulsecore/source.c
+@@ -1122,8 +1122,11 @@ pa_usec_t pa_source_get_requested_latency_within_thread(pa_source *s) {
+     if (result != (pa_usec_t) -1)
+         result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency);
+ 
+-    s->thread_info.requested_latency = result;
+-    s->thread_info.requested_latency_valid = TRUE;
++    if (PA_SOURCE_IS_LINKED(s->thread_info.state)) {
++        /* Only cache this if we are fully set up */
++        s->thread_info.requested_latency = result;
++        s->thread_info.requested_latency_valid = TRUE;
++    }
  
- static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -4034,7 +4043,7 @@
-     CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID);
- 
-     cb = (pa_native_protocol_ext_cb_t) pa_hashmap_get(c->protocol->extensions, m);
--    CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION);
-+    CHECK_VALIDITY(c->pstream, cb, tag, PA_ERR_NOEXTENSION);
- 
-     if (cb(c->protocol, m, c, tag, t) < 0)
-         protocol_error(c);
-Index: pulseaudio-0.9.14/src/utils/padsp.c
-===================================================================
---- src/utils/padsp.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/utils/padsp.c	2009-02-19 19:25:11.000000000 -0500
-@@ -1202,7 +1202,7 @@
- static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, void *userdata) {
-     fd_info *i = userdata;
- 
--    if (!si && eol < 0) {
-+    if (!si || eol < 0) {
-         i->operation_success = 0;
-         pa_threaded_mainloop_signal(i->mainloop, 0);
-         return;
-@@ -1224,7 +1224,7 @@
- static void source_info_cb(pa_context *context, const pa_source_info *si, int eol, void *userdata) {
-     fd_info *i = userdata;
- 
--    if (!si && eol < 0) {
-+    if (!si || eol < 0) {
-         i->operation_success = 0;
-         pa_threaded_mainloop_signal(i->mainloop, 0);
-         return;
-Index: pulseaudio-0.9.14/src/pulsecore/core-util.c
-===================================================================
---- src/pulsecore/core-util.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/pulsecore/core-util.c	2009-02-19 19:26:05.000000000 -0500
-@@ -1376,6 +1376,7 @@
-         return -1;
-     }
- 
-+    pa_xfree(p);
-     return 0;
+     return result;
  }
- 
-@@ -1408,6 +1409,7 @@
- 
-     if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0)  {
-         pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno));
-+        pa_xfree(d);
-         goto fail;
-     }
- 
-@@ -2424,7 +2426,7 @@
- 
-         pa_strip_nl(ln);
- 
--        if (ln[0])
-+        if (r && ln[0])
-             return pa_xstrdup(ln);
-     }
- 
-Index: pulseaudio-0.9.14/src/daemon/daemon-conf.c
-===================================================================
---- src/daemon/daemon-conf.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/daemon/daemon-conf.c	2009-02-19 19:25:11.000000000 -0500
-@@ -643,7 +643,7 @@
-     if (c->config_file)
-         pa_strbuf_printf(s, _("### Read from configuration file: %s ###\n"), c->config_file);
- 
--    pa_assert(c->log_level <= PA_LOG_LEVEL_MAX);
-+    pa_assert(c->log_level < PA_LOG_LEVEL_MAX);
- 
-     pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize));
-     pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail));
-Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c
-===================================================================
---- src/pulsecore/protocol-esound.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/pulsecore/protocol-esound.c	2009-02-19 19:25:11.000000000 -0500
-@@ -926,7 +926,7 @@
- 
-             c->request = PA_MAYBE_INT32_SWAP(c->swap_byte_order, c->request);
- 
--            if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) {
-+            if (c->request < ESD_PROTO_CONNECT || c->request >= ESD_PROTO_MAX) {
-                 pa_log("recieved invalid request.");
-                 return -1;
-             }
-Index: pulseaudio-0.9.14/src/modules/module-stream-restore.c
+From 85fb360fe3b9d3b3fb4e537373f4dc9202ca5e13 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 8 Jun 2009 18:22:19 +0200
+Subject: [PATCH 26/28] sample: fix build on BE archs
+
+---
+ src/pulsecore/sample-util.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c
+index dda3883..5b8ccf5 100644
+--- src/pulsecore/sample-util.c
++++ src/pulsecore/sample-util.c
+@@ -1182,7 +1182,7 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
+             case PA_SAMPLE_S24LE:
+             case PA_SAMPLE_S24BE:
+             case PA_SAMPLE_S24_32LE:
+-            case PA_SAMPLE_S24_32RE:
++            case PA_SAMPLE_S24_32BE:
+             case PA_SAMPLE_FLOAT32LE:
+             case PA_SAMPLE_FLOAT32BE:
+                 cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0);
+Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in
 ===================================================================
---- src/modules/module-stream-restore.c	2009-02-19 19:25:01.000000000 -0500
-+++ src/modules/module-stream-restore.c	2009-02-19 19:25:11.000000000 -0500
-@@ -429,6 +429,7 @@
-             pa_xfree(n);
-             continue;
-         }
-+	pa_xfree(n);
+--- src/daemon/daemon.conf.in	2009-03-07 05:01:11.000000000 -0500
++++ src/daemon/daemon.conf.in	2009-03-07 05:01:54.000000000 -0500
+@@ -46,7 +46,7 @@
+ ; log-target = auto
+ ; log-level = notice
  
-         if (u->restore_volume) {
-             pa_cvolume v = e->volume;
-@@ -460,6 +461,7 @@
-             pa_xfree(n);
-             continue;
-         }
-+	pa_xfree(n);
+-; resample-method = speex-float-3
++resample-method = speex-float-1
+ ; disable-remixing = no
+ ; disable-lfe-remixing = yes
  
-         if (u->restore_device &&
-             (s = pa_namereg_get(u->core, e->device, PA_NAMEREG_SOURCE, TRUE))) {
-Index: pulseaudio-0.9.14/src/modules/alsa-util.c
-===================================================================
---- src/modules/alsa-util.c	2009-02-19 19:28:55.000000000 -0500
-+++ src/modules/alsa-util.c	2009-02-19 19:29:23.000000000 -0500
-@@ -107,7 +107,7 @@
- static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
-     struct pa_alsa_fdlist *fdl = userdata;
-     unsigned num_fds, i;
--    int err;
-+    int err, n;
-     struct pollfd *temp;
- 
-     pa_assert(a);
-@@ -116,7 +116,11 @@
- 
-     a->defer_enable(fdl->defer, 0);
- 
--    num_fds = (unsigned) snd_mixer_poll_descriptors_count(fdl->mixer);
-+    if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) {
-+        pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n));
-+        return;
-+    }
-+    num_fds = (unsigned) n;
+@@ -72,5 +72,5 @@
+ ; default-sample-rate = 44100
+ ; default-sample-channels = 2
  
-     if (num_fds != fdl->num_fds) {
-         if (fdl->fds)
-Index: pulseaudio-0.9.14/src/daemon/cmdline.c
-===================================================================
---- src/daemon/cmdline.c	2009-02-22 00:19:36.000000000 -0500
-+++ src/daemon/cmdline.c	2009-02-22 00:21:01.000000000 -0500
-@@ -292,7 +292,7 @@
- 
-             case ARG_DISALLOW_EXIT:
-                 if ((conf->disallow_exit = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) {
--                    pa_log(_("--disallow-exit boolean argument"));
-+                    pa_log(_("--disallow-exit expects boolean argument"));
-                     goto fail;
-                 }
-                 break;
-Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c
-===================================================================
---- src/pulsecore/protocol-esound.c	2009-03-05 17:15:48.000000000 -0500
-+++ src/pulsecore/protocol-esound.c	2009-03-05 17:15:49.000000000 -0500
-@@ -1198,6 +1198,9 @@
-     connection *c = CONNECTION(o);
-     connection_assert_ref(c);
- 
-+    if (!c->protocol)
-+        return -1;
-+
-     switch (code) {
-         case CONNECTION_MESSAGE_REQUEST_DATA:
-             do_work(c);
-Index: pulseaudio-0.9.14/src/pulsecore/protocol-simple.c
+-; default-fragments = 4
+-; default-fragment-size-msec = 25
++default-fragments = 8
++default-fragment-size-msec = 10
 ===================================================================
---- src/pulsecore/protocol-simple.c	2009-03-05 17:12:00.000000000 -0500
-+++ src/pulsecore/protocol-simple.c	2009-03-05 17:15:49.000000000 -0500
-@@ -283,6 +283,9 @@
-     connection *c = CONNECTION(o);
-     connection_assert_ref(c);
- 
-+    if (!c->protocol)
-+        return -1;
-+
-     switch (code) {
-         case CONNECTION_MESSAGE_REQUEST_DATA:
-             do_work(c);
+--- src/daemon/default.pa.in	2009-02-13 19:12:33.000000000 -0500
++++ src/daemon/default.pa.in	2009-02-13 19:13:03.000000000 -0500
+@@ -58,7 +58,7 @@
+ 
+ ### Automatically load driver modules depending on the hardware available
+ .ifexists module-hal-detect@PA_SOEXT@
+-load-module module-hal-detect
++load-module module-hal-detect tsched=0
+ .else
+ ### Alternatively use the static hardware detection module (for systems that
+ ### lack HAL support)
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index d84110daef1b..e6c39d46b70f 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -67,84 +67,141 @@ lib/libpulse.a
 lib/libpulse.la
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulsecore.a
-lib/libpulsecore.la
-lib/libpulsecore.so
-lib/libpulsecore.so.9
+lib/libpulsecommon-%%PULSE_VERSION%%.a
+lib/libpulsecommon-%%PULSE_VERSION%%.la
+lib/libpulsecommon-%%PULSE_VERSION%%.so
+lib/libpulsecore-%%PULSE_VERSION%%.a
+lib/libpulsecore-%%PULSE_VERSION%%.la
+lib/libpulsecore-%%PULSE_VERSION%%.so
+lib/libpulsedsp.a
 lib/libpulsedsp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauth-cookie.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.so
-lib/pulse-%%PULSE_VERSION%%/modules/libioline.so
-lib/pulse-%%PULSE_VERSION%%/modules/libipacl.so
+lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpacket.so
-lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream.so
+lib/pulse-%%PULSE_VERSION%%/modules/libraop.a
+lib/pulse-%%PULSE_VERSION%%/modules/libraop.so
+lib/pulse-%%PULSE_VERSION%%/modules/librtp.a
 lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.so
-lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-combine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-detect.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
+%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.a
 %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
+%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.a
 %%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-match.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-oss.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-sine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 %%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
 libdata/pkgconfig/libpulse-mainloop-glib.pc
@@ -152,12 +209,40 @@ libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
 %%GCONF%%libexec/pulse/gconf-helper
 %%HAL%%share/PolicyKit/policy/org.pulseaudio.policy
+share/locale/as/LC_MESSAGES/pulseaudio.mo
+share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
+share/locale/ca/LC_MESSAGES/pulseaudio.mo
+share/locale/cs/LC_MESSAGES/pulseaudio.mo
 share/locale/de/LC_MESSAGES/pulseaudio.mo
 share/locale/el/LC_MESSAGES/pulseaudio.mo
+share/locale/es/LC_MESSAGES/pulseaudio.mo
+share/locale/fi/LC_MESSAGES/pulseaudio.mo
 share/locale/fr/LC_MESSAGES/pulseaudio.mo
+share/locale/gu/LC_MESSAGES/pulseaudio.mo
+share/locale/it/LC_MESSAGES/pulseaudio.mo
+share/locale/kn/LC_MESSAGES/pulseaudio.mo
+share/locale/mr/LC_MESSAGES/pulseaudio.mo
+share/locale/nl/LC_MESSAGES/pulseaudio.mo
+share/locale/or/LC_MESSAGES/pulseaudio.mo
+share/locale/pa/LC_MESSAGES/pulseaudio.mo
+share/locale/pl/LC_MESSAGES/pulseaudio.mo
+share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
+share/locale/sr/LC_MESSAGES/pulseaudio.mo
+share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
 share/locale/sv/LC_MESSAGES/pulseaudio.mo
+share/locale/ta/LC_MESSAGES/pulseaudio.mo
+share/locale/te/LC_MESSAGES/pulseaudio.mo
+share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
 %%GCONF%%@dirrm libexec/pulse
 @dirrm lib/pulse-%%PULSE_VERSION%%/modules
 @dirrm lib/pulse-%%PULSE_VERSION%%
 @dirrm include/pulse
 @dirrm etc/pulse
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile
index aba6e01f2a6a..b0ae4ed33079 100644
--- a/audio/py-taglib/Makefile
+++ b/audio/py-taglib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	tag.6:${PORTSDIR}/audio/taglib
 
 WRKSRC=		${WRKDIR}/python-taglib-${PORTVERSION}
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PYTHON=	-2.4
 USE_PYTHON_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index 08166eb6c8bf..8cec4e720aa1 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 2def21a2bf1c..34ae229f38a8 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -33,7 +33,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 nautilus2
 WANT_GNOME=	yes
 USE_GSTREAMER=	flac mp3 gnomevfs gconf jpeg
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-vala --with-libbrasero-media \
 		--without-libnautilus-burn
 INSTALLS_ICONS=	yes
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index f2ae6eef104f..3202683ce57d 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to inferface with the Rio600, Rio800, and psa[play devices
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 9da37db816ac..fc99855b396b 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	SDL_mixer-${PORTVERSION}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 03ad25d1f7d2..8d052ccc0734 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	SDL_sound-${PORTVERSION}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A SDL audio library and player for some popular sound file formats
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index e2c29d2a919a..4e5a61487a60 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open-source audio processing library
 
 CONFIGURE_ARGS=	--enable-shared=yes
-USE_AUTOTOOLS=	autoconf:262 automake:19:env libtool:15
+USE_AUTOTOOLS=	autoconf:262 automake:19:env libtool:22
 USE_LDCONFIG=	yes
 
 pre-configure:
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index b74aef946fac..7ad5b93b401b 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sox
 PORTVERSION=	14.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 68a30b80b947..b1dea7d27236 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	speex-devel-[0-9]*
 
 USE_GNOME=	gnomehack gnometarget ltverhack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 0b5fade4d2e7..7031d4908ce3 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -20,7 +20,7 @@ DEST=		${WRKSRC}/src/libsphinx2/
 USE_LDCONFIG=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_GMAKE=	yes
-USE_AUTOTOOLS=libtool:15
+USE_AUTOTOOLS=libtool:22
 
 # contains i386 sound code
 ONLY_FOR_ARCHS=	i386
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index 0071c4f3f370..d3ec55f2ae6b 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	sphinxfe.0:${PORTSDIR}/audio/sphinxbase
 
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=libtool:15
+USE_AUTOTOOLS=libtool:22
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 0cb09061b8ef..c27e8bfb1735 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sphinxbase
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cmusphinx
@@ -17,7 +18,8 @@ COMMENT=	CMU SPhinx Speech recognition system base
 USE_LDCONFIG=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 automake:19
+USE_GNOME=	gnomehack
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -25,7 +27,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
-
 .include <bsd.port.mk>
diff --git a/audio/sphinxbase/files/patch-configure.in b/audio/sphinxbase/files/patch-configure
index bba277a6037e..f536d39e1773 100644
--- a/audio/sphinxbase/files/patch-configure.in
+++ b/audio/sphinxbase/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.in	(revision 7550)
-+++ configure.in	(working copy)
-@@ -105,18 +105,12 @@
+--- configure.orig	2009-07-13 10:53:01.000000000 -0500
++++ configure	2009-07-13 10:54:06.000000000 -0500
+@@ -7166,7 +7166,8 @@
  
  if test "x$ad_files" = "x"; then
          case $host in
@@ -9,14 +9,21 @@
 +                *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
                          ad_files="ad_oss.lo"
                          ad_backend="AD_BACKEND_OSS"
- 			AC_DEFINE(AD_BACKEND_OSS, [], [Use OSS interface for sound I/O])
+ 
+@@ -7175,17 +7176,6 @@
+ _ACEOF
+ 
                          ;;
 -                # FIXME: isn't this the same OSS as on Linux?
 -                *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
 -                        ad_files="ad_oss_bsd.lo mulaw_base.lo"
 -                        ad_libs="-lossaudio"
 -                        ad_backend="AD_BACKEND_OSS_BSD"
--			AC_DEFINE(AD_BACKEND_OSS_BSD, [], [Use OSS interface for sound I/O])
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define AD_BACKEND_OSS_BSD
+-_ACEOF
+-
 -                        ;;
                  *-*-osf*)
                          ad_files="ad_osf.lo mulaw_base.lo"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 19aa8589034c..00862c527ede 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 52b636ea6298..226e23bee77b 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	fftw3f.5:${PORTSDIR}/math/fftw3-float
 # includes assembler code
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index f972a635dade..6873ad1384ee 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Library for manipulating ID3 tags and Ogg comments
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 745bc6f46629..c8c5967a9a8a 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -24,6 +24,6 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget gnomehack gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libexo thunar
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index ff75a5eb8d25..483daab7040b 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A MIDI library
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--without-doc-install
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 5f0ad7c7ef72..987cb0451100 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15 autoconf:262
+USE_AUTOTOOLS=	libtool:22 autoconf:262
 USE_GNOME=	pkgconfig gtk20
 USE_GSTREAMER=	good mad
 INSTALLS_ICONS=	yes
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 0c40b5c91a5f..8da7c3bef845 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Utility for capturing audio streams from programs with OSS output
 BUILD_DEPENDS=	sox:${PORTSDIR}/audio/sox
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 2f7525c451de..39add0ba2390 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 		dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index f3818464e70b..30934a68ce87 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_MOTIF=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAN1=		xanalyser.1
 PLIST_FILES=	bin/xanalyser \
 		lib/X11/app-defaults/XAnalyser
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 7cc3974e9951..20e239ed1a30 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		artsc.0:${PORTSDIR}/audio/arts
 
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 PLIST_FILES=	lib/xmms/Output/libarts.a \
 		lib/xmms/Output/libarts.la \
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 81b2e3ac62ba..3ae842d12229 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XMMS input plugin for playing FLAC files
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		FLAC.10:${PORTSDIR}/audio/flac
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 737e295b21e9..87c04f2b288b 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 36240631471e..6ab1c85058bc 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 USE_KDELIBS_VER=	3
 USE_GNOME=	gtk12 gnometarget
 USE_SDL=	sdl
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-xmms-prefix=${LOCALBASE} \
 		--with-smpeg-prefix=${LOCALBASE} \
 		--with-vorbis-prefix=${LOCALBASE} \
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 0c23aa1b8774..40192ece52d6 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 PLIST_FILES=	lib/xmms/Input/libmid.a \
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index 68cd592c5228..334e14eb499c 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	lib/xmms/Input/libxmms_sndfile.so \
 		lib/xmms/Input/libxmms_sndfile.la
 
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xmu xi
 USE_LDCONFIG=	yes
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index 2603297a9364..a82be1351947 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	gnometarget gtk12 lthack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 PLIST_FILES=	lib/xmms/Input/libtfmx.so
 
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index fbc8e3bb717c..044a8e07d197 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -24,6 +24,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 CFLAGS+=	-I${LOCALBASE}/include/dssi
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index d45e2e5f8b39..903c5a535f09 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	XMMS "XMMS backend support" off
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:15
+USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gstreamer
 
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 49b45abe161d..9b0fadef8827 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	A modular, cross-platform and multi-threaded benchmark tool
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 OPTIONS=	LARGEFILE "Enable Largefile support" on \
 		MYSQL "Enable MySQL support" on \
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 6abea60a03f6..408a6189025e 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -30,7 +30,7 @@ NO_MTREE=	yes
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_MOTIF=	yes
 SUB_FILES=	pkg-message
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index f27daef37562..3258fd92d482 100644
--- a/biology/libgenome/Makefile
+++ b/biology/libgenome/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	libGenome-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for developing bioinformatic related software in C++
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index a75886b73a8b..d2f260fe9602 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		rle.1:${PORTSDIR}/graphics/urt
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GL=		gl
 USE_XORG=	x11 xt xi xproto xext inputproto
diff --git a/cad/fandango/Makefile b/cad/fandango/Makefile
index 71fada28ba61..c0a5b84bc706 100644
--- a/cad/fandango/Makefile
+++ b/cad/fandango/Makefile
@@ -23,7 +23,7 @@ USE_GL=		yes
 USE_GNOME=	gnometarget
 USE_GETTEXT=	yes
 USE_KDEBASE_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LDFLAGS+=	-lGL
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 60201b2e4800..7617381be596 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -18,7 +18,7 @@ USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack \
 		pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 HAS_CONFIGURE=	yes
 
 MAN1=		freehdl-config.1 \
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 90ecd39c06ba..4e8dcc14beb2 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Free Gerber Viewer
 
 USE_GNOME=	desktopfileutils gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 703f97e29376..d780839cae4d 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Electronic Waveform Viewer
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index f9a58311ab3d..1a9d60853770 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -50,7 +50,7 @@ LIB_TCLX=	${LOCALBASE}/lib/tclx${TCL_VER}/libtclx${TCL_VER}.so
 PATCH_WRKSRC=	${WRKDIR}/OpenCASCADE${PORTVERSION}.0
 WRKSRC=		${PATCH_WRKSRC}/ros
 REINPLACE_ARGS=	-i ""
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 LIBTOOLFILES=	ros/configure
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR}				\
 		--with-tk=${TK_LIBDIR}					\
diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile
index 69e6ca5100d0..22a322a7b35b 100644
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclspice
 PORTVERSION=	0.2.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tclspice
@@ -17,10 +17,11 @@ COMMENT=	Improved version on SPICE3 suite with TCL scripting features
 
 BUILD_DEPENDS=	bltwish:${PORTSDIR}/x11-toolkits/blt \
 		${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	bltwish:${PORTSDIR}/x11-toolkits/blt \
+		${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-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
 ALL_TARGET=	tcl
@@ -34,7 +35,7 @@ OPTIONS=	EXPERIMENTAL "Enable experimental features" on \
 
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS} -fPIC" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -ltcl84 -lBLT24"
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 
 WISH=		${LOCALBASE}/bin/wish8.4
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 72086ace3cdc..516852250302 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index a57afede30e0..54e868445b0a 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index e3fc4243319e..b8d6d06800b6 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -22,7 +22,7 @@ USE_XORG=	x11 xproto
 WRKSRC=		${WRKDIR}/iiimf-xcin
 USE_BZIP2=	yes
 USE_GNOME=	libxml2
-USE_AUTOTOOLS=	automake:19 autoheader:262 autoconf:262 libtool:15
+USE_AUTOTOOLS=	automake:19 autoheader:262 autoconf:262 libtool:22
 AUTOMAKE_ARGS=	--add-missing
 
 do-extract:
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index e5b7e3c466c3..70bee3c8485a 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_GNOME=	gnomehack lthack
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 6c728fc5b961..86fa999188f1 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	Collection of writing tools in Chinese
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index ef120a0ce312..0d5cee1f0ac3 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:15
+USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:22
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index ab38b6aba2d1..28f56cd85862 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gconf gnomeprint
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index ed306c164a95..4a43d07d3671 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -31,7 +31,7 @@ USE_PYTHON=	2.4+
 USE_WX=		2.6+
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 8c294ac3eb93..a59dd5619e75 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library to access GSM mobile phones through GSM modems
 
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index c8bd262ade8d..0336c0847914 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	pkgconfig gnomehack libxml2
 USE_PERL5=	yes
 USE_TCL=	yes
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-perl-binding --with-python=${PYTHON_CMD} \
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index 1c371ece7414..0a2de5cfaa8e 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
 INSTALLS_ICONS=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@CXXFLAGS@|@CXXFLAGS@ -fPIC|' \
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 4ae5dd66135b..5cc38b2da6e6 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	hamlib.2:${PORTSDIR}/comms/hamlib
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-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
 INSTALLS_ICONS=	yes
 
diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile
index 372c8a24dec9..ba946418405d 100644
--- a/comms/kmobiletools/Makefile
+++ b/comms/kmobiletools/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Control mobile phones with your PC
 USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index 4e93fbc98f90..7ce848cf853b 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \
 		USER_LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-debug=full
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index e1b5349eb6b9..dace400550bb 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -26,7 +26,7 @@ USE_KDEBASE_VER=3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 
 post-patch:
diff --git a/comms/libsyncml/Makefile b/comms/libsyncml/Makefile
index ee316bcdd3d0..64aade612f7e 100644
--- a/comms/libsyncml/Makefile
+++ b/comms/libsyncml/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	wbxml2:${PORTSDIR}/textproc/wbxml2 \
 		openobex:${PORTSDIR}/comms/openobex \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup22
 
-USE_AUTOTOOLS=	autoheader:262 automake:110 libtool:15
+USE_AUTOTOOLS=	autoheader:262 automake:110 libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20 libxml2
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 78a40cb6c708..0b1622f16360 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -18,7 +18,7 @@ COMMENT=	TI calculator link cables library
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index d032f3ce2644..7fae9e2f53ee 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	TI calculator link cables library
 
 LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack pkgconfig
 USE_LDCONFIG=	yes
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 72d7c941632e..f4aa3d804cf5 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	ticables2.1:${PORTSDIR}/comms/libticables2 \
 		ticonv.3:${PORTSDIR}/converters/libticonv \
 		tifiles2.5:${PORTSDIR}/devel/libtifiles2
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack pkgconfig
 USE_LDCONFIG=	yes
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 917ab9b1057e..98ba142d266e 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	lirc
 MAINTAINER=	doconnor@gsoft.com.au
 COMMENT=	Linux Infared Remote Control
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index f4fb4e3c3b2d..23d38bdbf4af 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -20,7 +20,7 @@ COMMENT=	A DSP library and software FAX machine
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//}
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile
index edcb2ea1d13f..581b39e1f145 100644
--- a/comms/spandsp-devel5/Makefile
+++ b/comms/spandsp-devel5/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 LATEST_LINK=	${PORTNAME}5
 
 WRKSRC=		${WRKDIR}/spandsp-0.0.5
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index cfe5086a59ff..fb42e0c4bf76 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
 
 USE_GMAKE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index c7f453858d87..e4b8fac35e02 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ticables2.1:${PORTSDIR}/comms/libticables2 \
 		ticalcs2.7:${PORTSDIR}/comms/libticalcs2 \
 		ticonv.3:${PORTSDIR}/converters/libticonv
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index f17116571ff4..a55d59d6dd11 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	db@FreeBSD.org
 COMMENT=	Amateur Radio curses based logging program
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS=	autoconf:262 libtool:15 aclocal:19 automake:19
+USE_AUTOTOOLS=	autoconf:262 libtool:22 aclocal:19 automake:19
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 2f951a5892b9..c0fdbd969990 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
 		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
 USE_GMAKE=	yes
 USE_PYTHON=	2.4+
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 32b3cbfe6a78..2518cfa26b80 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -19,7 +19,7 @@ COMMENT=	X version of who is on the air
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-install:
 .if	!defined(NOPORTDOCS)
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index 20169f7d9b65..bb4b059ff8ee 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://trific.ath.cx/Ftp/enca/ \
 MAINTAINER=	never@nevermind.kiev.ua
 COMMENT=	A package for detecting encoding of text files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig
 USE_ICONV=	yes
 USE_BZIP2=	yes
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile
index c2c5a22da824..5ee8afc76c12 100644
--- a/converters/ktextdecode/Makefile
+++ b/converters/ktextdecode/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The simple text conversion utility for KDE 3
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 2b3e0b3bb797..657f2b62dba6 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
 USE_GNOME=	gnometarget
diff --git a/converters/libticonv/Makefile b/converters/libticonv/Makefile
index e647ef011c9b..7f06e9b0ed36 100644
--- a/converters/libticonv/Makefile
+++ b/converters/libticonv/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	tilibs2-20080110
 MAINTAINER=	tijl@ulyssis.org
 COMMENT=	TI calculator character set library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack pkgconfig
 USE_LDCONFIG=	yes
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index 8b0fe4137c26..8d59982b1c3c 100644
--- a/converters/mimelib/Makefile
+++ b/converters/mimelib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C++ class library for manipulating messages in MIME format
 
 CONFLICTS=	kdenetwork-3.1.*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 54b243c8c4ef..921d506c19ba 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://software.frodo.looijaard.name/psiconv/files/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A conversion utility to convert Psion 5(MX) files into other formats
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 9d838952ae89..20129cc4ffda 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-included-gettext
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index e4f2e316447c..0dd629f88c5a 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -30,7 +30,7 @@ COUCH_USER?=	couchdb
 
 USE_RC_SUBR=	couchdb
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-erlang=${LOCALBASE}/lib/erlang/usr/include \
 		--localstatedir=/var \
diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index 3edd9e5ad53a..21ab54139429 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -10,7 +10,7 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 USE_LDCONFIG=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 CONFIGURE_SCRIPT=	../dist/configure
 LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 BDBVER=			${PORTVERSION:R}
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 72179c200d80..2ba73b0865e6 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Disk Based Hashtables
 
 CONFLICTS=	dbh-[2-9]*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 2a5ee02adbb9..58a2d25f99c9 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -30,7 +30,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack \
 		ltasneededhack
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BDB=	41+
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index e6443e3fdfdf..205a8c7c6788 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -25,7 +25,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GCC=	3.4
 
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 0af8efcc91a4..7e03ccabda91 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -23,7 +23,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 MAKE_JOBS_UNSAFE=	yes
diff --git a/databases/firebird20-server/files/patch-libtool22 b/databases/firebird20-server/files/patch-libtool22
new file mode 100644
index 000000000000..47c94dafb599
--- /dev/null
+++ b/databases/firebird20-server/files/patch-libtool22
@@ -0,0 +1,11 @@
+--- autogen.sh.orig	2009-07-11 20:59:22.000000000 -0500
++++ autogen.sh	2009-07-11 20:59:32.000000000 -0500
+@@ -73,7 +73,7 @@
+  rm -f aclocal.m4
+  cp $LIBTOOL_M4 aclocal.m4
+ fi
+-$LIBTOOLIZE --copy --force || exit 1
++$LIBTOOLIZE --copy --force --install || exit 1
+ 
+ echo "Running autoheader ..."
+ $AUTOHEADER || exit 1
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index b2c61154fec6..4c18b7879955 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -23,7 +23,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262:env libtool:15
+USE_AUTOTOOLS=	autoconf:262:env libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 23105ed255f0..bd982cab47de 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -20,7 +20,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262:env libtool:15
+USE_AUTOTOOLS=	autoconf:262:env libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile
index 06dafc4691ce..8cf202ba7a58 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Editor/browser for BibTeX bibliographic databases
 USE_GNOME=	gnomelibs
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index f919f6040fdd..a712d9ef3612 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	The GNU database manager
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/gdbm/files/patch-libtool22 b/databases/gdbm/files/patch-libtool22
new file mode 100644
index 000000000000..5f6d58758f08
--- /dev/null
+++ b/databases/gdbm/files/patch-libtool22
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2009-06-29 13:15:23.000000000 -0500
++++ Makefile.in	2009-06-29 13:16:42.000000000 -0500
+@@ -130,7 +130,7 @@
+ 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
+ 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
+ 		$(INSTALL_ROOT)$(infodir)
+-	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
++	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
+ 		$(INSTALL_ROOT)$(includedir)/gdbm.h
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
+@@ -141,7 +141,7 @@
+ install-compat:
+ 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
+ 		$(INSTALL_ROOT)$(includedir)
+-	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
++	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
+ 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
+ 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
+ 		$(INSTALL_ROOT)$(includedir)/dbm.h
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 6d3a5e9d964f..bac4e330452e 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 76a16adaaac0..bd34f16dc059 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 58b2d6ac0346..c19be63e372b 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
 		--with-python-incdir=${PYTHON_INCLUDEDIR} \
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index a1273068a300..ea8a882e7ff7 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -16,7 +16,7 @@ COMMENT=	BibTeX editor for KDE
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 MAN1=		kbibtex.1
 
diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile
index 73cae4275813..49ee31255048 100644
--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=		kexicore:${PORTSDIR}/editors/koffice-kde3
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 
 .include <bsd.port.mk>
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 502d500d8ccd..42ee88b7feda 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical frontend for administration of mysql servers
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 5e0177aef58e..e2677b32a836 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_PYTHON=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 CONFIGURE_ARGS+=	--with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \
 		--with-hk_classes-incdir=${LOCALBASE}/include/hk_classes
diff --git a/databases/kpogre/Makefile b/databases/kpogre/Makefile
index 22620965c12e..fb921feebe68 100644
--- a/databases/kpogre/Makefile
+++ b/databases/kpogre/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpq
 RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
 
 USE_KDELIBS_VER=	3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PGSQL=	yes
diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile
index 21e2b6d8eb3f..0ad880a14205 100644
--- a/databases/ksqlanalyzer/Makefile
+++ b/databases/ksqlanalyzer/Makefile
@@ -16,7 +16,7 @@ COMMENT=	MSSQL database client for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile
index fadc765f68b6..1b24b1889c0a 100644
--- a/databases/ksqlshell/Makefile
+++ b/databases/ksqlshell/Makefile
@@ -16,7 +16,7 @@ COMMENT=	MySQL and PostgreSQL client for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_MYSQL=	yes
 USE_PGSQL=	yes
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 40198650b70a..b4285be86b46 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Drivers for libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
 
 USE_GNOME=	gnometarget lthack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 274fa7936d02..974f34de1e15 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 929540f6081b..545a4f8d10ca 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 2e1fbf4b3c3c..a4a27d760812 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -25,7 +25,7 @@ LIBGDA3_SLAVE?=	no
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index ceb6941e0e17..52ad9ed52db5 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index c3ddbf85c478..04ec0e84c7d0 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -19,7 +19,7 @@ COMMENT=	C++ wrapper for libgda4 library
 LIB_DEPENDS=	glibmm-2.4:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgda4
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 56de5cf5f71b..6e7145f9d368 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
 		intlhack referencehack
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 0d657d7d8e19..d77941a58200 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	unixODBC-[0-9]*
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR}
 USE_LDCONFIG=	yes
diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 813081614092..c0779a93b2f9 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The C library for accessing a memcache cluster
 
 USE_BZIP2=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index d4a81aeb7161..d5c274bc2569 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C++ class library and toolset for ODBC access to data sources
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-isqlxx
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index cdf071777f7f..cac05114429c 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -19,7 +19,7 @@ OPTIONS=	MYSQL "Add MySQL support" on \
 
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/databases/ludia/Makefile b/databases/ludia/Makefile
index 1d2fae272f96..9593b42499e3 100644
--- a/databases/ludia/Makefile
+++ b/databases/ludia/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \
 		senna-cfg:${PORTSDIR}/textproc/senna
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PGSQL=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index bb8b19ce71eb..ac96f0658ad6 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 # To build man-pages
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 USE_GNOME=	glib20
 WANT_GNOME=	yes
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 658ffa45bc5f..d043f4c39acc 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -23,7 +23,7 @@ NOT_FOR_ARCHS_REASON_sparc64=	Fails to compile
 
 USE_MYSQL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 USE_LDCONFIG=	yes
 
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 5b5e145f9e93..f6480ce4479f 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
 USE_MYSQL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} \
 		--includedir=${PREFIX}/include/mysql++ \
 		--disable-examples
diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile
index ebdf0808b0aa..1cbefe279468 100644
--- a/databases/mysql++3/Makefile
+++ b/databases/mysql++3/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	dudu@dudu.ro
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
 USE_MYSQL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 8d66f8f52217..4d2470f23508 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mysql-connector-odbc
 PORTVERSION=	3.51.26
 DISTVERSIONSUFFIX=	r1127
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-ODBC/3.51
@@ -21,7 +21,7 @@ USE_MYSQL=		yes
 IGNORE_WITH_MYSQL=	323
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 USE_LDCONFIG=	yes
 CFLAGS+=		-L${LOCALBASE}/lib
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile
index c11d6c7ef4e0..174cf5e1f63f 100644
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
 OPTIONS=	QUERY_BROWSER	"Build the MySQL Query Browser"	on \
 		ADMINISTRATOR	"Build the MySQL Administrator"	on
 
-USE_AUTOTOOLS=	autoconf:262 libtool:15 automake:110
+USE_AUTOTOOLS=	autoconf:262 libtool:22 automake:110
 USE_GNOME=	gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
 USE_GL=		gl glut
 USE_GMAKE=	yes
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 966fc44df514..d716576267b4 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -21,7 +21,7 @@ USE_MYSQL=	yes
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
 MAKE_ENV+=	MOC="${MOC}" QTDIR="${QT_PREFIX}"
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index f8dbd256ef31..d140feb00cfd 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/databases/mysql${MYSQL_VER}-server:bui
 RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 WANT_MYSQL_VER?=	51
 
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 024f97a25aa0..c1f4e2920ebf 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	PYTHON	"Enable Python scripting and modules" off
 
-USE_AUTOTOOLS=	autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:15:env
+USE_AUTOTOOLS=	autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:22
 AUTOMAKE_ARGS=	--add-missing --foreign
 ACLOCAL_ARGS=
 AUTOCONF_ARGS=
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index b78afab92c71..cb7bb32aa5df 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--with-iodbc
 CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 1a08458e272d..29b6b0946ee5 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql323-client
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index c052f60c0c0d..b53a2b34fb32 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql40-client
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index e33db162f7ef..c14854c69861 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql41-client
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index a61073e86068..f47a3a6602db 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 1666d8b69b84..4f98f7ce5712 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql60-client databases/mysql60-scripts
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 312d9837286b..856995029c9e 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=mysqlcppapi
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fork of mysql++ C++ API for MySQL
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_MYSQL=	yes
 USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 42e5d4ccd987..bd961631ebd2 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -22,7 +22,7 @@ PM_BASE=	${SITE_PERL}
 USE_PERL5=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE}
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 62d27b26c91d..9581ab0c3370 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -16,10 +16,10 @@ MAINTAINER=	tremere@cainites.net
 COMMENT=	A C library for accessing databases with a single API
 
 USE_GMAKE=	YES
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L../lib -L${LOCALBASE}/lib
+LDFLAGS+=	${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-backends="${CONFIGURE_MODULES}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index c06657821d69..3ae0e41e486a 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}" \
 		LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\
 		AUTOHEADER=true
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index dadf6b16dda2..d2a7330a76e0 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	postgresql
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	An easy-to-use C interface to PostgreSQL
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PGSQL=	YES
 USE_GMAKE=	YES
 USE_LDCONFIG=	YES
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index efd3fd829793..d74d10db121a 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	pure-db-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of libraries for creating and reading constant databases
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 60bf7551b178..de16808eb8fe 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C library to read various Paradox files
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 07874e2ea9a7..e2a9fffc39cc 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 
 CONFLICTS=	rrdtool-1.0*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 8b1f80de5607..a08a79657ed3 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV=	PERL=${PERL}
 CONFLICTS=	rrdtool-1.2*
 LATEST_LINK=	rrdtool10
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
 		--program-transform-name=''
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index bc350ef86d97..62a224b1b492 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK=	${PORTNAME}12
 
 CONFLICTS=	rrdtool-1.0* rrdtool-1.3*
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 9527269e4999..d9c0d629c0c8 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An SQL database engine in a C library
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	YES
 
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 21953cc99fb0..3d2d424e5d3a 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	sqlite34-[0-9]*
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--prefix=${PREFIX}
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index 9b3d98a19dd9..3ccb41282dc3 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	sqlite3-[0-9]*
 
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_DOS2UNIX=	*.pc.in
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 6ba6381b2561..21a4fbd9fa5f 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A persistent DB connection pooling/proxying/load balancing system
 LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
 
 USE_GMAKE=		yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
 			CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 3e476cef29f7..cb67f3d878d7 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -24,7 +24,7 @@ ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
 
 ONLY_FOR_ARCHS=	i386
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:22
 USE_QT_VER=	4
 QT_COMPONENTS=	gui corelib sql xml network linguist moc_build uic_build rcc_build
 USE_GMAKE=	yes
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 802feffad4ab..c08803dc7011 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	libiodbc-[0-9]*
 
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index b9579fefe160..aba72ce77f04 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Universal SQL/Application Server
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS=	--with-readline\
 		--with-iodbc=${LOCALBASE}\
 		--enable-bpel-vad\
diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile
index 048d4a524f0a..0094c80543a9 100644
--- a/databases/xbase/Makefile
+++ b/databases/xbase/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	lthack
 USE_LDCONFIG=	yes
 
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index f9a28b23b9f7..bb40d3e21026 100644
--- a/databases/xbsql/Makefile
+++ b/databases/xbsql/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An SQL wrapper for the XBase DBMS library
 
 LIB_DEPENDS=	xbase-2.0.0:${PORTSDIR}/databases/xbase
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index c46b649c8f47..c1898a7e9474 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Desktop organization tool
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 OPTIONS=	KONTACT	"Kontact plugin" on \
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index a1dd71f2c5e3..32ba821aa424 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -19,7 +19,7 @@ COMMENT=	System tray controller for beep-media-player
 BUILD_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 RUN_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/bookreader/Makefile b/deskutils/bookreader/Makefile
index 35c47361bbae..7d7a9c153781 100644
--- a/deskutils/bookreader/Makefile
+++ b/deskutils/bookreader/Makefile
@@ -18,6 +18,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index c821734c6cf8..95ee1d756354 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehier evolutiondataserver
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GCONF_SCHEMAS=	contacts.schemas
 MAN1=		${PORTNAME}.1
 # CFLAGS+=	-g
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index a325a2f35a56..54204ee3bb57 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Drop stack applet for KDE
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_KDEBASE_VER=	3
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 88f3a81dcf15..69154a08d9c7 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeui intlhack gtksourceview
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 633593ba1c98..d1925657172d 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-extra-gcc-optimization
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index b803407947b3..e5eea41702b7 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -22,7 +22,7 @@ WANT_GNOME=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 8f4f9baef51d..f9942a32e2c4 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=		yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15 automake:19:env autoheader:262:env
+USE_AUTOTOOLS=		libtool:22 automake:19:env autoheader:262:env
 INSTALLS_ICONS=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 9a5f2c02622c..c270dd8b41c2 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
 		libgnomeprintui gnomedesktop ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index c102a8d3eae4..b55064c60041 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnotime
 PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/gttr:gttr SF/qof:qof
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gttr \
@@ -23,7 +23,7 @@ USE_XORG=	xscrnsaver
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+USE_AUTOTOOLS=	libtool:22 libltdl:22
 LIBTOOLFILES=	configure ../${QOF_DISTNAME}/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index e4bb19f04920..99349f43d921 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	google-gadgets
 PORTVERSION=	0.10.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@@ -39,7 +39,7 @@ USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" CPPFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-ltdl-install=no
-USE_AUTOTOOLS=	libtool:15:env autoconf:262:env automake:110:env aclocal:110:env libltdl:15
+USE_AUTOTOOLS=	libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 004f540126c4..7d568ddb8288 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	smyru@heron.pl
 COMMENT=	A simple customizable GTK screen ruler
 
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libglade2
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 0f951a8fbfa7..62e4172cb683 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
 PLIST_FILES=	bin/gtkjournal lib/libsqlitemm.a lib/libsqlitemm.la \
 		lib/libsqlitemm.so lib/libsqlitemm.so.0
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile
index afbba0740df3..84c1a4bb10c2 100644
--- a/deskutils/karamba/Makefile
+++ b/deskutils/karamba/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Display various information right on your desktop
 EXTRA_PATCHES=	${.CURDIR}/../../comms/kallers/files/patch-configure
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 34ca76fcc21d..1b1abbfda930 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fast, extensible launcher for KDE similar to Quicksilver on OSX
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	${PREFIX}/lib/ ${PREFIX}/lib/kde3/
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index b184f98dd2da..76f06661ec6b 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.gfai.de/~jaham/download/ \
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	KDE kicker-applet that reminds you of birthdays and anniversaries
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index 8090913945fb..d117defebdcd 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		mich@FreeBSD.org
 COMMENT=		KDE bloglines notifier
 
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_GMAKE=		yes
 USE_KDELIBS_VER=	3
 
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 68b31d8772bb..1d47b82a6dc7 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -21,6 +21,6 @@ LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index cd2d343ec08f..bcb5e0a2d9c2 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	chm:${PORTSDIR}/misc/chmlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 DO_NOT_COMPILE+=chmlib
 CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 409c85e1c93b..be99b566e881 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -29,7 +29,7 @@ _NO_KDE_FINAL=	yes
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 125cdf3ead87..67112010512a 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -17,7 +17,7 @@ COMMENT=		Panel applet for editing and accessing the KDE addressbook
 USE_KDEBASE_VER=	3
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 CONFIGURE_ENV=		LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
index 1157b8bb4fbf..3943e8746292 100644
--- a/deskutils/klipoquery/Makefile
+++ b/deskutils/klipoquery/Makefile
@@ -17,7 +17,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index c142d5abbb1a..7a3a7c953fe2 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A KDE client for the popular online journal site LiveJournal
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g ; \
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index a565d168f5f5..fe6b48116f40 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -22,7 +22,7 @@ WRKSRC=			${WRKDIR}/${PORTNAME}
 USE_GL=			glut
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15 automake:19:env autoheader:262:env
+USE_AUTOTOOLS=		libtool:22 automake:19:env autoheader:262:env
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 USE_PERL5_BUILD=	yes
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 0462607d25c3..5ac154dcf020 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 2d81e2bd479f..583bb9863015 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_EFL=	imlib2
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 6f3d6a127843..ca17aacabe6e 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/kooldock
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 INSTALLS_ICONS=		yes
 USE_GETTEXT=		yes
 USE_KDELIBS_VER=	3
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index abd5e8f7fdfe..e173e67605b2 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Quick Reference sheets for KDE
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
 DOCSDIR=	share/doc/HTML
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 4822c5a3eecf..a5daaf697865 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -18,7 +18,7 @@ COMMENT=	KDE Rich Site Summary viewer
 
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
 MAKE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
 
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index 149dc061a678..1582edf78622 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:22
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5_BUILD=yes
diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile
index e910d946f25e..cdce3de04727 100644
--- a/deskutils/ktagebuch/Makefile
+++ b/deskutils/ktagebuch/Makefile
@@ -20,7 +20,7 @@ EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:22
 USE_LDCONFIG=		yes
 INSTALLS_ICONS=		yes
 USE_GETTEXT=		yes
diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile
index 4f5594ad941e..981790300e85 100644
--- a/deskutils/kuake/Makefile
+++ b/deskutils/kuake/Makefile
@@ -15,7 +15,7 @@ COMMENT=	KDE konsole application acting like the Quake-console
 
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 5089bf0ad2d4..167a6c79daf7 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 5089bf0ad2d4..167a6c79daf7 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index 5e4b927558e5..0967f38c4d3e 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sidebar plugin for Konqueror
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index a40ea405ac26..6337ce02f804 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -20,7 +20,7 @@ WRKSRCMASTER=	${WRKDIR}/multisync-${PORTVERSION}
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env libtool:15
+USE_AUTOTOOLS=	automake:19:env libtool:22
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
 pre-configure:
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index 297c9012e846..b0261d2d36a1 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	pav
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Nautilus plugin that allows you to encrypt the contents of a folder
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2 eel2
 PKGCONFIGS=	gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 5089bf0ad2d4..167a6c79daf7 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 7c1a201bf838..130fdcdd2d63 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_PERL5_RUN=	yes
 USE_GMAKE=	yes
-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
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
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