I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

169 files changed, 5705 insertions, 16989 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index f17243726..dce50714f 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 135112 2011-08-10 10:56:40Z giovanni $
+# $Id: PKGBUILD 136921 2011-09-02 23:48:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10598
+pkgver=10602
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('3ba206bd0c43c6fb3247e76141fcf148')
+md5sums=('17e61b690fa52b7ee5a4e7bf350967a0')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 82f013287..d98c73c2d 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125827 2011-05-30 09:46:57Z jgc $
+# $Id: PKGBUILD 136658 2011-08-31 11:29:58Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.19
-pkgrel=2
+pkgver=2.2.20
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
@@ -35,7 +35,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd.logrotate
         httpd
         arch.layout)
-md5sums=('832f96a6ec4b8fc7cf49b9efd4e89060'
+md5sums=('1ac251431c8c4285f6b085c1d156bb56'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD
index db30facf8..806c39d81 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=atkmm
 pkgname=(atkmm atkmm-docs)
-pkgver=2.22.4
+pkgver=2.22.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
@@ -11,7 +11,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('c47ac8866fd0be695b6ba54a7cda5ab94676295ec5b2c22bd159bb8212aca438')
+sha256sums=('61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 29c8d9b28..4082c750e 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,19 +1,22 @@
-# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $
+# $Id: PKGBUILD 136227 2011-08-25 02:57:58Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://audacious-media-player.org/'
 license=('GPL3')
-depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('unzip: zipped skins support')
+depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins')
+optdepends=('unzip: zipped skins support'
+            'hicolor-icon-theme: for icons'
+            'gtk-update-icon-cache: for icons'
+            'desktop-file-utils: desktop integration')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e')
+sha1sums=('68799076acafb151668285e8d9498048633d7b60')
 
 provides=('audacious-player')
 replaces=('audacious-player')
@@ -21,8 +24,8 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	[[ ${CARCH} == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
-	./configure --prefix=/usr ${extraopts}
+	[[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2'
+	./configure --prefix=/usr ${_extraopts}
 	make
 }
 
diff --git a/extra/audacious/install b/extra/audacious/install
index af0c8724a..4a3873e96 100644
--- a/extra/audacious/install
+++ b/extra/audacious/install
@@ -1,6 +1,7 @@
 post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	type update-desktop-database &>/dev/null && update-desktop-database -q
+	type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	true
 }
 
 post_upgrade() {
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
new file mode 100644
index 000000000..d5c42fd92
--- /dev/null
+++ b/extra/audacity/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=audacity
+pkgver=1.3.13
+pkgrel=1
+pkgdesc="A program that lets you manipulate digital audio waveforms"
+arch=('i686' 'x86_64')
+url="http://audacity.sourceforge.net/"
+license=('GPL')
+depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
+	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
+makedepends=('zip')
+options=('!makeflags')
+install=audacity.install
+source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2)
+md5sums=('57be7fadb8c8dd17b8462c7ac1561d03')
+
+build() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+    --with-portaudio --with-libsamplerate \
+    --without-libresample --with-libmad \
+    --with-id3tag --with-libflac \
+    --with-vorbis --with-libexpat \
+    --with-libsndfile --with-soundtouch \
+    --enable-unicode --without-taglib
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install
new file mode 100644
index 000000000..028c9f62a
--- /dev/null
+++ b/extra/audacity/audacity.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 61a88ee54..b4e31041c 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $
+# $Id: PKGBUILD 136347 2011-08-26 22:11:46Z allan $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=4
+pkgrel=5
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.avahi.org/'
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index b6e6ea92e..c6a6adabe 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130507 2011-07-07 02:35:18Z bisson $
+# $Id: PKGBUILD 136713 2011-08-31 16:36:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -8,22 +8,18 @@ pkgname=bind
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.0.P4
 _pkgver=9.8.0-P4
-pkgrel=1
+pkgrel=2
 
-pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
-provides=('dns-server')
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
         'so_bsdcompat.patch'
-        'notools.patch'
+        'remove-tools.patch'
         'named'
         'named.conf'
         'named.conf.d'
@@ -33,7 +29,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
 sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
-          '17444f9d759a4bde7688bdaa304dac57a138e4c1'
+          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
@@ -41,13 +37,18 @@ sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
           '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
+provides=('dns-server')
+
 install=install
+backup=('etc/logrotate.d/named'
+        'etc/conf.d/named'
+        'etc/named.conf')
 
 build() {
-	cd "${srcdir}/${pkgname}-${_pkgver}"
+	cd "${srcdir}/bind-${_pkgver}"
 
+	patch -p1 -i ../remove-tools.patch
 	patch -p1 -i ../so_bsdcompat.patch
-	patch -p1 -i ../notools.patch
 
 	./configure \
 		--prefix=/usr \
@@ -65,14 +66,15 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${_pkgver}"
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	make DESTDIR="${pkgdir}" install
 
 	rmdir "${pkgdir}/var/run"
 	install -d "${pkgdir}"/usr/share/doc/bind
 	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
-	install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
 	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
diff --git a/extra/bind/install b/extra/bind/install
index e3a1397cb..287d0e05b 100644
--- a/extra/bind/install
+++ b/extra/bind/install
@@ -1,13 +1,13 @@
 post_install() {
-	getent group named  >/dev/null || groupadd -g 40 named
-	getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
+	getent group named &>/dev/null || groupadd -g 40 named
+	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
 	passwd -l named &>/dev/null
 
 	touch var/log/named.log
 	chown named:named var/log/named.log
 
 	# create an rndc.key if it doesn't already exist
-	if [ ! -s etc/rndc.key ]; then
+	if [[ ! -s etc/rndc.key ]]; then
 		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
 		chown root:named etc/rndc.key
 		chmod 640 etc/rndc.key
diff --git a/extra/bind/notools.patch b/extra/bind/remove-tools.patch
index 0ad083a01..cbd1c53ad 100644
--- a/extra/bind/notools.patch
+++ b/extra/bind/remove-tools.patch
@@ -1,12 +1,12 @@
 diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2011-05-27 10:12:59.392416094 +0200
-+++ new/bin/Makefile.in	2011-05-27 10:13:12.372521984 +0200
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
 @@ -19,7 +19,7 @@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
 -SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools \
++SUBDIRS =	named rndc dnssec tests tools nsupdate \
  		check confgen @PKCS11_TOOLS@
  TARGETS =
  
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 2fbdf9266..22ed2d921 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $
+# $Id: PKGBUILD 136183 2011-08-23 19:33:20Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.bitlbee.org/'
@@ -32,7 +32,7 @@ build() {
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
 		--systemdsystemunitdir=/lib/systemd/system \
-		--ssl=openssl \
+		--ssl=gnutls \
 		--strip=0 \
 		--otr=1 \
 		--ssl=gnutls
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index b0f79e140..35af04bad 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 84161 2010-06-26 23:01:03Z kevin $
+# $Id: PKGBUILD 136398 2011-08-29 05:25:50Z bisson $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
-pkgver=2.0.16
+pkgver=2.4.0
 pkgrel=1
-pkgdesc="A multiplayer 3D tank battle game"
-depends=('curl' 'mesa' 'sdl')
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='Multiplayer 3D tank battle game'
+url='http://bzflag.org/'
 license=('LGPL')
-options=(!libtool)
-url="http://www.bzflag.org"
-source=(http://downloads.sourceforge.net/sourceforge/bzflag/$pkgname-$pkgver.tar.bz2)
-md5sums=('161b973bee586d43ebff4695dfb8c359')
+options=('!libtool')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'glew' 'mesa' 'sdl')
+source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
+sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure --prefix=/usr
+	make
+
+	cd misc
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+	make DESTDIR="${pkgdir}" install
 
-  # gnome menu entry and icon.
-  cd misc
-  make || return 1
-  mkdir -p ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 bzflag.desktop $pkgdir/usr/share/applications/bzflag.desktop
-  install -m644 ../data/bzflag-48x48.png $pkgdir/usr/share/pixmaps/bzflag-48x48.png
+	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
+	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
 }
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index e00f2e0af..bf9f545b4 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131892 2011-07-16 22:47:18Z eric $
+# $Id: PKGBUILD 136739 2011-08-31 19:42:25Z eric $
 # Maintainer :
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=bzr
-pkgver=2.3.4
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="A decentralized revision control system (bazaar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('python2')
 optdepends=('python-paramiko: for sftp support')
 source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2efb1350c69abd4d5bf7437f06f1fdb9')
+md5sums=('087c65e4b79f454b9e733c21607bdd56')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD
index 0491cfb94..f33a8b078 100644
--- a/extra/ccache/PKGBUILD
+++ b/extra/ccache/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 125865 2011-05-30 17:15:51Z giovanni $
+# $Id: PKGBUILD 136057 2011-08-22 10:10:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ccache
-pkgver=3.1.5
+pkgver=3.1.6
 pkgrel=1
 pkgdesc="A compiler cache"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccache.samba.org/"
-source=("http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.bz2")
 license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
-md5sums=('f652bd20253bb4aa1440ae50bea3c9e3')
+source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('343dc9b642e1d2af1e6bd8e474dde92e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 7d8ed522b..6ed23a398 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 125144 2011-05-25 19:01:27Z foutrelis $
+# $Id: PKGBUILD 136389 2011-08-28 17:30:33Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
-pkgver=3.7.9
-pkgrel=4
+pkgver=3.7.10
+pkgrel=1
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('claws-mail>=3.7.8')
+depends=('claws-mail>=3.7.10')
 makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
              'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra')
+             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
 optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
             'perl: for perl plugin'
             'libnotify: for notification plugin'
@@ -24,17 +24,16 @@ optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
             'libytnef: for tnef_parse plugin'
             'libwebkit: for the fancy webkit html plugin'
             'libsoup-gnome: for the fancy webkit html plugin'
-            'python2: for python plugin')
+            'python2: for python plugin'
+	    'libgdata: for gdata plugin')
 conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
            'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
            'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
-        claws-mail-notification-0.26-libnotify-0.7.patch)
-md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
-         'a02be84594ebd28b18811ccc358509be')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
+md5sums=('fe782b2d4762c9727e22c1bb7979f7d6')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
@@ -46,9 +45,6 @@ build() {
     [[ $dir != geolocation_plugin-* ]] && (
       cd $dir
 
-      [[ $dir == notification_plugin-* ]] &&
-        patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
-
       ./configure --prefix=/usr --disable-static
       make
     )
diff --git a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
deleted file mode 100644
index efc06a472..000000000
--- a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c
---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c	2009-04-26 03:05:05.000000000 +0200
-+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c	2010-11-12 13:39:02.363909583 +0100
-@@ -339,7 +339,7 @@
-     break;
-   }
- 
--  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
-   g_free(utf8_str);
-   if(ppopup->notification == NULL) {
-     debug_print("Notification Plugin: Failed to create a new "
-diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c
---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c	2010-03-25 09:56:34.000000000 +0100
-+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c	2010-11-12 13:38:30.809340907 +0100
-@@ -589,8 +589,7 @@
-   summary  = notification_trayicon_popup_assemble_summary();
-   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
- 
--  popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
--  notify_notification_attach_to_status_icon(popup.notification, trayicon);
-+  popup.notification = notify_notification_new(summary, utf8_str, NULL);
- 
-   g_free(summary);
-   g_free(utf8_str);
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 726f0f271..e298d0cb4 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135774 2011-08-18 15:03:56Z andyrtr $
+# $Id: PKGBUILD 136387 2011-08-28 17:30:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
-pkgver=3.7.9
-pkgrel=5
+pkgver=3.7.10
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -14,21 +14,17 @@ makedepends=('compface' 'spamassassin' 'bogofilter')
 optdepends=('python2:           needed for some tools'
             'perl:              needed for some tools'
             'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering'
-            'html2ps:		AUR pkg - adds support for printing html mails together with html plugins')
+            'bogofilter:        adds support for spamfiltering')
 replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
-        claws-notify-crash.patch)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
-         '9a2903449f679344b5f5f51c91825b45')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fcf58dcff52f0908ff3bc368d820408b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np0 -i $srcdir/claws-notify-crash.patch
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
   ./configure --prefix=/usr --disable-static \
diff --git a/extra/claws-mail/claws-mail.install b/extra/claws-mail/claws-mail.install
index 648480c3b..a6ae1eae6 100644
--- a/extra/claws-mail/claws-mail.install
+++ b/extra/claws-mail/claws-mail.install
@@ -1,13 +1,16 @@
 post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch
deleted file mode 100644
index e1d4eb686..000000000
--- a/extra/claws-mail/claws-notify-crash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/main.c
-===================================================================
-RCS file: //claws/src/main.c,v
-retrieving revision 1.115.2.237
-retrieving revision 1.115.2.238
-diff -u -r1.115.2.237 -r1.115.2.238
---- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
-+++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
-@@ -331,7 +331,7 @@
- 		gtk_widget_show(hack);
- 	}
- 
--	xdisplay = gdk_display_get_default();
-+	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
- 	sn_display = sn_display_new(xdisplay,
- 				sn_error_trap_push,
- 				sn_error_trap_pop);
-
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 6f101a31b..5f8c16bb8 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 126722 2011-06-06 21:13:23Z heftig $
+# $Id: PKGBUILD 136748 2011-09-01 02:40:16Z eric $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=clutter-gst
-pkgver=1.3.12
+pkgver=1.3.14
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('clutter' 'gstreamer0.10-base')
+url="http://www.clutter-project.org/"
+license=('LGPL')
+depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
 source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('bfb652721469a73badb2c2c0470a8a45c784bce7abf14bb41dd2bd633417556d')
+sha256sums=('aab908e9298ada2a10226deceba8a3f361b00e5c999ceea26b23050a12103e66')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index fc291a045..0f137f184 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118087 2011-04-05 12:00:37Z ibiru $
+# $Id: PKGBUILD 136800 2011-09-01 15:46:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
-pkgver=1.0.0
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ options=('!libtool')
 license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5d395218e30e2971dbf9ca69e564036e6b6316e2d995b93fef11c0195f136cdb')
+source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('044e46b4b36e71bd05f677639bbc5f8c6debd655e2ce69a8d937ed1b4e79d192')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 85464033f..ba3430d87 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135776 2011-08-18 15:04:02Z andyrtr $
+# $Id: PKGBUILD 136886 2011-09-02 16:22:36Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.4.8
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -16,10 +16,10 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6'
-         '8ebd390197501ffd709f0ee546937fd5'
+md5sums=('e54ed09ede2340fc3014913333520fe4'
+         'e0843e8d8c345792ac73a185260e69fe'
          '9b8467a1e51d360096b70e2c3c081e6c'
-         'c9ede95cfc8e76571bd8156f0a573e3b'
+         '3733c23e77eb503bd94cc368e02830dc'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -28,7 +28,7 @@ md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6'
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Fedora
+  # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups
   patch -Np1 -i ${srcdir}/cups-avahi.patch
 
   # Do not export SSL libs in cups-config
@@ -51,15 +51,11 @@ build() {
      --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 \
      --enable-ssl=yes --enable-gnutls \
-     --disable-threads \
+     --enable-threads \
      --enable-avahi\
      --with-php=/usr/bin/php-cgi \
      --with-pdftops=pdftops \
      --with-optim="$CFLAGS"
-
-     #reminder
-     #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1
-
   make
 }
 
diff --git a/extra/cups/cups-avahi.patch b/extra/cups/cups-avahi.patch
index cf1056a75..7e9c8ecea 100644
--- a/extra/cups/cups-avahi.patch
+++ b/extra/cups/cups-avahi.patch
@@ -1,15 +1,33 @@
-diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
---- cups-1.4.5/backend/dnssd.c.avahi	2009-08-08 00:27:12.000000000 +0200
-+++ cups-1.4.5/backend/dnssd.c	2010-11-12 13:13:31.000000000 +0100
-@@ -22,6 +22,7 @@
+Description: Avahi support
+Bug: http://www.cups.org/str.php?L3066
+Author: Tim Waugh
+Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011)
+
+--- a/backend/dnssd.c
++++ b/backend/dnssd.c
+@@ -15,14 +15,21 @@
+  *
+  * Contents:
+  *
++ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
++ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
+  *   main()                  - Browse for printers.
+  *   browse_callback()       - Browse devices.
+  *   browse_local_callback() - Browse local devices.
+  *   compare_devices()       - Compare two devices.
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
++ *   device_type()           - Get DNS-SD type enumeration from string.
   *   get_device()            - Create or update a device.
-+*    find_device()
   *   query_callback()        - Process query data.
++ *   avahi_client_callback() - Avahi client callback function.
++ *   avahi_query_callback()  - Avahi query callback function.
++ *   avahi_browse_callback() - Avahi browse callback function.
++ *   find_device()           - Find a device from its name and domain.
   *   sigterm_handler()       - Handle termination signals...
   *   unquote()               - Unquote a name string.
-@@ -33,7 +34,18 @@
+  */
+@@ -33,7 +40,18 @@
  
  #include "backend-private.h"
  #include <cups/array.h>
@@ -29,7 +47,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
  
  /*
-@@ -52,7 +64,12 @@ typedef enum
+@@ -53,7 +71,12 @@
  
  typedef struct
  {
@@ -42,7 +60,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
    char		*name,			/* Service name */
  		*domain,		/* Domain name */
  		*fullName,		/* Full name */
-@@ -64,6 +81,20 @@ typedef struct
+@@ -65,6 +88,20 @@
  		sent;			/* Did we list the device? */
  } cups_device_t;
  
@@ -63,7 +81,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
  /*
   * Local globals...
-@@ -77,6 +108,7 @@ static int		job_canceled = 0;
+@@ -78,6 +115,7 @@
   * Local functions...
   */
  
@@ -71,7 +89,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  static void		browse_callback(DNSServiceRef sdRef,
  			                DNSServiceFlags flags,
  				        uint32_t interfaceIndex,
-@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
+@@ -93,12 +131,6 @@
  					      const char *regtype,
  					      const char *replyDomain,
  					      void *context);
@@ -84,7 +102,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  static void		query_callback(DNSServiceRef sdRef,
  			               DNSServiceFlags flags,
  				       uint32_t interfaceIndex,
-@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
+@@ -107,9 +139,118 @@
  				       uint16_t rrclass, uint16_t rdlen,
  				       const void *rdata, uint32_t ttl,
  				       void *context);
@@ -123,8 +141,9 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +
 +
 +/*
-+ * cups_txt_records_t access functions
++ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
 + */
++
 +static cups_txt_records_t *
 +next_txt_record (cups_txt_records_t *txt)
 +{
@@ -139,6 +158,11 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +  return txt;
 +}
 +
++
++/*
++ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
++ */
++
 +static int
 +parse_txt_record_pair (cups_txt_records_t *txt)
 +{
@@ -193,10 +217,11 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +
 +  return 0;
 +}
++
  
  /*
   * 'main()' - Browse for printers.
-@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
+@@ -120,6 +261,13 @@
       char *argv[])			/* I - Command-line arguments */
  {
    const char	*name;			/* Backend name */
@@ -210,7 +235,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
    DNSServiceRef	main_ref,		/* Main service reference */
  		fax_ipp_ref,		/* IPP fax service reference */
  		ipp_ref,		/* IPP service reference */
-@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
+@@ -133,12 +281,11 @@
  		pdl_datastream_ref,	/* AppSocket service reference */
  		printer_ref,		/* LPD service reference */
  		riousbprint_ref;	/* Remote IO service reference */
@@ -228,7 +253,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
    struct sigaction action;		/* Actions for POSIX signals */
  #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
+@@ -198,6 +345,49 @@
    * Browse for different kinds of printers...
    */
  
@@ -243,8 +268,8 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +			     0, avahi_client_callback, NULL, &error);
 +  if (!client)
 +  {
-+    perror ("ERROR: Unable to create avahi client");
-+    return (1);
++    perror ("DEBUG: Unable to create avahi client");
++    return (0);
 +  }
 +
 +  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
@@ -278,7 +303,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
    if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
    {
      perror("ERROR: Unable to create service connection");
-@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
+@@ -258,6 +448,7 @@
    riousbprint_ref = main_ref;
    DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
                     "_riousbprint._tcp", NULL, browse_callback, devices);
@@ -286,7 +311,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
   /*
    * Loop until we are killed...
-@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
+@@ -265,6 +456,9 @@
  
    while (!job_canceled)
    {
@@ -296,7 +321,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
      FD_ZERO(&input);
      FD_SET(fd, &input);
  
-@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
+@@ -284,11 +478,35 @@
      }
      else
      {
@@ -332,15 +357,15 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
        cups_device_t *best;		/* Best matching device */
        char	device_uri[1024];	/* Device URI */
        int	count;			/* Number of queries */
-@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
-                best = NULL, count = 0;
-            device;
- 	   device = (cups_device_t *)cupsArrayNext(devices))
+@@ -302,6 +520,7 @@
+         if (device->sent)
+ 	  sent ++;
+ 
 +#ifdef HAVE_DNSSD
-         if (!device->ref && !device->sent)
- 	{
- 	 /*
-@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
+         if (device->ref)
+ 	  count ++;
+ 
+@@ -333,14 +552,23 @@
  	      count ++;
            }
  	}
@@ -365,30 +390,15 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
            if (!best)
  	    best = device;
-@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
-  * 'browse_callback()' - Browse devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +621,14 @@ browse_callback(
- 
-   get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
+@@ -401,6 +629,7 @@
  }
-+#endif /* HAVE_DNSSD */
  
  
++#ifdef HAVE_DNSSD
  /*
-  * 'browse_local_callback()' - Browse local devices.
+  * 'browse_callback()' - Browse devices.
   */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_local_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +674,7 @@ browse_local_callback(
+@@ -489,6 +718,7 @@
  	  device->fullName);
    device->sent = 1;
  }
@@ -396,25 +406,32 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
  
  /*
-@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
-   exit(CUPS_BACKEND_STOP);
- }
+@@ -569,6 +799,41 @@
  
+ 
+ /*
++ * 'device_type()' - Get DNS-SD type enumeration from string.
++ */
++
 +static int
 +device_type (const char *regtype)
 +{
 +#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp") ||
-+      !strcmp(regtype, "_ipp-tls._tcp"))
++  if (!strcmp(regtype, "_ipp._tcp"))
 +    return (CUPS_DEVICE_IPP);
++  else if (!strcmp(regtype, "_ipps._tcp") ||
++	   !strcmp(regtype, "_ipp-tls._tcp"))
++    return (CUPS_DEVICE_IPPS);
 +  else if (!strcmp(regtype, "_fax-ipp._tcp"))
 +    return (CUPS_DEVICE_FAX_IPP);
 +  else if (!strcmp(regtype, "_printer._tcp"))
 +    return (CUPS_DEVICE_PDL_DATASTREAM);
 +#else
-+  if (!strcmp(regtype, "_ipp._tcp.") ||
-+      !strcmp(regtype, "_ipp-tls._tcp."))
++  if (!strcmp(regtype, "_ipp._tcp."))
 +    return (CUPS_DEVICE_IPP);
++  else if (!strcmp(regtype, "_ipps._tcp.") ||
++	   !strcmp(regtype, "_ipp-tls._tcp."))
++    return (CUPS_DEVICE_IPPS);
 +  else if (!strcmp(regtype, "_fax-ipp._tcp."))
 +    return (CUPS_DEVICE_FAX_IPP);
 +  else if (!strcmp(regtype, "_printer._tcp."))
@@ -426,17 +443,21 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +  return (CUPS_DEVICE_RIOUSBPRINT);
 +}
 +
- 
- /*
++
++/*
   * 'get_device()' - Create or update a device.
-@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
+  */
+ 
+@@ -589,20 +854,7 @@
    */
  
    key.name = (char *)serviceName;
 -
--  if (!strcmp(regtype, "_ipp._tcp.") ||
--      !strcmp(regtype, "_ipp-tls._tcp."))
+-  if (!strcmp(regtype, "_ipp._tcp."))
 -    key.type = CUPS_DEVICE_IPP;
+-  else if (!strcmp(regtype, "_ipps._tcp.") ||
+-	   !strcmp(regtype, "_ipp-tls._tcp."))
+-    key.type = CUPS_DEVICE_IPPS;
 -  else if (!strcmp(regtype, "_fax-ipp._tcp."))
 -    key.type = CUPS_DEVICE_FAX_IPP;
 -  else if (!strcmp(regtype, "_printer._tcp."))
@@ -449,7 +470,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
    for (device = cupsArrayFind(devices, &key);
         device;
-@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
+@@ -622,8 +874,14 @@
          free(device->domain);
  	device->domain = strdup(replyDomain);
  
@@ -464,7 +485,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  	free(device->fullName);
  	device->fullName = strdup(fullName);
        }
-@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
+@@ -643,6 +901,9 @@
    device->domain   = strdup(replyDomain);
    device->type     = key.type;
    device->priority = 50;
@@ -474,7 +495,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
    cupsArrayAdd(devices, device);
  
-@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
+@@ -650,13 +911,20 @@
    * Set the "full name" of this service, which is used for queries...
    */
  
@@ -488,15 +509,14 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
    device->fullName = strdup(fullName);
  
    return (device);
-@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
-  * 'query_callback()' - Process query data.
-  */
+ }
+ 
  
 +#ifdef HAVE_DNSSD
- static void
- query_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +889,7 @@ query_callback(
+ /*
+  * 'query_callback()' - Process query data.
+  */
+@@ -680,7 +948,7 @@
  		*ptr;			/* Pointer into string */
    cups_device_t	dkey,			/* Search key */
  		*device;		/* Device */
@@ -505,13 +525,15 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  
    fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
                    "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +923,212 @@ query_callback(
+@@ -714,94 +982,233 @@
    if ((ptr = strstr(name, "._")) != NULL)
      *ptr = '\0';
  
--  if (strstr(fullName, "_ipp._tcp.") ||
--      strstr(fullName, "_ipp-tls._tcp."))
+-  if (strstr(fullName, "_ipp._tcp."))
 -    dkey.type = CUPS_DEVICE_IPP;
+-  else if (strstr(fullName, "_ipps._tcp.") ||
+-           strstr(fullName, "_ipp-tls._tcp."))
+-    dkey.type = CUPS_DEVICE_IPPS;
 -  else if (strstr(fullName, "_fax-ipp._tcp."))
 -    dkey.type = CUPS_DEVICE_FAX_IPP;
 -  else if (strstr(fullName, "_printer._tcp."))
@@ -528,7 +550,12 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +}
 +#endif /* HAVE_DNSSD */
 +
++
 +#ifdef HAVE_AVAHI
++/*
++ * 'avahi_client_callback()' - Avahi client callback function.
++ */
++
 +static void
 +avahi_client_callback(AvahiClient *client,
 +		      AvahiClientState state,
@@ -545,6 +572,11 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +  }
 +}
 +
++
++/*
++ * 'avahi_query_callback()' - Avahi query callback function.
++ */
++
 +static void
 +avahi_query_callback(AvahiServiceResolver *resolver,
 +		     AvahiIfIndex interface,
@@ -614,6 +646,11 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +  avahi_service_resolver_free (resolver);
 +}
 +
++
++/*
++ * 'avahi_browse_callback()' - Avahi browse callback function.
++ */
++
 +static void
 +avahi_browse_callback(AvahiServiceBrowser *browser,
 +		      AvahiIfIndex interface,
@@ -671,16 +708,21 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 +    }
 +
 +    break;
- 
--  for (device = cupsArrayFind(devices, &dkey);
++
 +  case AVAHI_BROWSER_REMOVE:
 +  case AVAHI_BROWSER_ALL_FOR_NOW:
 +  case AVAHI_BROWSER_CACHE_EXHAUSTED:
 +    break;
-+  }  
++  }
 +}
 +#endif /* HAVE_AVAHI */
 +
+ 
+-  for (device = cupsArrayFind(devices, &dkey);
++/*
++ * 'find_device()' - Find a device from its name and domain.
++ */
++
 +static cups_device_t *
 +find_device (cups_array_t *devices,
 +	     cups_txt_records_t *txt,
@@ -693,10 +735,10 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
         device;
         device = cupsArrayNext(devices))
    {
--    if (strcasecmp(device->name, dkey.name) ||
--        strcasecmp(device->domain, dkey.domain))
-+    if (strcasecmp(device->name, dkey->name) ||
-+        strcasecmp(device->domain, dkey->domain))
+-    if (_cups_strcasecmp(device->name, dkey.name) ||
+-        _cups_strcasecmp(device->domain, dkey.domain))
++    if (_cups_strcasecmp(device->name, dkey->name) ||
++        _cups_strcasecmp(device->domain, dkey->domain))
      {
        device = NULL;
        break;
@@ -745,13 +787,13 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 -	  break;
 -
 -        datanext = data + datalen;
-+	char *key;
-+	char *value;
- 
+-
 -        for (ptr = key; data < datanext && *data != '='; data ++)
 -	  *ptr++ = *data;
 -	*ptr = '\0';
--
++	char *key;
++	char *value;
+ 
 -	if (data < datanext && *data == '=')
 -	{
 -	  data ++;
@@ -759,18 +801,27 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
 -	  if (data < datanext)
 -	    memcpy(value, data, datanext - data);
 -	  value[datanext - data] = '\0';
--	}
--	else
--	  continue;
 +	if (parse_txt_record_pair (txt))
 +	  goto next;
  
+-	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
+-	          key, value);
+-	}
+-	else
+-	{
+-	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
+-	          key);
+-	  continue;
+-	}
+-
+-        if (!_cups_strncasecmp(key, "usb_", 4))
 +	key = txt->key;
 +	value = txt->value;
-         if (!strncasecmp(key, "usb_", 4))
++        if (!strncasecmp(key, "usb_", 4))
  	{
  	 /*
-@@ -805,6 +1183,10 @@ query_callback(
+ 	  * Add USB device ID information...
+@@ -856,6 +1263,10 @@
  	  if (device->type == CUPS_DEVICE_PRINTER)
  	    device->sent = 1;
  	}
@@ -781,7 +832,7 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
        }
  
        if (device->device_id)
-@@ -854,11 +1236,9 @@ query_callback(
+@@ -905,11 +1316,9 @@
      }
    }
  
@@ -794,27 +845,9 @@ diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
  /*
   * 'sigterm_handler()' - Handle termination signals...
   */
-diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in
---- cups-1.4.5/config.h.in.avahi	2010-08-13 06:11:46.000000000 +0200
-+++ cups-1.4.5/config.h.in	2010-11-12 13:13:31.000000000 +0100
-@@ -344,6 +344,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4
---- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi	2009-08-29 00:54:34.000000000 +0200
-+++ cups-1.4.5/config-scripts/cups-dnssd.m4	2010-11-12 13:13:31.000000000 +0100
-@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
+--- a/config-scripts/cups-dnssd.m4
++++ b/config-scripts/cups-dnssd.m4
+@@ -23,6 +23,21 @@
  DNSSDLIBS=""
  DNSSD_BACKEND=""
  
@@ -836,12 +869,38 @@ diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
  		case "$uname" in
-diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
---- cups-1.4.5/cups/http-support.c.avahi	2010-10-02 00:40:38.000000000 +0200
-+++ cups-1.4.5/cups/http-support.c	2010-11-12 13:28:45.000000000 +0100
-@@ -55,6 +55,11 @@
- #  include <dns_sd.h>
- #  include <poll.h>
+--- a/config.h.in
++++ b/config.h.in
+@@ -390,6 +390,13 @@
+ 
+ 
+ /*
++ * Do we have Avahi for DNS Service Discovery?
++ */
++
++#undef HAVE_AVAHI
++
++
++/*
+  * Do we have <sys/ioctl.h>?
+  */
+ 
+--- a/cups/http-support.c
++++ b/cups/http-support.c
+@@ -43,6 +43,10 @@
+  *   http_copy_decode()   - Copy and decode a URI.
+  *   http_copy_encode()   - Copy and encode a URI.
+  *   http_resolve_cb()    - Build a device URI for the given service name.
++ *   avahi_resolve_uri_client_cb()
++ *                        - Avahi client callback for resolving URI.
++ *   avahi_resolve_uri_resolver_cb()
++ *                        - Avahi resolver callback for resolving URI.
+  */
+ 
+ /*
+@@ -60,6 +64,11 @@
+ #    include <sys/select.h>
+ #  endif /* WIN32 */
  #endif /* HAVE_DNSSD */
 +#ifdef HAVE_AVAHI
 +#  include <avahi-client/client.h>
@@ -851,8 +910,8 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
  
  
  /*
-@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
- 					 void *context);
+@@ -127,6 +136,24 @@
+ 					void *context);
  #endif /* HAVE_DNSSD */
  
 +#ifdef HAVE_AVAHI
@@ -876,7 +935,7 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
  
  /*
   * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1351,16 +1374,27 @@ _httpResolveURI(
+@@ -1431,6 +1458,9 @@
  
    if (strstr(hostname, "._tcp"))
    {
@@ -884,15 +943,12 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 +    char		*regtype,	/* Pointer to type in hostname */
 +			*domain;	/* Pointer to domain in hostname */
  #ifdef HAVE_DNSSD
-     DNSServiceRef	ref,		/* DNS-SD master service reference */
- 			domainref,	/* DNS-SD service reference for domain */
- 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0,	/* Send the domain resolve? */
- 			offline = 0;	/* offline-report state set? */
--    char		*regtype,	/* Pointer to type in hostname */
--			*domain;	/* Pointer to domain in hostname */
-     _http_uribuf_t	uribuf;		/* URI buffer */
-     struct pollfd	polldata;	/* Polling data */
+ #  ifdef WIN32
+ #    pragma comment(lib, "dnssd.lib")
+@@ -1449,6 +1479,17 @@
+     fd_set		input_set;	/* Input set for select() */
+     struct timeval	stimeout;	/* Timeout value for select() */
+ #endif /* HAVE_POLL */
 +#else /* HAVE_AVAHI */
 +    AvahiSimplePoll	*simple_poll;
 +    AvahiClient		*client;
@@ -903,24 +959,28 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 +      _http_uribuf_t	uribuf;
 +    } user_data;
 +#endif /* HAVE_DNSSD */
++
  
- 
-     if (logit)
-@@ -1398,8 +1432,13 @@ _httpResolveURI(
+     if (options & _HTTP_RESOLVE_STDERR)
+       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
+@@ -1485,9 +1526,16 @@
      if (domain)
        *domain++ = '\0';
  
 +#ifdef HAVE_DNSSD
-     uribuf.buffer  = resolved_uri;
-     uribuf.bufsize = resolved_size;
+     uribuf.buffer   = resolved_uri;
+     uribuf.bufsize  = resolved_size;
+     uribuf.options  = options;
 +#else
 +    user_data.uribuf.buffer = resolved_uri;
 +    user_data.uribuf.bufsize = resolved_size;
++    user_data.uribuf.options = options;
 +#endif
- 
++
      resolved_uri[0] = '\0';
  
-@@ -1414,6 +1453,7 @@ _httpResolveURI(
+     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
+@@ -1501,6 +1549,7 @@
  
      uri = NULL;
  
@@ -928,7 +988,7 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
      if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
      {
        localref = ref;
-@@ -1500,6 +1540,36 @@ _httpResolveURI(
+@@ -1608,6 +1657,36 @@
  
        DNSServiceRefDeallocate(ref);
      }
@@ -963,9 +1023,9 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 +    }
 +#endif /* HAVE_DNSSD */
  
-     if (logit)
+     if (options & _HTTP_RESOLVE_STDERR)
      {
-@@ -1511,13 +1581,13 @@ _httpResolveURI(
+@@ -1619,13 +1698,13 @@
        fputs("STATE: -connecting-to-device,offline-report\n", stderr);
      }
  
@@ -979,13 +1039,17 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 -#endif /* HAVE_DNSSD */
 +#endif /* HAVE_DNSSD || HAVE_AVAHI */
  
-     if (logit && !uri)
-       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1722,6 +1792,105 @@ resolve_callback(
- }
+     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
+       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
+@@ -1895,6 +1974,116 @@
  #endif /* HAVE_DNSSD */
  
+ 
 +#ifdef HAVE_AVAHI
++/*
++ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
++ */
++
 +static void
 +avahi_resolve_uri_client_cb (AvahiClient *client,
 +			     AvahiClientState state,
@@ -1002,6 +1066,12 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 +    avahi_simple_poll_quit (simple_poll);
 +}
 +
++
++/*
++ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
++ *                                     URI.
++ */
++
 +static void
 +avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
 +			       AvahiIfIndex interface,
@@ -1084,6 +1154,2003 @@ diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
 +}
 +#endif /* HAVE_AVAHI */
 +
++
+ /*
+  * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $".
+  */
+--- a/scheduler/Makefile
++++ b/scheduler/Makefile
+@@ -17,6 +17,7 @@
+ 
+ CUPSDOBJS =	\
+ 		auth.o \
++		avahi.o \
+ 		banners.o \
+ 		cert.o \
+ 		classes.o \
+@@ -39,7 +40,8 @@
+ 		server.o \
+ 		statbuf.o \
+ 		subscriptions.o \
+-		sysman.o
++		sysman.o \
++		timeout.o
+ LIBOBJS =	\
+ 		filter.o \
+ 		mime.o \
+--- /dev/null
++++ b/scheduler/avahi.c
+@@ -0,0 +1,445 @@
++/*
++ * "$Id$"
++ *
++ *   Avahi poll implementation for the CUPS scheduler.
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *    Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   "LICENSE" which should have been included with this file.  If this
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ *
++ * Contents:
++ *
++ *   watch_read_cb         - Read callback for file descriptor
++ *   watch_write_cb        - Write callback for file descriptor
++ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
++ *   watch_new()           - Create a new file descriptor watch
++ *   watch_free()          - Free a file descriptor watch
++ *   watch_update()        - Update watched events for a file descriptor
++ *   watch_get_events()    - Get events that happened for a file descriptor
++ *   timeout_cb()          - Run a timed Avahi callback
++ *   timeout_new()         - Set a wakeup time
++ *   timeout_update()      - Update the expiration time for a timeout
++ *   timeout_free()        - Free a timeout
++ *   compare_watched_fds() - Compare watched file descriptors for array sorting
++ *   compare_timeouts()    - Compare timeouts for array sorting
++ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
++ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
++ *   avahi_cups_poll_get() - Get the abstract poll API structure
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI /* Applies to entire file... */
++
++/*
++ * Include necessary headers...
++ */
++
++#include "cupsd.h"
++
++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
++#  include <malloc.h>
++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
++
++#ifdef HAVE_AVAHI
++#  include <avahi-common/timeval.h>
++#endif /* HAVE_AVAHI */
++
++
++typedef struct
++{
++  AvahiCupsPoll *cups_poll;
++
++  int fd;
++  AvahiWatchEvent occurred;
++  cups_array_t *watches;
++} cupsd_watched_fd_t;
++
++struct AvahiWatch
++{
++  cupsd_watched_fd_t *watched_fd;
++
++  AvahiWatchEvent events;
++  AvahiWatchCallback callback;
++  void *userdata;
++};
++
++struct AvahiTimeout
++{
++  AvahiCupsPoll *cups_poll;
++  AvahiTimeoutCallback callback;
++  void *userdata;
++  cupsd_timeout_t *cupsd_timeout;
++};
++
++/*
++ * Local functions...
++ */
++
++static AvahiWatch *	watch_new(const AvahiPoll *api,
++				  int fd,
++				  AvahiWatchEvent events,
++				  AvahiWatchCallback callback,
++				  void *userdata);
++static void		watch_free(AvahiWatch *watch);
++static void		watch_update(AvahiWatch *watch,
++				     AvahiWatchEvent events);
++static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
++static int		compare_watches(AvahiWatch *p0,
++					AvahiWatch *p1);
++
++
++/*
++ * 'watch_read_cb' - Read callback for file descriptor
++ */
++
++static void
++watch_read_cb (void *userdata)
++{
++  AvahiWatch *watch;
++  cupsd_watched_fd_t *watched_fd = userdata;
++  watched_fd->occurred |= AVAHI_WATCH_IN;
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & watched_fd->occurred) {
++      (watch->callback) (watch, watched_fd->fd,
++			 AVAHI_WATCH_IN, watch->userdata);
++      watched_fd->occurred &= ~AVAHI_WATCH_IN;
++      break;
++    }
++  }
++}
++
++
++/*
++ * 'watch_write_cb' - Write callback for file descriptor
++ */
++
++static void
++watch_write_cb (void *userdata)
++{
++  AvahiWatch *watch;
++  cupsd_watched_fd_t *watched_fd = userdata;
++  watched_fd->occurred |= AVAHI_WATCH_OUT;
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & watched_fd->occurred) {
++      (watch->callback) (watch, watched_fd->fd,
++			 AVAHI_WATCH_OUT, watch->userdata);
++      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
++      break;
++    }
++  }
++}
++
++
++/*
++ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
++ */
++
++static int						/* O - Watches? */
++watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
++{
++  AvahiWatch *watch;
++  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
++
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & (AVAHI_WATCH_IN |
++			     AVAHI_WATCH_ERR |
++			     AVAHI_WATCH_HUP)) {
++      read_cb = (cupsd_selfunc_t)watch_read_cb;
++      if (write_cb != NULL)
++	break;
++    }
++
++    if (watch->events & AVAHI_WATCH_OUT) {
++      write_cb = (cupsd_selfunc_t)watch_write_cb;
++      if (read_cb != NULL)
++	break;
++    }
++  }
++
++  if (read_cb || write_cb)
++    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
++  else
++    cupsdRemoveSelect (watched_fd->fd);
++
++  return (read_cb || write_cb);
++}
++
++/*
++ * 'watch_new' - Create a new file descriptor watch
++ */
++
++static AvahiWatch *
++watch_new (const AvahiPoll *api,
++	   int fd,
++	   AvahiWatchEvent events,
++	   AvahiWatchCallback callback,
++	   void *userdata)
++{
++  cupsd_watched_fd_t key, *watched_fd;
++  AvahiCupsPoll *cups_poll = api->userdata;
++  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
++  if (watch == NULL)
++    return (NULL);
++
++  watch->events = events;
++  watch->callback = callback;
++  watch->userdata = userdata;
++
++  key.fd = fd;
++  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
++  if (watched_fd == NULL) {
++    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
++    if (watched_fd == NULL) {
++      free (watch);
++      return (NULL);
++    }
++
++    watched_fd->fd = fd;
++    watched_fd->occurred = 0;
++    watched_fd->cups_poll = cups_poll;
++    watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
++					NULL);
++  }
++
++  watch->watched_fd = watched_fd;
++  cupsArrayAdd(watched_fd->watches, watch);
++  watched_fd_add_select (watched_fd);
++  return (watch);
++}
++
++
++/*
++ * 'watch_free' - Free a file descriptor watch
++ */
++
++static void
++watch_free (AvahiWatch *watch)
++{
++  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
++  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
++
++  cupsArrayRemove (watched_fd->watches, watch);
++  free (watch);
++
++  if (!watched_fd_add_select (watched_fd)) {
++    /* No more watches */
++    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
++    free (watched_fd);
++  }
++}
++
++
++/*
++ * 'watch_update' - Update watched events for a file descriptor
++ */
++
++static void
++watch_update (AvahiWatch *watch,
++	      AvahiWatchEvent events)
++{
++  watch->events = events;
++  watched_fd_add_select (watch->watched_fd);
++}
++
++
++/*
++ * 'watch_get_events' - Get events that happened for a file descriptor
++ */
++
++static AvahiWatchEvent
++watch_get_events (AvahiWatch *watch)
++{
++  return (watch->watched_fd->occurred);
++}
++
++
++/*
++ * 'compare_watches' - Compare watches for array sorting
++ */
++
++static int
++compare_watches (AvahiWatch *p0,
++		 AvahiWatch *p1)
++{
++  if (p0->watched_fd->fd < p1->watched_fd->fd)
++    return (-1);
++
++  return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
++}
++
++
++/*
++ * 'timeout_cb()' - Run a timed Avahi callback
++ */
++
++static void
++timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
++{
++  AvahiTimeout *timeout = userdata;
++  (timeout->callback) (timeout, timeout->userdata);
++}
++
++
++/*
++ * 'timeout_new' - Set a wakeup time
++ */
++
++static AvahiTimeout *
++timeout_new (const AvahiPoll *api,
++	     const struct timeval *tv,
++	     AvahiTimeoutCallback callback,
++	     void *userdata)
++{
++  AvahiTimeout *timeout;
++  AvahiCupsPoll *cups_poll = api->userdata;
++
++  timeout = malloc(sizeof(AvahiTimeout));
++  if (timeout == NULL)
++    return (NULL);
++
++  timeout->cups_poll = cups_poll;
++  timeout->callback = callback;
++  timeout->userdata = userdata;
++  timeout->cupsd_timeout = cupsdAddTimeout (tv,
++					    (cupsd_timeoutfunc_t)timeout_cb,
++					    timeout);
++  cupsArrayAdd (cups_poll->timeouts, timeout);
++  return (timeout);
++}
++
++
++/*
++ * 'timeout_update' - Update the expiration time for a timeout
++ */
++
++static void
++timeout_update (AvahiTimeout *timeout,
++		const struct timeval *tv)
++{
++  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
++}
++
++
++/*
++ * ' timeout_free' - Free a timeout
++ */
++
++static void
++timeout_free (AvahiTimeout *timeout)
++{
++  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
++  cupsdRemoveTimeout (timeout->cupsd_timeout);
++  free (timeout);
++}
++
++
++/*
++ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
++ */
++static int
++compare_watched_fds(cupsd_watched_fd_t *p0,
++		    cupsd_watched_fd_t *p1)
++{
++  if (p0->fd != p1->fd)
++    return (p0->fd < p1->fd ? -1 : 1);
++
++  if (p0 == p1)
++    return (0);
++
++  return (p0 < p1 ? -1 : 1);
++}
++
++
++/*
++ * 'compare_timeouts' - Compare timeouts for array sorting
++ */
++static int
++compare_timeouts(AvahiTimeout *p0,
++		 AvahiTimeout *p1)
++{
++ /*
++  * Just compare pointers to make it a stable sort.
++  */
++
++  if (p0->cupsd_timeout < p1->cupsd_timeout)
++    return (-1);
++  return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
++}
++
++
++/*
++ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
++ */
++
++AvahiCupsPoll *
++avahi_cups_poll_new (void)
++{
++  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
++  if (cups_poll == NULL)
++    return (NULL);
++
++  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
++					 NULL);
++  cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
++				      NULL);
++
++  cups_poll->api.userdata = cups_poll;
++  cups_poll->api.watch_new = watch_new;
++  cups_poll->api.watch_free = watch_free;
++  cups_poll->api.watch_update = watch_update;
++  cups_poll->api.watch_get_events = watch_get_events;
++
++  cups_poll->api.timeout_new = timeout_new;
++  cups_poll->api.timeout_update = timeout_update;
++  cups_poll->api.timeout_free = timeout_free;
++
++  return (cups_poll);
++}
++
++
++/*
++ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
++ */
++void
++avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
++{
++  cupsd_watched_fd_t *watched_fd;
++
++  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
++       watched_fd;
++       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
++    cupsArrayClear (watched_fd->watches);
++  }
++
++  cupsArrayClear (cups_poll->watched_fds);
++  cupsArrayClear (cups_poll->timeouts);
++}
++
++
++/*
++ * 'avahi_cups_poll_get' - Get the abstract poll API structure
++ */
++
++const AvahiPoll *
++avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
++{
++  return (&cups_poll->api);
++}
++
++
++#endif /* HAVE_AVAHI ... from top of file */
++
++/*
++ * End of "$Id$".
++ */
+--- /dev/null
++++ b/scheduler/avahi.h
+@@ -0,0 +1,49 @@
++/*
++ * "$Id$"
++ *
++ *   Avahi poll implementation for the CUPS scheduler.
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *    Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   which should have been included with this file.  If this file is
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI
++#  include <avahi-client/client.h>
++#  include <avahi-client/publish.h>
++#endif /* HAVE_AVAHI */
++
++#ifdef HAVE_AUTHORIZATION_H
++#  include <Security/Authorization.h>
++#endif /* HAVE_AUTHORIZATION_H */
++
++
++#ifdef HAVE_AVAHI
++typedef struct
++{
++    AvahiPoll api;
++    cups_array_t *watched_fds;
++    cups_array_t *timeouts;
++} AvahiCupsPoll;
++#endif /* HAVE_AVAHI */
++
++/*
++ * Prototypes...
++ */
++
++#ifdef HAVE_AVAHI
++extern AvahiCupsPoll *	avahi_cups_poll_new(void);
++extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
++extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
++#endif /* HAVE_AVAHI */
++
++
++/*
++ * End of "$Id$".
++ */
+--- a/scheduler/cupsd.h
++++ b/scheduler/cupsd.h
+@@ -140,6 +140,15 @@
+ 
+ typedef void (*cupsd_selfunc_t)(void *data);
+ 
++#ifdef HAVE_AVAHI
++/*
++ * Timeout callback function type...
++ */
++
++typedef struct _cupsd_timeout_s cupsd_timeout_t;
++typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
++#endif /* HAVE_AVAHI */
++
+ 
+ /*
+  * Globals...
+@@ -173,6 +182,11 @@
+ 					/* Running from launchd */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_AVAHI
++VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
++#endif /* HAVE_AVAHI */
++
++
+ 
+ /*
+  * Prototypes...
+@@ -242,6 +256,20 @@
+ extern void		cupsdStartServer(void);
+ extern void		cupsdStopServer(void);
+ 
++#ifdef HAVE_AVAHI
++extern void     cupsdInitTimeouts(void);
++extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
++					 cupsd_timeoutfunc_t cb,
++					 void *data);
++extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
++extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
++extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
++				    const struct timeval *tv);
++extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
++#endif /* HAVE_AVAHI */
++
++extern int	cupsdRemoveFile(const char *filename);
++
+ 
+ /*
+  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -122,6 +122,10 @@
+   cupsd_listener_t	*lis;		/* Current listener */
+   time_t		current_time,	/* Current time */
+ 			activity,	/* Client activity timer */
++#ifdef HAVE_AVAHI
++			avahi_client_time, /* Time for next Avahi client
++					      check */
++#endif /* HAVE_AVAHI */
+ 			browse_time,	/* Next browse send time */
+ 			senddoc_time,	/* Send-Document time */
+ 			expire_time,	/* Subscription expire time */
+@@ -148,6 +152,10 @@
+   int			launchd_idle_exit;
+ 					/* Idle exit on select timeout? */
+ #endif	/* HAVE_LAUNCHD */
++#ifdef HAVE_AVAHI
++  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
++  long			tmo_delay;	/* Time before it must be called */
++#endif /* HAVE_AVAHI */
+ 
+ 
+ #ifdef HAVE_GETEUID
+@@ -527,6 +535,14 @@
+ 
+   httpInitialize();
+ 
++#ifdef HAVE_AVAHI
++ /*
++  * Initialize timed callback structures.
++  */
++
++  cupsdInitTimeouts();
++#endif /* HAVE_AVAHI */
++
+   cupsdStartServer();
+ 
+  /*
+@@ -657,6 +673,9 @@
+   */
+ 
+   current_time  = time(NULL);
++#ifdef HAVE_AVAHI
++  avahi_client_time = current_time;
++#endif /* HAVE_AVAHI */
+   browse_time   = current_time;
+   event_time    = current_time;
+   expire_time   = current_time;
+@@ -871,6 +890,26 @@
+     }
+ #endif /* __APPLE__ */
+ 
++#ifdef HAVE_AVAHI
++   /*
++    * If a timed callback is due, run it.
++    */
++
++    tmo = cupsdNextTimeout (&tmo_delay);
++    if (tmo && tmo_delay == 0)
++      cupsdRunTimeout (tmo);
++
++   /*
++    * Try to restart the Avahi client every 10 seconds if needed...
++    */
++
++    if ((current_time - avahi_client_time) >= 10)
++    {
++      avahi_client_time = current_time;
++      cupsdStartAvahiClient();
++    }
++#endif /* HAVE_AVAHI */
++
+ #ifndef __APPLE__
+    /*
+     * Update the network interfaces once a minute...
+@@ -1815,6 +1854,10 @@
+   cupsd_job_t		*job;		/* Job information */
+   cupsd_subscription_t	*sub;		/* Subscription information */
+   const char		*why;		/* Debugging aid */
++#ifdef HAVE_AVAHI
++  cupsd_timeout_t	*tmo;		/* Timed callback */
++  long			tmo_delay;	/* Seconds before calling it */
++#endif /* HAVE_AVAHI */
+ 
+ 
+  /*
+@@ -1857,6 +1900,19 @@
+   }
+ #endif /* __APPLE__ */
+ 
++#ifdef HAVE_AVAHI
++ /*
++  * See if there are any scheduled timed callbacks to run.
++  */
++
++  tmo = cupsdNextTimeout (&tmo_delay);
++  if (tmo)
++  {
++    timeout = tmo_delay;
++    why = "run a timed callback";
++  }
++#endif /* HAVE_AVAHI */
++
+  /*
+   * Check whether we are accepting new connections...
+   */
+--- /dev/null
++++ b/scheduler/timeout.c
+@@ -0,0 +1,195 @@
++/*
++ * "$Id$"
++ *
++ *   Timeout functions for the Common UNIX Printing System (CUPS).
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *     Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   which should have been included with this file.  If this file is
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ *
++ * Contents:
++ *
++ *   cupsdInitTimeouts()  - Initialise timeout structure.
++ *   cupsdAddTimeout()    - Add a timed callback.
++ *   cupsdNextTimeout()   - Find the next enabled timed callback.
++ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
++ *   cupsdRemoveTimeout() - Discard a timed callback.
++ *   compare_timeouts()   - Compare timed callbacks for array sorting.
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI /* Applies to entire file... */
++
++/*
++ * Include necessary headers...
++ */
++
++#include "cupsd.h"
++
++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
++#  include <malloc.h>
++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
++
++#ifdef HAVE_AVAHI
++#  include <avahi-common/timeval.h>
++#endif /* HAVE_AVAHI */
++
++
++struct _cupsd_timeout_s
++{
++  struct timeval when;
++  int enabled;
++  cupsd_timeoutfunc_t callback;
++  void *data;
++};
++
++/*
++ * Local functions...
++ */
++
++/*
++ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
++ */
++
++static int
++compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
++{
++  if (!p0->enabled || !p1->enabled)
++  {
++    if (!p0->enabled && !p1->enabled)
++      return (0);
++
++    return (p0->enabled ? -1 : 1);
++  }
++
++  return (avahi_timeval_compare (&p0->when, &p1->when));
++}
++
++
++/*
++ * 'cupsdInitTimeouts()' - Initialise timeout structures.
++ */
++
++void
++cupsdInitTimeouts(void)
++{
++  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
++}
++
++
++/*
++ * 'cupsdAddTimeout()' - Add a timed callback.
++ */
++
++cupsd_timeout_t *				/* O - Timeout handle */
++cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
++		cupsd_timeoutfunc_t cb,		/* I - Callback function */
++		void *data)			/* I - User data */
++{
++  cupsd_timeout_t *timeout;
++
++  timeout = malloc (sizeof(cupsd_timeout_t));
++  if (timeout != NULL)
++  {
++    timeout->enabled = (tv != NULL);
++    if (tv)
++    {
++      timeout->when.tv_sec = tv->tv_sec;
++      timeout->when.tv_usec = tv->tv_usec;
++    }
++
++    timeout->callback = cb;
++    timeout->data = data;
++    cupsArrayAdd (Timeouts, timeout);
++  }
++
++  return timeout;
++}
++
++
++/*
++ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
++ */
++
++cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
++cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
++{
++  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
++  struct timeval curtime;
++
++  if (first && !first->enabled)
++    first = NULL;
++
++  if (first && delay)
++  {
++    gettimeofday (&curtime, NULL);
++    if (avahi_timeval_compare (&curtime, &first->when) > 0)
++    {
++      *delay = 0;
++    } else {
++      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
++      if (first->when.tv_usec < curtime.tv_usec)
++	(*delay)--;
++    }
++  }
++
++  return (first);
++}
++
++
++/*
++ * 'cupsdRunTimeout()' - Run a timed callback.
++ */
++
++void
++cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
++{
++  if (!timeout)
++    return;
++  timeout->enabled = 0;
++  if (!timeout->callback)
++    return;
++  timeout->callback (timeout, timeout->data);
++}
++
++/*
++ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
++ */
++
++void
++cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
++		   const struct timeval *tv)	/* I - Absolute time or NULL */
++{
++  cupsArrayRemove (Timeouts, timeout);
++  timeout->enabled = (tv != NULL);
++  if (tv)
++  {
++    timeout->when.tv_sec = tv->tv_sec;
++    timeout->when.tv_usec = tv->tv_usec;
++  }
++  cupsArrayAdd (Timeouts, timeout);
++}
++
++
++/*
++ * 'cupsdRemoveTimeout()' - Discard a timed callback.
++ */
++
++void
++cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
++{
++  cupsArrayRemove (Timeouts, timeout);
++  free (timeout);
++}
++
++
++#endif /* HAVE_AVAHI ... from top of file */
++
++/*
++ * End of "$Id$".
++ */
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1643,7 +1643,7 @@
+       else
+ 	local_protocols[0] = '\0';
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
+       {
+ 	if (local_protocols[0])
+@@ -1651,7 +1651,7 @@
+ 	else
+ 	  strcat(local_protocols, "dnssd");
+       }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LDAP
+       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
+@@ -2718,9 +2718,9 @@
+ #endif /* HAVE_GSSAPI */
+   cgiSetVariable("KERBEROS", "");
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cgiSetVariable("HAVE_DNSSD", "1");
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LDAP
+   cgiSetVariable("HAVE_LDAP", "1");
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -4987,7 +4987,7 @@
+ 	    !strncmp(host, "[::1]:", 6));
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  /*
+   * Check if the hostname is something.local (Bonjour); if so, allow it.
+   */
+@@ -4996,7 +4996,7 @@
+       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
+        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
+     return (1);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+  /*
+   * Check if the hostname is an IP address...
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -27,6 +27,7 @@
+  *   ldap_connect()             - Start new LDAP connection
+  *   ldap_reconnect()           - Reconnect to LDAP Server
+  *   ldap_disconnect()          - Disconnect from LDAP Server
++ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
+  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
+  *                                information.
+  *   cupsdStartPolling()        - Start polling servers as needed.
+@@ -45,6 +46,8 @@
+  *                                printer.
+  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
+  *                                record format.
++ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
++ *                                AvahiStringList.
+  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
+  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
+  *                                printer or update the broadcast contents.
+@@ -83,6 +86,7 @@
+  */
+ 
+ #include "cupsd.h"
++#include <assert.h>
+ #include <grp.h>
+ 
+ #ifdef HAVE_DNSSD
+@@ -97,6 +101,17 @@
+ #    endif /* HAVE_SYSTEMCONFIGURATION */
+ #  endif /* __APPLE__ */
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include <avahi-common/domain.h>
++#endif /* HAVE_AVAHI */
++
++
++#ifdef HAVE_DNSSD
++typedef char *cupsd_txt_record_t;
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++typedef AvahiStringList *cupsd_txt_record_t;
++#endif /* HAVE_AVAHI */
+ 
+ 
+ /*
+@@ -159,27 +174,39 @@
+ static void	update_smb(int onoff);
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
++					      int for_lpd);
++static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
++static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
++static void	dnssdRegisterPrinter(cupsd_printer_t *p);
++static void	dnssdStop(void);
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++
+ #ifdef HAVE_DNSSD
+ #  ifdef HAVE_COREFOUNDATION
+ static void	dnssdAddAlias(const void *key, const void *value,
+ 		              void *context);
+ #  endif /* HAVE_COREFOUNDATION */
+-static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
+-		                     int for_lpd);
+-static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
+-static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
+-static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
+-		                    int count);
+ static void	dnssdRegisterCallback(DNSServiceRef sdRef,
+ 		                      DNSServiceFlags flags,
+ 				      DNSServiceErrorType errorCode,
+ 				      const char *name, const char *regtype,
+ 				      const char *domain, void *context);
+-static void	dnssdRegisterPrinter(cupsd_printer_t *p);
+-static void	dnssdStop(void);
+ static void	dnssdUpdate(void);
+ #endif /* HAVE_DNSSD */
+ 
++#ifdef HAVE_AVAHI
++static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
++					   int count);
++static void	avahi_entry_group_cb (AvahiEntryGroup *group,
++				      AvahiEntryGroupState state,
++				      void *userdata);
++static void	avahi_client_cb (AvahiClient *client,
++				 AvahiClientState state,
++				 void *userdata);
++#endif /* HAVE_AVAHI */
++
+ #ifdef HAVE_LDAP
+ static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
+ 		{
+@@ -283,10 +310,10 @@
+     ldap_dereg_printer(p);
+ #endif /* HAVE_LDAP */
+ 
+-#ifdef HAVE_DNSSD
+-  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdDeregisterPrinter(p);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+@@ -702,10 +729,10 @@
+     slpRegisterPrinter(p); */
+ #endif /* HAVE_LIBSLP */
+ 
+-#ifdef HAVE_DNSSD
+-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if ((BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdRegisterPrinter(p);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+@@ -1419,6 +1446,27 @@
+ #endif /* HAVE_LDAP */
+ 
+ 
++#ifdef HAVE_AVAHI
++/*
++ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
++ */
++
++void
++cupsdStartAvahiClient(void)
++{
++  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
++  {
++    if (!AvahiCupsPollHandle)
++      AvahiCupsPollHandle = avahi_cups_poll_new ();
++
++    if (AvahiCupsPollHandle)
++      avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
++			AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);
++  }
++}
++#endif /* HAVE_AVAHI */
++
++  
+ /*
+  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
+  */
+@@ -1542,13 +1590,16 @@
+   else
+     BrowseSocket = -1;
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
+   {
++#ifdef HAVE_DNSSD
+     DNSServiceErrorType error;		/* Error from service creation */
++#endif /* HAVE_DNSSD */
+     cupsd_listener_t	*lis;		/* Current listening socket */
+ 
+ 
++#ifdef HAVE_DNSSD
+    /*
+     * First create a "master" connection for all registrations...
+     */
+@@ -1573,6 +1624,7 @@
+       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+ 
+       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
++#endif /* HAVE_DNSSD */
+ 
+      /*
+       * Then get the port we use for registrations.  If we are not listening
+@@ -1606,9 +1658,16 @@
+       */
+ 
+       cupsdUpdateDNSSDName();
++
++#ifdef HAVE_AVAHI
++      cupsdStartAvahiClient ();
++#endif /* HAVE_AVAHI */
++
++#ifdef HAVE_DNSSD
+     }
+-  }
+ #endif /* HAVE_DNSSD */
++  }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LIBSLP
+   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
+@@ -1834,10 +1893,10 @@
+     BrowseSocket = -1;
+   }
+ 
+-#ifdef HAVE_DNSSD
+-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if ((BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdStop();
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LIBSLP
+   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
+@@ -1902,7 +1961,7 @@
+ }
+ 
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
+  */
+@@ -1910,8 +1969,14 @@
+ void
+ cupsdUpdateDNSSDName(void)
+ {
++#ifdef HAVE_DNSSD
+   DNSServiceErrorType error;		/* Error from service creation */
+   char		webif[1024];		/* Web interface share name */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int		ret;			/* Error from service creation */
++  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
++#endif /* HAVE_AVAHI */
+ #  ifdef HAVE_SYSTEMCONFIGURATION
+   SCDynamicStoreRef sc;			/* Context for dynamic store */
+   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
+@@ -2042,6 +2107,7 @@
+     else
+       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
+ 
++#ifdef HAVE_DNSSD
+     if (WebIFRef)
+       DNSServiceRefDeallocate(WebIFRef);
+ 
+@@ -2054,9 +2120,45 @@
+ 				    NULL)) != kDNSServiceErr_NoError)
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+ 		      "DNS-SD web interface registration failed: %d", error);
++#endif /* HAVE_DNSSD */
++
++#ifdef HAVE_AVAHI
++    if (!AvahiCupsClient)
++     /*
++      * Client not yet running.
++      */
++      return;
++
++    if (AvahiWebIFGroup)
++      avahi_entry_group_reset (AvahiWebIFGroup);
++    else
++      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
++					       avahi_entry_group_cb,
++					       NULL);
++
++    if (AvahiWebIFGroup)
++    {
++      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
++					   AVAHI_IF_UNSPEC,
++					   AVAHI_PROTO_UNSPEC,
++					   0, /* flags */
++					   webif, /* name */
++					   "_http._tcp", /* type */
++					   NULL, /* domain */
++					   NULL, /* host */
++					   DNSSDPort, /* port */
++					   "path=/", NULL);
++      if (ret == 0)
++	ret = avahi_entry_group_commit (AvahiWebIFGroup);
++
++      if (ret != 0)
++	cupsdLogMessage (CUPSD_LOG_ERROR,
++			 "Avahi web interface registration failed: %d", ret);
++    }
++#endif /* HAVE_AVAHI */
+   }
+ }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
+ #ifdef HAVE_LDAP
+@@ -2334,13 +2436,15 @@
+                     "Bad Back to My Mac domain in dynamic store!");
+ }
+ #  endif /* HAVE_COREFOUNDATION */
++#endif /* HAVE_DNSSD */
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
+  */
+ 
+-static char *				/* O - TXT record */
++static cupsd_txt_record_t		/* O - TXT record */
+ dnssdBuildTxtRecord(
+     int             *txt_len,		/* O - TXT record length */
+     cupsd_printer_t *p,			/* I - Printer information */
+@@ -2379,7 +2483,12 @@
+   keyvalue[i  ][0] = "ty";
+   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
+ 
+-  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
++  snprintf(admin_hostname, sizeof(admin_hostname),
++	   "%s.local"
++#ifdef HAVE_DNSSD
++	   "." /* terminating dot no good for Avahi */
++#endif /* HAVE_DNSSD */
++	   , DNSSDHostName);
+   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
+                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
+ 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
+@@ -2462,7 +2571,12 @@
+   * Then pack them into a proper txt record...
+   */
+ 
++#ifdef HAVE_DNSSD
+   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  return (avahiPackTxtRecord(keyvalue, i));
++#endif /* HAVE_AVAHI */
+ }
+ 
+ 
+@@ -2474,7 +2588,16 @@
+ dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
+                      cupsd_printer_t *b)/* I - Second printer */
+ {
+-  return (_cups_strcasecmp(a->reg_name, b->reg_name));
++  if (!a->reg_name)
++    if (!b->reg_name)
++      return 0;
++    else
++      return -1;
++  else
++    if (!b->reg_name)
++      return 1;
++    else
++      return (_cups_strcasecmp(a->reg_name, b->reg_name));
+ }
+ 
+ 
+@@ -2489,6 +2612,10 @@
+ {
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++
+  /*
+   * Closing the socket deregisters the service
+   */
+@@ -2524,6 +2651,24 @@
+     free(p->printer_txt);
+     p->printer_txt = NULL;
+   }
++#endif /* HAVE_DNSSD */
++
++#ifdef HAVE_AVAHI
++  if (p->avahi_group)
++    {
++      avahi_entry_group_reset (p->avahi_group);
++      avahi_entry_group_free (p->avahi_group);
++      p->avahi_group = NULL;
++
++      if (p->ipp_txt)
++	avahi_string_list_free (p->ipp_txt);
++
++      if (p->printer_txt)
++	avahi_string_list_free (p->printer_txt);
++
++      p->ipp_txt = p->printer_txt = NULL;
++    }
++#endif /* HAVE_AVAHI */
+ 
+  /*
+   * Remove the printer from the array of DNS-SD printers, then clear the
+@@ -2533,8 +2678,10 @@
+   cupsArrayRemove(DNSSDPrinters, p);
+   cupsdClearString(&p->reg_name);
+ }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
+  *                          TXT record format.
+@@ -2644,8 +2791,10 @@
+     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
+   }
+ }
++#endif /* HAVE_DNSSD */
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
+  *		              or update the broadcast contents.
+@@ -2654,20 +2803,40 @@
+ static void
+ dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
+ {
++#ifdef HAVE_DNSSD
+   DNSServiceErrorType	se;		/* dnssd errors */
+   char			*ipp_txt,	/* IPP TXT record buffer */
+ 			*printer_txt,	/* LPD TXT record buffer */
+-			name[1024],	/* Service name */
+-			*nameptr;	/* Pointer into name */
++			name[1024];	/* Service name */
+   int			ipp_len,	/* IPP TXT record length */
+ 			printer_len,	/* LPD TXT record length */
+ 			printer_port;	/* LPD port number */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int			ret;		/* Error code */
++  AvahiStringList	*ipp_txt,	/* IPP TXT record */
++			*printer_txt;	/* LPD TXT record */
++  char			name[AVAHI_LABEL_MAX],	/* Service name */
++			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
++  char			*regtype_copy,	/* Writeable copy of reg type */
++			*subtype,	/* Current service sub type */
++			*nextsubtype;	/* Next service sub type */
++#endif /* HAVE_AVAHI */
++  char			*nameptr;	/* Pointer into name */
+   const char		*regtype;	/* Registration type */
+ 
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
+                   !p->ipp_ref ? "new" : "update");
+-
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
++		  !p->avahi_group ? "new" : "update");
++#endif /* HAVE_AVAHI */
+  /*
+   * If per-printer sharing was just disabled make sure we're not
+   * registered before returning.
+@@ -2686,12 +2855,36 @@
+   if (p->info && strlen(p->info) > 0)
+   {
+     if (DNSSDComputerName)
+-      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
++    {
++     /*
++      * Make sure there is room for at least 15 characters of
++      * DNSSDComputerName.
++      */
++
++      assert(sizeof(name) >= 15 + 4);
++      nameptr = name + strlcpy(name, p->info,
++			       sizeof(name) - 4 -
++			       strnlen(DNSSDComputerName, 15));
++      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
++      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
++    }
+     else
+       strlcpy(name, p->info, sizeof(name));
+   }
+   else if (DNSSDComputerName)
+-    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
++  {
++   /*
++    * Make sure there is room for at least 15 characters of
++    * DNSSDComputerName.
++    */
++
++    assert(sizeof(name) >= 15 + 4);
++    nameptr = name + strlcpy(name, p->info,
++			     sizeof(name) - 4 -
++			     strnlen(DNSSDComputerName, 15));
++    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
++    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
++  }
+   else
+     strlcpy(name, p->name, sizeof(name));
+ 
+@@ -2712,6 +2905,7 @@
+   * Register IPP and (optionally) LPD...
+   */
+ 
++#ifdef HAVE_DNSSD
+   ipp_len = 0;				/* anti-compiler-warning-code */
+   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
+ 
+@@ -2884,6 +3078,209 @@
+ 
+   if (printer_txt)
+     free(printer_txt);
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  if (!AvahiCupsClient)
++   /*
++    * Client not running yet.  The client callback will call us again later.
++    */
++    return;
++
++  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
++  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
++  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
++
++  if (p->avahi_group && p->ipp_txt && ipp_txt &&
++      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
++  {
++   /*
++    * Update the existing registration...
++    */
++
++    avahi_string_list_free (p->ipp_txt);
++
++    if (p->printer_txt)
++      avahi_string_list_free (p->printer_txt);
++
++   /*
++    * Update the service group entry.
++    */
++
++    regtype_copy = strdup (regtype);
++    subtype = strchr (regtype_copy, ',');
++    if (subtype)
++      *subtype = '\0';
++
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Updating TXT record for %s (%s)", name, regtype_copy);
++    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
++						       AVAHI_IF_UNSPEC,
++						       AVAHI_PROTO_UNSPEC,
++						       0, name,
++						       regtype_copy,
++						       NULL, ipp_txt);
++    free (regtype_copy);
++
++    if (ret < 0)
++      goto update_failed;
++
++    p->ipp_txt = ipp_txt;
++    ipp_txt = NULL;
++
++    if (BrowseLocalProtocols & BROWSE_LPD)
++    {
++      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
++							 AVAHI_IF_UNSPEC,
++							 AVAHI_PROTO_UNSPEC,
++							 0, name,
++							 "_printer._tcp", NULL,
++							 printer_txt);
++      if (ret < 0)
++	goto update_failed;
++
++      p->printer_txt = printer_txt;
++      printer_txt = NULL;
++    }
++
++    ret = avahi_entry_group_commit (p->avahi_group);
++    if (ret < 0)
++    {
++    update_failed:
++      cupsdLogMessage (CUPSD_LOG_ERROR,
++		       "Failed to update TXT record for %s: %d",
++		       name, ret);
++      avahi_entry_group_reset (p->avahi_group);
++      avahi_entry_group_free (p->avahi_group);
++      p->avahi_group = NULL;
++      ipp_txt = p->ipp_txt;
++      p->ipp_txt = NULL;
++    }
++  }
++
++  if (!p->avahi_group)
++  {
++   /*
++    * Initial registration.  Use the _fax subtype for fax queues...
++    */
++
++    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
++					    avahi_entry_group_cb,
++					    p);
++
++    cupsdLogMessage(CUPSD_LOG_DEBUG,
++		    "Registering Avahi printer %s with name \"%s\" and "
++		    "type \"%s\"", p->name, name, regtype);
++
++    if (!p->avahi_group)
++    {
++      ret = 0;
++      goto add_failed;
++    }
++
++   /*
++    * Add each service type (DNSSDRegType may contain several,
++    * separated by commas).
++    */
++
++    subtype = regtype_copy = strdup (regtype);
++    while (subtype && *subtype)
++    {
++      nextsubtype = strchr (subtype, ',');
++      if (nextsubtype)
++	*nextsubtype++ = '\0';
++
++      if (subtype == regtype_copy)
++      {
++       /*
++	* Main type entry.
++	*/
++
++	cupsdLogMessage (CUPSD_LOG_DEBUG,
++			 "Adding TXT record for %s (%s)", name, regtype_copy);
++	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
++						    AVAHI_IF_UNSPEC,
++						    AVAHI_PROTO_UNSPEC,
++						    0, name, regtype_copy,
++						    NULL, NULL,
++						    DNSSDPort,
++						    ipp_txt);
++      }
++      else
++      {
++       /*
++	* Sub-type entry.
++	*/
++
++	snprintf (fullsubtype, sizeof(fullsubtype),
++		  "%s._sub.%s", subtype, regtype_copy);
++	cupsdLogMessage (CUPSD_LOG_DEBUG,
++			 "Adding TXT record for %s (%s)", name, fullsubtype);
++	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
++						     AVAHI_IF_UNSPEC,
++						     AVAHI_PROTO_UNSPEC,
++						     0, name,
++						     regtype_copy,
++						     NULL, fullsubtype);
++      }
++
++      if (ret < 0)
++      {
++	free (regtype_copy);
++	goto add_failed;
++      }
++
++      subtype = nextsubtype;
++    }
++
++    free (regtype_copy);
++    p->ipp_txt = ipp_txt;
++    ipp_txt = NULL;
++
++    if (BrowseLocalProtocols & BROWSE_LPD)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++		      "Registering Avahi printer %s with name \"%s\" and "
++		      "type \"_printer._tcp\"", p->name, name);
++
++      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
++						  AVAHI_IF_UNSPEC,
++						  AVAHI_PROTO_UNSPEC,
++						  0, name,
++						  "_printer._tcp", NULL, NULL,
++						  515,
++						  printer_txt);
++      if (ret < 0)
++	goto add_failed;
++
++      p->printer_txt = printer_txt;
++      printer_txt = NULL;
++    }
++
++    ret = avahi_entry_group_commit (p->avahi_group);
++
++    if (ret < 0)
++    {
++    add_failed:
++      cupsdLogMessage (CUPSD_LOG_ERROR,
++		       "Failed to add Avahi entry for %s: %d",
++		       name, ret);
++      if (p->avahi_group)
++      {
++	avahi_entry_group_reset (p->avahi_group);
++	avahi_entry_group_free (p->avahi_group);
++	p->avahi_group = NULL;
++      }
++      ipp_txt = p->ipp_txt;
++      p->ipp_txt = NULL;
++    }
++  }
++
++  if (ipp_txt)
++    avahi_string_list_free (ipp_txt);
++
++  if (printer_txt)
++    avahi_string_list_free (printer_txt);
++#endif /* HAVE_AVAHI */
+ }
+ 
+ 
+@@ -2896,6 +3293,10 @@
+ {
+   cupsd_printer_t	*p;		/* Current printer */
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++#endif /* HAVE_DNSSD */
+ 
+  /*
+   * De-register the individual printers
+@@ -2906,6 +3307,7 @@
+        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+     dnssdDeregisterPrinter(p);
+ 
++#ifdef HAVE_DNSSD
+  /*
+   * Shutdown the rest of the service refs...
+   */
+@@ -2926,14 +3328,17 @@
+ 
+   DNSServiceRefDeallocate(DNSSDRef);
+   DNSSDRef = NULL;
++#endif /* HAVE_DNSSD */
+ 
+   cupsArrayDelete(DNSSDPrinters);
+   DNSSDPrinters = NULL;
+ 
+   DNSSDPort = 0;
+ }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'dnssdUpdate()' - Handle DNS-SD queries.
+  */
+@@ -2955,6 +3360,147 @@
+ #endif /* HAVE_DNSSD */
+ 
+ 
++#ifdef HAVE_AVAHI
++/*
++ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
++ *                          AvahiStringList.
++ */
++
++static AvahiStringList *		/* O - new string list */
++avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
++		   int count)		/* I - Number of items in table */
++{
++  AvahiStringList *strlst = NULL;
++  char **elements;
++  size_t len;
++  int i = 0;
++
++  elements = malloc ((1 + count) * sizeof (char *));
++  if (!elements)
++    goto cleanup;
++
++  for (i = 0; i < count; i++)
++    {
++      len = (1 + strlen (keyvalue[i][0]) +
++	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
++      elements[i] = malloc (len * sizeof (char));
++      if (!elements[i])
++	goto cleanup;
++
++      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
++    }
++
++  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
++
++cleanup:
++  while (--i >= 0)
++    free (elements[i]);
++
++  free (elements);
++  return (strlst);
++}
++
++
++/*
++ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
++ */
++static void
++avahi_entry_group_cb (AvahiEntryGroup *group,
++		      AvahiEntryGroupState state,
++		      void *userdata)
++{
++  char *name;
++
++  if (userdata)
++    name = ((cupsd_printer_t *) userdata)->reg_name;
++  else
++    name = "CUPS web interface";
++
++  switch (state)
++  {
++  case AVAHI_ENTRY_GROUP_UNCOMMITED:
++  case AVAHI_ENTRY_GROUP_REGISTERING:
++    break;
++
++  case AVAHI_ENTRY_GROUP_ESTABLISHED:
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Avahi entry group established for %s", name);
++    break;
++
++  default:
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Avahi entry group %s has state %d",
++		     name, state);
++    break;
++  }
++}
++
++
++/*
++ * 'avahi_client_cb()' - Avahi client callback function.
++ */
++static void
++avahi_client_cb (AvahiClient *client,
++		 AvahiClientState state,
++		 void *userdata)
++{
++  cupsd_printer_t *printer;
++  switch (state)
++  {
++  case AVAHI_CLIENT_S_RUNNING:
++   /*
++    * Avahi client started successfully.
++    */
++    AvahiCupsClient = client;
++    AvahiCupsClientConnecting = 0;
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
++
++    cupsdUpdateDNSSDName ();
++
++    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
++	 printer;
++	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
++      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
++	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
++			      CUPS_PRINTER_SCANNER))) && printer->shared)
++	dnssdRegisterPrinter (printer);
++
++    break;
++
++  case AVAHI_CLIENT_CONNECTING:
++   /*
++    * No Avahi daemon, client is waiting.
++    */
++    AvahiCupsClientConnecting = 1;
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
++    break;
++
++  case AVAHI_CLIENT_FAILURE:
++   /*
++    * Avahi client failed, close it to allow a clean restart.
++    */
++    cupsdLogMessage (CUPSD_LOG_ERROR,
++		     "Avahi client failed, "
++		     "closing client to allow a clean restart");
++
++    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
++	 printer;
++	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
++      dnssdDeregisterPrinter (printer);
++
++    avahi_client_free(client);
++    AvahiCupsClientConnecting = 0;
++    AvahiCupsClient = NULL;
++
++    break;
++
++  default:
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
++  }
++}
++#endif /* HAVE_AVAHI */
++
++
+ /*
+  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
+  */
+--- a/scheduler/dirsvc.h
++++ b/scheduler/dirsvc.h
+@@ -31,6 +31,10 @@
+ #  endif /* HAVE_LDAP_SSL_H */
+ #endif /* HAVE_LDAP */
  
++#ifdef HAVE_AVAHI
++#  include <avahi-client/publish.h>
++#endif /* HAVE_AVAHI */
++
  /*
-  * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $".
+  * Browse protocols...
+  */
+@@ -131,19 +135,22 @@
+ VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
+ 					/* Status buffer for pollers */
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ VAR char		*DNSSDComputerName VALUE(NULL),
+ 					/* Computer/server name */
+ 			*DNSSDHostName	VALUE(NULL),
+ 					/* Hostname */
+ 			*DNSSDRegType VALUE(NULL);
+ 					/* Bonjour registration type */
+-VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
+-					/* List of dynamic ServerAlias's */
+ VAR int			DNSSDPort	VALUE(0);
+ 					/* Port number to register */
+ VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
+ 					/* Printers we have registered */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++
++#ifdef HAVE_DNSSD
++VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
++					/* List of dynamic ServerAlias's */
+ VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
+ 					/* Master DNS-SD service reference */
+ 			WebIFRef	VALUE(NULL),
+@@ -152,6 +159,17 @@
+ 					/* Remote printer browse reference */
+ #endif /* HAVE_DNSSD */
+ 
++#ifdef HAVE_AVAHI
++VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
++					/* AvahiCupsPoll object */
++VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
++					/* AvahiClient object */
++VAR int			AvahiCupsClientConnecting	VALUE(0);
++					/* Is AvahiClient object connecting? */
++VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
++					/* Web interface entry group */
++#endif /* HAVE_AVAHI */
++
+ #ifdef HAVE_LIBSLP
+ VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
+ 					/* SLP API handle */
+@@ -195,13 +213,14 @@
+ extern void	cupsdRestartPolling(void);
+ extern void	cupsdSaveRemoteCache(void);
+ extern void	cupsdSendBrowseList(void);
++extern void	cupsdStartAvahiClient(void);
+ extern void	cupsdStartBrowsing(void);
+ extern void	cupsdStartPolling(void);
+ extern void	cupsdStopBrowsing(void);
+ extern void	cupsdStopPolling(void);
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ extern void	cupsdUpdateDNSSDName(void);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ #ifdef HAVE_LDAP
+ extern void	cupsdUpdateLDAPBrowse(void);
+ #endif /* HAVE_LDAP */
+--- a/scheduler/ipp.c
++++ b/scheduler/ipp.c
+@@ -6087,7 +6087,7 @@
+     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+                ippTimeToDate(curtime));
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
+   {
+     if (printer->reg_name)
+@@ -6097,7 +6097,7 @@
+       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
+                    "printer-dns-sd-name", 0);
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
+     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -883,9 +883,9 @@
+   cupsdClearString(&p->alert);
+   cupsdClearString(&p->alert_description);
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cupsdClearString(&p->pdl);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+   cupsArrayDelete(p->filetypes);
+ 
+@@ -3765,7 +3765,7 @@
+     attr->values[i].string.text = _cupsStrAlloc(mimetype);
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   {
+     char		pdl[1024];	/* Buffer to build pdl list */
+     mime_filter_t	*filter;	/* MIME filter looping var */
+@@ -3821,7 +3821,7 @@
+ 
+     cupsdSetString(&p->pdl, pdl);
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+--- a/scheduler/printers.h
++++ b/scheduler/printers.h
+@@ -16,6 +16,9 @@
+ #ifdef HAVE_DNSSD
+ #  include <dns_sd.h>
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include "avahi.h"
++#endif /* HAVE_AVAHI */
+ #include <cups/pwg-private.h>
+ 
+ 
+@@ -95,16 +98,23 @@
+   time_t	marker_time;		/* Last time marker attributes were updated */
+   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   char		*reg_name,		/* Name used for service registration */
+-		*pdl,			/* pdl value for TXT record */
+-		*ipp_txt,		/* IPP TXT record contents */
++		*pdl;			/* pdl value for TXT record */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++#ifdef HAVE_DNSSD
++  char		*ipp_txt,		/* IPP TXT record contents */
+ 		*printer_txt;		/* LPD TXT record contents */
+   int		ipp_len,		/* IPP TXT record length */
+ 		printer_len;		/* LPD TXT record length */
+   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
+ 		printer_ref;		/* Reference for _printer._tcp */
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  AvahiStringList *ipp_txt,		/* IPP TXT record */
++		*printer_txt;		/* LPD TXT record */
++  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
++#endif /* HAVE_AVAHI */
+ };
+ 
+ 
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -650,7 +650,7 @@
+   Browsing                 = CUPS_DEFAULT_BROWSING;
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
+ #endif /* HAVE_DNSSD */
+ 
diff --git a/extra/cups/cups-no-gcrypt.patch b/extra/cups/cups-no-gcrypt.patch
index 203b4f4ac..42f71d0d4 100644
--- a/extra/cups/cups-no-gcrypt.patch
+++ b/extra/cups/cups-no-gcrypt.patch
@@ -1,17 +1,17 @@
 diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.4.7.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.4.7/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
-@@ -74,7 +74,6 @@
+--- cups-1.5.0.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
++++ cups-1.5.0/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
+@@ -96,7 +96,6 @@
      dnl Then look for GNU TLS...
      if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
      	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
 -    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
  	if $PKGCONFIG --exists gnutls; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
-@@ -96,16 +95,6 @@
- 	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
+ 	    have_ssl=1
+ 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
+@@ -110,16 +109,6 @@
+ 	    AC_DEFINE(HAVE_SSL)
+ 	    AC_DEFINE(HAVE_GNUTLS)
  	fi
 -
 -	if test $have_ssl = 1; then
@@ -26,14 +26,13 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/
      fi
  
      dnl Check for the OpenSSL library last...
-diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h
---- cups-1.4.7.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.4.7/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
-@@ -98,7 +98,6 @@
-  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
-  */
+--- cups-1.5.0.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
++++ cups-1.5.0/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
+@@ -93,7 +93,6 @@
+ #  elif defined HAVE_GNUTLS
  #    include <gnutls/gnutls.h>
+ #    include <gnutls/x509.h>
 -#    include <gcrypt.h>
- 
- typedef struct
- {
+ #  elif defined(HAVE_CDSASSL)
+ #    include <CoreFoundation/CoreFoundation.h>
+ #    include <Security/Security.h>
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index f6224fa17..388d61455 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,40 +1,43 @@
-# $Id: PKGBUILD 111081 2011-02-23 22:48:06Z paul $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 136349 2011-08-27 02:25:00Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.57
+pkgver=2.58
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('glibc' 'bash')
+depends=('glibc' 'bash' 'dbus-core')
 makedepends=('libcap>=2.16')
 backup=('etc/dnsmasq.conf')
 install=
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 
         'rc.dnsmasq')
-md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495')
+md5sums=('14c5c81debb324adc261db971730f4c6'
+         'e956eee1ec24212a3254d2b168187495')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Build
-  make || return 1
+  # link against dbus
+  echo '#define HAVE_DBUS' >> src/config.h
 
-  # Install
-  install -d $pkgdir/etc/rc.d || return 1
-  make PREFIX=/usr DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -D -m755 \
-    $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1
-  install -D -m644 \
-    dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1
+  make PREFIX=/usr DESTDIR="$pkgdir" install
 
-  # Make the Required Directories for DHCP Server Default Directories
-  install -d $pkgdir/var/db || return 1
-  install -d $pkgdir/var/lib/misc || return 1
+  install -dm755 "$pkgdir"/var/{db,lib/misc}
+  install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
+  install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
+  install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+  install -Dm644 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
 }
 
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 9bde92e18..7658f0311 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 135549 2011-08-15 05:01:28Z andyrtr $
+# $Id: PKGBUILD 136453 2011-08-29 14:56:34Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.0.13
-pkgrel=3
+pkgver=2.0.14
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
@@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('fd8a0702275a61332db7353dadff0f92'
+md5sums=('92a10a6ca341921db9e35c6753e8de0b'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 0b64ad9d0..38c885149 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 135533 2011-08-15 02:13:14Z dan $
+# $Id: PKGBUILD 136084 2011-08-22 14:13:59Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.7.5
+pkgver=1.7.5.1
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
-makedepends=('flex' 'texlive-core' 'ghostscript' 'texlive-latexextra') #'qt' 
+makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('40912d0a4b8248d78df6f705837dcd80')
-sha1sums=('406c261950b73037d91a2dce0799693a42d96051')
+md5sums=('f5355c442c5bc2481dbef7fdea8f0556')
+sha1sums=('15671defd1eefe255aa564b6f3097e30ab07ff55')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/eject/eject-2.1.5-handle-spaces.patch b/extra/eject/eject-2.1.5-handle-spaces.patch
deleted file mode 100644
index 692368fa5..000000000
--- a/extra/eject/eject-2.1.5-handle-spaces.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-http://bugs.gentoo.org/151257
-
---- eject.c
-+++ eject.c
-@@ -370,6 +370,30 @@ static int FileExists(const char *name, 
- 
- 
- /*
-+ * Linux mangles spaces in mount points by changing them to an octal string
-+ * of '\040'.  So lets scan the mount point and fix it up by replacing all
-+ * occurrences off '\0##' with the ASCII value of 0##.  Requires a writable
-+ * string as input as we mangle in place.  Some of this was taken from the
-+ * util-linux package.
-+ */
-+#define octalify(a) ((a) & 7)
-+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3]))
-+#define isoctal(a) (((a) & ~7) == '0')
-+static char *DeMangleMount(char *s)
-+{
-+	char *tmp = s;
-+	while ((tmp = strchr(tmp, '\\')) != NULL) {
-+		if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) {
-+			tmp[0] = tooctal(tmp);
-+			memmove(tmp+1, tmp+4, strlen(tmp)-3);
-+		}
-+		++tmp;
-+	}
-+	return s;
-+}
-+
-+
-+/*
-  * Given name, such as foo, see if any of the following exist:
-  *
-  * foo (if foo starts with '.' or '/')
-@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam
- 			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
- 				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
- 				FCLOSE(fp);
--				*deviceName = strdup(s1);
--				*mountName = strdup(s2);
-+				*deviceName = DeMangleMount(strdup(s1));
-+				*mountName = DeMangleMount(strdup(s2));
- 				return 1;
- 			}
- 		}
-@@ -928,8 +952,8 @@ static int MountableDevice(const char *n
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
- 			FCLOSE(fp);
--			*deviceName = strdup(s1);
--			*mountName = strdup(s2);
-+			*deviceName = DeMangleMount(strdup(s1));
-+			*mountName = DeMangleMount(strdup(s2));
- 			return 1;
- 		}
- 	}
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 71e2f1d5a..eea93da40 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $
+# $Id: PKGBUILD 136102 2011-08-23 01:57:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.3.2
+pkgrel=1
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -15,15 +15,11 @@ optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        fix-generation-po.patch)
-sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06'
-            'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-generation-po.patch"
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-install \
       --disable-scrollkeeper --enable-dbus
diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch
deleted file mode 100644
index ebec28433..000000000
--- a/extra/ekiga/fix-generation-po.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Tue, 19 Jul 2011 08:15:52 +0000
-Subject: Fix generation of po translation files
-
-Bug introduced by commit 2bfaf29.
----
-diff --git a/configure.ac b/configure.ac
-index 63d8685..eefae22 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes")
- dnl #########################################################################
- dnl  Support for internationalization
- dnl ########################################################################
--AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix])
-+GETTEXT_PACKAGE=AC_PACKAGE_NAME
-+AC_SUBST(GETTEXT_PACKAGE)  # needed by gettext in po directory
-+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
- AM_GLIB_GNU_GETTEXT
- 
- 
---
-cgit v0.9
diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD
index 3e1194b3e..e3a78dd72 100644
--- a/extra/emelfm2/PKGBUILD
+++ b/extra/emelfm2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109827 2011-02-13 03:40:47Z kevin $
+# $Id: PKGBUILD 136106 2011-08-23 02:10:25Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: contrasutra
 
 pkgname=emelfm2
-pkgver=0.7.5
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A file manager that implements the popular two-pane design"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +11,7 @@ url="http://emelfm2.net/"
 depends=('gtk2')
 license=('GPL')
 source=(http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f2167b0a595a2d3964b0cde2c5a6305c')
+md5sums=('8490d501e19009860f53ac6a98db74c1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/evilwm/evilwm.desktop b/extra/evilwm/evilwm.desktop
deleted file mode 100644
index e12f6ca43..000000000
--- a/extra/evilwm/evilwm.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Evilwm
-Comment=The evilwm window manager
-Exec=evilwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 023b2ff4e..f99930536 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129456 2011-06-28 01:27:57Z stephane $
+# $Id: PKGBUILD 136661 2011-08-31 11:49:46Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.0.2.1
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
@@ -11,8 +11,8 @@ makedepends=('intltool' 'gperf' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('c23cfb53cc6224fd61339b1d4bf8bde869149c808cf31c29529c0f2dd364c033')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 85f5189c5..420fdd61a 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129506 2011-06-28 14:23:10Z stephane $
+# $Id: PKGBUILD 136701 2011-08-31 14:58:18Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,8 +12,8 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('45740017f509f45cc2eba525022da8828017ad98737179b450d3177b469b30d7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 557c4b855..355f957de 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $
+# $Id: PKGBUILD 136676 2011-08-31 12:39:09Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('37fadcd459b74960fccf805f627ff869e315367690af8809ce956ec7e23294f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD
deleted file mode 100644
index 4f2560625..000000000
--- a/extra/fam/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 136014 2011-08-21 14:26:17Z eric $
-# Maintainer:
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=fam
-pkgver=2.7.0
-pkgrel=16
-pkgdesc="File Alteration Monitor"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL' 'GPL')
-depends=('rpcbind' 'gcc-libs' 'bash')
-url="http://oss.sgi.com/projects/fam/"
-backup=('etc/fam/fam.conf')
-options=('!makeflags' 'libtool')
-source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
-	fam-2.7.0-dnotify.patch
-	fam-2.7.0-largefiles.patch
-	fam-2.7.0-limits.patch
-	fam-2.7.0-buildfixes.patch
-	fam)
-md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39'
-         '073d1763318344635ea316293390205c'
-         '47b41e0b0498793af004696a096d7da1'
-         '2638b8ffacb9f03b6e438e08ea7b290a'
-         'fc0cabc0ac4f819680401eb3090c29c9'
-         'ec50139679bc31508a843cafa47cd298')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch
-  patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch
-  patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch
-  patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch
-
-  chmod 755 configure
-
-  autoheader
-  aclocal
-  automake -a -c
-  autoconf
-  libtoolize --copy --force
-
-  ./configure --build=$CHOST --prefix=/usr --sysconfdir=/etc/fam
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam
-}
diff --git a/extra/fam/fam b/extra/fam/fam
deleted file mode 100755
index 69a049730..000000000
--- a/extra/fam/fam
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/famd`
-case "$1" in
-  start)
-    stat_busy "Starting File Alteration Monitor"
-    if ck_daemon rpcbind; then
-      echo "ERROR: Refusing to start fam without rpcbind running!" >&2
-      stat_die
-    fi
-    if [ -z "$PID" ]; then
-       /usr/sbin/famd -T 0 -c /etc/fam/fam.conf
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fam
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping File Alteration Monitor"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fam
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/fam/fam-2.7.0-buildfixes.patch b/extra/fam/fam-2.7.0-buildfixes.patch
deleted file mode 100644
index abc78883d..000000000
--- a/extra/fam/fam-2.7.0-buildfixes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur fam-2.7.0-old/include/BTree.h fam-2.7.0/include/BTree.h
---- fam-2.7.0-old/include/BTree.h	2003-01-20 14:22:30.000000000 +1000
-+++ fam-2.7.0/include/BTree.h	2009-06-14 21:21:41.000000000 +1000
-@@ -24,6 +24,7 @@
- #define BTree_included
- 
- #include "Boolean.h"
-+#include <cstdlib>
- 
- //  This is an in-core B-Tree implementation.
- //
-diff -Naur fam-2.7.0-old/lib/Client.c++ fam-2.7.0/lib/Client.c++
---- fam-2.7.0-old/lib/Client.c++	2003-01-19 00:18:12.000000000 +1000
-+++ fam-2.7.0/lib/Client.c++	2009-06-14 21:22:33.000000000 +1000
-@@ -34,7 +34,7 @@
- #include <syslog.h>
- #include <errno.h>
- 
--#include <iostream.h>
-+#include <iostream>
- 
- #include "fam.h"
- #include "Client.h"
-diff -Naur fam-2.7.0-old/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
---- fam-2.7.0-old/src/DNotify.c++	2009-06-14 21:14:34.000000000 +1000
-+++ fam-2.7.0/src/DNotify.c++	2009-06-14 21:23:23.000000000 +1000
-@@ -31,6 +31,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <libgen.h>
-+#include <cstdlib>
- 
- #include "DNotify.h"
- 
-diff -Naur fam-2.7.0-old/src/IMon.c++ fam-2.7.0/src/IMon.c++
---- fam-2.7.0-old/src/IMon.c++	2003-01-19 00:18:12.000000000 +1000
-+++ fam-2.7.0/src/IMon.c++	2009-06-14 21:24:11.000000000 +1000
-@@ -40,7 +40,7 @@
- #include "Interest.h"
- #include "Log.h"
- #include "Scheduler.h"
--#include "alloc.h"
-+#include <memory>
- 
- int		   IMon::imonfd = -2;
- IMon::EventHandler IMon::ehandler = NULL;
-diff -Naur fam-2.7.0-old/src/Interest.h fam-2.7.0/src/Interest.h
---- fam-2.7.0-old/src/Interest.h	2009-06-14 21:14:34.000000000 +1000
-+++ fam-2.7.0/src/Interest.h	2009-06-14 21:25:25.000000000 +1000
-@@ -29,6 +29,7 @@
- #include <netinet/in.h>  //  for in_addr
- 
- #include "Boolean.h"
-+#include <cstdlib>
- 
- class Event;
- class FileSystem;
-diff -Naur fam-2.7.0-old/src/NFSFileSystem.c++ fam-2.7.0/src/NFSFileSystem.c++
---- fam-2.7.0-old/src/NFSFileSystem.c++	2003-01-19 00:18:12.000000000 +1000
-+++ fam-2.7.0/src/NFSFileSystem.c++	2009-06-14 21:26:16.000000000 +1000
-@@ -97,7 +97,7 @@
- 
-     attr_cache_timeout = ACREGMAX;
- 
--    char * p;
-+    const char * p;
-         
-     if (strstr(opt, "noac")) {
-         f_noac = true;
diff --git a/extra/fam/fam-2.7.0-dnotify.patch b/extra/fam/fam-2.7.0-dnotify.patch
deleted file mode 100644
index 1d8910efb..000000000
--- a/extra/fam/fam-2.7.0-dnotify.patch
+++ /dev/null
@@ -1,975 +0,0 @@
---- fam-2.7.0/src/DNotify.c++	2004-01-30 00:00:00.000000000 +0100
-+++ fam-2.7.0.dnotify/src/DNotify.c++	2004-01-30 00:00:00.000000000 +0100
-@@ -0,0 +1,582 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+
-+#include <string.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <libgen.h>
-+
-+#include "DNotify.h"
-+
-+#include "Interest.h"
-+#include "Log.h"
-+#include "Scheduler.h"
-+#include <memory>
-+
-+
-+int DNotify::pipe_write_fd = -2;
-+int DNotify::pipe_read_fd = -2;
-+volatile sig_atomic_t DNotify::queue_overflowed = 0;
-+volatile sig_atomic_t DNotify::queue_changed = 0;
-+int DNotify::change_queue[QUEUESIZE];
-+volatile int DNotify::queue_head = 0; // Only modified by read handler
-+volatile int DNotify::queue_tail = 0; // Only modified by signal handler
-+DNotify::EventHandler DNotify::ehandler;
-+
-+DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE];
-+DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE];
-+
-+struct DNotify::FileWatch
-+{
-+    DirWatch *dir_watch;
-+    dev_t file_dev;
-+    ino_t file_ino;
-+    FileWatch *next; // The DirWatch.watches list
-+    FileWatch *hash_link;
-+};
-+
-+struct DNotify::DirWatch
-+{
-+    int fd;
-+    dev_t dir_dev;
-+    ino_t dir_ino;
-+    
-+    DirWatch *hash_link;
-+    FileWatch *watches;
-+};
-+
-+struct DNotify::ChangeEventData
-+{
-+    dev_t file_dev;
-+    ino_t file_ino;
-+};    
-+
-+DNotify::DNotify(EventHandler h)
-+{
-+    assert(ehandler == NULL);
-+    ehandler = h;
-+}
-+
-+DNotify::~DNotify()
-+{
-+    if (pipe_read_fd >= 0)
-+    {
-+	//  Tell the scheduler.
-+
-+	(void) Scheduler::remove_read_handler(pipe_read_fd);
-+
-+	//  Close the pipe.
-+
-+	if (close(pipe_read_fd) < 0)
-+	    Log::perror("can't pipe read end");
-+	else
-+	    Log::debug("closed pipe read end");
-+	
-+	if (close(pipe_write_fd) < 0)
-+	    Log::perror("can't pipe write end");
-+	else
-+	    Log::debug("closed pipe write end");
-+	pipe_read_fd = -1;
-+    }
-+    ehandler = NULL;
-+}
-+
-+void
-+DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  char c = 'x';
-+
-+  {
-+    char *str = "*************** overflow sigqueue ***********************\n";
-+    write (STDERR_FILENO, str, strlen(str));
-+  }
-+
-+  if (!queue_overflowed)
-+  {
-+      queue_overflowed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+void
-+DNotify::signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  int left;
-+  char c = 'x';
-+
-+  if (queue_head <= queue_tail)
-+    left = (QUEUESIZE + queue_head) - queue_tail;
-+  else 
-+    left = queue_head - queue_tail;
-+  
-+  // Must leave at least one item unused to see difference
-+  // Betweeen empty and full
-+  if (left <= 1)
-+  {
-+      queue_overflowed = 1;
-+      {
-+	char *str = "*************** overflow famqueue ****************\n";
-+	write (STDERR_FILENO, str, strlen(str));
-+      }
-+  }
-+  else
-+  {
-+      change_queue[queue_tail] = si->si_fd;
-+      queue_tail = (queue_tail + 1) % QUEUESIZE;
-+  }
-+  
-+  if (!queue_changed)
-+  {
-+      queue_changed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+bool
-+DNotify::is_active()
-+{
-+    if (pipe_read_fd == -2)
-+    {
-+        int filedes[2];
-+	int res;
-+	
-+	res = pipe (filedes);
-+	if (res >= 0)
-+	{   Log::debug("opened pipe");
-+   	    pipe_read_fd = filedes[0];
-+   	    pipe_write_fd = filedes[1];
-+
-+	    // Setup signal handler:
-+	    struct sigaction act;
-+	    
-+	    act.sa_sigaction = signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    act.sa_flags = SA_SIGINFO;
-+	    sigaction(SIGRTMIN, &act, NULL);
-+
-+	    // When the RT queue overflows we get a SIGIO
-+	    act.sa_sigaction = overflow_signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    sigaction(SIGIO, &act, NULL);
-+
-+	    (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL);
-+	}
-+    }
-+    return pipe_read_fd >= 0;
-+}
-+
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (int fd)
-+{
-+  DirWatch **p;
-+  DirWatch *w;
-+
-+  p = dir_hashchain (fd);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->fd == fd)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// This colud be made faster by using another hash table.
-+// But it's not that bad, since it is only used by express/revoke
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino)
-+{
-+  DirWatch *p;
-+  int i;
-+
-+  for (i=0;i<DIR_HASHSIZE;i++)
-+    {
-+      p = dir_hash[i];
-+      
-+      while (p)
-+	{
-+	  if (p->dir_dev == dir_dev && p->dir_ino == dir_ino)
-+	    return p;
-+	  
-+	  p = p->hash_link;
-+	}
-+    }
-+  
-+  return NULL;
-+}
-+
-+DNotify::FileWatch *
-+DNotify::lookup_filewatch (dev_t dev, ino_t ino)
-+{
-+  FileWatch **p;
-+  FileWatch *w;
-+
-+  p = file_hashchain (dev, ino);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->file_dev == dev && w->file_ino == ino)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  p = dir_hashchain (w->fd);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+void
-+DNotify::unhash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  
-+  p = dir_hashchain (w->fd);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+void
-+DNotify::unhash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+DNotify::Status
-+DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino)
-+{
-+  struct stat stat;
-+  dev_t dir_dev;
-+  ino_t dir_ino;
-+  DirWatch *dwatch;
-+  FileWatch *fw;
-+    
-+  if (lstat (notify_dir, &stat) == -1)
-+      return BAD;
-+  
-+  dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino);
-+  if (!dwatch)
-+    {
-+      Log::debug ("New DirWatch for %s (%x %x)\n",
-+		  notify_dir, (int)stat.st_dev, (int)stat.st_ino);
-+      dwatch = new DirWatch;
-+      dwatch->watches = NULL;
-+      dwatch->hash_link = NULL;
-+      dwatch->dir_dev = stat.st_dev;
-+      dwatch->dir_ino = stat.st_ino;
-+      
-+      dwatch->fd = open(notify_dir, O_RDONLY);
-+      fcntl (dwatch->fd, F_SETSIG, SIGRTMIN);
-+      if (fcntl (dwatch->fd, F_NOTIFY,
-+                 (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) 
-+		  | DN_MULTISHOT) == -1) {
-+	      return BAD;
-+      }
-+      hash_dirwatch (dwatch);
-+    }
-+
-+  fw = lookup_filewatch (file_dev, file_ino);
-+  if (fw && fw->dir_watch == dwatch)
-+	return OK;
-+  
-+  // No old FileWatch, need to add one:
-+  Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino);
-+  fw = new FileWatch;
-+  fw->next = dwatch->watches;
-+  dwatch->watches = fw;
-+  fw->file_dev = file_dev;
-+  fw->file_ino = file_ino;
-+  fw->dir_watch = dwatch;
-+  hash_filewatch(fw);
-+  return OK;
-+}
-+
-+char *
-+dirname_dup (const char *name)
-+{
-+  char *copy = strdup(name);
-+  char *res = dirname(copy);
-+  res = strdup(res);
-+  free (copy);
-+  return res;
-+}
-+
-+DNotify::Status
-+DNotify::express(const char *name, struct stat *status)
-+{
-+    struct stat stat;
-+    char *notify_dir;
-+    int res;
-+    Status s;
-+    dev_t dev;
-+    ino_t ino;
-+
-+    Log::debug("express() name: %s\n", name);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    if (::lstat (name, &stat) == -1)
-+      return BAD;
-+
-+    dev = stat.st_dev;
-+    ino = stat.st_ino;
-+    
-+    if ((stat.st_mode & S_IFMT) != S_IFDIR)
-+	notify_dir = dirname_dup (name);
-+    else
-+	notify_dir = (char *)name;
-+
-+    s = watch_dir (notify_dir, dev, ino);
-+    if (notify_dir != name)
-+        free (notify_dir);
-+    if (s)
-+      return s;
-+
-+    // Check for a race condition; if someone removed or changed the
-+    // file at the same time that we are expressing interest in it,
-+    // revoke the interest so we don't get notifications about changes
-+    // to a recycled inode that we don't otherwise care about.
-+    //
-+    struct stat st;
-+    if (status == NULL) {
-+	status = &st;
-+    }
-+    if (::lstat(name, status) == -1) {
-+	Log::perror("stat on \"%s\" failed", name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }
-+    if (status->st_dev != stat.st_dev
-+	|| status->st_ino != stat.st_ino) {
-+	Log::error("File \"%s\" changed between express and stat",
-+		   name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }	
-+
-+    Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name,
-+	       major(status->st_dev), minor(status->st_dev),
-+	       status->st_ino);
-+    return OK;
-+}
-+
-+DNotify::Status
-+DNotify::revoke(const char *name, dev_t dev, ino_t ino)
-+{
-+    FileWatch *fwatch;
-+    DirWatch *dwatch;
-+    
-+    Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    // Lookup FileWatch by dev:ino, and its DirWatch.
-+    fwatch = lookup_filewatch (dev, ino);
-+    if (fwatch == NULL)
-+	return BAD;
-+    
-+    dwatch = fwatch->dir_watch;
-+    
-+    // delete FileWatch, if last FileWatch: close fd, delete DirWatch
-+    Log::debug ("Destroying FileWatch for (%x %x)\n",
-+		(int)fwatch->file_dev, (int)fwatch->file_ino);
-+    FileWatch **p;
-+    for (p=&dwatch->watches; *p; p=&(*p)->next)
-+    {
-+      if (*p == fwatch)
-+	{
-+	  *p = (*p)->next;
-+	  break;
-+	}
-+    }
-+    unhash_filewatch(fwatch);
-+    delete fwatch;
-+    if (dwatch->watches == NULL)
-+      {
-+	Log::debug ("Destroying DirWatch for (%x %x)\n",
-+		    (int)dwatch->dir_dev, (int)dwatch->dir_ino);
-+	close(dwatch->fd);
-+	unhash_dirwatch(dwatch);
-+	delete dwatch;
-+      }
-+  
-+    return OK;
-+}
-+
-+
-+void
-+DNotify::all_watches_changed(void)
-+{
-+  int i;
-+  FileWatch *fw;
-+
-+  for (i=0; i<FILE_HASHSIZE; i++)
-+  {
-+      fw = file_hash[i];
-+      while (fw)
-+      {
-+	  (*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
-+
-+	  fw = fw->hash_link;
-+      }
-+  }
-+}
-+
-+
-+void
-+DNotify::read_handler(int fd, void *)
-+{
-+    static char readbuf[5000];
-+    DirWatch *dw;
-+    FileWatch *fw;
-+    int snap_queue_tail;
-+    int last_fd;
-+
-+    int rc = read(fd, readbuf, sizeof readbuf);
-+    queue_changed = 0;
-+    if (rc < 0)
-+        Log::perror("pipe read");
-+    else if (queue_overflowed)
-+    {
-+	  // There is a *slight* race condition here. Between reading
-+	  // the queue_overflow flag and resetting it. But it doesn't
-+	  // matter, since I'm gonna handle the overflow after reseting
-+	  // anyway.
-+	  queue_overflowed = false;
-+
-+	  // We're soon gonna check all watches anyway, so
-+	  // get rid of the current queue
-+	  queue_head = queue_tail;
-+	  
-+	  all_watches_changed ();
-+    }
-+    else
-+    {
-+	// Don't read events that happen later than
-+	// the initial read. (Otherwise skipping fd's
-+	// might miss some changes).
-+	snap_queue_tail = queue_tail;
-+	last_fd = -1;
-+	while (queue_head != snap_queue_tail)
-+	{
-+	    fd = change_queue[queue_head];
-+	    queue_head = (queue_head + 1) % QUEUESIZE;
-+
-+	    // Skip multiple changes to the same fd
-+	    if (fd != last_fd)
-+	    {
-+		dw = lookup_dirwatch (fd);
-+		if (dw)
-+		{
-+		    int n_watches, i;
-+		    ChangeEventData *data;
-+		    
-+		    Log::debug("dnotify said dev %d/%d, ino %ld changed",
-+			       major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino);
-+		    
-+		    n_watches = 0;
-+		    for (fw=dw->watches; fw; fw=fw->next)
-+			n_watches++;
-+		    
-+		    data = new ChangeEventData[n_watches];
-+
-+		    i = 0;
-+		    for (fw=dw->watches; fw; fw=fw->next)
-+		    {
-+			data[i].file_dev = fw->file_dev;
-+			data[i].file_ino = fw->file_ino;
-+			i++;
-+		    }
-+
-+		    for (i = 0; i < n_watches; i++)
-+		    {
-+			(*ehandler)(data[i].file_dev, data[i].file_ino, CHANGE);
-+		    }
-+		    
-+		    delete[] data;
-+		}
-+	    }
-+	    last_fd = fd;
-+	}
-+    }
-+}
-+
---- fam-2.7.0/src/DNotify.h	2004-01-30 00:00:00.000000000 +0100
-+++ fam-2.7.0.dnotify/src/DNotify.h	2004-01-30 00:00:00.000000000 +0100
-@@ -0,0 +1,98 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef DNotify_included
-+#define DNotify_included
-+
-+#include "config.h"
-+#include "Monitor.h"
-+#include <signal.h>
-+
-+//  DNotify is an object encapsulating the dnotify linux fcntl.
-+//  It "emulates" the IMon interface.
-+//  There can only be one instantiation of the DNotify object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file.  There is also
-+//  a callback, the EventHandler.  When an dnotify event comes in,
-+//  the EventHandler is called.
-+//
-+//  The user of the DNotify object is the Interest class.
-+
-+class DNotify : public Monitor {
-+public:
-+    DNotify(EventHandler h);
-+    ~DNotify();
-+
-+    static bool is_active();
-+
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
-+
-+private:
-+    struct FileWatch;
-+    struct DirWatch;
-+    struct ChangeEventData;
-+  
-+    //  Class Variables
-+    enum { QUEUESIZE = 1024 };
-+    static int pipe_write_fd;
-+    static int pipe_read_fd;
-+    static int change_queue[QUEUESIZE];
-+    static volatile sig_atomic_t queue_overflowed;
-+    static volatile sig_atomic_t queue_changed;
-+    static volatile int queue_head; // Only modified by read handler
-+    static volatile int queue_tail; // Only modified by signal handler
-+    static EventHandler ehandler;
-+    static void overflow_signal_handler(int sig, siginfo_t *si, void *data);
-+    static void signal_handler(int sig, siginfo_t *si, void *data);
-+    static void read_handler(int fd, void *closure);
-+ 
-+    enum { DIR_HASHSIZE = 367 };
-+    static DirWatch *dir_hash[DIR_HASHSIZE];
-+    enum { FILE_HASHSIZE = 823 };
-+    static FileWatch *file_hash[FILE_HASHSIZE];
-+
-+    static DirWatch **dir_hashchain(int fd)
-+			  { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; }
-+    static FileWatch **file_hashchain(dev_t d, ino_t i)
-+			  { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; }
-+
-+    static DirWatch *lookup_dirwatch (int fd);
-+    static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino);
-+    static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino);
-+    static void hash_dirwatch(DirWatch *w);
-+    static void hash_filewatch(FileWatch *w);
-+    static void unhash_dirwatch(DirWatch *w);
-+    static void unhash_filewatch(FileWatch *w);
-+    static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino);
-+
-+    static void all_watches_changed(void);
-+    
-+    DNotify(const DNotify&);			// Do not copy
-+    DNotify & operator = (const DNotify&);	//  or assign.
-+};
-+
-+#endif /* !IMon_included */
-+
-+
---- fam-2.7.0/src/Interest.c++	2004-01-30 00:00:00.000000000 +0100
-+++ fam-2.7.0.dnotify/src/Interest.c++	2004-01-30 00:00:00.000000000 +0100
-@@ -42,12 +42,21 @@
- #include "Event.h"
- #include "FileSystem.h"
- #include "IMon.h"
-+#include "DNotify.h"
- #include "Log.h"
- #include "Pollster.h"
- #include "timeval.h"
- 
- Interest *Interest::hashtable[];
--IMon      Interest::imon(imon_handler);
-+
-+#ifdef USE_DNOTIFY 
-+static DNotify dnotify(Interest::monitor_handler);
-+Monitor * Interest::monitor = &dnotify;
-+#else
-+static IMon imon(Interest::monitor_handler);
-+Monitor * Interest::monitor = &imon;
-+#endif
-+
- bool      Interest::xtab_verification = true;
- 
- Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
-@@ -60,10 +69,10 @@
-       mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
- {
-     memset(&old_stat, 0, sizeof(old_stat)); 
--    IMon::Status s = IMon::BAD;
- 
--    s = imon.express(name, &old_stat);
--    if (s != IMon::OK)
-+    Monitor::Status s = Monitor::BAD;
-+    s = monitor->express(name, &old_stat);
-+    if (s != Monitor::OK)
-     {   int rc = lstat(name, &old_stat);
- 	if (rc < 0)
- 	{   Log::info("can't lstat %s", name);
-@@ -100,7 +109,7 @@
-     }
- #endif
- 
--    if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK);
-+    if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK);
- }
- 
- Interest::~Interest()
-@@ -128,7 +137,7 @@
- 		pp = &p->hashlink;	// move to next element
- 	    }
- 	if (!found_same)
--	    (void) imon.revoke(name(), dev, ino);
-+	  (void) monitor->revoke(name(), dev, ino);
-     }
- }
- 
-@@ -147,7 +156,7 @@
- 
-         // Express interest.
-         IMon::Status s = IMon::BAD;
--	s = imon.express(name(), NULL);
-+	s = monitor->express(name(), NULL);
-         if (s != IMon::OK) {
-             return true;
-         }
-@@ -248,23 +257,23 @@
- }
- 
- void
--Interest::imon_handler(dev_t device, ino_t inumber, int event)
-+Interest::monitor_handler(dev_t device, ino_t inumber, int event)
- {
-     assert(device || inumber);
- 
-     for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next)
-     {	next = p->hashlink;
- 	if (p->ino == inumber && p->dev == device)
--	{   if (event == IMon::EXEC)
-+	  {   if (event == Monitor::EXEC)
- 	    {   p->cur_exec_state = EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
--	    else if (event == IMon::EXIT)
-+	    else if (event == Monitor::EXIT)
- 	    {   p->cur_exec_state = NOT_EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
- 	    else
--	    {   assert(event == IMon::CHANGE);
-+	    {   assert(event == Monitor::CHANGE);
- 		p->scan();
- 	    }
- 	}
---- fam-2.7.0/config.h.in	2003-01-20 01:40:15.000000000 +0100
-+++ fam-2.7.0.dnotify/config.h.in	2004-01-30 13:50:33.000000000 +0100
-@@ -180,3 +180,6 @@
- 
- /* Define to `int' if <sys/types.h> doesn't define. */
- #undef uid_t
-+
-+/* Define to 1 if you have F_NOTIFY fcntl */
-+#undef USE_DNOTIFY
---- fam-2.7.0/configure.ac	2003-11-26 20:47:59.000000000 +0100
-+++ fam-2.7.0.dnotify/configure.ac	2004-01-30 13:50:33.000000000 +0100
-@@ -34,7 +34,26 @@
- AC_HEADER_DIRENT
- AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h])
- 
--if test "$have_sys_imon_h"; then
-+# Test for the linux dnotify fcntl
-+AC_MSG_CHECKING([for dnotify fcntl support])
-+AC_TRY_COMPILE([
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+#include <unistd.h>
-+],
-+[ int fd = 1;
-+  fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB)
-+                       |DN_MULTISHOT);
-+], have_dnotify=yes, have_dnotify=no)
-+
-+use_dnotify=false
-+AC_MSG_RESULT($have_dnotify)
-+
-+if test "$have_dnotify"; then
-+        MONITOR_FUNCS=IMonNone
-+        AC_DEFINE([USE_DNOTIFY], [], [Use dnotify])
-+	use_dnotify=true
-+elif test "$have_sys_imon_h"; then
- 	MONITOR_FUNCS=IMonIRIX
- elif test "$have_linux_imon_h"; then
- 	MONITOR_FUNCS=IMonLinux
-@@ -42,6 +62,7 @@
- 	MONITOR_FUNCS=IMonNone
- fi
- AC_SUBST(MONITOR_FUNCS)
-+AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify)
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
---- fam-2.7.0/src/IMon.h	2004-01-30 00:00:00.000000000 +0200
-+++ fam-2.7.0.dnotify/src/IMon.h	2004-01-30 00:00:00.000000000 +0200
-@@ -24,10 +24,7 @@
- #define IMon_included
- 
- #include "config.h"
--#include <sys/stat.h>
--#include <sys/types.h>
--
--#include "Boolean.h"
-+#include "Monitor.h"
- 
- struct stat;
- 
-@@ -41,25 +38,18 @@
- //
- //  The user of the IMon object is the Interest class.
- 
--class IMon {
-+class IMon : public Monitor {
- 
- public:
--
--    enum Status { OK = 0, BAD = -1 };
--    enum Event { EXEC, EXIT, CHANGE };
--
--    typedef void (*EventHandler)(dev_t, ino_t, int event);
--
-     IMon(EventHandler h);
-     ~IMon();
- 
-     static bool is_active();
- 
--    Status express(const char *name, struct stat *stat_return);
--    Status revoke(const char *name, dev_t dev, ino_t ino);
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
- 
- private:
--
-     //  Class Variables
- 
-     static int imonfd;
---- fam-2.7.0/src/Interest.h	2004-01-30 00:00:00.000000000 +0200
-+++ fam-2.7.0.dnotify/src/Interest.h	2004-01-30 00:00:00.000000000 +0200
-@@ -32,7 +32,7 @@
- 
- class Event;
- class FileSystem;
--class IMon;
-+class Monitor;
- struct stat;
- 
- //  Interest -- abstract base class for filesystem entities of interest.
-@@ -74,7 +74,7 @@
- 
-     //  Public Class Method
- 
--    static void imon_handler(dev_t, ino_t, int event);
-+    static void monitor_handler(dev_t, ino_t, int event);
- 
-     static void enable_xtab_verification(bool enable);
- 
-@@ -121,7 +121,7 @@
- 
-     //  Class Variables
- 
--    static IMon imon;
-+    static Monitor *monitor;
-     static Interest *hashtable[HASHSIZE];
-     static bool xtab_verification;
- 
---- fam-2.7.0/src/Makefile.am	2003-01-19 13:00:17.000000000 +0100
-+++ fam-2.7.0.dnotify/src/Makefile.am	2004-01-30 13:50:38.000000000 +0100
-@@ -71,7 +71,11 @@
-   main.c++ \
-   timeval.c++ \
-   timeval.h \
--  @MONITOR_FUNCS@.c++
-+  Monitor.h \
-+  DNotify.h \
-+  DNotify.c++ \
-+  @MONITOR_FUNCS@.c++ 
- 
--EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
-+EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++ \
-+  DNotify.h Monitor.h
- 
---- fam-2.7.0/src/Monitor.h	2004-01-30 00:00:00.000000000 +0200
-+++ fam-2.7.0.dnotify/src/Monitor.h	2004-01-30 00:00:00.000000000 +0200
-@@ -0,0 +1,57 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef Monitor_included
-+#define Monitor_included
-+
-+#include "config.h"
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+
-+struct stat;
-+
-+//  Monitor is an abstract baseclass for differend file monitoring
-+//  systems. The original system used was IMon, and the Montor API
-+//  is heavily influenced by that.
-+//  There can only be one instantiation of the Monitor object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file to imon.  There is also
-+//  a callback, the EventHandler.  When an event comes in,
-+//  the EventHandler is called.
-+//
-+//  The main implementers of the Monitor class is IMon and DNotify
-+
-+class Monitor {
-+public:
-+
-+    enum Status { OK = 0, BAD = -1 };
-+    enum Event { EXEC, EXIT, CHANGE };
-+
-+    typedef void (*EventHandler)(dev_t, ino_t, int event);
-+
-+    virtual Status express(const char *name, struct stat *stat_return) = 0;
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0;
-+};
-+
-+#endif /* !Monitor_included */
diff --git a/extra/fam/fam-2.7.0-largefiles.patch b/extra/fam/fam-2.7.0-largefiles.patch
deleted file mode 100644
index 60de9a494..000000000
--- a/extra/fam/fam-2.7.0-largefiles.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- fam-2.7.0/common.am	2003-01-19 06:09:08.000000000 -0600
-+++ fam-2.7.0.largefile/common.am	2005-01-12 19:08:06.462113110 -0600
-@@ -1,2 +1,5 @@
--INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\"
-+INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" \
-+       -D_FILE_OFFSET_BITS=64                  \
-+       -D_LARGEFILE64_SOURCE
-+
diff --git a/extra/fam/fam-2.7.0-limits.patch b/extra/fam/fam-2.7.0-limits.patch
deleted file mode 100644
index 424895719..000000000
--- a/extra/fam/fam-2.7.0-limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/fam.h.orig	2005-05-25 09:26:38.000000000 +0000
-+++ include/fam.h	2005-05-25 09:27:04.000000000 +0000
-@@ -41,7 +41,7 @@
- *****************************************************************************/
- 
- /* For NAME_MAX - maximum # of chars in a filename */
--#include "limits.h"
-+#include <limits.h>
- 
- 
- 
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 016dc91ad..3e4dc590b 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,27 +1,64 @@
-# $Id: PKGBUILD 103288 2010-12-17 09:19:33Z andrea $
+# $Id: PKGBUILD 136943 2011-09-03 10:34:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
 
-pkgname=fcitx
-pkgver=4.0.1
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-depends=('dbus-core' 'pango')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('22d48cd65ae6ee36e49c0ed07761a3cb2f7e2669')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'icu' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fcitx/fcitx-gtk2.install b/extra/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk2.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx-gtk3.install b/extra/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install
new file mode 100644
index 000000000..316bccffe
--- /dev/null
+++ b/extra/fcitx/fcitx.install
@@ -0,0 +1,12 @@
+post_install() {
+  [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
+  [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 41c4e5431..dcf15c5e3 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: boromil@gmail.com
 
 pkgname=ffmpegthumbnailer
-pkgver=2.0.6
+pkgver=2.0.7
 pkgrel=1
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
@@ -11,9 +11,11 @@ license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz
+	ffmpegthumbnailer.desktop)
 options=(!libtool)
-md5sums=('5003ceaadc1c5a1be1dbb34739a12bab')
+sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
+          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,6 +27,10 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+  # FS#24105: Generate thumbnails in nautilus
+  install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \
+	${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop
 }
 
 
diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop
new file mode 100644
index 000000000..79203e5bc
--- /dev/null
+++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=ffmpegthumbnailer
+Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
+MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index d2a0d5832..d6d2555f2 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110392 2011-02-19 07:05:55Z allan $
+# $Id: PKGBUILD 136896 2011-09-02 17:27:59Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fftw
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.3
+pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -14,13 +14,13 @@ makedepends=('gcc-fortran')
 options=(!libtool)
 source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz)
 install=fftw.install
+sha1sums=('e44493ba4babeacba184568e727876d9aed44205')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
 # http://www.fftw.org/faq/section2.html#singleprec
 # http://www.fftw.org/fftw3_doc/Precision.html#Precision
 
-md5sums=('b616e5c91218cc778b5aa735fefb61ae')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD
index 82bdb3ca4..007af72e0 100644
--- a/extra/fwbuilder/PKGBUILD
+++ b/extra/fwbuilder/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 109609 2011-02-11 02:28:42Z kevin $
+# $Id: PKGBUILD 136184 2011-08-24 01:47:26Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fwbuilder
-pkgver=4.1.3
+pkgver=5.0.0.3568
 pkgrel=1
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 url="http://www.fwbuilder.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=("libfwbuilder=${pkgver}" 'qt' 'net-snmp' 'hicolor-icon-theme')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7cb6d50ce6f02b485525405bd00d8c33')
+depends=('libxslt' 'net-snmp' 'qt')
+conflicts=('libfwbuilder')
+source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz")
+md5sums=('0324edab10329dde029953d646aa8dad')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/fwbuilder-${pkgver}"
   ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/fwbuilder-${pkgver}"
   make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
new file mode 100644
index 000000000..b811faa3a
--- /dev/null
+++ b/extra/gamin/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
+# Contributor: Pulphix <crimea.v@libero.it>
+
+pkgname=gamin
+pkgver=0.1.10
+pkgrel=5
+pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).'
+url='http://www.gnome.org/~veillard/gamin'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('glib2')
+makedepends=('python2')
+options=('libtool')
+optdepends=('python2: for the python module.')
+provides=('fam')
+conflicts=('fam')
+source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz")
+md5sums=('b4ec549e57da470c04edd5ec2876a028')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python 2
+  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
+
+  ./configure --prefix=/usr --disable-static --with-threads \
+    --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
+    --with-python=/usr/bin/python2
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 966f0dcaf..a1bceff29 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131965 2011-07-18 13:37:20Z bisson $
+# $Id: PKGBUILD 136756 2011-09-01 08:20:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
         'qt4-lib64.patch')
-sha1sums=('36ed067b354abb1e0707a4b327e2ad624cb6f88d'
+sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 24ec6ef79..4aacf4e32 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129483 2011-06-28 07:59:13Z ibiru $
+# $Id: PKGBUILD 136355 2011-08-27 09:31:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gdk-pixbuf2
-pkgver=2.23.5
+pkgver=2.24.0
 pkgrel=1
-pkgdesc="An image loading library for gtk2"
+pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
@@ -11,8 +11,8 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
+sha256sums=('67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7')
 
 build() {
   cd "${srcdir}/gdk-pixbuf-${pkgver}"
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index 61ad4ea4c..279078fe1 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,25 +1,36 @@
-# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $
+# $Id: PKGBUILD 136949 2011-09-03 12:23:55Z foutrelis $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.maxmind.com/app/c"
+license=('GPL')
 depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
+backup=('etc/geoip/GeoIP.conf')
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('a802175d5b7e2b57b540a7dd308d9205')
+md5sums=('05b7300435336231b556df5ab36f326d')
 
 build() {
-  cd ${startdir}/src/GeoIP-${pkgver}
+  cd "${srcdir}/GeoIP-${pkgver}"
+
+  autoreconf -i
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
-  make check || return 1
-  make DESTDIR=${startdir}/pkg install
+  make
+}
+
+check() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index 94743a7c7..8773e5900 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130357 2011-07-05 18:03:52Z eric $
+# $Id: PKGBUILD 136060 2011-08-22 10:24:51Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.7.2
-pkgrel=2
+pkgver=2.7.3
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
@@ -20,39 +20,32 @@ options=('!libtool' '!makeflags')
 conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch)
-md5sums=('6996138ab70b0bfebfe9f563284e5f78'
-         'bb27bc214261d36484093e857f015f38'
-         'b3f8faa246e5794b0d63583059f54698')
-sha1sums=('4690420961d110f99448c32fe61aae7d4869a863'
-          '110ce9798173b19a662d086ed7b882b4729f06cf'
-          '8a87adc11ee13d5fce79ea4226f04e682a2af97d')
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
+md5sums=('851b55dc4af966e62ef5c8b679bcc623'
+         'bb27bc214261d36484093e857f015f38')
+sha1sums=('bea6edc3423774ace8dd86222314f4ef2278cdd8'
+          '110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
-  patch -p1 < ../uri-backend-libcurl.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw --with-libcurl \
-    --without-aa --without-hal --without-gvfs
+    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
+    --with-gif-compression=lzw --without-aa --without-gvfs
   make
 }
 
 package() {
   cd "${srcdir}/gimp-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
+  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
   install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
 
   ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimp-remote-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-remote.1.gz"
   ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
   ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
   ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
 
   ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
   ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
-  ln -s gimp-remote-${pkgver%.*} "${pkgdir}/usr/bin/gimp-remote"
   ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
 }
diff --git a/extra/gimp-devel/uri-backend-libcurl.patch b/extra/gimp-devel/uri-backend-libcurl.patch
deleted file mode 100644
index d3217a292..000000000
--- a/extra/gimp-devel/uri-backend-libcurl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
-+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
-@@ -24,7 +23,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib/gstdio.h>
-@@ -63,7 +61,7 @@
- 
-   vinfo = curl_version_info (CURLVERSION_NOW);
- 
--  protocols = g_string_new ("http:,ftp:");
-+  protocols = g_string_new ("http:,ftp:,gopher:");
- 
-   if (vinfo->features & CURL_VERSION_SSL)
-     {
-@@ -153,7 +151,7 @@
-   FILE      *out_file;
-   CURL      *curl_handle;
-   CURLcode   result;
--  gint       response_code;
-+  glong      response_code;
- 
-   gimp_progress_init (_("Connecting to server"));
- 
-@@ -195,12 +193,12 @@
- 
-   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
--  if (response_code != 200)
-+  if (response_code != 200 && response_code != 226 && response_code != 0)
-     {
-       fclose (out_file);
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Opening '%s' for reading resulted in HTTP "
--                     "response code: %d"),
-+                     "response code: %ld"),
-                    uri, response_code);
-       curl_easy_cleanup (curl_handle);
-       return FALSE;
diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog
index 76298e68f..f0c15233e 100644
--- a/extra/git/ChangeLog
+++ b/extra/git/ChangeLog
@@ -1,5 +1,9 @@
 Simple version bumps are omitted from the following ChangeLog.
 
+2011-08-16 Dan McGee <dan@archlinux.org>
+	Version 1.7.6.1-1
+	* Enable USE_LIBPCRE for `git grep -P` usage
+
 2011-05-05 Dan McGee <dan@archlinux.org>
 	Version 1.7.5.1-1
 	* Byte compile emacs files (FS#20874)
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index adbbfaf7f..3e2b83e2d 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 129435 2011-06-27 17:14:23Z dan $
+# $Id: PKGBUILD 136451 2011-08-29 14:54:02Z jgc $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.6
+pkgver=1.7.6.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
 url="http://git-scm.com/"
 license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0')
+depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
 makedepends=('python2' 'emacs')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
@@ -32,7 +32,9 @@ build() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+    USE_LIBPCRE=1 \
+    NO_CROSS_DIRECTORY_HARDLINKS=1
 
   cd contrib/emacs
   make prefix=/usr
@@ -43,6 +45,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr gitexecdir=/usr/lib/git-core \
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+    USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
     INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
 
@@ -75,11 +78,11 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('9e0a438eb71e89eedb61f89470ed32a0'
-         'a017935cf9e90d9f056b6547c318fd15'
+md5sums=('d1e00772cc9dc6c571999feb9e8771ab'
+         'cae559424a62507cb2c15252d85a158e'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082'
-            'a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad'
+sha256sums=('856d4197ef7172938b0b44e55174c7d7ddfaf5e844e04960322c49eda9f3a246'
+            'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD
index 0b62bd0f1..aab6f690a 100644
--- a/extra/gmpc/PKGBUILD
+++ b/extra/gmpc/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 135824 2011-08-18 21:27:02Z eric $
+# $Id: PKGBUILD 136735 2011-08-31 19:33:21Z eric $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=gmpc
-pkgver=0.20.0
-pkgrel=2
+pkgver=11.8.16
+pkgrel=1
 pkgdesc="A GTK2 client for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpclient.org/home"
 license=('GPL')
-depends=('libglade' 'libmpd>=0.20.0' 'libsoup' 'libsexy' 'sqlite3' \
-         'hicolor-icon-theme' 'xdg-utils')
+depends=('libunique' 'libmpd' 'libsoup' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('gob2' 'intltool' 'vala')
 options=('!libtool')
 install=gmpc.install
-source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('902fd69b0b6bb40abb647604080dd7ef')
+source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('223aeb000e41697d8fdf54ccedee89d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' \
-    data/gmpc.desktop.in
-  ./configure --prefix=/usr --enable-system-libsexy
+  sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 08e91fcaf..65634e63c 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134977 2011-08-09 18:01:57Z ibiru $
+# $Id: PKGBUILD 136310 2011-08-25 17:39:52Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -17,8 +17,8 @@ url="http://www.gnome.org"
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 912b25ec6..5d67ca6f1 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 135782 2011-08-18 15:04:11Z andyrtr $
+# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=5
+pkgrel=6
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
+depends=('gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index eccfb9f99..927fe0859 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135996 2011-08-21 08:10:46Z andyrtr $
+# $Id: PKGBUILD 136760 2011-09-01 10:56:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
 makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
+md5sums=('1f8c3b74b2c6faa9b08f84a422f93863')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/align.patch b/extra/gnutls/align.patch
deleted file mode 100644
index dce5cf408..000000000
--- a/extra/gnutls/align.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
---- a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
-   uint8_t iv[16];
- };
- 
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+        ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
-   struct aes_ctx *ctx = _ctx;
-   int ret;
- 
--  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+  ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key));
-   if (ret != 0)
-     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
--  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+  ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec));
-   if (ret != 0)
-     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
-@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1);
-   return 0;
- }
- 
-@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0);
- 
-   return 0;
- }
-diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
-index 8f49ff3..20a169e 100644
---- a/lib/accelerated/intel/aes-x86.h
-+++ b/lib/accelerated/intel/aes-x86.h
-@@ -11,10 +11,11 @@ void register_x86_crypto (void);
- # define ALIGN16
- #endif
- 
-+#define AES_KEY_ALIGN_SIZE 8
- #define AES_MAXNR 14
- typedef struct
- {
--  uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
-+  uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
-   int rounds;
- } AES_KEY;
- 
diff --git a/extra/gpsd/LICENSE b/extra/gpsd/LICENSE
deleted file mode 100644
index 076538678..000000000
--- a/extra/gpsd/LICENSE
+++ /dev/null
@@ -1,38 +0,0 @@
-			COPYRIGHTS
-
-Compilation copyright is held by the GPSD project.  All rights reserved.
-
-GPSD project copyrights are assigned to the project lead, currently
-Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
-1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
-Copyright (c) 2005 by Eric S. Raymond.  For other copyrights, see
-individual files.
-
-			BSD LICENSE
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:<P>
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.<P>
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.<P>
-
-Neither name of the GPSD project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index cea2fc70f..c1ae62d2b 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 136033 2011-08-21 23:13:31Z andrea $
+# $Id: PKGBUILD 136393 2011-08-28 23:22:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=3.0
-pkgrel=3
+pkgver=3.1
+pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gpsd.berlios.de"
@@ -20,7 +20,7 @@ options=('!libtool' '!buildflags')
 install="${pkgname}.install"
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'gpsd' 'gpsd.conf.d')
-md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
+md5sums=('f280b914c19da3a91aa5e67d83d35033'
          '1f3402f8e33a7032b9ae6dfd077234f7'
          '3e963df3f9f7ef3572ecc648ae829315')
 
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 7a3a36e81..7337b409c 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134153 2011-08-02 11:48:33Z ibiru $
+# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.5
-pkgrel=3
+pkgver=2.24.6
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -13,15 +13,16 @@ options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
         xid-collision-debug.patch
-        gdk_Make_background_changes_queue_a_repaint.patch)
-sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
+        gtk2-dont-ellipsize-filters.diff)
+sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
+            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-    patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.patch"
+    #https://bugzilla.gnome.org/show_bug.cgi?id=657949
+    patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -33,6 +34,7 @@ build() {
 
     make
 }
+
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install
diff --git a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
deleted file mode 100644
index 40aa187e6..000000000
--- a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Thu, 09 Jun 2011 04:29:45 +0000
-Subject: gdk: Make background changes queue a repaint
-
-For client-side windows, we need to queue a repaint when the background
-changes. For native windows, the windowing system does take care of it,
-but client-side windows are our own, so we gotta do it manually.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652102
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index f058570..10d83ab 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow      *window,
-     }
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
--      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--      impl_iface->set_background (window, &private->bg_color);
-+      if (gdk_window_has_impl (private))
-+        {
-+          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+          impl_iface->set_background (window, &private->bg_color);
-+        }
-+      else
-+        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-     }
- }
- 
-@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
-     private->bg_pixmap = GDK_NO_BG;
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
--      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--      impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+      if (gdk_window_has_impl (private))
-+        {
-+          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+          impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+        }
-+      else
-+        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-     }
- }
- 
---
-cgit v0.9
diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
new file mode 100644
index 000000000..ff8dff6ef
--- /dev/null
+++ b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
@@ -0,0 +1,28 @@
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index 2ee7903..37d9e8d 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
+ static GtkWidget *
+ filter_create (GtkFileChooserDefault *impl)
+ {
+-  GtkCellRenderer *cell;
+-  GList           *cells;
+-
+   impl->filter_combo = gtk_combo_box_text_new ();
+   gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+ 
+-  /* Get the combo's text renderer and set ellipsize parameters */
+-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo));
+-  g_assert (cells);
+-  cell = cells->data;
+-
+-  g_object_set (G_OBJECT (cell),
+-		"ellipsize", PANGO_ELLIPSIZE_END,
+-		NULL);
+-
+-  g_list_free (cells);
+-
+   g_signal_connect (impl->filter_combo, "changed",
+ 		    G_CALLBACK (filter_combo_changed), impl);
+ 
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index f66541e44..35475af77 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120569 2011-04-25 17:16:30Z ibiru $
+# $Id: PKGBUILD 136663 2011-08-31 11:59:40Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -12,8 +12,8 @@ depends=('gconf' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('13fd845ce2ebc837fd4771d2dd0c103bde20faad9f77f6c7a62ff7d8099557ff')
+source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
+sha256sums=('9f40db52c869dce891bbe8faa9e14209750e22e73790de96837460d6d51f827a')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 6102a6f28..6614df57c 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 132127 2011-07-20 16:03:07Z andyrtr $
+# $Id: PKGBUILD 136837 2011-09-02 08:00:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'xulrunner')
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('16017dc91f7216e0631b759db1eebecb')
+md5sums=('564e10820887793b86b04ac9979cb6e5')
 
 build() {
   _javaver=6
@@ -78,5 +78,3 @@ package_icedtea-web-doc() {
   rm -rf ${pkgdir}/usr/share/man
   rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
 }
-
-# plugin test here http://www.java.com/en/download/help/testvm.xml
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index a3e3ab704..bb986e0fb 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135540 2011-08-15 02:21:48Z eric $
+# $Id: PKGBUILD 136461 2011-08-29 20:24:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.1.6
+pkgver=6.7.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -12,9 +12,9 @@ depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-md5sums=('bbb7cfef14b8e85f5499c0ee4212f193'
+md5sums=('efa11515407ef0a22535d5f429668bcb'
          'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('75b770f3108ecd25b19c4bba44da99c71768f897'
+sha1sums=('9e82c6926db62aa5dc547a029b49a593f5d4a991'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 02e03d3c2..a67585373 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 79752 2010-05-06 13:39:04Z ronald $
+# $Id: PKGBUILD 136939 2011-09-03 09:44:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
-depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8')
+depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b')
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -25,9 +25,13 @@ build() {
   # Configure and Build
   ./configure --prefix=/usr \
               --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+              --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 
   # Install License
   install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index 9d804dc5f..9d25c78d1 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=('java-commons-daemon' 'java-jsvc')
 pkgbase=java-commons-daemon
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://commons.apache.org/daemon/"
 license=('APACHE')
 _libname=commons-daemon
 source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
+md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
 makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
 
 
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index c151a9489..57909f255 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134137 2011-08-02 08:56:19Z andrea $
+# $Id: PKGBUILD 136263 2011-08-25 08:59:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
 pkgver=4.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,13 +14,13 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
+        'gpsd3.patch')
 sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-          'f44dfd3bb384e631d59b93d7dda3413795da8183')
+          '3916dd6307109d70d0dd538de913c91eede81d78')
 
 build() {
   cd "${srcdir}"/marble-${pkgver}
-  patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+  patch -p1 -i "${srcdir}"/gpsd3.patch
 
   cd "${srcdir}"
   mkdir build
diff --git a/extra/kdeedu-marble/gpsd-2.96.patch b/extra/kdeedu-marble/gpsd3.patch
index e27702181..e11859b0b 100644
--- a/extra/kdeedu-marble/gpsd-2.96.patch
+++ b/extra/kdeedu-marble/gpsd3.patch
@@ -1,6 +1,7 @@
---- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
+diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig	2011-05-20 15:34:41.000000000 -0500
++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp	2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
  
  GpsdConnection::GpsdConnection( QObject* parent )
      : QObject( parent ),
@@ -9,8 +10,8 @@
 +#endif
        m_timer( 0 )
  {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
+     m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
  void GpsdConnection::initialize()
  {
      m_timer.stop();
@@ -22,7 +23,7 @@
      if ( data ) {
          m_status = PositionProviderStatusAcquiring;
          emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
  void GpsdConnection::update()
  {
  #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 1ae2fd5e4..720b923a4 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,19 +4,21 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=git20110726
-_commit=72f48aff1a672af24f66c26dd83b3ac6ee87df5f
+pkgver=git20110828
+_commit=d248768561b8d11e76482fb0f685d7b78dd8c140
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org/"
 license=('GPL')
 depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
-optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
+makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info'
+             'openconnect')
+optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
+            'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('1176f19901b6667c846a14fc0a04c07f')
+md5sums=('9cc7ab53a3c48209869d6e5ca8dbe6df')
 
 build() {
   cd "${srcdir}"
@@ -24,12 +26,11 @@ build() {
   cd build
   cmake ../networkmanagement \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 6fc1c62cc..feb20a0f2 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100978 2010-11-27 05:30:04Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
+pkgver=0.9.96
+pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kdiff3.sourceforge.net/"
@@ -12,14 +12,12 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
 optdepends=('kdebase-lib: for the plugin')
 install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../docbook.patch
-  sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
   mkdir release
   cd release
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/kdiff3/docbook.patch b/extra/kdiff3/docbook.patch
deleted file mode 100644
index b957e51fd..000000000
--- a/extra/kdiff3/docbook.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r --unified kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95-neu/doc/de/index.docbook
---- kdiff3-0.9.95/doc/de/index.docbook	2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/de/index.docbook	2010-10-11 23:52:40.138829992 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95-neu/doc/fr/index.docbook
---- kdiff3-0.9.95/doc/fr/index.docbook	2010-10-11 23:51:27.610931550 +0200
-+++ kdiff3-0.9.95-neu/doc/fr/index.docbook	2010-10-11 23:52:23.739728901 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95-neu/doc/it/index.docbook
---- kdiff3-0.9.95/doc/it/index.docbook	2010-10-11 23:51:27.580378903 +0200
-+++ kdiff3-0.9.95-neu/doc/it/index.docbook	2010-10-11 23:52:32.462829209 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95-neu/doc/nl/index.docbook
---- kdiff3-0.9.95/doc/nl/index.docbook	2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/nl/index.docbook	2010-10-11 23:52:45.371829602 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index d9a26d522..b2121f984 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 110362 2011-02-19 03:39:03Z allan $
+# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
 pkgver=2.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
 source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
-        'kexec' 'kexec.conf.d')
+        'kexec-tools-2.0.0-purgatory-makefile.patch'
+        'kexec' 
+        'kexec.conf.d')
 depends=('gawk')
 makedepends=('zlib' 'xz')
 backup=('etc/conf.d/kexec')
 license=('GPL2')
 md5sums=('35d05fed1c97008ac34c5bfb929295eb'
-         '15599234f174ddc4d2611f32effec6ab'
-         'b9ddfb9fbcc7e4e7e7294fe94fa60aeb')
+         'b96f47c29757fcadfbc50ea6ea22f839'
+         'be059a103e5989519d22fca99f860a64'
+         '9ca7e31d2c5c66c436a9a2baf20ad9b2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   export LDFLAGS+=" -static"
+  patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/kexec-tools/kexec b/extra/kexec-tools/kexec
index bef5b5ef3..c2e9a78a8 100755
--- a/extra/kexec-tools/kexec
+++ b/extra/kexec-tools/kexec
@@ -7,19 +7,19 @@
 
 case "$1" in
   start)
-      stat_busy "Enabled loading kernel for Kexec into running kernel on reboot"
+      stat_busy "Enabling kexec on reboot"
       add_daemon kexec
       stat_done
   ;;
   
   stop|load)
     if [ "$RUNLEVEL" = "6" -o "$1" = "load" ]; then
-      stat_busy "Loading kernel for Kexec into running kernel"
+      stat_busy "Loading kexec kernel"
       [ -f "$KPATH" ] || stat_fail
       [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD"
       /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1
     else
-      stat_busy "Skipping loading kernel for Kexec into running kernel"
+      stat_busy "Disabling kexec on reboot"
     fi
     if [ $? -eq 0 ] ; then
       rm_daemon kexec
@@ -30,7 +30,7 @@ case "$1" in
   ;;
 
   unload)
-    stat_busy "Unloading Kexec kernel from running kernel"
+    stat_busy "Unloading kexec kernel"
     /sbin/kexec -u
     if [ $? -eq 0 ] ; then
       stat_done
diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
new file mode 100644
index 000000000..0c029c8f4
--- /dev/null
+++ b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
@@ -0,0 +1,20 @@
+diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile
+--- kexec-tools-2.0.0/purgatory/Makefile.orig	2011-03-10 11:39:22.100799291 -0500
++++ kexec-tools-2.0.0/purgatory/Makefile	2011-03-10 11:39:36.422736886 -0500
+@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO
+ 			-I$(srcdir)/util_lib/include \
+ 			-I$(shell $(CC) -print-file-name=include)
+ $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+-			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
++			-nostartfiles -nostdlib -nodefaultlibs \
+ 			-e purgatory_start -r
+ 
+ $(PURGATORY): $(PURGATORY_OBJS)
+ 	$(MKDIR) -p $(@D)
+ 	$(CC) $(LDFLAGS) -o $@ $^
+ 
+-#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
++#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
+ 
+ echo::
+ 	@echo "PURGATORY_SRCS $(PURGATORY_SRCS)"
diff --git a/extra/kexec-tools/kexec.conf.d b/extra/kexec-tools/kexec.conf.d
index 17b10d228..991a7a27d 100644
--- a/extra/kexec-tools/kexec.conf.d
+++ b/extra/kexec-tools/kexec.conf.d
@@ -3,7 +3,7 @@
 #
 
 # Path to kernel, default to stock arch kernel
-KPATH="/boot/vmlinuz26"
+KPATH="/boot/vmlinuz-linux"
 
 # Root partition
 # The default attempts to autodetect
@@ -13,4 +13,4 @@ ROOTPART="$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' /etc/fstab)"
 KPARAM="ro"
 
 # Path to initrd image, default to stock arch kernel
-INITRD="/boot/kernel26.img"
+INITRD="/boot/initramfs-linux.img"
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index e0aed1a88..ae10da267 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 129478 2011-06-28 07:38:29Z andrea $
+# $Id: PKGBUILD 136744 2011-08-31 22:52:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
-pkgver=0.8.3
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('qt')
 makedepends=('cmake')
 source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8def56db4f58ca0a40d60807786f5912')
+md5sums=('cc6b7b551377e2a07f6fa5afef0d29ff')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 7742eed63..e5c47a2ee 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126352 2011-06-05 00:53:01Z giovanni $
+# $Id: PKGBUILD 136933 2011-09-03 00:24:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5')
 conflicts=('libdvbpsi4' 'libdvbpsi5')
 url="http://developers.videolan.org/libdvbpsi/"
 source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b80f3fb7fd58d35276cc4c4a84b6ac03')
+md5sums=('c8582dc18fc7ea1f76016d78a76ea5dd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libffi/PKGBUILD b/extra/libffi/PKGBUILD
index 13b8d2ab6..ba466479b 100644
--- a/extra/libffi/PKGBUILD
+++ b/extra/libffi/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 72255 2010-03-13 20:43:14Z jgc $
+# $Id: PKGBUILD 136233 2011-08-25 06:36:16Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libffi
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=1
-pkgdesc="A portable, high level programming interface to various calling conventions."
+pkgdesc="A portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64' 'mips64el')
-license=('MIT')
 url="http://sourceware.org/libffi"
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
+license=('MIT')
+depends=('glibc')
+options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libffi/libffi.install b/extra/libffi/libffi.install
index 151b79b60..903bede10 100644
--- a/extra/libffi/libffi.install
+++ b/extra/libffi/libffi.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(libffi.info.gz)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/extra/libfwbuilder/PKGBUILD b/extra/libfwbuilder/PKGBUILD
deleted file mode 100644
index 33f5b51ab..000000000
--- a/extra/libfwbuilder/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 112491 2011-03-05 04:49:27Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libfwbuilder
-pkgver=4.1.3
-pkgrel=2
-pkgdesc="Support libraries for fwbuilder"
-url="http://www.fwbuilder.org/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libxslt' 'net-snmp' 'gcc-libs')
-makedepends=('qt')
-source=("http://downloads.sourceforge.net/fwbuilder/${pkgname}-${pkgver}.tar.gz")
-md5sums=('810e832a3cadc625917403f4b191fda2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/extra/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD
index c6b2208c0..abca78872 100644
--- a/extra/libgtop/PKGBUILD
+++ b/extra/libgtop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120401 2011-04-23 20:45:46Z ibiru $
+# $Id: PKGBUILD 136578 2011-08-30 12:54:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtop
-pkgver=2.28.3
+pkgver=2.28.4
 pkgrel=1
 pkgdesc="A library that read information about processes and the running system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,10 +10,10 @@ license=('LGPL')
 depends=('glib2' 'libxau' 'texinfo')
 makedepends=('intltool' 'gobject-introspection')
 install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool')
 url="http://www.gnome.org/"
-sha256sums=('2c866bd14b3cd78f78504cfb65baa105d62b8085c90e433ab9db97e050efea42')
+sha256sums=('b6619cfd1540267ee81d456d1a26c72c793261586f1b00a7b9a7a229d0abe1d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD
index 9309a8f64..3ec83e29a 100644
--- a/extra/libmpd/PKGBUILD
+++ b/extra/libmpd/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 80681 2010-05-20 18:05:26Z ibiru $
+# $Id: PKGBUILD 136733 2011-08-31 19:31:16Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=libmpd
-pkgver=0.20.0
+pkgver=11.8.17
 pkgrel=1
 pkgdesc="Signal based wrapper around libmpdclient"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
+license=('GPL')
 depends=('glib2')
 options=('!libtool')
-source=(http://download.sarine.nl/Programs/gmpc/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f1c99e12c69f7d95cfd1e27368056ed')
+source=(http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5ae3d87467d52aef3345407adb0a2488')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index a32351445..c4391f5d0 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120819 2011-04-26 16:19:33Z andyrtr $
+# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmspack
-pkgver=0.2alpha
+pkgver=0.3alpha
 pkgrel=1
 pkgdesc="A library for Microsoft compression formats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=()
 options=('!libtool')
 source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz)
-md5sums=('a51c65ba1dc9b53090d4e65e1f55d860')
+md5sums=('08d08455b6d58ea649b35febd23f6386')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,6 +20,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index 34d03a7c6..cde614593 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123347 2011-05-10 13:55:24Z ibiru $
+# $Id: PKGBUILD 136391 2011-08-28 17:53:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="Desktop notification library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('gdk-pixbuf2')
 makedepends=('gtk3' 'gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e3c58345112672c2cbb05a67512ff6c7028892df7a34746e2162fe76d9877019')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index ff8ac34bd..2f5a9ceae 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134623 2011-08-06 17:29:22Z andyrtr $
+# $Id: PKGBUILD 136687 2011-08-31 14:13:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -35,9 +35,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.2.3
-pkgver=3.4.2
-pkgrel=2
+_LOver=3.4.3.2
+pkgver=3.4.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -58,6 +58,7 @@ makedepends=( # makedepends
 	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
+
 _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
@@ -91,9 +92,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
@@ -144,70 +145,68 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz)
-
-md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2
-         '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2
-         'f106511220a2a0b2a45571cf7605953a' #libreoffice-bootstrap-3.4.2.3.tar.bz2
-         '20854b5961b8b0b38219376a93ecf362' #libreoffice-calc-3.4.2.3.tar.bz2
-         '5799be1571289b7c17bd8fd2020c00f6' #libreoffice-components-3.4.2.3.tar.bz2
-         '75ca9da214abe072e37fb4d19fc2c34f' #libreoffice-extensions-3.4.2.3.tar.bz2
-         '73aa766053ea8f4c84dd0a76c0888f18' #libreoffice-extras-3.4.2.3.tar.bz2
-         '4416cc18cfa84f61eae905ff441a18d0' #libreoffice-filters-3.4.2.3.tar.bz2
-         'ecfd57a3dfd0ce230e5837b5099a0d5a' #libreoffice-help-3.4.2.3.tar.bz2
-         '40e23531e95617c7fe91e7025f007a91' #libreoffice-impress-3.4.2.3.tar.bz2
-         'bd2027fc2160798728e49d0fd331d163' #libreoffice-libs-core-3.4.2.3.tar.bz2
-         '9a948012496fcd27c31f755314ff98e3' #libreoffice-libs-extern-3.4.2.3.tar.bz2
-         'a5a8d9080492968eef001314093cd82d' #libreoffice-libs-extern-sys-3.4.2.3.tar.bz2
-         '810aa9e69b96af0f4de2e6d74b7b1847' #libreoffice-libs-gui-3.4.2.3.tar.bz2
-         '45de04dcbb6f6ff7474110ee982da7b8' #libreoffice-postprocess-3.4.2.3.tar.bz2
-         '545d65e92b674d354dd6511ee552d23f' #libreoffice-sdk-3.4.2.3.tar.bz2
-         '99e306957e38ce5e68deed9568874be6' #libreoffice-testing-3.4.2.3.tar.bz2
-         '2e7277588ef610b7a06953c59dc77c9b' #libreoffice-ure-3.4.2.3.tar.bz2
-         '281973e517d3b5626f5eedd746378fcc' #libreoffice-writer-3.4.2.3.tar.bz2
-         '1f24ab1d39f4a51faf22244c94a6203f' #1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-         '35c94d2df8893241173de1d16b6034c0' #35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-         '798b2ffdc8bcfe7bca2cf92b62caf685' #798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab' #fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-         'ada24d37d8d638b3d8a9985e80bc2978' #ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-         '2a177023f9ea8ec8bd00837605c5df1b' #2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-         'a7983f859eafb2677d7ff386a023bc40' #a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-         '3c219630e4302863a9a83d0efde889db' #3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-         '2ae988b339daec234019a7066f96733e' #2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-         '2c9b0f83ed5890af02c0df1c1776f39b' #2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-         'af3c3acf618de6108d65fcdc92b492e1' #af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-         'eeb2c7ddf0d302fba4bfc6e97eac9624' #eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-         '39bb3fcea1514f1369fcfc87542390fd' #39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-         '3404ab6b1792ae5f16bbd603bd1e1d03' #3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-         '97b2d4dba862397f446b217e2b623e71' #97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-         'f94d9870737518e3b597f9265f4e9803' #f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-         '8ce2fcd72becf06c41f7201d15373ed9' #8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-         'd8bd5eed178db6e2b18eeed243f85aa8' #d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-         '3bdf40c0d199af31923e900d082ca2dd' #3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-         'ace6ab49184e329db254e454a010f56d' #ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-         'db60e4fde8dd6d6807523deb71ee34dc' #db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-         'ba2930200c9f019c2d93a8c88c651a0f' #ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-         '18f577b374d60b3c760a3a3350407632' #18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-         '0ff7d225d087793c8c2c680d77aac3e7' #0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-         '185d60944ea767075d27247c3162b3bc' #185d60944ea767075d27247c3162b3bc-unowinreg.dll
-         'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-         '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-         'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-         '0625a7d661f899a8ce263fc8a9879108' #0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-         '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-         '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
-         'bbdd5639ada63e3130761daaecae1a10' #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-         '23bd75552206dfcd8fd4e29137dcac84' #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-         'b8cbca7b3363e6ca2d02bc0ba2b63904' #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-         'b632bdd25649cc4067bcb410bae23d2b' #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-         '9d60b6cfa3ef1926848710bbcd11115b' #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-         'dbaafd21de055e582d92d7d32fe9da13' #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-         'b7b2d0e04e142f26dd96119c80757d1f' #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-         'bc228237108cab7745897a9f466b6d39' #buildfix_boost.diff
-         'eee273f501ff45dc5f1365e78c6d57c0' #buildfix_ct2n.diff
-         '43b145db28e6c0d73578ae6fd35e510d' #vbahelper.visibility.patch
-         '37638431e7e40baf2e47966ebb9bc0e9' #scp2-more-reasonable-file-access-rights.diff
-         )
+md5sums=('7c2e73f1197d169519f86efe422e5df9'
+         '823956297a7e0b7603c585c49bd9fd4e'
+         '465b3be0e30f88e1139c45d2e2217927'
+         'a1d5af5be5eb522c8a24feacbb0161fa'
+         '8b972e130dfe62eb41d1d71d72de4b76'
+         'a6b22494e3a65a3b242ecb896aa7ab48'
+         'b7d86f8baee5b31af210cc81785e5676'
+         'de6c062d334daab99cf0592aa3568215'
+         'df46914d540ef0126cd746d09c68ca2a'
+         '8f308250c397ddc6fdb1aae13e102927'
+         '1fd00a0fcfd4a5d1956c3f6a0990d1ce'
+         '86914ac8bc30ea721b708b2f2faa3111'
+         '1452229e57ac3c4191e798eac4c0a7e0'
+         'bb46bdb682689629d432cdbf5f3f42c2'
+         'bec7f633562762debdf810690002e688'
+         '87061613efece1c253906a90cd4dc01f'
+         '308284d7d1d1bd6860d128b26e24390b'
+         'fa8b36365a2b2fb110c44886d7069774'
+         'da8a40cac4bd9d4f6f326e0e3b1b7e2a'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '18f577b374d60b3c760a3a3350407632'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         '185d60944ea767075d27247c3162b3bc'
+         'b4cae0700aa1c2aef7eb7f345365e6f1'
+         '90401bca927835b6fbae4a707ed187c8'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '0625a7d661f899a8ce263fc8a9879108'
+         '451ccf439a36a568653b024534669971'
+         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
+         '41c9b65ad60af4b3255bbecdfef11736'
+         'bbdd5639ada63e3130761daaecae1a10'
+         '23bd75552206dfcd8fd4e29137dcac84'
+         'b8cbca7b3363e6ca2d02bc0ba2b63904'
+         'b632bdd25649cc4067bcb410bae23d2b'
+         '9d60b6cfa3ef1926848710bbcd11115b'
+         'dbaafd21de055e582d92d7d32fe9da13'
+         'b7b2d0e04e142f26dd96119c80757d1f'
+         'bc228237108cab7745897a9f466b6d39'
+         'eee273f501ff45dc5f1365e78c6d57c0'
+         '43b145db28e6c0d73578ae6fd35e510d'
+         '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
 
@@ -238,9 +237,6 @@ build() {
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
 	
-	# Temporary workaround to avoid build failure in ct2n
-	mv ${srcdir}/451ccf439a36a568653b024534669971-ConvertTextToNumber{_,-}1.3.2.oxt
-
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -443,7 +439,7 @@ package_libreoffice-common() {
 }
 
 package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -465,7 +461,7 @@ package_libreoffice-base() {
 }
 
 package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
+ pkgdesc="Spreadsheet application for LibreOffice."
  depends=('libreoffice-common' 'lpsolve' )
  optdepends=()
  backup=()
@@ -487,7 +483,7 @@ package_libreoffice-calc() {
 }
 
 package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
+ pkgdesc="Drawing Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -509,7 +505,7 @@ package_libreoffice-draw() {
 }
 
 package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
  depends=('libreoffice-common' 'dbus-glib')
  optdepends=()
  backup=()
@@ -530,7 +526,7 @@ package_libreoffice-gnome() {
 }
 
 package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
+ pkgdesc="Presentation Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=('mesa:             for the OGLTrans extension')
  backup=()
@@ -552,7 +548,7 @@ package_libreoffice-impress() {
 }
 
 package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
  depends=('libreoffice-common' 'kdelibs')
  optdepends=()
  backup=()
@@ -573,7 +569,7 @@ package_libreoffice-kde4() {
 }
 
 package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -595,7 +591,7 @@ package_libreoffice-math() {
 }
 
 package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
+ pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
  optdepends=()
  backup=()
@@ -630,7 +626,7 @@ package_libreoffice-sdk() {
 }
 
 package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
+ pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
  optdepends=()
  backup=()
@@ -654,7 +650,7 @@ package_libreoffice-sdk-doc() {
 }
 
 package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
+ pkgdesc="Word Processor Applicationfor LibreOffice."
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
  backup=()
diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install
index 0bccb81f3..809472f89 100644
--- a/extra/libreoffice/libreoffice.install
+++ b/extra/libreoffice/libreoffice.install
@@ -10,9 +10,9 @@ echo "LibreOffice has been split into several packages:"
 echo "- libreoffice-common"
 echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
 echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "                              the LibreOffice APIs and for creating"
+echo "                              extensions (UNO components)."
 echo "-------------------------------------------------------------------"
 echo " * you need to install at least one libreoffice-langpack"
 echo " * you may want to pacman -Ss libreoffice-extensions"
@@ -33,9 +33,9 @@ update-mime-database usr/share/mime > /dev/null 2>&1
     echo "- libreoffice-common"
     echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
     echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
+    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+    echo "                              the LibreOffice APIs and for creating"
+    echo "                              extensions (UNO components)."
     echo "Now you need to install at least one libreoffice-langpack!"
   fi
 }
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index b5435f7c0..d7e6f0cd9 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123061 2011-05-07 21:22:40Z eric $
+# $Id: PKGBUILD 136113 2011-08-23 03:20:21Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsamplerate
-pkgver=0.1.7
-pkgrel=2
+pkgver=0.1.8
+pkgrel=1
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/SRC/index.html"
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('libsndfile')
 options=('!libtool')
 source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
-md5sums=('6731a81cb0c622c483b28c0d7f90867d')
-sha1sums=('f3f803ec5feae5a3fdb0fa3937277669e854386e')
+md5sums=('1c7fb25191b4e6e3628d198a66a84f47')
+sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +20,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index f1969de2e..d469ac73b 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 127471 2011-06-15 14:38:56Z ibiru $
+# $Id: PKGBUILD 136705 2011-08-31 15:52:34Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=libsocialweb
-pkgver=0.25.18
+pkgver=0.25.19
 pkgrel=1
 pkgdesc="A personal social data server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
 makedepends=('intltool' 'gtk-doc')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('67f4c8b0a49258f65defea1383893ba00aa7280508c980d8eaa1292fa2feb34c')
+sha256sums=('377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD
index b3704bf92..00a2d0872 100644
--- a/extra/libssh2/PKGBUILD
+++ b/extra/libssh2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $
+# $Id: PKGBUILD 136215 2011-08-24 15:37:17Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 
 pkgname=libssh2
-pkgver=1.2.7
-pkgrel=2
+pkgver=1.2.9
+pkgrel=1
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
 url="http://www.libssh2.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('openssl')
 makedepends=('zlib')
 options=('!libtool')
 source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a5d78344886f1282e4008c09bf568076')
+md5sums=('62ea143c41c6ed437a55d6a0b0579f2f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libwnck/PKGBUILD b/extra/libwnck/PKGBUILD
index dd3fa4a1e..48b4212dc 100644
--- a/extra/libwnck/PKGBUILD
+++ b/extra/libwnck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109642 2011-02-11 16:58:51Z ibiru $
+# $Id: PKGBUILD 136665 2011-08-31 12:07:16Z jgc $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libwnck
-pkgver=2.30.6
-pkgrel=2
+pkgver=2.30.7
+pkgrel=1
 pkgdesc="Window Navigator Construction Kit"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -10,8 +10,8 @@ depends=('gtk2' 'startup-notification' 'libxres')
 makedepends=('libxt' 'intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8be84d5333f0ade0e61af9f4cbf7685cb7cce2aa0ee32f53bac32107a81fe194')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 5f4293632..081f84394 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135575 2011-08-16 00:19:32Z giovanni $
+# $Id: PKGBUILD 136923 2011-09-02 23:55:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.08.13
+pkgver=2011.09.02
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('0ef56c4bf6be8cc4e31656c7293e50de')
+md5sums=('e66901b4bc2b4e6fbd7821880d0373fd')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index d8010d675..b89f57d2b 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134393 2011-08-03 15:08:59Z giovanni $
+# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz
         mercurial.profile)
-md5sums=('601990cc58af8316af4e1ea63e19d1be'
+md5sums=('0bda8040e2626e70d3d1a0654b0b03f2'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index a3f335504..f086e8c58 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134098 2011-08-01 12:57:59Z ibiru $
+# $Id: PKGBUILD 136627 2011-08-31 07:47:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -15,10 +15,10 @@ if [ "${_git}" = "true" ]; then
   else
     pkgver=7.11
 fi
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.0' 'python2' 'libxml2' 'imake' 'udev')
+             'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
 [ "$CARCH" = "mips64el" ] || makedepends+=('dri2proto=2.6' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
@@ -186,7 +186,7 @@ package_libegl() {
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') # 'dri2proto>=2.6' 'glproto>=1.4.14')
+  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
@@ -315,9 +315,3 @@ package_nouveau-dri() {
 #    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 #fi
 #}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'ff03aca82d0560009a076a87c888cf13')
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'ff03aca82d0560009a076a87c888cf13'
-         'c7788f2495060bf133771aef6ad25929'
-         '598c24dccfcdcc99c07d883f7c09f36a')
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 7e3d00838..2b252e890 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130052 2011-07-01 16:18:58Z ronald $
+# $Id: PKGBUILD 136884 2011-09-02 16:14:24Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
 makedepends=('pkg-config')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('22342897ca748fa19738c9c1c510510f314fa7eb')
+sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/linux"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index c3607c103..d305adcf5 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125653 2011-05-27 18:09:01Z ibiru $
+# $Id: PKGBUILD 136196 2011-08-24 08:32:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,21 +6,19 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.8.9997
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3'
-         'notification-daemon' 'libnotify' 'gnome-icon-theme'
-         'mobile-broadband-provider-info' 'gconf')
-makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc')
+depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf')
+makedepends=('intltool' 'gnome-bluetooth')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool')
 install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1620e52bfdba18f3640e57a3d450e913ad73a6e529dd0bad895d4c07700018ab')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 46b500642..93ef02fbc 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 122496 2011-05-04 09:27:02Z ibiru $
+# $Id: PKGBUILD 136198 2011-08-24 08:32:50Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.8.999
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf' 'libgnome-keyring')
-makedepends=('intltool' 'namcap')
+depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
-sha256sums=('e191c71ff23268eac427609aeb0fb3df7bb1b6da2645bac84c62872cdfc218f5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
+sha256sums=('0fef61c672265f2b6008d8439ed5b18fe188f2a5f207227fc79a1b78657a6812')
 
 build() {
   cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index f65860d6b..cf29a5dae 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130881 2011-07-08 15:29:40Z ibiru $
+# $Id: PKGBUILD 136200 2011-08-24 08:32:52Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.8.9997
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('47aa4d73a3e2074cf7fe4c293213df00a2fd0f76e663b05e7178731a5faa2c02')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
+sha256sums=('741e39bcedd589b656067c9d3aa45ebca41a0f329914d157450f4b92e79bf7ee')
 
 build() {
   cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index ff234bf25..b3a470c06 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122486 2011-05-04 09:21:32Z ibiru $
+# $Id: PKGBUILD 136202 2011-08-24 08:32:55Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.8.999
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2)
-sha256sums=('81cfbe647c1d155a9bf0e7e4d4f3fad4b54dce50fd7162964e7a0f5c85fb2325')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
+sha256sums=('97da81b0c8b1698316908a1dfe66c5a02a71088b56471d67d7e12066d956cbd5')
 
 build() {
   cd "${srcdir}/NetworkManager-pptp-${pkgver}"
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index ad33dc5f0..af9139630 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122481 2011-05-04 09:16:50Z ibiru $
+# $Id: PKGBUILD 136204 2011-08-24 08:32:59Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.8.999
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2)
-sha256sums=('b3802070fb25872c9cc59d82bee27b6f8ec3c3feb36b5fd148a7da2b6371c3f3')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
+sha256sums=('d672ed353f57d0422486ba96bc1bd673fd08aec5f9c015584028af07c45239a4')
 
 build() {
   cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index dc1fb1aa3..46e05f3bd 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134721 2011-08-07 16:59:44Z dreisner $
+# $Id: PKGBUILD 136194 2011-08-24 08:32:46Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -6,14 +6,14 @@
 # Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
 pkgname=networkmanager
-pkgver=0.8.9997
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -22,11 +22,11 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('af2e08546cfcd51731be8f4d944b77876ba2eca93cf4f15509caf5572cac6596'
+sha256sums=('166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 build() {
   cd "${srcdir}/NetworkManager-${pkgver}"
diff --git a/extra/networkmanager/disable_set_hostname.patch b/extra/networkmanager/disable_set_hostname.patch
index 6c9e2f6c6..ee95dd0e1 100644
--- a/extra/networkmanager/disable_set_hostname.patch
+++ b/extra/networkmanager/disable_set_hostname.patch
@@ -1,7 +1,7 @@
-diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c
---- NetworkManager-0.8.2.orig/src/nm-policy.c	2010-11-03 12:58:42.000000000 -0700
-+++ NetworkManager-0.8.2/src/nm-policy.c	2010-11-23 06:22:32.436707081 -0800
-@@ -342,6 +342,7 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
  		return;
  	}
  
@@ -9,7 +9,7 @@ diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-
  	/* Try automatically determined hostname from the best device's IP config */
  	if (!best4)
  		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -396,6 +397,7 @@
+@@ -356,6 +357,7 @@
  		}
  	}
  
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 7b918c9ec..de238d8d1 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $
+# $Id: PKGBUILD 136177 2011-08-23 18:46:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.8.8
+pkgver=4.8.9
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('b3a961d2e0ff3331745220984c70b6a9'
+md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 88c740808..7852a0e4d 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $
+# $Id: PKGBUILD 136639 2011-08-31 10:15:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=nss
-pkgver=3.12.10
-pkgrel=1
+pkgver=3.12.11
+pkgrel=3
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.7
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh')
+_nsprver=4.8.9
+depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
 options=('!strip')
@@ -16,43 +17,46 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
+        distrust-diginotar.patch
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-md5sums=('027954e894f02732f4e66cd854261145'
+md5sums=('ca0ca058380be200cf247ea2496b5352'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
-         '7f39c19b1dfd62d7db7d8bf19f156fed'
+         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
+         'f8690c4cfef46b2796026581db15b4ea'
          'd83c7b61abb7e9f8f7bcd157183d1ade')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
+  # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
+  patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
-  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
   # Removes rpath
-  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
+  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
 
-  cd mozilla/security/nss/lib/ckfw/builtins
-  make generate
+  # Respect LDFLAGS
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+      -i security/coreconf/rules.mk
 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  unset CFLAGS
-  unset CXXFLAGS
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSS_USE_SYSTEM_SQLITE=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
   export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export XCFLAGS="${CFLAGS}"
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
   make -j 1 -C mozilla/security/coreconf
   make -j 1 -C mozilla/security/dbm
   make -j 1 -C mozilla/security/nss
-
 }
 
 package() {
@@ -100,3 +104,17 @@ package() {
 
   install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
 }
+md5sums=('ca0ca058380be200cf247ea2496b5352'
+         'e5c97db0c884d5f4cfda21e562dc9bba'
+         'c547b030c57fe1ed8b77c73bf52b3ded'
+         '46bee81908f1e5b26d6a7a2e14c64d9f'
+         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
+         'f8690c4cfef46b2796026581db15b4ea'
+         'd83c7b61abb7e9f8f7bcd157183d1ade')
+md5sums=('ca0ca058380be200cf247ea2496b5352'
+         'e5c97db0c884d5f4cfda21e562dc9bba'
+         'c547b030c57fe1ed8b77c73bf52b3ded'
+         '46bee81908f1e5b26d6a7a2e14c64d9f'
+         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
+         'ba2357c5b9881bfd7d54b037954ba0ff'
+         'd83c7b61abb7e9f8f7bcd157183d1ade')
diff --git a/extra/nss/add_spi+cacert_ca_certs.patch b/extra/nss/add_spi+cacert_ca_certs.patch
index 1cc7c18f5..0af0deab7 100644
--- a/extra/nss/add_spi+cacert_ca_certs.patch
+++ b/extra/nss/add_spi+cacert_ca_certs.patch
@@ -1,8 +1,597 @@
---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds the SPI Inc. and CAcert.org CA certificates
+
+Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c
+===================================================================
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:13.000000000 +0200
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:29.056420467 +0200
+@@ -1045,6 +1045,24 @@
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
+  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+ };
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_330 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_331 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_332 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_333 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
++};
+ #ifdef DEBUG
+ static const NSSItem nss_builtins_items_0 [] = {
+   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+@@ -21910,6 +21928,531 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
++static const NSSItem nss_builtins_items_328 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
++"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
++"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
++"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
++"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
++"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
++"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
++"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
++"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
++"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
++"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
++"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
++"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
++"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
++"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
++"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
++"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
++"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
++"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
++"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
++"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
++"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
++"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
++"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
++"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
++"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
++"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
++"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
++"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
++"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
++"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
++"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
++"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
++"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
++"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
++"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
++"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
++"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
++"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
++"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
++"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
++"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
++"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
++"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
++"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
++"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
++"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
++"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
++"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
++"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
++"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
++"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
++"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
++"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
++"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
++"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
++"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
++"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
++"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
++"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
++"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
++"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
++"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
++"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
++"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
++"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
++"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
++"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
++"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
++"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
++"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
++"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
++"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
++"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
++"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
++"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
++"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
++"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
++"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
++"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
++"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
++"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
++"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
++"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
++"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
++"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
++"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
++"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
++"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
++"\103"
++, (PRUint32)1857 }
++};
++static const NSSItem nss_builtins_items_329 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
++  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
++"\166\316\217\063"
++, (PRUint32)20 },
++  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
++static const NSSItem nss_builtins_items_330 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
++"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
++"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
++"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
++"\063\040\122\157\157\164"
++, (PRUint32)86 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
++"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
++"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
++"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
++"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
++"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
++"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
++"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
++"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
++"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
++"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
++"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
++"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
++"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
++"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
++"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
++"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
++"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
++"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
++"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
++"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
++"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
++"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
++"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
++"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
++"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
++"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
++"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
++"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
++"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
++"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
++"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
++"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
++"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
++"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
++"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
++"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
++"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
++"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
++"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
++"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
++"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
++"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
++"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
++"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
++"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
++"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
++"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
++"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
++"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
++"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
++"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
++"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
++"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
++"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
++"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
++"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
++"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
++"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
++"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
++"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
++"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
++"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
++"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
++"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
++"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
++"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
++"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
++"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
++"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
++"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
++"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
++"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
++"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
++"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
++"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
++"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
++"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
++"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
++"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
++"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
++"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
++"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
++"\322\156\245\033\231\047\200\347\013\251\250\000"
++, (PRUint32)1548 }
++};
++static const NSSItem nss_builtins_items_331 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
++  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
++"\030\116\052\055"
++, (PRUint32)20 },
++  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
++static const NSSItem nss_builtins_items_332 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
++, (PRUint32)11 },
++  { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000"
++"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206"
++"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003"
++"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010"
++"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125"
++"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163"
++"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167"
++"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151"
++"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003"
++"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061"
++"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146"
++"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061"
++"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026"
++"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151"
++"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063"
++"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060"
++"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125"
++"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023"
++"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004"
++"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061"
++"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141"
++"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143"
++"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125"
++"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036"
++"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151"
++"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045"
++"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150"
++"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156"
++"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
++"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051"
++"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074"
++"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271"
++"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240"
++"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321"
++"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265"
++"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175"
++"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375"
++"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161"
++"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342"
++"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172"
++"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056"
++"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247"
++"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310"
++"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361"
++"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356"
++"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110"
++"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151"
++"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316"
++"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307"
++"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320"
++"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205"
++"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123"
++"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154"
++"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275"
++"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356"
++"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250"
++"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204"
++"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147"
++"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305"
++"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057"
++"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124"
++"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060"
++"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161"
++"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122"
++"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346"
++"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102"
++"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061"
++"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016"
++"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025"
++"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141"
++"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037"
++"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040"
++"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061"
++"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141"
++"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103"
++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157"
++"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015"
++"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100"
++"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216"
++"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377"
++"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206"
++"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035"
++"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102"
++"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151"
++"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164"
++"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102"
++"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141"
++"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055"
++"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206"
++"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057"
++"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143"
++"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125"
++"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164"
++"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016"
++"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015"
++"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002"
++"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162"
++"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030"
++"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255"
++"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065"
++"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014"
++"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306"
++"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051"
++"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017"
++"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302"
++"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213"
++"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017"
++"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162"
++"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152"
++"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357"
++"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266"
++"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104"
++"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177"
++"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253"
++"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206"
++"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217"
++"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265"
++"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225"
++"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140"
++"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207"
++"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252"
++"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340"
++"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254"
++"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275"
++"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132"
++"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151"
++"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005"
++"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004"
++"\243\140"
++, (PRUint32)2066 }
++};
++static const NSSItem nss_builtins_items_333 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
++  { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044"
++"\251\220\103\034"
++, (PRUint32)20 },
++  { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170"
++, (PRUint32)16 },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
++, (PRUint32)11 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
+ 
+ builtinsInternalObject
+ nss_builtins_data[] = {
+@@ -22244,11 +22787,17 @@
+   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
+   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
+-  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
++  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
++  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
++  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} },
++  { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} },
++  { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} },
++  { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} },
++  { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 327+1;
++  nss_builtins_nObjects = 333+1;
+ #else
+-  nss_builtins_nObjects = 327;
++  nss_builtins_nObjects = 333;
+ #endif /* DEBUG */
+Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+===================================================================
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:25:29.000000000 +0200
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:29:25.460425941 +0200
+@@ -22589,3 +22589,558 @@
  CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 +
 +#
diff --git a/extra/nss/distrust-diginotar.patch b/extra/nss/distrust-diginotar.patch
new file mode 100644
index 000000000..60c63fc68
--- /dev/null
+++ b/extra/nss/distrust-diginotar.patch
@@ -0,0 +1,1675 @@
+Index: security/nss/lib/ckfw/builtins/certdata.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
+retrieving revision 1.67.2.10
+retrieving revision 1.67.2.11
+diff -u -r1.67.2.10 -r1.67.2.11
+--- security/nss/lib/ckfw/builtins/certdata.c	1 Aug 2011 06:40:03 -0000	1.67.2.10
++++ security/nss/lib/ckfw/builtins/certdata.c	30 Aug 2011 20:04:39 -0000	1.67.2.11
+@@ -35,7 +35,7 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifdef DEBUG
+-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
+ #endif /* DEBUG */
+ 
+ #ifndef BUILTINS_H
+@@ -1039,12 +1039,6 @@
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
+  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+ };
+-static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
+- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+-};
+-static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
+- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+-};
+ #ifdef DEBUG
+ static const NSSItem nss_builtins_items_0 [] = {
+   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+@@ -1053,7 +1047,7 @@
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)"CVS ID", (PRUint32)7 },
+   { (void *)"NSS", (PRUint32)4 },
+-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
++  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
+ };
+ #endif /* DEBUG */
+ static const NSSItem nss_builtins_items_1 [] = {
+@@ -12506,151 +12500,6 @@
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)"DigiNotar Root CA", (PRUint32)18 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
+-"\074\114"
+-, (PRUint32)18 },
+-  { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
+-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
+-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
+-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
+-"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
+-"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
+-"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
+-"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
+-"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
+-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
+-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
+-"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
+-"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
+-"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
+-"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
+-"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
+-"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
+-"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
+-"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
+-"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
+-"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
+-"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
+-"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
+-"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
+-"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
+-"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
+-"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
+-"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
+-"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
+-"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
+-"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
+-"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
+-"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
+-"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
+-"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
+-"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
+-"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
+-"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
+-"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
+-"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
+-"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
+-"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
+-"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
+-"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
+-"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
+-"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
+-"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
+-"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
+-"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
+-"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
+-"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
+-"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035"
+-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125"
+-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
+-"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
+-"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
+-"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
+-"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
+-"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
+-"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
+-"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
+-"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
+-"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
+-"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
+-"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
+-"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
+-"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
+-"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
+-"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
+-"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
+-"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
+-"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
+-"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
+-"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
+-"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
+-"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
+-"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
+-"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
+-"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
+-"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
+-"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
+-"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
+-"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
+-"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
+-"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
+-"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
+-"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
+-"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
+-"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
+-, (PRUint32)1422 }
+-};
+-static const NSSItem nss_builtins_items_187 [] = {
+-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)"DigiNotar Root CA", (PRUint32)18 },
+-  { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
+-"\201\147\107\214"
+-, (PRUint32)20 },
+-  { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
+-, (PRUint32)16 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
+-"\074\114"
+-, (PRUint32)18 },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_188 [] = {
+-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
+   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+   { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+@@ -12738,7 +12587,7 @@
+ "\244\140\114\260\125\240\240\173\127\262"
+ , (PRUint32)1002 }
+ };
+-static const NSSItem nss_builtins_items_189 [] = {
++static const NSSItem nss_builtins_items_187 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12765,7 +12614,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_190 [] = {
++static const NSSItem nss_builtins_items_188 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12874,7 +12723,7 @@
+ "\333"
+ , (PRUint32)1217 }
+ };
+-static const NSSItem nss_builtins_items_191 [] = {
++static const NSSItem nss_builtins_items_189 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12902,7 +12751,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_192 [] = {
++static const NSSItem nss_builtins_items_190 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12976,7 +12825,7 @@
+ "\334\335\363\377\035\054\072\026\127\331\222\071\326"
+ , (PRUint32)653 }
+ };
+-static const NSSItem nss_builtins_items_193 [] = {
++static const NSSItem nss_builtins_items_191 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13005,7 +12854,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_194 [] = {
++static const NSSItem nss_builtins_items_192 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13097,7 +12946,7 @@
+ "\321\236\164\310\166\147"
+ , (PRUint32)1078 }
+ };
+-static const NSSItem nss_builtins_items_195 [] = {
++static const NSSItem nss_builtins_items_193 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13122,7 +12971,7 @@
+   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_196 [] = {
++static const NSSItem nss_builtins_items_194 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13219,7 +13068,7 @@
+ "\253\205\322\140\126\132"
+ , (PRUint32)1030 }
+ };
+-static const NSSItem nss_builtins_items_197 [] = {
++static const NSSItem nss_builtins_items_195 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13247,7 +13096,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_198 [] = {
++static const NSSItem nss_builtins_items_196 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13332,7 +13181,7 @@
+ "\164"
+ , (PRUint32)897 }
+ };
+-static const NSSItem nss_builtins_items_199 [] = {
++static const NSSItem nss_builtins_items_197 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13358,7 +13207,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_200 [] = {
++static const NSSItem nss_builtins_items_198 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13455,7 +13304,7 @@
+ "\374\276\337\012\015"
+ , (PRUint32)1013 }
+ };
+-static const NSSItem nss_builtins_items_201 [] = {
++static const NSSItem nss_builtins_items_199 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13484,7 +13333,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_202 [] = {
++static const NSSItem nss_builtins_items_200 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13595,7 +13444,7 @@
+ "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
+ , (PRUint32)1151 }
+ };
+-static const NSSItem nss_builtins_items_203 [] = {
++static const NSSItem nss_builtins_items_201 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13627,7 +13476,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_204 [] = {
++static const NSSItem nss_builtins_items_202 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13781,7 +13630,7 @@
+ "\103\307\003\340\067\116\135\012\334\131\040\045"
+ , (PRUint32)1964 }
+ };
+-static const NSSItem nss_builtins_items_205 [] = {
++static const NSSItem nss_builtins_items_203 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13809,7 +13658,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_206 [] = {
++static const NSSItem nss_builtins_items_204 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13890,7 +13739,7 @@
+ "\300\226\130\057\352\273\106\327\273\344\331\056"
+ , (PRUint32)940 }
+ };
+-static const NSSItem nss_builtins_items_207 [] = {
++static const NSSItem nss_builtins_items_205 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13913,7 +13762,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_208 [] = {
++static const NSSItem nss_builtins_items_206 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14047,7 +13896,7 @@
+ "\005\211\374\170\326\134\054\046\103\251"
+ , (PRUint32)1642 }
+ };
+-static const NSSItem nss_builtins_items_209 [] = {
++static const NSSItem nss_builtins_items_207 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14075,7 +13924,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_210 [] = {
++static const NSSItem nss_builtins_items_208 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14180,7 +14029,7 @@
+ "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
+ , (PRUint32)1198 }
+ };
+-static const NSSItem nss_builtins_items_211 [] = {
++static const NSSItem nss_builtins_items_209 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14207,7 +14056,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_212 [] = {
++static const NSSItem nss_builtins_items_210 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14312,7 +14161,7 @@
+ "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
+ , (PRUint32)1198 }
+ };
+-static const NSSItem nss_builtins_items_213 [] = {
++static const NSSItem nss_builtins_items_211 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14339,7 +14188,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_214 [] = {
++static const NSSItem nss_builtins_items_212 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14432,7 +14281,7 @@
+ "\230"
+ , (PRUint32)993 }
+ };
+-static const NSSItem nss_builtins_items_215 [] = {
++static const NSSItem nss_builtins_items_213 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14459,7 +14308,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_216 [] = {
++static const NSSItem nss_builtins_items_214 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14548,7 +14397,7 @@
+ "\126\144\127"
+ , (PRUint32)931 }
+ };
+-static const NSSItem nss_builtins_items_217 [] = {
++static const NSSItem nss_builtins_items_215 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14575,7 +14424,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_218 [] = {
++static const NSSItem nss_builtins_items_216 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14656,7 +14505,7 @@
+ "\000\147\240\161\000\202\110"
+ , (PRUint32)919 }
+ };
+-static const NSSItem nss_builtins_items_219 [] = {
++static const NSSItem nss_builtins_items_217 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14680,7 +14529,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_220 [] = {
++static const NSSItem nss_builtins_items_218 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14762,7 +14611,7 @@
+ "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
+ , (PRUint32)943 }
+ };
+-static const NSSItem nss_builtins_items_221 [] = {
++static const NSSItem nss_builtins_items_219 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14786,7 +14635,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_222 [] = {
++static const NSSItem nss_builtins_items_220 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14867,7 +14716,7 @@
+ "\246\210\070\316\125"
+ , (PRUint32)933 }
+ };
+-static const NSSItem nss_builtins_items_223 [] = {
++static const NSSItem nss_builtins_items_221 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14890,7 +14739,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_224 [] = {
++static const NSSItem nss_builtins_items_222 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15009,7 +14858,7 @@
+ "\201\370\021\234"
+ , (PRUint32)1460 }
+ };
+-static const NSSItem nss_builtins_items_225 [] = {
++static const NSSItem nss_builtins_items_223 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15035,7 +14884,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_226 [] = {
++static const NSSItem nss_builtins_items_224 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15169,7 +15018,7 @@
+ "\311\234\220\332\354\251\102\074\255\266\002"
+ , (PRUint32)1307 }
+ };
+-static const NSSItem nss_builtins_items_227 [] = {
++static const NSSItem nss_builtins_items_225 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15207,7 +15056,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_228 [] = {
++static const NSSItem nss_builtins_items_226 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15285,7 +15134,7 @@
+ "\366\324\357\277\114\210\150"
+ , (PRUint32)855 }
+ };
+-static const NSSItem nss_builtins_items_229 [] = {
++static const NSSItem nss_builtins_items_227 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15309,7 +15158,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_230 [] = {
++static const NSSItem nss_builtins_items_228 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15387,7 +15236,7 @@
+ "\246\347\313\100\003\335\171"
+ , (PRUint32)855 }
+ };
+-static const NSSItem nss_builtins_items_231 [] = {
++static const NSSItem nss_builtins_items_229 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15411,7 +15260,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_232 [] = {
++static const NSSItem nss_builtins_items_230 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15538,7 +15387,7 @@
+ "\320\352\111\242\034\215\122\024\246\012\223"
+ , (PRUint32)1515 }
+ };
+-static const NSSItem nss_builtins_items_233 [] = {
++static const NSSItem nss_builtins_items_231 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15566,7 +15415,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_234 [] = {
++static const NSSItem nss_builtins_items_232 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15640,7 +15489,7 @@
+ "\366\356\260\132\116\111\104\124\130\137\102\203"
+ , (PRUint32)828 }
+ };
+-static const NSSItem nss_builtins_items_235 [] = {
++static const NSSItem nss_builtins_items_233 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15663,7 +15512,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_236 [] = {
++static const NSSItem nss_builtins_items_234 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15739,7 +15588,7 @@
+ "\011\333\212\101\202\236\146\233\021"
+ , (PRUint32)857 }
+ };
+-static const NSSItem nss_builtins_items_237 [] = {
++static const NSSItem nss_builtins_items_235 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15762,7 +15611,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_238 [] = {
++static const NSSItem nss_builtins_items_236 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15845,7 +15694,7 @@
+ "\262\033\211\124"
+ , (PRUint32)932 }
+ };
+-static const NSSItem nss_builtins_items_239 [] = {
++static const NSSItem nss_builtins_items_237 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15869,7 +15718,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_240 [] = {
++static const NSSItem nss_builtins_items_238 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15969,7 +15818,7 @@
+ "\021\055"
+ , (PRUint32)1026 }
+ };
+-static const NSSItem nss_builtins_items_241 [] = {
++static const NSSItem nss_builtins_items_239 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15999,7 +15848,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_242 [] = {
++static const NSSItem nss_builtins_items_240 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16073,7 +15922,7 @@
+ "\367\130\077\056\162\002\127\243\217\241\024\056"
+ , (PRUint32)652 }
+ };
+-static const NSSItem nss_builtins_items_243 [] = {
++static const NSSItem nss_builtins_items_241 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16102,7 +15951,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_244 [] = {
++static const NSSItem nss_builtins_items_242 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16208,7 +16057,7 @@
+ "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
+ , (PRUint32)1070 }
+ };
+-static const NSSItem nss_builtins_items_245 [] = {
++static const NSSItem nss_builtins_items_243 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16240,7 +16089,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_246 [] = {
++static const NSSItem nss_builtins_items_244 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16319,7 +16168,7 @@
+ "\017\212"
+ , (PRUint32)690 }
+ };
+-static const NSSItem nss_builtins_items_247 [] = {
++static const NSSItem nss_builtins_items_245 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16349,7 +16198,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_248 [] = {
++static const NSSItem nss_builtins_items_246 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16464,7 +16313,7 @@
+ "\354\315\202\141\361\070\346\117\227\230\052\132\215"
+ , (PRUint32)1213 }
+ };
+-static const NSSItem nss_builtins_items_249 [] = {
++static const NSSItem nss_builtins_items_247 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16496,7 +16345,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_250 [] = {
++static const NSSItem nss_builtins_items_248 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16594,7 +16443,7 @@
+ "\055\247\330\206\052\335\056\020"
+ , (PRUint32)904 }
+ };
+-static const NSSItem nss_builtins_items_251 [] = {
++static const NSSItem nss_builtins_items_249 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16627,7 +16476,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_252 [] = {
++static const NSSItem nss_builtins_items_250 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16729,7 +16578,7 @@
+ "\330\316\304\143\165\077\131\107\261"
+ , (PRUint32)1049 }
+ };
+-static const NSSItem nss_builtins_items_253 [] = {
++static const NSSItem nss_builtins_items_251 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16759,7 +16608,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_254 [] = {
++static const NSSItem nss_builtins_items_252 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16878,7 +16727,7 @@
+ "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
+ , (PRUint32)1486 }
+ };
+-static const NSSItem nss_builtins_items_255 [] = {
++static const NSSItem nss_builtins_items_253 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16903,7 +16752,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_256 [] = {
++static const NSSItem nss_builtins_items_254 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16993,7 +16842,7 @@
+ "\315\345\250"
+ , (PRUint32)1043 }
+ };
+-static const NSSItem nss_builtins_items_257 [] = {
++static const NSSItem nss_builtins_items_255 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17017,7 +16866,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_258 [] = {
++static const NSSItem nss_builtins_items_256 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17122,7 +16971,7 @@
+ "\115\273\306\104\333\066\313\052\234\216"
+ , (PRUint32)1258 }
+ };
+-static const NSSItem nss_builtins_items_259 [] = {
++static const NSSItem nss_builtins_items_257 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17147,7 +16996,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_260 [] = {
++static const NSSItem nss_builtins_items_258 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17223,7 +17072,7 @@
+ "\002\153\331\132"
+ , (PRUint32)820 }
+ };
+-static const NSSItem nss_builtins_items_261 [] = {
++static const NSSItem nss_builtins_items_259 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17247,7 +17096,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_262 [] = {
++static const NSSItem nss_builtins_items_260 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17329,7 +17178,7 @@
+ "\362"
+ , (PRUint32)881 }
+ };
+-static const NSSItem nss_builtins_items_263 [] = {
++static const NSSItem nss_builtins_items_261 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17354,7 +17203,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_264 [] = {
++static const NSSItem nss_builtins_items_262 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17470,7 +17319,7 @@
+ "\113\076\053\070\007\125\230\136\244"
+ , (PRUint32)1465 }
+ };
+-static const NSSItem nss_builtins_items_265 [] = {
++static const NSSItem nss_builtins_items_263 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17494,7 +17343,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_266 [] = {
++static const NSSItem nss_builtins_items_264 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17559,7 +17408,7 @@
+ "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_267 [] = {
++static const NSSItem nss_builtins_items_265 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17586,7 +17435,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_268 [] = {
++static const NSSItem nss_builtins_items_266 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17651,7 +17500,7 @@
+ "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_269 [] = {
++static const NSSItem nss_builtins_items_267 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17678,7 +17527,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_270 [] = {
++static const NSSItem nss_builtins_items_268 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17775,7 +17624,7 @@
+ "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
+ , (PRUint32)1038 }
+ };
+-static const NSSItem nss_builtins_items_271 [] = {
++static const NSSItem nss_builtins_items_269 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17803,7 +17652,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_272 [] = {
++static const NSSItem nss_builtins_items_270 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17894,7 +17743,7 @@
+ "\336\102\343\055\202\361\017\345\372\227"
+ , (PRUint32)954 }
+ };
+-static const NSSItem nss_builtins_items_273 [] = {
++static const NSSItem nss_builtins_items_271 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17922,7 +17771,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_274 [] = {
++static const NSSItem nss_builtins_items_272 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18001,7 +17850,7 @@
+ "\130\077\137"
+ , (PRUint32)867 }
+ };
+-static const NSSItem nss_builtins_items_275 [] = {
++static const NSSItem nss_builtins_items_273 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18025,7 +17874,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_276 [] = {
++static const NSSItem nss_builtins_items_274 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18118,7 +17967,7 @@
+ "\045\361\224\264\146"
+ , (PRUint32)997 }
+ };
+-static const NSSItem nss_builtins_items_277 [] = {
++static const NSSItem nss_builtins_items_275 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18145,7 +17994,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_278 [] = {
++static const NSSItem nss_builtins_items_276 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18269,7 +18118,7 @@
+ "\156\117\022\176\012\074\235\225"
+ , (PRUint32)1560 }
+ };
+-static const NSSItem nss_builtins_items_279 [] = {
++static const NSSItem nss_builtins_items_277 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18294,7 +18143,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_280 [] = {
++static const NSSItem nss_builtins_items_278 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18413,7 +18262,7 @@
+ "\333\374\046\210\307"
+ , (PRUint32)1525 }
+ };
+-static const NSSItem nss_builtins_items_281 [] = {
++static const NSSItem nss_builtins_items_279 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18437,7 +18286,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_282 [] = {
++static const NSSItem nss_builtins_items_280 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18593,7 +18442,7 @@
+ "\167\110\320"
+ , (PRUint32)1875 }
+ };
+-static const NSSItem nss_builtins_items_283 [] = {
++static const NSSItem nss_builtins_items_281 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18624,7 +18473,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_284 [] = {
++static const NSSItem nss_builtins_items_282 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18777,7 +18626,7 @@
+ "\351\233\256\325\124\300\164\200\321\013\102\237\301"
+ , (PRUint32)1869 }
+ };
+-static const NSSItem nss_builtins_items_285 [] = {
++static const NSSItem nss_builtins_items_283 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18807,7 +18656,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_286 [] = {
++static const NSSItem nss_builtins_items_284 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18943,7 +18792,7 @@
+ "\242\355\264\324\265\145\103\267\223\106\212\323"
+ , (PRUint32)1532 }
+ };
+-static const NSSItem nss_builtins_items_287 [] = {
++static const NSSItem nss_builtins_items_285 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18973,7 +18822,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_288 [] = {
++static const NSSItem nss_builtins_items_286 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19124,7 +18973,7 @@
+ "\264"
+ , (PRUint32)1761 }
+ };
+-static const NSSItem nss_builtins_items_289 [] = {
++static const NSSItem nss_builtins_items_287 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19154,7 +19003,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_290 [] = {
++static const NSSItem nss_builtins_items_288 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19290,7 +19139,7 @@
+ "\111\043"
+ , (PRUint32)1522 }
+ };
+-static const NSSItem nss_builtins_items_291 [] = {
++static const NSSItem nss_builtins_items_289 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19320,7 +19169,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_292 [] = {
++static const NSSItem nss_builtins_items_290 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19455,7 +19304,7 @@
+ "\172\244\047\023\326\117\364\151"
+ , (PRUint32)1512 }
+ };
+-static const NSSItem nss_builtins_items_293 [] = {
++static const NSSItem nss_builtins_items_291 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19485,7 +19334,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_294 [] = {
++static const NSSItem nss_builtins_items_292 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19621,7 +19470,7 @@
+ "\302\021\254"
+ , (PRUint32)1523 }
+ };
+-static const NSSItem nss_builtins_items_295 [] = {
++static const NSSItem nss_builtins_items_293 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19651,7 +19500,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_296 [] = {
++static const NSSItem nss_builtins_items_294 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19787,7 +19636,7 @@
+ "\147\024\060"
+ , (PRUint32)1523 }
+ };
+-static const NSSItem nss_builtins_items_297 [] = {
++static const NSSItem nss_builtins_items_295 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19817,7 +19666,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_298 [] = {
++static const NSSItem nss_builtins_items_296 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19951,7 +19800,7 @@
+ "\217\116\235\306\066\347\134\246\253\022\017\326\317"
+ , (PRUint32)1501 }
+ };
+-static const NSSItem nss_builtins_items_299 [] = {
++static const NSSItem nss_builtins_items_297 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19981,7 +19830,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_300 [] = {
++static const NSSItem nss_builtins_items_298 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20115,7 +19964,7 @@
+ "\130\113\161\203\237\146\346\254\171\110\376\376\107"
+ , (PRUint32)1501 }
+ };
+-static const NSSItem nss_builtins_items_301 [] = {
++static const NSSItem nss_builtins_items_299 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20145,7 +19994,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_302 [] = {
++static const NSSItem nss_builtins_items_300 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20280,7 +20129,7 @@
+ "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
+ , (PRUint32)1520 }
+ };
+-static const NSSItem nss_builtins_items_303 [] = {
++static const NSSItem nss_builtins_items_301 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20310,7 +20159,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_304 [] = {
++static const NSSItem nss_builtins_items_302 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20438,7 +20287,7 @@
+ "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
+ , (PRUint32)1392 }
+ };
+-static const NSSItem nss_builtins_items_305 [] = {
++static const NSSItem nss_builtins_items_303 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20468,7 +20317,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_306 [] = {
++static const NSSItem nss_builtins_items_304 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20561,7 +20410,7 @@
+ "\342\342\104\276\134\367\352\034\365"
+ , (PRUint32)969 }
+ };
+-static const NSSItem nss_builtins_items_307 [] = {
++static const NSSItem nss_builtins_items_305 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20589,7 +20438,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_308 [] = {
++static const NSSItem nss_builtins_items_306 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20686,7 +20535,7 @@
+ "\364"
+ , (PRUint32)993 }
+ };
+-static const NSSItem nss_builtins_items_309 [] = {
++static const NSSItem nss_builtins_items_307 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20715,7 +20564,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_310 [] = {
++static const NSSItem nss_builtins_items_308 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20813,7 +20662,7 @@
+ "\261\050\272"
+ , (PRUint32)1011 }
+ };
+-static const NSSItem nss_builtins_items_311 [] = {
++static const NSSItem nss_builtins_items_309 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20842,7 +20691,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_312 [] = {
++static const NSSItem nss_builtins_items_310 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20919,7 +20768,7 @@
+ "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
+ , (PRUint32)848 }
+ };
+-static const NSSItem nss_builtins_items_313 [] = {
++static const NSSItem nss_builtins_items_311 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20943,7 +20792,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_314 [] = {
++static const NSSItem nss_builtins_items_312 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21020,7 +20869,7 @@
+ "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
+ , (PRUint32)848 }
+ };
+-static const NSSItem nss_builtins_items_315 [] = {
++static const NSSItem nss_builtins_items_313 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21044,7 +20893,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_316 [] = {
++static const NSSItem nss_builtins_items_314 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21153,7 +21002,7 @@
+ "\051\340\266\270\011\150\031\034\030\103"
+ , (PRUint32)1354 }
+ };
+-static const NSSItem nss_builtins_items_317 [] = {
++static const NSSItem nss_builtins_items_315 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21177,7 +21026,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_318 [] = {
++static const NSSItem nss_builtins_items_316 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21234,7 +21083,7 @@
+ "\214\171"
+ , (PRUint32)514 }
+ };
+-static const NSSItem nss_builtins_items_319 [] = {
++static const NSSItem nss_builtins_items_317 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21258,7 +21107,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_320 [] = {
++static const NSSItem nss_builtins_items_318 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21348,7 +21197,7 @@
+ "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
+ , (PRUint32)959 }
+ };
+-static const NSSItem nss_builtins_items_321 [] = {
++static const NSSItem nss_builtins_items_319 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21375,7 +21224,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_322 [] = {
++static const NSSItem nss_builtins_items_320 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21493,7 +21342,7 @@
+ "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
+ , (PRUint32)1440 }
+ };
+-static const NSSItem nss_builtins_items_323 [] = {
++static const NSSItem nss_builtins_items_321 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21519,7 +21368,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_324 [] = {
++static const NSSItem nss_builtins_items_322 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21652,7 +21501,7 @@
+ "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
+ , (PRUint32)1679 }
+ };
+-static const NSSItem nss_builtins_items_325 [] = {
++static const NSSItem nss_builtins_items_323 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21678,7 +21527,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_326 [] = {
++static const NSSItem nss_builtins_items_324 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21772,7 +21621,7 @@
+ "\204\232\315"
+ , (PRUint32)979 }
+ };
+-static const NSSItem nss_builtins_items_327 [] = {
++static const NSSItem nss_builtins_items_325 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21800,7 +21649,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_328 [] = {
++static const NSSItem nss_builtins_items_326 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21884,7 +21733,7 @@
+ "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
+ , (PRUint32)895 }
+ };
+-static const NSSItem nss_builtins_items_329 [] = {
++static const NSSItem nss_builtins_items_327 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -22242,13 +22091,11 @@
+   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
+   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
+-  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
+-  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
+-  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
++  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 329+1;
++  nss_builtins_nObjects = 327+1;
+ #else
+-  nss_builtins_nObjects = 329;
++  nss_builtins_nObjects = 327;
+ #endif /* DEBUG */
+Index: security/nss/lib/ckfw/builtins/certdata.txt
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
+retrieving revision 1.64.2.10
+retrieving revision 1.64.2.11
+diff -u -r1.64.2.10 -r1.64.2.11
+--- security/nss/lib/ckfw/builtins/certdata.txt	1 Aug 2011 06:40:04 -0000	1.64.2.10
++++ security/nss/lib/ckfw/builtins/certdata.txt	30 Aug 2011 20:04:39 -0000	1.64.2.11
+@@ -34,7 +34,7 @@
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
+ 
+ #
+ # certdata.txt
+@@ -12461,161 +12461,6 @@
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+ 
+ #
+-# Certificate "DigiNotar Root CA"
+-#
+-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+-CKA_TOKEN CK_BBOOL CK_TRUE
+-CKA_PRIVATE CK_BBOOL CK_FALSE
+-CKA_MODIFIABLE CK_BBOOL CK_FALSE
+-CKA_LABEL UTF8 "DigiNotar Root CA"
+-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+-CKA_SUBJECT MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_ID UTF8 "0"
+-CKA_ISSUER MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_SERIAL_NUMBER MULTILINE_OCTAL
+-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
+-\074\114
+-END
+-CKA_VALUE MULTILINE_OCTAL
+-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
+-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
+-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
+-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
+-\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
+-\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
+-\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
+-\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
+-\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
+-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
+-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
+-\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
+-\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
+-\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
+-\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
+-\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
+-\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
+-\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
+-\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
+-\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
+-\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
+-\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
+-\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
+-\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
+-\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
+-\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
+-\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
+-\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
+-\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
+-\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
+-\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
+-\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
+-\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
+-\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
+-\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
+-\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
+-\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
+-\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
+-\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
+-\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
+-\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
+-\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
+-\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
+-\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
+-\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
+-\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
+-\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
+-\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
+-\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
+-\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
+-\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
+-\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
+-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
+-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
+-\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
+-\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
+-\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
+-\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
+-\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
+-\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
+-\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
+-\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
+-\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
+-\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
+-\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
+-\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
+-\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
+-\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
+-\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
+-\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
+-\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
+-\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
+-\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
+-\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
+-\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
+-\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
+-\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
+-\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
+-\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
+-\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
+-\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
+-\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
+-\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
+-\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
+-\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
+-\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
+-\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
+-\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
+-\262\345\214\360\206\231\270\345\305\337\204\301\267\353
+-END
+-
+-# Trust for Certificate "DigiNotar Root CA"
+-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+-CKA_TOKEN CK_BBOOL CK_TRUE
+-CKA_PRIVATE CK_BBOOL CK_FALSE
+-CKA_MODIFIABLE CK_BBOOL CK_FALSE
+-CKA_LABEL UTF8 "DigiNotar Root CA"
+-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
+-\201\147\107\214
+-END
+-CKA_CERT_MD5_HASH MULTILINE_OCTAL
+-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
+-END
+-CKA_ISSUER MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_SERIAL_NUMBER MULTILINE_OCTAL
+-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
+-\074\114
+-END
+-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+-
+-#
+ # Certificate "Network Solutions Certificate Authority"
+ #
+ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+Index: security/nss/lib/ckfw/builtins/nssckbi.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
+retrieving revision 1.24.2.5
+retrieving revision 1.24.2.6
+diff -u -r1.24.2.5 -r1.24.2.6
+--- security/nss/lib/ckfw/builtins/nssckbi.h	1 Aug 2011 06:40:04 -0000	1.24.2.5
++++ security/nss/lib/ckfw/builtins/nssckbi.h	30 Aug 2011 20:04:40 -0000	1.24.2.6
+@@ -77,8 +77,8 @@
+  * of the comment in the CK_VERSION type definition.
+  */
+ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
+-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
+-#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
++#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
++#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
+ 
+ /* These version numbers detail the semantic changes to the ckfw engine. */
+ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD
index 3006d5dc4..1b075036d 100644
--- a/extra/nxserver/PKGBUILD
+++ b/extra/nxserver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128331 2011-06-22 20:48:01Z andyrtr $
+# $Id: PKGBUILD 136221 2011-08-24 21:00:37Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nxserver
 pkgver=3.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
 arch=(i686 x86_64 'mips64el')
 url="http://nomachine.com/"
@@ -15,12 +15,12 @@ depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$p
 makedepends=('imake')
 source=(
 #X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
 #X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-5.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
 #Compression libs and proxy sources
 http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
@@ -29,11 +29,11 @@ http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
 # gcc 43 fix
 nxcompsh-gcc43.patch)
 options=(!libtool) 
-md5sums=('54ac7dd8806928b991b0819cf76b37dd'
+md5sums=('12060433a74ac61a1c776d1d6d136117'
          '84c7f1575d9a1506370125ed050514ab'
          'cf38ec1e5a5f6453946cd387c14f2684'
          'ad8c0f133122c6d07732ca69c8759410'
-         '7b0f60d5a3c54f22da7d81aac055836e'
+         '1086a92fb523d0a5d3685b89f1c96b9f'
          '84ade443b79ea079380b754aba9d392e'
          '488bb4d9b8e9f82dc272b4e6e9c57d30'
          'abde2ccc33e31fc695031c2cfb60f3dd'
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index b348676f3..d4c0d33dd 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 132761 2011-07-25 20:47:45Z ibiru $
+# $Id: PKGBUILD 136105 2011-08-23 01:58:25Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('ptlib' 'libtheora' 'x264' 'speex')
 makedepends=('ffmpeg')
 options=(!makeflags)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('093ff27589f5884af452e6e954ab4da1cc36ff4cc27138230b7d551f22d4f230')
+sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 1caa4732f..71ef0e32e 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 121998 2011-05-01 11:06:29Z ibiru $
+# $Id: PKGBUILD 136206 2011-08-24 08:33:01Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.02
+pkgver=3.11
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
@@ -12,18 +12,16 @@ url="http://www.infradead.org/openconnect.html"
 depends=('libxml2' 'openssl' 'libproxy')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c12688474f432a6d590958cc1c1ff076')
+md5sums=('b66927f98cfeb577b3016f8b83005d6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s|/usr/libexec|/usr/lib/networkmanager|" Makefile
+  ./configure --prefix=/usr \
+      --disable-static
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" LIBDIR=/usr/lib install-lib
-
-  install  -Dm0644 openconnect.8 "${pkgdir}"/usr/share/man/man8/openconnect.8
 }
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index d73086080..360db2427 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $
+# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +17,8 @@ makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
 optdepends=('python2-numpy: Python 2.x interface'
             'eigen2')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2"
-        'pypkgpath_nondebian.patch')
-md5sums=('dea5e9df241ac37f4439da16559e420d'
-         'eb884bad665047276e80556e44043a43')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
+md5sums=('827c9f8aa14384c531c73aa165f9b777')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -49,9 +47,6 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
-  # fix upstream's assumption of "debian-based"
-  patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch"
-
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
     _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
@@ -72,18 +67,24 @@ package_opencv() {
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  cd "$pkgdir/usr/share"
+
+  # prepare FSH-friendly dirs
+  if [ -d OpenCV ]; then
+    mv opencv/samples OpenCV/
+    rm -r opencv
+    mv OpenCV opencv
+  fi
+
   # separate docs package; also be -R friendly
-  [ -d "$pkgdir/usr/share/opencv/doc" ] && \
-    mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc"
+  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
 
   # separate samples package
-  [ -d "$pkgdir/usr/share/opencv/samples" ] && \
-    mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples"
+  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  #arch=('any')
   depends=()
   optdepends=()
   options=('docs')
@@ -96,7 +97,6 @@ package_opencv-docs() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  #arch=('any')
   depends=()
   optdepends=()
   options=()
diff --git a/extra/opencv/opencv.install b/extra/opencv/opencv.install
index 7709a9cc3..ae3f50d5c 100644
--- a/extra/opencv/opencv.install
+++ b/extra/opencv/opencv.install
@@ -1,8 +1,7 @@
 post_install() {
-	echo "==> Documentation and samples are in separate packages:"
-	echo
-	echo "* opencv-docs"
-	echo "* opencv-samples"
+	echo "  Documentation and samples are in separate packages:"
+	echo "    * opencv-docs"
+	echo "    * opencv-samples"
 }
 
 post_upgrade() {
diff --git a/extra/opencv/pypkgpath_nondebian.patch b/extra/opencv/pypkgpath_nondebian.patch
deleted file mode 100644
index 7c2d44b09..000000000
--- a/extra/opencv/pypkgpath_nondebian.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
---- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800
-+++ OpenCV-2.3.0/CMakeLists.txt	2011-07-07 17:40:34.110696242 +0800
-@@ -620,11 +620,7 @@
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-     set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
--    if(APPLE)
--        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
--    else() #debian based assumed, install to the dist-packages.
--       set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
--    endif()
-+    set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
- endif()
- if(WIN32)
-     get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
new file mode 100644
index 000000000..802db0d91
--- /dev/null
+++ b/extra/p11-kit/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 136806 2011-09-01 17:14:51Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=p11-kit
+pkgver=0.5
+pkgrel=1
+pkgdesc="Library to work with PKCS#11 modules"
+arch=(i686 x86_64)
+url="http://p11-glue.freedesktop.org"
+license=('BSD')
+depends=(glibc)
+options=(!libtool)
+source=($url/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('1b4886ed4e6d25ab0b69e6350a804082')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index e8f39abfc..2b0398446 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 116819 2011-03-25 21:50:27Z heftig $
+# $Id: PKGBUILD 136693 2011-08-31 14:25:10Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pangomm
 pkgname=('pangomm' 'pangomm-docs')
-pkgver=2.28.1
+pkgver=2.28.2
 pkgrel=1
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -11,7 +11,7 @@ makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-sha256sums=('2c89b4460f88f8ece0e94a3332a804ca4858a3594abd84043b2898b61ab21c1b')
+sha256sums=('ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 734fe9e2e..e7f9eeb54 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135860 2011-08-19 20:05:50Z pierre $
+# $Id: PKGBUILD 136443 2011-08-29 12:25:25Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -7,6 +7,7 @@ pkgname=('php'
          'php-apache'
          'php-fpm'
          'php-embed'
+         'php-pear'
          'php-curl'
          'php-enchant'
          'php-gd'
@@ -22,8 +23,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.7
-_suhosinver=${pkgver}-0.9.10
+pkgver=5.3.8
+_suhosinver=5.3.7-0.9.10
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -36,7 +37,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('2d47d003c96de4e88863ff38da61af33'
+md5sums=('704cd414a0565d905e1074ffdc1fadfb'
          '08582e502fed8221c6577042ca45ddb8'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
@@ -191,6 +192,17 @@ build() {
 		--enable-embed=shared \
 		${phpextensions}
 	make
+
+	# pear
+	cp -a ${srcdir}/build-php ${srcdir}/build-pear
+	cd ${srcdir}/build-pear
+	./configure ${phpconfig} \
+		--disable-cgi \
+		--with-readline \
+		--enable-pcntl \
+		--with-pear \
+		${phpextensions}
+	make
 }
 
 # check() {
@@ -256,6 +268,19 @@ package_php-embed() {
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
 }
 
+package_php-pear() {
+	pkgdesc='PHP Extension and Application Repository'
+	depends=('php' 'bash')
+	backup=('etc/php/pear.conf')
+
+	cd ${srcdir}/build-pear
+	make -j1 install-pear INSTALL_ROOT=${pkgdir}
+	local i
+	while read i; do
+		[ ! -e "$i" ] || rm -rf "$i"
+	done < <(find ${pkgdir} -name '.*')
+}
+
 package_php-curl() {
 	depends=('php' 'curl')
 	pkgdesc='curl module for PHP'
diff --git a/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz b/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz
deleted file mode 100644
index 7167ce2d0..000000000
--- a/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz
+++ /dev/null
diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
deleted file mode 100644
index bf0966891..000000000
--- a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#
-# patch "libpurple/conversation.c"
-#  from [cd6817f4863abafef969359f65cc025f9483b401]
-#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
-#
-============================================================
---- libpurple/conversation.c	cd6817f4863abafef969359f65cc025f9483b401
-+++ libpurple/conversation.c	19aac10ceebae1ee28788b6f0c02bcfcff0c8803
-@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
- 	}
- 
- 	g_hash_table_remove_all(chat->users);
--	chat->users = NULL;
- 
- 	g_list_free(users);
- 	chat->in_room = NULL;
diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD
index bdcfe0751..b3e7e7852 100644
--- a/extra/pinentry/PKGBUILD
+++ b/extra/pinentry/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $
+# $Id: PKGBUILD 136330 2011-08-26 13:04:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk' 'qt3' 'gtk2' 'qt')
-optdepends=('gtk: for gtk backend'
-            'gtk2: for gtk2 backend'
-            'qt3: for qt3 backend'
+makedepends=('gtk2' 'qt')
+optdepends=('gtk2: for gtk2 backend'
             'qt: for qt4 backend')  
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
         gtk2-pinentry-segfault.patch)
@@ -19,22 +17,21 @@ install=pinentry.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
   for file in qt4/*.moc; do
        /usr/bin/moc ${file/.moc/.h} > ${file}
    done
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
-	--enable-pinentry-gtk \
+        --disable-pinentry-gtk \
+        --disable-pinentry-qt \
 	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt \
         --enable-pinentry-qt4 \
 	--enable-fallback-curses
   make 
   make DESTDIR=${pkgdir} install 
-  rm ${pkgdir}/usr/share/info/dir 
-  rm ${pkgdir}/usr/bin/pinentry 
-  ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
+  #rm ${pkgdir}/usr/share/info/dir 
+  #rm ${pkgdir}/usr/bin/pinentry 
+  #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
 }
 md5sums=('81f99904daee5331eb6738408bb024b6'
          'bd9888fafc56464b2c4deaad5b8edb07')
diff --git a/extra/polkit/CVE-2011-1485.patch b/extra/polkit/CVE-2011-1485.patch
deleted file mode 100644
index f7054a63a..000000000
--- a/extra/polkit/CVE-2011-1485.patch
+++ /dev/null
@@ -1,908 +0,0 @@
-From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Thu, 31 Mar 2011 16:59:09 +0000
-Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one
-
-On Linux, also switch to parsing /proc/<pid>/status instead of relying
-on the st_uid returned by stat(2) to be the uid we want.
-
-This was pointed out by Neel Mehta <nmehta@google.com>. Thanks!
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index d95a1d4..876da69 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -24,9 +24,7 @@
- #endif
- 
- #include <sys/types.h>
--#ifndef HAVE_FREEBSD
--#include <sys/stat.h>
--#else
-+#ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
-@@ -34,6 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdio.h>
- 
- #include "polkitunixprocess.h"
- #include "polkitsubject.h"
-@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process)
-  *
-  * Gets the uid of the owner of @process.
-  *
-+ * Note that this returns the real user-id (not the effective user-id) of @process.
-+ *
-  * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-  **/
- gint
-@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-                                GError            **error)
- {
-   gint result;
-+  gchar *contents;
-+  gchar **lines;
- #ifdef HAVE_FREEBSD
-   struct kinfo_proc p;
- #else
--  struct stat statbuf;
--  char procbuf[32];
-+  gchar filename[64];
-+  guint n;
- #endif
- 
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-   g_return_val_if_fail (error == NULL || *error == NULL, 0);
- 
-   result = 0;
-+  lines = NULL;
-+  contents = NULL;
- 
- #ifdef HAVE_FREEBSD
-   if (get_kinfo_proc (process->pid, &p) == 0)
-@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
- 
-   result = p.ki_uid;
- #else
--  g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid);
--  if (stat (procbuf, &statbuf) != 0)
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-     {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "stat() failed for /proc/%d: %s",
--                   process->pid,
--                   g_strerror (errno));
-       goto out;
-     }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
- 
--  result = statbuf.st_uid;
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
- #endif
- 
-- out:
--
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-   return result;
- }
- 
---
-cgit v0.8.3-6-g21f6
-From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:09:45 +0000
-Subject: Make PolkitUnixProcess also record the uid of the process
-
-This is needed to avoid possible TOCTTOU issues since a process can
-change both its real uid and effective uid.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
-index 12141e3..9f4fcf8 100644
---- a/docs/polkit/polkit-1-sections.txt
-+++ b/docs/polkit/polkit-1-sections.txt
-@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS
- PolkitUnixProcess
- polkit_unix_process_new
- polkit_unix_process_new_full
-+polkit_unix_process_new_for_owner
-+polkit_unix_process_set_pid
- polkit_unix_process_get_pid
-+polkit_unix_process_set_start_time
- polkit_unix_process_get_start_time
--polkit_unix_process_set_pid
--polkit_unix_process_get_owner
-+polkit_unix_process_set_uid
-+polkit_unix_process_get_uid
- <SUBSECTION Standard>
- PolkitUnixProcessClass
- POLKIT_UNIX_PROCESS
-diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
-index 577afec..d2c4c20 100644
---- a/src/polkit/polkitsubject.c
-+++ b/src/polkit/polkitsubject.c
-@@ -238,13 +238,18 @@ polkit_subject_from_string  (const gchar   *str,
-     {
-       gint scanned_pid;
-       guint64 scanned_starttime;
--      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-+      gint scanned_uid;
-+      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3)
-+        {
-+          subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid);
-+        }
-+      else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-         {
-           subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime);
-         }
-       else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1)
-         {
--          subject = polkit_unix_process_new_full (scanned_pid, 0);
-+          subject = polkit_unix_process_new (scanned_pid);
-           if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0)
-             {
-               g_object_unref (subject);
-@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject)
-                              g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))));
-       g_variant_builder_add (&builder, "{sv}", "start-time",
-                              g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject))));
-+      g_variant_builder_add (&builder, "{sv}", "uid",
-+                             g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject))));
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
-@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       GVariant *v;
-       guint32 pid;
-       guint64 start_time;
-+      gint32 uid;
- 
-       v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error);
-       if (v == NULL)
-@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       start_time = g_variant_get_uint64 (v);
-       g_variant_unref (v);
- 
--      ret = polkit_unix_process_new_full (pid, start_time);
-+      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
-+      if (v != NULL)
-+        {
-+          uid = g_variant_get_int32 (v);
-+          g_variant_unref (v);
-+        }
-+      else
-+        {
-+          uid = -1;
-+        }
-+
-+      ret = polkit_unix_process_new_for_owner (pid, start_time, uid);
-     }
-   else if (g_strcmp0 (kind, "unix-session") == 0)
-     {
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 876da69..913be3a 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -62,6 +62,7 @@ struct _PolkitUnixProcess
- 
-   gint pid;
-   guint64 start_time;
-+  gint uid;
- };
- 
- struct _PolkitUnixProcessClass
-@@ -74,6 +75,7 @@ enum
-   PROP_0,
-   PROP_PID,
-   PROP_START_TIME,
-+  PROP_UID
- };
- 
- static void subject_iface_init (PolkitSubjectIface *subject_iface);
-@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
- static guint64 get_start_time_for_pid (gint    pid,
-                                        GError **error);
- 
-+static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                            GError            **error);
-+
- #ifdef HAVE_FREEBSD
- static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
- #endif
-@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT,
- static void
- polkit_unix_process_init (PolkitUnixProcess *unix_process)
- {
-+  unix_process->uid = -1;
- }
- 
- static void
-@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject    *object,
-       g_value_set_int (value, unix_process->pid);
-       break;
- 
-+    case PROP_UID:
-+      g_value_set_int (value, unix_process->uid);
-+      break;
-+
-     case PROP_START_TIME:
-       g_value_set_uint64 (value, unix_process->start_time);
-       break;
-@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject      *object,
-       polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
-       break;
- 
-+    case PROP_UID:
-+      polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
-+      break;
-+
-+    case PROP_START_TIME:
-+      polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
-+      break;
-+
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-       break;
-@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject      *object,
- }
- 
- static void
-+polkit_unix_process_constructed (GObject *object)
-+{
-+  PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object);
-+
-+  /* sets start_time and uid in case they are unset */
-+
-+  if (process->start_time == 0)
-+    process->start_time = get_start_time_for_pid (process->pid, NULL);
-+
-+  if (process->uid == -1)
-+    {
-+      GError *error;
-+      error = NULL;
-+      process->uid = _polkit_unix_process_get_owner (process, &error);
-+      if (error != NULL)
-+        {
-+          process->uid = -1;
-+          g_error_free (error);
-+        }
-+    }
-+
-+  if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL)
-+    G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object);
-+}
-+
-+static void
- polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- {
-   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- 
-   gobject_class->get_property = polkit_unix_process_get_property;
-   gobject_class->set_property = polkit_unix_process_set_property;
-+  gobject_class->constructed =  polkit_unix_process_constructed;
- 
-   /**
-    * PolkitUnixProcess:pid:
-@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                    g_param_spec_int ("pid",
-                                                      "Process ID",
-                                                      "The UNIX process ID",
--                                                     -1,
-+                                                     0,
-                                                      G_MAXINT,
-                                                      0,
-                                                      G_PARAM_CONSTRUCT |
-@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                      G_PARAM_STATIC_NICK));
- 
-   /**
-+   * PolkitUnixProcess:uid:
-+   *
-+   * The UNIX user id of the process or -1 if unknown.
-+   *
-+   * Note that this is the real user-id, not the effective user-id.
-+   */
-+  g_object_class_install_property (gobject_class,
-+                                   PROP_UID,
-+                                   g_param_spec_int ("uid",
-+                                                     "User ID",
-+                                                     "The UNIX user ID",
-+                                                     -1,
-+                                                     G_MAXINT,
-+                                                     -1,
-+                                                     G_PARAM_CONSTRUCT |
-+                                                     G_PARAM_READWRITE |
-+                                                     G_PARAM_STATIC_NAME |
-+                                                     G_PARAM_STATIC_BLURB |
-+                                                     G_PARAM_STATIC_NICK));
-+
-+  /**
-    * PolkitUnixProcess:start-time:
-    *
-    * The start time of the process.
-@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                         0,
-                                                         G_MAXUINT64,
-                                                         0,
--                                                        G_PARAM_READABLE |
-+                                                        G_PARAM_CONSTRUCT |
-+                                                        G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_BLURB |
-                                                         G_PARAM_STATIC_NICK));
-@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- }
- 
- /**
-- * polkit_unix_process_get_pid:
-+ * polkit_unix_process_get_uid:
-  * @process: A #PolkitUnixProcess.
-  *
-- * Gets the process id for @process.
-+ * Gets the user id for @process. Note that this is the real user-id,
-+ * not the effective user-id.
-  *
-- * Returns: The process id for @process.
-+ * Returns: The user id for @process or -1 if unknown.
-  */
- gint
--polkit_unix_process_get_pid (PolkitUnixProcess *process)
-+polkit_unix_process_get_uid (PolkitUnixProcess *process)
- {
--  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  return process->pid;
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1);
-+  return process->uid;
- }
- 
- /**
-- * polkit_unix_process_get_owner:
-+ * polkit_unix_process_set_uid:
-  * @process: A #PolkitUnixProcess.
-- * @error: (allow-none): Return location for error or %NULL.
-+ * @uid: The user id to set for @process or -1 to unset it.
-  *
-- * Gets the uid of the owner of @process.
-+ * Sets the (real, not effective) user id for @process.
-+ */
-+void
-+polkit_unix_process_set_uid (PolkitUnixProcess *process,
-+                             gint               uid)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  g_return_if_fail (uid >= -1);
-+  process->uid = uid;
-+}
-+
-+/**
-+ * polkit_unix_process_get_pid:
-+ * @process: A #PolkitUnixProcess.
-  *
-- * Note that this returns the real user-id (not the effective user-id) of @process.
-+ * Gets the process id for @process.
-  *
-- * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-- **/
-+ * Returns: The process id for @process.
-+ */
- gint
--polkit_unix_process_get_owner (PolkitUnixProcess  *process,
--                               GError            **error)
-+polkit_unix_process_get_pid (PolkitUnixProcess *process)
- {
--  gint result;
--  gchar *contents;
--  gchar **lines;
--#ifdef HAVE_FREEBSD
--  struct kinfo_proc p;
--#else
--  gchar filename[64];
--  guint n;
--#endif
--
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  g_return_val_if_fail (error == NULL || *error == NULL, 0);
--
--  result = 0;
--  lines = NULL;
--  contents = NULL;
--
--#ifdef HAVE_FREEBSD
--  if (get_kinfo_proc (process->pid, &p) == 0)
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "get_kinfo_proc() failed for pid %d: %s",
--                   process->pid,
--                   g_strerror (errno));
--      goto out;
--    }
--
--  result = p.ki_uid;
--#else
--
--  /* see 'man proc' for layout of the status file
--   *
--   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
--   */
--  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
--  if (!g_file_get_contents (filename,
--                            &contents,
--                            NULL,
--                            error))
--    {
--      goto out;
--    }
--  lines = g_strsplit (contents, "\n", -1);
--  for (n = 0; lines != NULL && lines[n] != NULL; n++)
--    {
--      gint real_uid, effective_uid;
--      if (!g_str_has_prefix (lines[n], "Uid:"))
--        continue;
--      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unexpected line `%s' in file %s",
--                       lines[n],
--                       filename);
--          goto out;
--        }
--      else
--        {
--          result = real_uid;
--          goto out;
--        }
--    }
--
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "Didn't find any line starting with `Uid:' in file %s",
--               filename);
--#endif
--
--out:
--  g_strfreev (lines);
--  g_free (contents);
--  return result;
-+  return process->pid;
- }
- 
- /**
-@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process)
- }
- 
- /**
-+ * polkit_unix_process_set_start_time:
-+ * @process: A #PolkitUnixProcess.
-+ * @start_time: The start time for @pid.
-+ *
-+ * Set the start time of @process.
-+ */
-+void
-+polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                    guint64            start_time)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  process->start_time = start_time;
-+}
-+
-+/**
-  * polkit_unix_process_set_pid:
-  * @process: A #PolkitUnixProcess.
-  * @pid: A process id.
-@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process,
- {
-   g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-   process->pid = pid;
--  if (pid != (gint) -1)
--    process->start_time = get_start_time_for_pid (pid, NULL);
- }
- 
- /**
-  * polkit_unix_process_new:
-  * @pid: The process id.
-  *
-- * Creates a new #PolkitUnixProcess for @pid. The start time of the
-- * process will be looked up in using e.g. the
-- * <filename>/proc</filename> filesystem depending on the platform in
-- * use.
-+ * Creates a new #PolkitUnixProcess for @pid.
-+ *
-+ * The uid and start time of the process will be looked up in using
-+ * e.g. the <filename>/proc</filename> filesystem depending on the
-+ * platform in use.
-  *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
-@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid)
-  *
-  * Creates a new #PolkitUnixProcess object for @pid and @start_time.
-  *
-+ * The uid of the process will be looked up in using e.g. the
-+ * <filename>/proc</filename> filesystem depending on the platform in
-+ * use.
-+ *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
- PolkitSubject *
- polkit_unix_process_new_full (gint pid,
-                               guint64 start_time)
- {
--  PolkitUnixProcess *process;
--
--  process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
--  process->pid = pid;
--  if (start_time != 0)
--    process->start_time = start_time;
--  else
--    process->start_time = get_start_time_for_pid (pid, NULL);
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       NULL));
-+}
- 
--  return POLKIT_SUBJECT (process);
-+/**
-+ * polkit_unix_process_new_for_owner:
-+ * @pid: The process id.
-+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>.
-+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>.
-+ *
-+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid.
-+ *
-+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-+ */
-+PolkitSubject *
-+polkit_unix_process_new_for_owner (gint    pid,
-+                                   guint64 start_time,
-+                                   gint    uid)
-+{
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       "uid", uid,
-+                                       NULL));
- }
- 
- static guint
-@@ -616,3 +654,95 @@ out:
- 
-   return start_time;
- }
-+
-+static gint
-+_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                GError            **error)
-+{
-+  gint result;
-+  gchar *contents;
-+  gchar **lines;
-+#ifdef HAVE_FREEBSD
-+  struct kinfo_proc p;
-+#else
-+  gchar filename[64];
-+  guint n;
-+#endif
-+
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-+  g_return_val_if_fail (error == NULL || *error == NULL, 0);
-+
-+  result = 0;
-+  lines = NULL;
-+  contents = NULL;
-+
-+#ifdef HAVE_FREEBSD
-+  if (get_kinfo_proc (process->pid, &p) == 0)
-+    {
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "get_kinfo_proc() failed for pid %d: %s",
-+                   process->pid,
-+                   g_strerror (errno));
-+      goto out;
-+    }
-+
-+  result = p.ki_uid;
-+#else
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-+    {
-+      goto out;
-+    }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
-+
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
-+#endif
-+
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-+  return result;
-+}
-+
-+/* deprecated public method */
-+gint
-+polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                               GError            **error)
-+{
-+  return _polkit_unix_process_get_owner (process, error);
-+}
-diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h
-index b88cd03..531a57d 100644
---- a/src/polkit/polkitunixprocess.h
-+++ b/src/polkit/polkitunixprocess.h
-@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess;
- typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass;
- 
- GType           polkit_unix_process_get_type       (void) G_GNUC_CONST;
--PolkitSubject  *polkit_unix_process_new            (gint pid);
--PolkitSubject  *polkit_unix_process_new_full       (gint pid,
--                                                    guint64 start_time);
--
-+PolkitSubject  *polkit_unix_process_new            (gint               pid);
-+PolkitSubject  *polkit_unix_process_new_full       (gint               pid,
-+                                                    guint64            start_time);
-+PolkitSubject  *polkit_unix_process_new_for_owner  (gint               pid,
-+                                                    guint64            start_time,
-+                                                    gint               uid);
- gint            polkit_unix_process_get_pid        (PolkitUnixProcess *process);
- guint64         polkit_unix_process_get_start_time (PolkitUnixProcess *process);
-+gint            polkit_unix_process_get_uid        (PolkitUnixProcess *process);
- void            polkit_unix_process_set_pid        (PolkitUnixProcess *process,
-                                                     gint               pid);
-+void            polkit_unix_process_set_uid        (PolkitUnixProcess *process,
-+                                                    gint               uid);
-+void            polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                                    guint64            start_time);
-+
- gint            polkit_unix_process_get_owner      (PolkitUnixProcess  *process,
--                                                    GError            **error);
-+                                                    GError            **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid);
- 
- G_END_DECLS
- 
---
-cgit v0.8.3-6-g21f6
-From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:12:27 +0000
-Subject: Use polkit_unix_process_get_uid() to get the owner of a process
-
-This avoids a TOCTTOU problem.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
-index 495f752..9c331b6 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
-@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      local_error = NULL;
--      uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error);
--      if (local_error != NULL)
-+      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
-+      if ((gint) uid == -1)
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting user for process: ");
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unix process subject does not have uid set");
-           goto out;
-         }
--
-       ret = polkit_unix_user_new (uid);
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
---
-cgit v0.8.3-6-g21f6
-From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:13:15 +0000
-Subject: pkexec: Avoid TOCTTOU problems with parent process
-
-In a nutshell, the parent process may change its uid (either real- or
-effective uid) after launching pkexec. It can do this by exec()'ing
-e.g. a setuid root program.
-
-To avoid this problem, just use the uid the parent process had when it
-executed pkexec. This happens to be the same uid of the pkexec process
-itself.
-
-Additionally, remove some dubious code that allowed pkexec to continue
-when the parent process died as there is no reason to support
-something like that. Also ensure that the pkexec process is killed if
-the parent process dies.
-
-This problem was pointed out by Neel Mehta <nmehta@google.com>.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 9217954..3e656be 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -35,6 +35,10 @@
- #include <pwd.h>
- #include <errno.h>
- 
-+#ifdef __linux__
-+#include <sys/prctl.h>
-+#endif
-+
- #include <glib/gi18n.h>
- 
- #ifdef POLKIT_AUTHFW_PAM
-@@ -423,7 +427,6 @@ main (int argc, char *argv[])
-   GPtrArray *saved_env;
-   gchar *opt_user;
-   pid_t pid_of_caller;
--  uid_t uid_of_caller;
-   gpointer local_agent_handle;
- 
-   ret = 127;
-@@ -598,40 +601,49 @@ main (int argc, char *argv[])
-    */
-   g_type_init ();
- 
--  /* now check if the program that invoked us is authorized */
-+  /* make sure we are nuked if the parent process dies */
-+#ifdef __linux__
-+  if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
-+    {
-+      g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno));
-+      goto out;
-+    }
-+#else
-+#warning "Please add OS specific code to catch when the parent dies"
-+#endif
-+
-+  /* Figure out the parent process */
-   pid_of_caller = getppid ();
-   if (pid_of_caller == 1)
-     {
-       /* getppid() can return 1 if the parent died (meaning that we are reaped
--       * by /sbin/init); get process group leader instead - for example, this
--       * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit').
-+       * by /sbin/init); In that case we simpy bail.
-        */
--      pid_of_caller = getpgrp ();
--    }
--
--  subject = polkit_unix_process_new (pid_of_caller);
--  if (subject == NULL)
--    {
--      g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
-+      g_printerr ("Refusing to render service to dead parents.\n");
-       goto out;
-     }
- 
--  /* paranoia: check that the uid of pid_of_caller matches getuid() */
--  error = NULL;
--  uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject),
--                                                 &error);
--  if (error != NULL)
--    {
--      g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
--      goto out;
--    }
--  if (uid_of_caller != getuid ())
--    {
--      g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ());
--      goto out;
--    }
-+  /* This process we want to check an authorization for is the process
-+   * that launched us - our parent process.
-+   *
-+   * At the time the parent process fork()'ed and exec()'ed us, the
-+   * process had the same real-uid that we have now. So we use this
-+   * real-uid instead of of looking it up to avoid TOCTTOU issues
-+   * (consider the parent process exec()'ing a setuid helper).
-+   *
-+   * On the other hand, the monotonic process start-time is guaranteed
-+   * to never change so it's safe to look that up given only the PID
-+   * since we are guaranteed to be nuked if the parent goes away
-+   * (cf. the prctl(2) call above).
-+   */
-+  subject = polkit_unix_process_new_for_owner (pid_of_caller,
-+                                               0, /* 0 means "look up start-time in /proc" */
-+                                               getuid ());
-+  /* really double-check the invariants guaranteed by the PolkitUnixProcess class */
-+  g_assert (subject != NULL);
-+  g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller);
-+  g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0);
-+  g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0);
- 
-   error = NULL;
-   authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index fadb173be..0fe7ea09b 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120110 2011-04-20 09:34:59Z jgc $
+# $Id: PKGBUILD 136695 2011-08-31 14:31:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.101
-pkgrel=2
+pkgver=0.102
+pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -13,15 +13,12 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 replaces=('policykit')
 options=('!libtool')
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        CVE-2011-1485.patch
         polkit.pam)
-md5sums=('f925ac93aba3c072977370c1e27feb7f'
-         '4d858b8ab602614d7db2bc8574f6fd29'
+md5sums=('a3726bdb9728c103e58f62131e26693a'
          '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/CVE-2011-1485.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
       --disable-static --enable-gtk-doc
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index c94fdc984..f5ee29640 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 130701 2011-07-07 21:12:32Z bisson $
+# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.4
+pkgver=2.8.5
 pkgrel=1
-pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
+pkgdesc='Secure, fast, easy to administer alternative to Sendmail'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('48d077ad2614098f39411cb965a74d8ce2f3e5be'
+sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
diff --git a/extra/postfix/install b/extra/postfix/install
index f5d81a565..c276e0919 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -18,11 +18,10 @@ post_install() {
 post_upgrade() {
 	post_install
 
-	if [ `vercmp $2 2.8` = -1 ]; then cat <<EOF
+	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
 
 ==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because the queue manager to delivery agent
-==> protocol has changed.
+==> This is needed because of an inter-daemon protocol change.
 
 EOF
 	fi
diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD
index 0824c14f6..443e4a6c8 100644
--- a/extra/progsreiserfs/PKGBUILD
+++ b/extra/progsreiserfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107514 2011-01-26 12:57:49Z tpowa $
+# $Id: PKGBUILD 136335 2011-08-26 15:07:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=progsreiserfs
 pkgver=0.3.0.5
-pkgrel=6
+pkgrel=7
 pkgdesc="library for accessing and manipulating reiserfs partitions"
 arch=(i686 x86_64 'mips64el')
 url="http://www.namesys.com"
@@ -12,11 +12,13 @@ depends=('e2fsprogs')
 options=('!libtool')
 source=(#ftp://ftp.namesys.com/pub/libreiserfs/${pkgname}-${pkgver}.tar.gz
 	ftp://ftp.archlinux.org/other/progsreiserfs/${pkgname}-${pkgver}.tar.gz
+        fix-underquoted-definition.patch
 	)
 md5sums=('d822579bbd4a29a1be5e4490869d9bee')
 
 build()        {
         cd ${srcdir}/${pkgname}-${pkgver}
+        patch -Np0 -i ../fix-underquoted-definition.patch
         ./configure --prefix=/usr --mandir=/usr/share/man 
         make
 }
@@ -28,3 +30,5 @@ package() {
         rm -r ${pkgdir}/usr/sbin
 	rm -r ${pkgdir}/usr/share/man/
 }
+md5sums=('d822579bbd4a29a1be5e4490869d9bee'
+         '4c47c1f136d01f60cb73f84116edbcc2')
diff --git a/extra/progsreiserfs/fix-underquoted-definition.patch b/extra/progsreiserfs/fix-underquoted-definition.patch
new file mode 100644
index 000000000..7d8eb7c0c
--- /dev/null
+++ b/extra/progsreiserfs/fix-underquoted-definition.patch
@@ -0,0 +1,11 @@
+--- progsreiserfs.m4~	2011-08-26 17:02:36.263433559 +0200
++++ progsreiserfs.m4	2011-08-26 17:02:36.263433559 +0200
+@@ -10,7 +10,7 @@
+ dnl Adds the required libraries to $REISERFS_LIBS and does an
+ dnl AC_SUBST(REISERFS_LIBS)
+ 
+-AC_DEFUN(AC_CHECK_LIBREISERFS,
++AC_DEFUN([AC_CHECK_LIBREISERFS],
+ [
+ 
+ dnl save LIBS
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 7d4f3238c..10a14cbc9 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88955 2010-08-26 15:26:52Z ronald $
+# $Id: PKGBUILD 136892 2011-09-02 17:05:04Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
-pkgver=3.50
-pkgrel=4
+pkgver=3.60
+pkgrel=1
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
@@ -15,18 +15,13 @@ makedepends=('ghostscript')
 options=('!libtool' '!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
 	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('5685bef29fa00aae7cc314d3a1dd21612a98eb2b'
+sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
           '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
           '54bbe019de66eb4cb8525371462595d21fbd074e')
 
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # fix FS#19221 - [pstoedit] plugin close problem 
-  patch -Np1 -i ../pstoedit-3.50-parallel.patch
-  patch -Np1 -i ../pstoedit-3.50-plugin-close.patch
-
   sed -i 's/-pedantic//' configure
 
   ./configure --prefix=/usr
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 97a79caac..26fe24ab7 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 132754 2011-07-25 19:54:44Z ibiru $
+# $Id: PKGBUILD 136104 2011-08-23 01:58:09Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
 replaces=('pwlib')
 conflicts=('pwlib')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9d5ad6baede23ed893f70a4a21948aa656bf96013f04c5c1ad5154a5dbe13c5f')
+sha256sums=('a0985848da2ea06a4df804a650fd800ff52a01f889c116595b9a67fc35537140')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject2/PKGBUILD
index 08b7bd67c..cc05dd543 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 133523 2011-07-28 20:25:13Z ibiru $
+# $Id: PKGBUILD 136848 2011-09-02 11:44:37Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=pygobject
-pkgname=(pygobject py3gobject pygobject-devel)
+pkgbase=pygobject2
+pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.pygtk.org/"
 license=('LGPL')
 depends=('glib2' 'gobject-introspection')
 makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
         python3-fix-build.patch
         python3-fix-maketrans.patch)
 options=('!libtool')
-url="http://www.pygtk.org/"
 sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
             'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
             '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
 build() {
   cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
+  cp -a "pygobject-${pkgver}" python2-build
   mkdir devel
 
   (
@@ -31,7 +31,7 @@ build() {
   )
 
   (
-    cd "${pkgbase}-${pkgver}"
+    cd "pygobject-${pkgver}"
     #patches available in 2.28 branch but unreleased.
     patch -Np1 -i "${srcdir}/python3-fix-build.patch"
     patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
@@ -41,9 +41,24 @@ build() {
   )
 }
 
-package_pygobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo' 'pygobject-devel')
+package_python-gobject2() {
+  pkgdesc="Python 3 bindings for GObject2"
+  depends+=('python' 'python-cairo' 'pygobject2-devel')
+  replaces=('py3gobject')
+  provides=("py3gobject=$pkgver")
+
+  cd "${srcdir}/pygobject-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # Delete devel stuff
+  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
+}
+
+package_python2-gobject2() {
+  pkgdesc="Python 2 bindings for GObject2"
+  depends+=('python2' 'python2-cairo' 'pygobject2-devel')
+  replaces=('pygobject')
+  provides=("pygobject=$pkgver")
 
   cd "${srcdir}/python2-build"
   make DESTDIR="${pkgdir}" install
@@ -56,20 +71,11 @@ package_pygobject() {
     "$srcdir/devel/"
 }
 
-package_py3gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo' 'pygobject-devel')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_pygobject-devel() {
+package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
   depends=(python2)
+  replaces=pygobject-devel
+  provides=pygobject-devel
 
   cd "${srcdir}/devel"
   mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}
diff --git a/extra/pygobject/python3-fix-build.patch b/extra/pygobject2/python3-fix-build.patch
index 4cb8cfe57..4cb8cfe57 100644
--- a/extra/pygobject/python3-fix-build.patch
+++ b/extra/pygobject2/python3-fix-build.patch
diff --git a/extra/pygobject/python3-fix-maketrans.patch b/extra/pygobject2/python3-fix-maketrans.patch
index f5bc0e77c..f5bc0e77c 100644
--- a/extra/pygobject/python3-fix-maketrans.patch
+++ b/extra/pygobject2/python3-fix-maketrans.patch
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 413b9c324..4cd7d78c6 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
+# $Id: PKGBUILD 136831 2011-09-01 23:43:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@ options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
+        'qtconfig.desktop')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'dc7ed8c2e8c68a175f7f05a34dccc937')
+         '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
 	unset QMAKESPEC
@@ -43,9 +41,6 @@ build() {
 
 	cd $srcdir/$_pkgfqn
 
-    # Already fixed upstream
-    patch -p1 -i "${srcdir}"/qtbug-16292.patch
-	
     sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
diff --git a/extra/qt/qtbug-16292.patch b/extra/qt/qtbug-16292.patch
deleted file mode 100644
index 9728e28f5..000000000
--- a/extra/qt/qtbug-16292.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
-Date: Tue, 15 Feb 2011 11:19:26 +0100
-Subject: [PATCH] Fix crash in KPackageKit
-
-QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex
-after calling QTreeView::indexRowSizeHint().
-
-Same thing inside QTreeView::indexRowSizeHint(), since
-QHeaderView::count() will call
-QAbstractItemViewPrivate::executePostedLayout() which may invalidate
-all the QModelIndex.
-
-Reviewed-by: Olivier
-Task-number: QTBUG-16292
----
- src/gui/itemviews/qtreeview.cpp |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
-index f1f3236..c0573bb 100644
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const
- 
-     int start = -1;
-     int end = -1;
-+    int indexRow = index.row();
-     int count = d->header->count();
-     bool emptyHeader = (count == 0);
-     QModelIndex parent = index.parent();
-@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const
-         int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column);
-         if (d->header->isSectionHidden(logicalColumn))
-             continue;
--        QModelIndex idx = d->model->index(index.row(), logicalColumn, parent);
-+        QModelIndex idx = d->model->index(indexRow, logicalColumn, parent);
-         if (idx.isValid()) {
-             QWidget *editor = d->editorForIndex(idx).editor;
-             if (editor && d->persistent.contains(editor)) {
-@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const
-     if (viewItems.isEmpty())
-         return 0;
-     const QModelIndex &index = viewItems.at(item).index;
-+    if (!index.isValid())
-+        return 0;
-     int height = viewItems.at(item).height;
--    if (height <= 0 && index.isValid()) {
-+    if (height <= 0) {
-         height = q_func()->indexRowSizeHint(index);
-         viewItems[item].height = height;
-     }
--    if (!index.isValid() || height < 0)
--        return 0;
--    return height;
-+    return qMax(height, 0);
- }
- 
- 
--- 
-1.6.1
-
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index c8dc0758c..1bb6ad272 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131207 2011-07-11 21:16:26Z ronald $
+# $Id: PKGBUILD 136909 2011-09-02 18:19:47Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir.archlinux.org>
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 pkgname=qtiplot
-pkgver=0.9.8.6
+pkgver=0.9.8.8
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/qtiplot.html"
@@ -25,7 +25,7 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
 	qtiplot-0.9.8.6-gold.patch
 	qtiplot-0.9.8.6-kde.patch
 	qtiplot-0.9.8.6-tamuanova.patch)
-sha1sums=('e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9'
+sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
           '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
           '4301cb2a36024a10108b689990d28c4fe5c7416e'
           'b3af6c866b3e63b537b418b6d00e57ef468f8f2b'
@@ -35,14 +35,13 @@ sha1sums=('e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9'
           'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
           '830b518e3ef63625df84363a8047417124f243b0')
 
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
    # gentoo fixes  
    patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
    patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
+#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
 
    # build also static qwtplot3d lib
    echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index b3eccf6de..3b7c111bb 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 131712 2011-07-13 18:32:34Z ronald $
+# $Id: PKGBUILD 136901 2011-09-02 17:44:52Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
-pkgver=6.0.0
+pkgver=6.0.1
 pkgrel=1
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!makeflags')
 license=("custom:$pkgname")
 source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \
         "qwtconfig-archlinux.pri")
-sha1sums=('306957fc06c90f2049aec57e13a971f54c3cb21a'
+sha1sums=('301cca0c49c7efc14363b42e082b09056178973e'
           'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
 
 build() {
@@ -33,8 +33,8 @@ package() {
   make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
 
   # Move man files to proper directory.
-  install -d ${pkgdir}/usr/share/man/man3
-  mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
+#  install -d ${pkgdir}/usr/share/man/man3
+#  mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
 
   # install licence
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index ca84c03b5..a9c2053e1 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130165 2011-07-02 23:00:40Z andrea $
+# $Id: PKGBUILD 136218 2011-08-24 20:33:47Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
 
 pkgname=rasqal
 epoch=1
-pkgver=0.9.26
+pkgver=0.9.27
 pkgrel=1
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('raptor>=2.0.3' 'mpfr')
 options=('!libtool')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1e9fe5423498f10f636319633855e691')
+md5sums=('dd48b9a80947a6136fbdb79276d476e2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 6fe4b4ed5..119c02ad9 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
+# $Id: PKGBUILD 136414 2011-08-29 08:01:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1.git20110610
-pkgrel=2
+pkgver=2.90.1.git20110829
+pkgrel=1
 pkgdesc="An iTunes-like music player/libary"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
-         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
+         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
          'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf')
 makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0')
+sha256sums=('6b33abe4cc0640bb3ad33aee61b848b3b87e5f284e302a894b5d2a2f283076d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index d8134cb81..a8b626e22 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135597 2011-08-16 14:39:28Z tpowa $
+# $Id: PKGBUILD 136436 2011-08-29 09:26:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,12 +8,11 @@ pkgver=3.6.0
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=1
+pkgrel=8
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
-options=(!makeflags)
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
         swat.xinetd
@@ -34,6 +33,9 @@ build() {
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
+              --with-dnsupdate \
+              --with-automount \
+              --with-quotas \
               --with-ads \
               --with-acl-support \
               --with-cifsmount \
@@ -42,7 +44,7 @@ build() {
               --enable-external-libtalloc \
               --disable-dnssd \
               --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
               --enable-external-libtdb
   make
 }
@@ -77,13 +79,14 @@ backup=(etc/logrotate.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
+  rm -rf ${pkgdir}/var/run/samba
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
   install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
@@ -102,12 +105,17 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
   ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
+  # winbind krb5 locator
+  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
       rm -f ${pkgdir}/usr/share/man/man8/${man}.8
   done
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
       rm -f ${pkgdir}/usr/lib/$i
   done
   for bin in net \
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index a44cc4263..854c11cc9 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131691 2011-07-13 14:56:55Z giovanni $
+# $Id: PKGBUILD 136927 2011-09-03 00:05:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=0.10.70
+pkgver=0.10.73
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
 install=smb4k.install
 source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('30f916d8f72fc43a9eca8f344960b43a')
+md5sums=('8f161a1b1146dc44217826901deb35c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 0d4d21212..6206fd6c4 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $
+# $Id: PKGBUILD 136171 2011-08-23 17:11:36Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=snd
-pkgver=12.3
+pkgver=12.4
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
-depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw')
+depends=('lesstif' 'jack' 'gamin' 'gsl' 'fftw')
 makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm'
              'timidity++' 'mpg123' 'vorbis-tools' 'gmp')
 optdepends=('ladspa' 'wavpack' 'flac' 'speex'
             'timidity++' 'mpg123' 'vorbis-tools')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('e1dab6945b9583f02aa6ae73d3780c98')
+md5sums=('107e5a4fd5df2d1432d0ec51cb31a88b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/soundtouch/ChangeLog b/extra/soundtouch/ChangeLog
deleted file mode 100644
index 06d96ba3b..000000000
--- a/extra/soundtouch/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2010-02-06  Eric Belanger  <eric@archlinux.org>
-
-	* soundtouch 1.5.0-1
-	* Upstream update
-	* Added shared libs
-
-2008-12-12  Eric Belanger  <eric@archlinux.org>
-
-	* soundtouch 1.3.1-3
-	* Added to [extra] repo
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 74ee51e37..a40896dd4 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 133028 2011-07-26 22:29:32Z eric $
+# $Id: PKGBUILD 136931 2011-09-03 00:12:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
-pkgver=3.1.4
-pkgrel=4
+pkgver=3.1.5
+pkgrel=1
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
@@ -14,7 +14,7 @@ makedepends=('ctags' 'boost')
 options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('becf8292b84ece6b532b0f0c92b530ee')
+md5sums=('3117ee47c1c6b0668667e20d2aca3757')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index 38b399256..778c0ba30 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125768 2011-05-29 12:37:27Z ibiru $
+# $Id: PKGBUILD 136819 2011-09-01 20:47:38Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
 pkgver=0.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Telepathy framework logging daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Logger"
@@ -19,6 +19,7 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/telepathy \
+    --enable-call \
     --disable-static \
     --disable-scrollkeeper \
     --disable-schemas-compile
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index a978fa4eb..f3e051171 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135871 2011-08-19 21:48:29Z eric $
+# $Id: PKGBUILD 136236 2011-08-25 06:48:07Z tpowa $
 # Maintainer: andyrtr <andyrtr funnychar archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -24,11 +24,13 @@ install=${pkgname}.install
 backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
 	org.freedesktop.udisks.pkla
-        fix-gvfs.patch)
+        fix-gvfs.patch
+	fix-samba.patch)
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
   patch -Np1 -i ../fix-gvfs.patch
+  patch -Np1 -i ../fix-samba.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -57,9 +59,8 @@ package() {
   install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
   install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+
 md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
          'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
-         'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '167c79462cddc5aaa1fcdc814041350b')
+         '167c79462cddc5aaa1fcdc814041350b'
+         'c8063873958d89402046f29b78c1d8d4')
diff --git a/extra/thunar/fix-samba.patch b/extra/thunar/fix-samba.patch
new file mode 100644
index 000000000..61d53bec3
--- /dev/null
+++ b/extra/thunar/fix-samba.patch
@@ -0,0 +1,14 @@
+--- thunar-file-ORIGINAL.c	2011-05-27 00:11:27.000000000 +0200
++++ thunar-1.2.2/thunar/thunar-file.c	2011-08-22 08:00:24.095066077 +0200
+@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile   *file,
+           target_uri = 
+             g_file_info_get_attribute_string (file->info,
+                                               G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+-          file->is_mounted = (target_uri != NULL);
++          file->is_mounted = (target_uri != NULL)
++			? !g_file_info_get_attribute_boolean (file->info,
++                                                  G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT)
++            : FALSE;
+         }
+     }
+   else
diff --git a/extra/udisks/01-mkfs-tempdir.patch b/extra/udisks/01-mkfs-tempdir.patch
deleted file mode 100644
index 976108264..000000000
--- a/extra/udisks/01-mkfs-tempdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail.
-# Just create the directory in /tmp, this is what /tmp is for, after all.
-# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265
-
-Index: udisks/src/helpers/job-mkfs.c
-===================================================================
---- udisks.orig/src/helpers/job-mkfs.c	2010-12-05 23:08:54.587881164 +0100
-+++ udisks/src/helpers/job-mkfs.c	2010-12-05 23:09:12.399889312 +0100
-@@ -546,7 +546,7 @@
-   /* take ownership of the device if requested */
-   if (take_ownership_uid != 0 || take_ownership_gid != 0)
-     {
--      char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
-+      char dir[256] = "/tmp/job-mkfs-XXXXXX";
- 
-       if (mkdtemp (dir) == NULL)
-         {
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 0c1529d9e..6e68c52ef 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $
+# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
-pkgver=1.0.3
-pkgrel=6
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        01-mkfs-tempdir.patch)
-sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
   #fix location for bash_completion helper
@@ -30,6 +27,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/var/run"
 }
diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch
deleted file mode 100644
index 77eee26ba..000000000
--- a/extra/udisks/fix_well_known_filesystems.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c
---- udisks-1.0.3.orig/src/device.c	2011-04-05 13:16:00.000000000 -0700
-+++ udisks-1.0.3/src/device.c	2011-05-03 13:27:39.064679418 -0700
-@@ -5902,7 +5902,7 @@
-   "msdos",
-   "umsdos",
-   "vfat",
--  "exfat"
-+  "exfat",
-   "ntfs",
-   NULL,
- };
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 01ad1b14f..ccb3b441f 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 133479 2011-07-28 14:12:10Z heftig $
+# $Id: PKGBUILD 136823 2011-09-01 21:33:21Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
-pkgname=(vim gvim vim-runtime)
+pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=266
+_patchlevel=289
 pkgver=${_topver}.${_patchlevel}
-__hgrev=124a81f12ca4
+__hgrev=ba9f075a347d
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
-             'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed')
+makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
+             'mercurial' 'rsync')
 source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
          'e57777374891063b9ca48a1fe392ac05'
          '10353a61aadc3f276692d0e17db1478e'
-         '63558c0b3509caea0d0f2b9274049c2a')
+         'd90413bd21f400313a785bb4010120cd')
 
 __hgroot='http://vim.googlecode.com/hg/'
 __hgrepo='vim'
@@ -31,7 +31,7 @@ _versiondir="vim${_topver//./}"
 ##### Build #####
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
 
   msg2 'Checking out source from Mercurial...'
 
@@ -70,7 +70,7 @@ build() {
 
   cp -a vim-build gvim-build
 
-  cd ${srcdir}/vim-build
+  cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
     --mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -81,14 +81,14 @@ build() {
 
   make
 
-  cd ${srcdir}/gvim-build
+  cd "${srcdir}"/gvim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
     --mandir=/usr/share/man --with-compiledby=ArchLinux \
     --with-features=big --enable-gpm --enable-acl --with-x=yes \
     --enable-gui=gtk2 --enable-multibyte --enable-cscope \
     --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-rubyinterp
+    --enable-python3interp --enable-rubyinterp
 
   make
 }
@@ -100,14 +100,14 @@ package_vim() {
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
   conflicts=('gvim')
 
-  cd ${srcdir}/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/vim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
     cd ${_mandir}
     rm -f ex.1 view.1 # provided by (n)vi
@@ -115,84 +115,87 @@ package_vim() {
   done
 
   # Runtime provided by runtime package
-  rm -r ${pkgdir}/usr/share/vim
+  rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim/license.txt
+  install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_gvim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
            'desktop-file-utils' 'gtk2')
   provides=("vim=${pkgver}-${pkgrel}")
   conflicts=('vim')
   install=gvim.install
 
-  cd ${srcdir}/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/gvim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
     cd ${_mandir}
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
   # Move the runtime for later packaging
-  mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
 
   # freedesktop links
-  install -Dm644 ${srcdir}/gvim.desktop \
-    ${pkgdir}/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+  install -Dm644 "${srcdir}"/gvim.desktop \
+    "${pkgdir}"/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/gvim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/gvim/license.txt
+   install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim-runtime() {
   pkgdesc='Runtime for vim and gvim'
-  backup=(etc/vimrc)
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
 
   # Install the runtime split from gvim
-  install -dm755 ${pkgdir}/usr/share
-  mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
 
   # Don't forget logtalk.dict
-  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
   sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
 
   # patch filetype.vim for better handling of pacman related files
   sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
   sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
 
   # make Aaron happy
-  install -Dm644 ${srcdir}/pythoncomplete.vim \
-    ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
+  install -Dm644 "${srcdir}"/pythoncomplete.vim \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
   
   # rc files
-  install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
-  install -Dm644 ${srcdir}/archlinux.vim \
-    ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm644 "${srcdir}"/archlinux.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+
+  # rgb.txt file
+  install -Dm644 "${srcdir}"/vim/runtime/rgb.txt \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime
+  install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
   ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim-runtime/license.txt
+    "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
 }
 
 # vim:set sw=2 sts=2 et:
diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
index 4f0d294ed..675357da5 100644
--- a/extra/vim/gvim.desktop
+++ b/extra/vim/gvim.desktop
@@ -58,7 +58,6 @@ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;tex
 Exec=gvim -f %F
 Icon=gvim
 Type=Application
-Terminal=0
+Terminal=false
 X-XClassHintResName=VIM
-MapNotify=false
 Categories=Utility;TextEditor;
diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install
index 0a8d3b0a9..2eaa60550 100644
--- a/extra/vim/gvim.install
+++ b/extra/vim/gvim.install
@@ -1,7 +1,5 @@
 post_install() {
-  echo -n "Updating desktop and mime database..."
   update-desktop-database -q
-  echo "done."
 }
 
 post_upgrade() {
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 6ca3a0d59..df1a1f0d4 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127491 2011-06-15 15:04:50Z ibiru $
+# $Id: PKGBUILD 136406 2011-08-29 07:32:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=vte
 pkgname=(vte vte3 vte-common)
-pkgver=0.28.1
+pkgver=0.28.2
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz)
-sha256sums=('ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad')
+sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index a8a54fdb5..57a086e8a 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 135814 2011-08-18 15:04:55Z andyrtr $
+# $Id: PKGBUILD 136353 2011-08-27 08:38:05Z ibiru $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
@@ -15,7 +15,6 @@ md5sums=('dc1e8c9800b64130674b120a183e2308')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
 
   ./configure \
       --prefix=/usr \
@@ -27,7 +26,7 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua')
+  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
   install=wireshark.install
   conflicts=(wireshark)
 
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 9b54c03f4..686999934 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125783 2011-05-29 16:48:03Z andyrtr $
+# $Id: PKGBUILD 136067 2011-08-22 12:16:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -24,6 +24,8 @@ build() {
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
+	--datadir=/usr/share \
+	--datarootdir=/usr/share \
 	--disable-static \
 	--with-pathhddtemp=/usr/sbin/hddtemp \
 	--disable-debug
diff --git a/extra/xfce4-sensors-plugin/git.patch b/extra/xfce4-sensors-plugin/git.patch
deleted file mode 100644
index 0e2140765..000000000
--- a/extra/xfce4-sensors-plugin/git.patch
+++ /dev/null
@@ -1,13319 +0,0 @@
-From 4b280a23c2a26a77f616efef86ce9784ab513d23 Mon Sep 17 00:00:00 2001
-From: Fabian Nowak <nowak@kit.edu>
-Date: Tue, 10 May 2011 09:18:53 +0000
-Subject: False -> FALSE
-
----
-diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c
-index f501a54..1485e34 100644
---- a/lib/sensors-interface.c
-+++ b/lib/sensors-interface.c
-@@ -484,7 +484,7 @@ init_widgets (t_sensors_dialog *sd)
-                             iter,
-                             0, chipfeature->name,
-                             1, "0.0",        /* chipfeature->formatted_value */
--                            2, False,        /* chipfeature->show */
-+                            2, FALSE,        /* chipfeature->show */
-                             3, "#000000",    /* chipfeature->color */
-                             4, 0.0,            /* chipfeature->min_value */
-                             5, 0.0,            /* chipfeature->max_value */
---
-cgit 
-From 2329169a8528ae02486c8703aed03e41b843d081 Mon Sep 17 00:00:00 2001
-From: Fabian Nowak <nowak@kit.edu>
-Date: Tue, 10 May 2011 10:02:57 +0000
-Subject: substitute more libxfcegui4 by libxfce4ui; newer ltmain.sh
-
----
-diff --git a/README b/README
-index 54d05da..fa6b695 100644
---- a/README
-+++ b/README
-@@ -10,12 +10,12 @@ Licence: GPL version 2 (or later at your option)
- 
- Description: Reads your hardware sensor values and displays them in your panel
- 
--Dependencies: libxfcegui4-4, libxfce4util-i4, libgtk2.0-0,
-+Dependencies: libxfce4ui, libxfce4util, libgtk2.0-0,
-                 xfce4-panel
--              libxfcegui4-dev, libxfce4util-dev, libgtk2.0-dev,
-+              libxfce4ui-dev, libxfce4util-dev, libgtk2.0-dev,
-                 xfce4-panel-dev
- 
--Optional: hddtemp, netcat, lmsensors3, working ACPI library
-+Optional: hddtemp, netcat, lmsensors3, working ACPI library, libnotify, nvidia-utils/xnvctrl
- 
- Installation: ./configure && make && [sudo] make install
- 
-diff --git a/ltmain.sh b/ltmain.sh
-index 6f650ae..7ed280b 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -1,9 +1,9 @@
-+# Generated from ltmain.m4sh.
- 
--# libtool (GNU libtool) 2.4
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions.  There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-@@ -32,56 +32,50 @@
- #
- # Provide generalized library-building support services.
- #
--#       --config             show all configuration variables
--#       --debug              enable verbose shell tracing
--#   -n, --dry-run            display commands without modifying any files
--#       --features           display basic configuration information and exit
--#       --mode=MODE          use operation mode MODE
--#       --preserve-dup-deps  don't remove duplicate dependency libraries
--#       --quiet, --silent    don't print informational messages
--#       --no-quiet, --no-silent
--#                            print informational messages (default)
--#       --tag=TAG            use configuration variables from tag TAG
--#   -v, --verbose            print more informational messages than default
--#       --no-verbose         don't print the extra informational messages
--#       --version            print version information
--#   -h, --help, --help-all   print short, long, or detailed help message
-+#     --config             show all configuration variables
-+#     --debug              enable verbose shell tracing
-+# -n, --dry-run            display commands without modifying any files
-+#     --features           display basic configuration information and exit
-+#     --mode=MODE          use operation mode MODE
-+#     --preserve-dup-deps  don't remove duplicate dependency libraries
-+#     --quiet, --silent    don't print informational messages
-+#     --tag=TAG            use configuration variables from tag TAG
-+# -v, --verbose            print informational messages (default)
-+#     --version            print version information
-+# -h, --help               print short or long help message
- #
- # MODE must be one of the following:
- #
--#         clean              remove files from the build directory
--#         compile            compile a source file into a libtool object
--#         execute            automatically set library path, then run a program
--#         finish             complete the installation of libtool libraries
--#         install            install libraries or executables
--#         link               create a library or an executable
--#         uninstall          remove libraries from an installed directory
-+#       clean              remove files from the build directory
-+#       compile            compile a source file into a libtool object
-+#       execute            automatically set library path, then run a program
-+#       finish             complete the installation of libtool libraries
-+#       install            install libraries or executables
-+#       link               create a library or an executable
-+#       uninstall          remove libraries from an installed directory
- #
--# MODE-ARGS vary depending on the MODE.  When passed as first option,
--# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-+# MODE-ARGS vary depending on the MODE.
- # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
- #
- # When reporting a bug, please describe a test case to reproduce it and
- # include the following information:
- #
--#         host-triplet:	$host
--#         shell:		$SHELL
--#         compiler:		$LTCC
--#         compiler flags:		$LTCFLAGS
--#         linker:		$LD (gnu? $with_gnu_ld)
--#         $progname:	(GNU libtool) 2.4 Debian-2.4-2
--#         automake:	$automake_version
--#         autoconf:	$autoconf_version
-+#       host-triplet:	$host
-+#       shell:		$SHELL
-+#       compiler:		$LTCC
-+#       compiler flags:		$LTCFLAGS
-+#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
--# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
--# General help using GNU software: <http://www.gnu.org/gethelp/>.
- 
--PROGRAM=libtool
-+PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.4 Debian-2.4-2"
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
- TIMESTAMP=""
--package_revision=1.3293
-+package_revision=1.3017
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -97,15 +91,10 @@ fi
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--$1
--_LTECHO_EOF'
--}
--
- # NLS nuisances: We save the old values to restore during execute mode.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -118,24 +107,15 @@ do
- 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- 	fi"
- done
--LC_ALL=C
--LANGUAGE=C
--export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
--# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--# is ksh but when the shell is invoked as "sh" and the current value of
--# the _XPG environment variable is not equal to 1 (one), the special
--# positional parameter $0, within a function call, is the name of the
--# function.
--progpath="$0"
- 
- 
- 
- : ${CP="cp -f"}
--test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-+: ${ECHO="echo"}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -164,27 +144,6 @@ IFS=" 	$lt_nl"
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
- 
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
--    if test "X$func_dirname_result" = "X${1}"; then
--      func_dirname_result="${3}"
--    else
--      func_dirname_result="$func_dirname_result${2}"
--    fi
--} # func_dirname may be replaced by extended shell implementation
--
--
--# func_basename file
--func_basename ()
--{
--    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
--} # func_basename may be replaced by extended shell implementation
--
--
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
-@@ -199,183 +158,33 @@ func_basename ()
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
--    # Extract subdirectory from the argument.
--    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
--    if test "X$func_dirname_result" = "X${1}"; then
--      func_dirname_result="${3}"
--    else
--      func_dirname_result="$func_dirname_result${2}"
--    fi
--    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
--} # func_dirname_and_basename may be replaced by extended shell implementation
--
--
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--# func_strip_suffix prefix name
--func_stripname ()
--{
--    case ${2} in
--      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
--      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
--    esac
--} # func_stripname may be replaced by extended shell implementation
--
--
--# These SED scripts presuppose an absolute path with a trailing slash.
--pathcar='s,^/\([^/]*\).*$,\1,'
--pathcdr='s,^/[^/]*,,'
--removedotparts=':dotsl
--		s@/\./@/@g
--		t dotsl
--		s,/\.$,/,'
--collapseslashes='s@/\{1,\}@/@g'
--finalslash='s,/*$,/,'
--
--# func_normal_abspath PATH
--# Remove doubled-up and trailing slashes, "." path components,
--# and cancel out any ".." path components in PATH after making
--# it an absolute path.
--#             value returned in "$func_normal_abspath_result"
--func_normal_abspath ()
--{
--  # Start from root dir and reassemble the path.
--  func_normal_abspath_result=
--  func_normal_abspath_tpath=$1
--  func_normal_abspath_altnamespace=
--  case $func_normal_abspath_tpath in
--    "")
--      # Empty path, that just means $cwd.
--      func_stripname '' '/' "`pwd`"
--      func_normal_abspath_result=$func_stripname_result
--      return
--    ;;
--    # The next three entries are used to spot a run of precisely
--    # two leading slashes without using negated character classes;
--    # we take advantage of case's first-match behaviour.
--    ///*)
--      # Unusual form of absolute path, do nothing.
--    ;;
--    //*)
--      # Not necessarily an ordinary path; POSIX reserves leading '//'
--      # and for example Cygwin uses it to access remote file shares
--      # over CIFS/SMB, so we conserve a leading double slash if found.
--      func_normal_abspath_altnamespace=/
--    ;;
--    /*)
--      # Absolute path, do nothing.
--    ;;
--    *)
--      # Relative path, prepend $cwd.
--      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
--    ;;
--  esac
--  # Cancel out all the simple stuff to save iterations.  We also want
--  # the path to end with a slash for ease of parsing, so make sure
--  # there is one (and only one) here.
--  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
--  while :; do
--    # Processed it all yet?
--    if test "$func_normal_abspath_tpath" = / ; then
--      # If we ascended to the root using ".." the result may be empty now.
--      if test -z "$func_normal_abspath_result" ; then
--        func_normal_abspath_result=/
--      fi
--      break
--    fi
--    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$pathcar"`
--    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
--        -e "$pathcdr"`
--    # Figure out what to do with it
--    case $func_normal_abspath_tcomponent in
--      "")
--        # Trailing empty path component, ignore it.
--      ;;
--      ..)
--        # Parent dir; strip last assembled component from result.
--        func_dirname "$func_normal_abspath_result"
--        func_normal_abspath_result=$func_dirname_result
--      ;;
--      *)
--        # Actual path component, append it.
--        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
--      ;;
--    esac
--  done
--  # Restore leading double-slash if one was found on entry.
--  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
- 
--# func_relative_path SRCDIR DSTDIR
--# generates a relative path from SRCDIR to DSTDIR, with a trailing
--# slash if non-empty, suitable for immediately appending a filename
--# without needing to append a separator.
--#             value returned in "$func_relative_path_result"
--func_relative_path ()
--{
--  func_relative_path_result=
--  func_normal_abspath "$1"
--  func_relative_path_tlibdir=$func_normal_abspath_result
--  func_normal_abspath "$2"
--  func_relative_path_tbindir=$func_normal_abspath_result
--
--  # Ascend the tree starting from libdir
--  while :; do
--    # check if we have found a prefix of bindir
--    case $func_relative_path_tbindir in
--      $func_relative_path_tlibdir)
--        # found an exact match
--        func_relative_path_tcancelled=
--        break
--        ;;
--      $func_relative_path_tlibdir*)
--        # found a matching prefix
--        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
--        func_relative_path_tcancelled=$func_stripname_result
--        if test -z "$func_relative_path_result"; then
--          func_relative_path_result=.
--        fi
--        break
--        ;;
--      *)
--        func_dirname $func_relative_path_tlibdir
--        func_relative_path_tlibdir=${func_dirname_result}
--        if test "x$func_relative_path_tlibdir" = x ; then
--          # Have to descend all the way to the root!
--          func_relative_path_result=../$func_relative_path_result
--          func_relative_path_tcancelled=$func_relative_path_tbindir
--          break
--        fi
--        func_relative_path_result=../$func_relative_path_result
--        ;;
--    esac
--  done
--
--  # Now calculate path; take care to avoid doubling-up slashes.
--  func_stripname '' '/' "$func_relative_path_result"
--  func_relative_path_result=$func_stripname_result
--  func_stripname '/' '/' "$func_relative_path_tcancelled"
--  if test "x$func_stripname_result" != x ; then
--    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
--  fi
-+# Generated shell functions inserted here.
- 
--  # Normalisation. If bindir is libdir, return empty string,
--  # else relative path ending with a slash; either way, target
--  # file name can be directly appended.
--  if test ! -z "$func_relative_path_result"; then
--    func_stripname './' '' "$func_relative_path_result/"
--    func_relative_path_result=$func_stripname_result
--  fi
--}
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
- 
- # The name of this program:
-+# In the unlikely event $progname began with a '-', it would play havoc with
-+# func_echo (imagine progname=-n), so we prepend ./ in that case:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
-+case $progname in
-+  -*) progname=./$progname ;;
-+esac
- 
- # Make sure we have an absolute path for reexecution:
- case $progpath in
-@@ -406,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
- 
--# Sed substitution that turns a string into a regex matching for the
--# string literally.
--sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
--
--# Sed substitution that converts a w32 file name or path
--# which contains forward slashes, into one that contains
--# (escaped) backslashes.  A very naive implementation.
--lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
-@@ -443,7 +243,7 @@ opt_warning=:
- # name if it has been set yet.
- func_echo ()
- {
--    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-+    $ECHO "$progname${mode+: }$mode: $*"
- }
- 
- # func_verbose arg...
-@@ -458,25 +258,18 @@ func_verbose ()
-     :
- }
- 
--# func_echo_all arg...
--# Invoke $ECHO with all args, space-separated.
--func_echo_all ()
--{
--    $ECHO "$*"
--}
--
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
- {
--    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
- }
- 
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
--    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
- 
-     # bash bug again:
-     :
-@@ -533,9 +326,9 @@ func_mkdir_p ()
-         case $my_directory_path in */*) ;; *) break ;; esac
- 
-         # ...otherwise throw away the child directory and loop
--        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-       done
--      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
- 
-       save_mkdir_p_IFS="$IFS"; IFS=':'
-       for my_dir in $my_dir_list; do
-@@ -585,7 +378,7 @@ func_mktempdir ()
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
--    $ECHO "$my_tmpdir"
-+    $ECHO "X$my_tmpdir" | $Xsed
- }
- 
- 
-@@ -599,7 +392,7 @@ func_quote_for_eval ()
- {
-     case $1 in
-       *[\\\`\"\$]*)
--	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
-@@ -626,7 +419,7 @@ func_quote_for_expand ()
- {
-     case $1 in
-       *[\\\`\"]*)
--	my_arg=`$ECHO "$1" | $SED \
-+	my_arg=`$ECHO "X$1" | $Xsed \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-@@ -695,39 +488,15 @@ func_show_eval_locale ()
-     fi
- }
- 
--# func_tr_sh
--# Turn $1 into a string suitable for a shell variable name.
--# Result is stored in $func_tr_sh_result.  All characters
--# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
--# if $1 begins with a digit, a '_' is prepended as well.
--func_tr_sh ()
--{
--  case $1 in
--  [0-9]* | *[!a-zA-Z0-9_]*)
--    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
--    ;;
--  * )
--    func_tr_sh_result=$1
--    ;;
--  esac
--}
-+
-+
- 
- 
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
--    $opt_debug
--
--    $SED -n '/(C)/!b go
--	:more
--	/\./!{
--	  N
--	  s/\n# / /
--	  b more
--	}
--	:go
--	/^# '$PROGRAM' (GNU /,/# warranty; / {
-+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-         s/^# //
- 	s/^# *$//
-         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -740,28 +509,22 @@ func_version ()
- # Echo short help message to standard output and exit.
- func_usage ()
- {
--    $opt_debug
--
--    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-+    $SED -n '/^# Usage:/,/# -h/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
--    echo
-+    $ECHO
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
--# func_help [NOEXIT]
--# Echo long help message to standard output and exit,
--# unless 'noexit' is passed as argument.
-+# func_help
-+# Echo long help message to standard output and exit.
- func_help ()
- {
--    $opt_debug
--
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
--	:print
-         s/^# //
- 	s/^# *$//
- 	s*\$progname*'$progname'*
-@@ -774,15 +537,8 @@ func_help ()
- 	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
- 	p
--	d
--     }
--     /^# .* home page:/b print
--     /^# General help using/b print
--     ' < "$progpath"
--    ret=$?
--    if test -z "$1"; then
--      exit $ret
--    fi
-+     }' < "$progpath"
-+    exit $?
- }
- 
- # func_missing_arg argname
-@@ -790,106 +546,63 @@ func_help ()
- # exit_cmd.
- func_missing_arg ()
- {
--    $opt_debug
--
--    func_error "missing argument for $1."
-+    func_error "missing argument for $1"
-     exit_cmd=exit
- }
- 
-+exit_cmd=:
- 
--# func_split_short_opt shortopt
--# Set func_split_short_opt_name and func_split_short_opt_arg shell
--# variables after splitting SHORTOPT after the 2nd character.
--func_split_short_opt ()
--{
--    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
--    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
--
--    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
--    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
--} # func_split_short_opt may be replaced by extended shell implementation
--
--
--# func_split_long_opt longopt
--# Set func_split_long_opt_name and func_split_long_opt_arg shell
--# variables after splitting LONGOPT at the `=' sign.
--func_split_long_opt ()
--{
--    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
--    my_sed_long_arg='1s/^--[^=]*=//'
--
--    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
--    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
--} # func_split_long_opt may be replaced by extended shell implementation
- 
--exit_cmd=:
- 
- 
- 
-+# Check that we have a working $ECHO.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $ECHO will work.
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
- 
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit $EXIT_SUCCESS
-+fi
- 
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
- 
- # Global variables.
-+# $mode is unset
- nonopt=
-+execute_dlfiles=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
- 
-+opt_dry_run=false
-+opt_duplicate_deps=false
-+opt_silent=false
-+opt_debug=:
-+
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--    eval "${1}=\$${1}\${2}"
--} # func_append may be replaced by extended shell implementation
--
--# func_append_quoted var value
--# Quote VALUE and append to the end of shell variable VAR, separated
--# by a space.
--func_append_quoted ()
--{
--    func_quote_for_eval "${2}"
--    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
--} # func_append_quoted may be replaced by extended shell implementation
--
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--    func_arith_result=`expr "${@}"`
--} # func_arith may be replaced by extended shell implementation
--
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
--} # func_len may be replaced by extended shell implementation
--
--
--# func_lo2o object
--func_lo2o ()
--{
--    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
--} # func_lo2o may be replaced by extended shell implementation
--
--
--# func_xform libobj-or-source
--func_xform ()
--{
--    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
--} # func_xform may be replaced by extended shell implementation
--
--
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
-@@ -923,16 +636,16 @@ func_config ()
- # Display the features supported by this script.
- func_features ()
- {
--    echo "host: $host"
-+    $ECHO "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      echo "enable shared libraries"
-+      $ECHO "enable shared libraries"
-     else
--      echo "disable shared libraries"
-+      $ECHO "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      echo "enable static libraries"
-+      $ECHO "enable static libraries"
-     else
--      echo "disable static libraries"
-+      $ECHO "disable static libraries"
-     fi
- 
-     exit $?
-@@ -979,204 +692,117 @@ func_enable_tag ()
-   esac
- }
- 
--# func_check_version_match
--# Ensure that we are using m4 macros, and libtool script from the same
--# release of libtool.
--func_check_version_match ()
-+# Parse options once, thoroughly.  This comes as soon as possible in
-+# the script to make things like `libtool --version' happen quickly.
- {
--  if test "$package_revision" != "$macro_revision"; then
--    if test "$VERSION" != "$macro_version"; then
--      if test -z "$macro_version"; then
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from an older release.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      else
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      fi
--    else
--      cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
--$progname: but the definition of this LT_INIT comes from revision $macro_revision.
--$progname: You should recreate aclocal.m4 with macros from revision $package_revision
--$progname: of $PACKAGE $VERSION and run autoconf again.
--_LT_EOF
--    fi
--
--    exit $EXIT_MISMATCH
--  fi
--}
--
--
--# Shorthand for --mode=foo, only valid as the first argument
--case $1 in
--clean|clea|cle|cl)
--  shift; set dummy --mode clean ${1+"$@"}; shift
--  ;;
--compile|compil|compi|comp|com|co|c)
--  shift; set dummy --mode compile ${1+"$@"}; shift
--  ;;
--execute|execut|execu|exec|exe|ex|e)
--  shift; set dummy --mode execute ${1+"$@"}; shift
--  ;;
--finish|finis|fini|fin|fi|f)
--  shift; set dummy --mode finish ${1+"$@"}; shift
--  ;;
--install|instal|insta|inst|ins|in|i)
--  shift; set dummy --mode install ${1+"$@"}; shift
--  ;;
--link|lin|li|l)
--  shift; set dummy --mode link ${1+"$@"}; shift
--  ;;
--uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
--  shift; set dummy --mode uninstall ${1+"$@"}; shift
--  ;;
--esac
--
--
--
--# Option defaults:
--opt_debug=:
--opt_dry_run=false
--opt_config=false
--opt_preserve_dup_deps=false
--opt_features=false
--opt_finish=false
--opt_help=false
--opt_help_all=false
--opt_silent=:
--opt_verbose=:
--opt_silent=false
--opt_verbose=false
- 
-+  # Shorthand for --mode=foo, only valid as the first argument
-+  case $1 in
-+  clean|clea|cle|cl)
-+    shift; set dummy --mode clean ${1+"$@"}; shift
-+    ;;
-+  compile|compil|compi|comp|com|co|c)
-+    shift; set dummy --mode compile ${1+"$@"}; shift
-+    ;;
-+  execute|execut|execu|exec|exe|ex|e)
-+    shift; set dummy --mode execute ${1+"$@"}; shift
-+    ;;
-+  finish|finis|fini|fin|fi|f)
-+    shift; set dummy --mode finish ${1+"$@"}; shift
-+    ;;
-+  install|instal|insta|inst|ins|in|i)
-+    shift; set dummy --mode install ${1+"$@"}; shift
-+    ;;
-+  link|lin|li|l)
-+    shift; set dummy --mode link ${1+"$@"}; shift
-+    ;;
-+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+    shift; set dummy --mode uninstall ${1+"$@"}; shift
-+    ;;
-+  esac
- 
--# Parse options once, thoroughly.  This comes as soon as possible in the
--# script to make things like `--version' happen as quickly as we can.
--{
--  # this just eases exit handling
--  while test $# -gt 0; do
-+  # Parse non-mode specific arguments:
-+  while test "$#" -gt 0; do
-     opt="$1"
-     shift
-+
-     case $opt in
--      --debug|-x)	opt_debug='set -x'
-+      --config)		func_config					;;
-+
-+      --debug)		preserve_args="$preserve_args $opt"
- 			func_echo "enabling shell trace mode"
-+			opt_debug='set -x'
- 			$opt_debug
- 			;;
--      --dry-run|--dryrun|-n)
--			opt_dry_run=:
--			;;
--      --config)
--			opt_config=:
--func_config
--			;;
--      --dlopen|-dlopen)
--			optarg="$1"
--			opt_dlopen="${opt_dlopen+$opt_dlopen
--}$optarg"
-+
-+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			execute_dlfiles="$execute_dlfiles $1"
- 			shift
- 			;;
--      --preserve-dup-deps)
--			opt_preserve_dup_deps=:
--			;;
--      --features)
--			opt_features=:
--func_features
--			;;
--      --finish)
--			opt_finish=:
--set dummy --mode finish ${1+"$@"}; shift
--			;;
--      --help)
--			opt_help=:
--			;;
--      --help-all)
--			opt_help_all=:
--opt_help=': help-all'
--			;;
--      --mode)
--			test $# = 0 && func_missing_arg $opt && break
--			optarg="$1"
--			opt_mode="$optarg"
--case $optarg in
--  # Valid mode arguments:
--  clean|compile|execute|finish|install|link|relink|uninstall) ;;
--
--  # Catch anything else as an error
--  *) func_error "invalid argument for $opt"
--     exit_cmd=exit
--     break
--     ;;
--esac
-+
-+      --dry-run | -n)	opt_dry_run=:					;;
-+      --features)       func_features					;;
-+      --finish)		mode="finish"					;;
-+
-+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			case $1 in
-+			  # Valid mode arguments:
-+			  clean)	;;
-+			  compile)	;;
-+			  execute)	;;
-+			  finish)	;;
-+			  install)	;;
-+			  link)		;;
-+			  relink)	;;
-+			  uninstall)	;;
-+
-+			  # Catch anything else as an error
-+			  *) func_error "invalid argument for $opt"
-+			     exit_cmd=exit
-+			     break
-+			     ;;
-+		        esac
-+
-+			mode="$1"
- 			shift
- 			;;
--      --no-silent|--no-quiet)
--			opt_silent=false
--func_append preserve_args " $opt"
--			;;
--      --no-verbose)
--			opt_verbose=false
--func_append preserve_args " $opt"
--			;;
--      --silent|--quiet)
-+
-+      --preserve-dup-deps)
-+			opt_duplicate_deps=:				;;
-+
-+      --quiet|--silent)	preserve_args="$preserve_args $opt"
- 			opt_silent=:
--func_append preserve_args " $opt"
--        opt_verbose=false
- 			;;
--      --verbose|-v)
--			opt_verbose=:
--func_append preserve_args " $opt"
--opt_silent=false
-+
-+      --verbose| -v)	preserve_args="$preserve_args $opt"
-+			opt_silent=false
- 			;;
--      --tag)
--			test $# = 0 && func_missing_arg $opt && break
--			optarg="$1"
--			opt_tag="$optarg"
--func_append preserve_args " $opt $optarg"
--func_enable_tag "$optarg"
-+
-+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			preserve_args="$preserve_args $opt $1"
-+			func_enable_tag "$1"	# tagname is set here
- 			shift
- 			;;
- 
--      -\?|-h)		func_usage				;;
--      --help)		func_help				;;
--      --version)	func_version				;;
--
-       # Separate optargs to long options:
--      --*=*)
--			func_split_long_opt "$opt"
--			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-+      -dlopen=*|--mode=*|--tag=*)
-+			func_opt_split "$opt"
-+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
- 			shift
- 			;;
- 
--      # Separate non-argument short options:
--      -\?*|-h*|-n*|-v*)
--			func_split_short_opt "$opt"
--			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
--			shift
--			;;
-+      -\?|-h)		func_usage					;;
-+      --help)		opt_help=:					;;
-+      --version)	func_version					;;
-+
-+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
- 
--      --)		break					;;
--      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
--      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-+      *)		nonopt="$opt"
-+			break
-+			;;
-     esac
-   done
- 
--  # Validate options:
--
--  # save first non-option argument
--  if test "$#" -gt 0; then
--    nonopt="$opt"
--    shift
--  fi
--
--  # preserve --debug
--  test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
-     *cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -1184,44 +810,82 @@ func_enable_tag "$optarg"
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-     *)
--      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-       ;;
-   esac
- 
--  $opt_help || {
--    # Sanity checks first:
--    func_check_version_match
-+  # Having warned about all mis-specified options, bail out if
-+  # anything was wrong.
-+  $exit_cmd $EXIT_FAILURE
-+}
- 
--    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--      func_fatal_configuration "not configured to build any kind of library"
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
-+{
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-     fi
- 
--    # Darwin sucks
--    eval std_shrext=\"$shrext_cmds\"
-+    exit $EXIT_MISMATCH
-+  fi
-+}
-+
- 
--    # Only execute mode is allowed to have -dlopen flags.
--    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
--      func_error "unrecognized option \`-dlopen'"
--      $ECHO "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
- 
--    # Change the help message to a mode-specific one.
--    generic_help="$help"
--    help="Try \`$progname --help --mode=$opt_mode' for more information."
--  }
-+$opt_help || {
-+  # Sanity checks first:
-+  func_check_version_match
- 
-+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+    func_fatal_configuration "not configured to build any kind of library"
-+  fi
- 
--  # Bail if the options were screwed
--  $exit_cmd $EXIT_FAILURE
--}
-+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
- 
- 
-+  # Darwin sucks
-+  eval std_shrext=\"$shrext_cmds\"
- 
- 
--## ----------- ##
--##    Main.    ##
--## ----------- ##
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    func_error "unrecognized option \`-dlopen'"
-+    $ECHO "$help" 1>&2
-+    exit $EXIT_FAILURE
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$progname --help --mode=$mode' for more information."
-+}
-+
- 
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -1286,9 +950,12 @@ func_ltwrapper_executable_p ()
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
--    func_dirname_and_basename "$1" "" "."
--    func_stripname '' '.exe' "$func_basename_result"
--    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-+    func_ltwrapper_scriptname_result=""
-+    if func_ltwrapper_executable_p "$1"; then
-+	func_dirname_and_basename "$1" "" "."
-+	func_stripname '' '.exe' "$func_basename_result"
-+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-+    fi
- }
- 
- # func_ltwrapper_p file
-@@ -1334,37 +1001,6 @@ func_source ()
- }
- 
- 
--# func_resolve_sysroot PATH
--# Replace a leading = in PATH with a sysroot.  Store the result into
--# func_resolve_sysroot_result
--func_resolve_sysroot ()
--{
--  func_resolve_sysroot_result=$1
--  case $func_resolve_sysroot_result in
--  =*)
--    func_stripname '=' '' "$func_resolve_sysroot_result"
--    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
--    ;;
--  esac
--}
--
--# func_replace_sysroot PATH
--# If PATH begins with the sysroot, replace it with = and
--# store the result into func_replace_sysroot_result.
--func_replace_sysroot ()
--{
--  case "$lt_sysroot:$1" in
--  ?*:"$lt_sysroot"*)
--    func_stripname "$lt_sysroot" '' "$1"
--    func_replace_sysroot_result="=$func_stripname_result"
--    ;;
--  *)
--    # Including no sysroot.
--    func_replace_sysroot_result=$1
--    ;;
--  esac
--}
--
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
-@@ -1377,15 +1013,13 @@ func_infer_tag ()
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
--	func_append_quoted CC_quoted "$arg"
-+        func_quote_for_eval "$arg"
-+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-       done
--      CC_expanded=`func_echo_all $CC`
--      CC_quoted_expanded=`func_echo_all $CC_quoted`
-       case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
--      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
-@@ -1396,13 +1030,11 @@ func_infer_tag ()
- 	    CC_quoted=
- 	    for arg in $CC; do
- 	      # Double-quote args containing other shell metacharacters.
--	      func_append_quoted CC_quoted "$arg"
-+	      func_quote_for_eval "$arg"
-+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
- 	    done
--	    CC_expanded=`func_echo_all $CC`
--	    CC_quoted_expanded=`func_echo_all $CC_quoted`
- 	    case "$@ " in
--	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
--	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
-@@ -1465,486 +1097,6 @@ EOF
-     }
- }
- 
--
--##################################################
--# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
--##################################################
--
--# func_convert_core_file_wine_to_w32 ARG
--# Helper function used by file name conversion functions when $build is *nix,
--# and $host is mingw, cygwin, or some other w32 environment. Relies on a
--# correctly configured wine environment available, with the winepath program
--# in $build's $PATH.
--#
--# ARG is the $build file name to be converted to w32 format.
--# Result is available in $func_convert_core_file_wine_to_w32_result, and will
--# be empty on error (or when ARG is empty)
--func_convert_core_file_wine_to_w32 ()
--{
--  $opt_debug
--  func_convert_core_file_wine_to_w32_result="$1"
--  if test -n "$1"; then
--    # Unfortunately, winepath does not exit with a non-zero error code, so we
--    # are forced to check the contents of stdout. On the other hand, if the
--    # command is not found, the shell will set an exit code of 127 and print
--    # *an error message* to stdout. So we must check for both error code of
--    # zero AND non-empty stdout, which explains the odd construction:
--    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
--    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
--      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
--        $SED -e "$lt_sed_naive_backslashify"`
--    else
--      func_convert_core_file_wine_to_w32_result=
--    fi
--  fi
--}
--# end: func_convert_core_file_wine_to_w32
--
--
--# func_convert_core_path_wine_to_w32 ARG
--# Helper function used by path conversion functions when $build is *nix, and
--# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
--# configured wine environment available, with the winepath program in $build's
--# $PATH. Assumes ARG has no leading or trailing path separator characters.
--#
--# ARG is path to be converted from $build format to win32.
--# Result is available in $func_convert_core_path_wine_to_w32_result.
--# Unconvertible file (directory) names in ARG are skipped; if no directory names
--# are convertible, then the result may be empty.
--func_convert_core_path_wine_to_w32 ()
--{
--  $opt_debug
--  # unfortunately, winepath doesn't convert paths, only file names
--  func_convert_core_path_wine_to_w32_result=""
--  if test -n "$1"; then
--    oldIFS=$IFS
--    IFS=:
--    for func_convert_core_path_wine_to_w32_f in $1; do
--      IFS=$oldIFS
--      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
--      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
--        if test -z "$func_convert_core_path_wine_to_w32_result"; then
--          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
--        else
--          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
--        fi
--      fi
--    done
--    IFS=$oldIFS
--  fi
--}
--# end: func_convert_core_path_wine_to_w32
--
--
--# func_cygpath ARGS...
--# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
--# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
--# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
--# (2), returns the Cygwin file name or path in func_cygpath_result (input
--# file name or path is assumed to be in w32 format, as previously converted
--# from $build's *nix or MSYS format). In case (3), returns the w32 file name
--# or path in func_cygpath_result (input file name or path is assumed to be in
--# Cygwin format). Returns an empty string on error.
--#
--# ARGS are passed to cygpath, with the last one being the file name or path to
--# be converted.
--#
--# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
--# environment variable; do not put it in $PATH.
--func_cygpath ()
--{
--  $opt_debug
--  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
--    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
--    if test "$?" -ne 0; then
--      # on failure, ensure result is empty
--      func_cygpath_result=
--    fi
--  else
--    func_cygpath_result=
--    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
--  fi
--}
--#end: func_cygpath
--
--
--# func_convert_core_msys_to_w32 ARG
--# Convert file name or path ARG from MSYS format to w32 format.  Return
--# result in func_convert_core_msys_to_w32_result.
--func_convert_core_msys_to_w32 ()
--{
--  $opt_debug
--  # awkward: cmd appends spaces to result
--  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
--    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
--}
--#end: func_convert_core_msys_to_w32
--
--
--# func_convert_file_check ARG1 ARG2
--# Verify that ARG1 (a file name in $build format) was converted to $host
--# format in ARG2. Otherwise, emit an error message, but continue (resetting
--# func_to_host_file_result to ARG1).
--func_convert_file_check ()
--{
--  $opt_debug
--  if test -z "$2" && test -n "$1" ; then
--    func_error "Could not determine host file name corresponding to"
--    func_error "  \`$1'"
--    func_error "Continuing, but uninstalled executables may not work."
--    # Fallback:
--    func_to_host_file_result="$1"
--  fi
--}
--# end func_convert_file_check
--
--
--# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
--# Verify that FROM_PATH (a path in $build format) was converted to $host
--# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
--# func_to_host_file_result to a simplistic fallback value (see below).
--func_convert_path_check ()
--{
--  $opt_debug
--  if test -z "$4" && test -n "$3"; then
--    func_error "Could not determine the host path corresponding to"
--    func_error "  \`$3'"
--    func_error "Continuing, but uninstalled executables may not work."
--    # Fallback.  This is a deliberately simplistic "conversion" and
--    # should not be "improved".  See libtool.info.
--    if test "x$1" != "x$2"; then
--      lt_replace_pathsep_chars="s|$1|$2|g"
--      func_to_host_path_result=`echo "$3" |
--        $SED -e "$lt_replace_pathsep_chars"`
--    else
--      func_to_host_path_result="$3"
--    fi
--  fi
--}
--# end func_convert_path_check
--
--
--# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
--# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
--# and appending REPL if ORIG matches BACKPAT.
--func_convert_path_front_back_pathsep ()
--{
--  $opt_debug
--  case $4 in
--  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
--    ;;
--  esac
--  case $4 in
--  $2 ) func_append func_to_host_path_result "$3"
--    ;;
--  esac
--}
--# end func_convert_path_front_back_pathsep
--
--
--##################################################
--# $build to $host FILE NAME CONVERSION FUNCTIONS #
--##################################################
--# invoked via `$to_host_file_cmd ARG'
--#
--# In each case, ARG is the path to be converted from $build to $host format.
--# Result will be available in $func_to_host_file_result.
--
--
--# func_to_host_file ARG
--# Converts the file name ARG from $build format to $host format. Return result
--# in func_to_host_file_result.
--func_to_host_file ()
--{
--  $opt_debug
--  $to_host_file_cmd "$1"
--}
--# end func_to_host_file
--
--
--# func_to_tool_file ARG LAZY
--# converts the file name ARG from $build format to toolchain format. Return
--# result in func_to_tool_file_result.  If the conversion in use is listed
--# in (the comma separated) LAZY, no conversion takes place.
--func_to_tool_file ()
--{
--  $opt_debug
--  case ,$2, in
--    *,"$to_tool_file_cmd",*)
--      func_to_tool_file_result=$1
--      ;;
--    *)
--      $to_tool_file_cmd "$1"
--      func_to_tool_file_result=$func_to_host_file_result
--      ;;
--  esac
--}
--# end func_to_tool_file
--
--
--# func_convert_file_noop ARG
--# Copy ARG to func_to_host_file_result.
--func_convert_file_noop ()
--{
--  func_to_host_file_result="$1"
--}
--# end func_convert_file_noop
--
--
--# func_convert_file_msys_to_w32 ARG
--# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
--# conversion to w32 is not available inside the cwrapper.  Returns result in
--# func_to_host_file_result.
--func_convert_file_msys_to_w32 ()
--{
--  $opt_debug
--  func_to_host_file_result="$1"
--  if test -n "$1"; then
--    func_convert_core_msys_to_w32 "$1"
--    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
--  fi
--  func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_msys_to_w32
--
--
--# func_convert_file_cygwin_to_w32 ARG
--# Convert file name ARG from Cygwin to w32 format.  Returns result in
--# func_to_host_file_result.
--func_convert_file_cygwin_to_w32 ()
--{
--  $opt_debug
--  func_to_host_file_result="$1"
--  if test -n "$1"; then
--    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
--    # LT_CYGPATH in this case.
--    func_to_host_file_result=`cygpath -m "$1"`
--  fi
--  func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_cygwin_to_w32
--
--
--# func_convert_file_nix_to_w32 ARG
--# Convert file name ARG from *nix to w32 format.  Requires a wine environment
--# and a working winepath. Returns result in func_to_host_file_result.
--func_convert_file_nix_to_w32 ()
--{
--  $opt_debug
--  func_to_host_file_result="$1"
--  if test -n "$1"; then
--    func_convert_core_file_wine_to_w32 "$1"
--    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
--  fi
--  func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_nix_to_w32
--
--
--# func_convert_file_msys_to_cygwin ARG
--# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
--# Returns result in func_to_host_file_result.
--func_convert_file_msys_to_cygwin ()
--{
--  $opt_debug
--  func_to_host_file_result="$1"
--  if test -n "$1"; then
--    func_convert_core_msys_to_w32 "$1"
--    func_cygpath -u "$func_convert_core_msys_to_w32_result"
--    func_to_host_file_result="$func_cygpath_result"
--  fi
--  func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_msys_to_cygwin
--
--
--# func_convert_file_nix_to_cygwin ARG
--# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
--# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
--# in func_to_host_file_result.
--func_convert_file_nix_to_cygwin ()
--{
--  $opt_debug
--  func_to_host_file_result="$1"
--  if test -n "$1"; then
--    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
--    func_convert_core_file_wine_to_w32 "$1"
--    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
--    func_to_host_file_result="$func_cygpath_result"
--  fi
--  func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_nix_to_cygwin
--
--
--#############################################
--# $build to $host PATH CONVERSION FUNCTIONS #
--#############################################
--# invoked via `$to_host_path_cmd ARG'
--#
--# In each case, ARG is the path to be converted from $build to $host format.
--# The result will be available in $func_to_host_path_result.
--#
--# Path separators are also converted from $build format to $host format.  If
--# ARG begins or ends with a path separator character, it is preserved (but
--# converted to $host format) on output.
--#
--# All path conversion functions are named using the following convention:
--#   file name conversion function    : func_convert_file_X_to_Y ()
--#   path conversion function         : func_convert_path_X_to_Y ()
--# where, for any given $build/$host combination the 'X_to_Y' value is the
--# same.  If conversion functions are added for new $build/$host combinations,
--# the two new functions must follow this pattern, or func_init_to_host_path_cmd
--# will break.
--
--
--# func_init_to_host_path_cmd
--# Ensures that function "pointer" variable $to_host_path_cmd is set to the
--# appropriate value, based on the value of $to_host_file_cmd.
--to_host_path_cmd=
--func_init_to_host_path_cmd ()
--{
--  $opt_debug
--  if test -z "$to_host_path_cmd"; then
--    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
--    to_host_path_cmd="func_convert_path_${func_stripname_result}"
--  fi
--}
--
--
--# func_to_host_path ARG
--# Converts the path ARG from $build format to $host format. Return result
--# in func_to_host_path_result.
--func_to_host_path ()
--{
--  $opt_debug
--  func_init_to_host_path_cmd
--  $to_host_path_cmd "$1"
--}
--# end func_to_host_path
--
--
--# func_convert_path_noop ARG
--# Copy ARG to func_to_host_path_result.
--func_convert_path_noop ()
--{
--  func_to_host_path_result="$1"
--}
--# end func_convert_path_noop
--
--
--# func_convert_path_msys_to_w32 ARG
--# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
--# conversion to w32 is not available inside the cwrapper.  Returns result in
--# func_to_host_path_result.
--func_convert_path_msys_to_w32 ()
--{
--  $opt_debug
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    # Remove leading and trailing path separator characters from ARG.  MSYS
--    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
--    # and winepath ignores them completely.
--    func_stripname : : "$1"
--    func_to_host_path_tmp1=$func_stripname_result
--    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
--    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
--    func_convert_path_check : ";" \
--      "$func_to_host_path_tmp1" "$func_to_host_path_result"
--    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
--  fi
--}
--# end func_convert_path_msys_to_w32
--
--
--# func_convert_path_cygwin_to_w32 ARG
--# Convert path ARG from Cygwin to w32 format.  Returns result in
--# func_to_host_file_result.
--func_convert_path_cygwin_to_w32 ()
--{
--  $opt_debug
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    # See func_convert_path_msys_to_w32:
--    func_stripname : : "$1"
--    func_to_host_path_tmp1=$func_stripname_result
--    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
--    func_convert_path_check : ";" \
--      "$func_to_host_path_tmp1" "$func_to_host_path_result"
--    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
--  fi
--}
--# end func_convert_path_cygwin_to_w32
--
--
--# func_convert_path_nix_to_w32 ARG
--# Convert path ARG from *nix to w32 format.  Requires a wine environment and
--# a working winepath.  Returns result in func_to_host_file_result.
--func_convert_path_nix_to_w32 ()
--{
--  $opt_debug
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    # See func_convert_path_msys_to_w32:
--    func_stripname : : "$1"
--    func_to_host_path_tmp1=$func_stripname_result
--    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
--    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
--    func_convert_path_check : ";" \
--      "$func_to_host_path_tmp1" "$func_to_host_path_result"
--    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
--  fi
--}
--# end func_convert_path_nix_to_w32
--
--
--# func_convert_path_msys_to_cygwin ARG
--# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
--# Returns result in func_to_host_file_result.
--func_convert_path_msys_to_cygwin ()
--{
--  $opt_debug
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    # See func_convert_path_msys_to_w32:
--    func_stripname : : "$1"
--    func_to_host_path_tmp1=$func_stripname_result
--    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
--    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
--    func_to_host_path_result="$func_cygpath_result"
--    func_convert_path_check : : \
--      "$func_to_host_path_tmp1" "$func_to_host_path_result"
--    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
--  fi
--}
--# end func_convert_path_msys_to_cygwin
--
--
--# func_convert_path_nix_to_cygwin ARG
--# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
--# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
--# func_to_host_file_result.
--func_convert_path_nix_to_cygwin ()
--{
--  $opt_debug
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    # Remove leading and trailing path separator characters from
--    # ARG. msys behavior is inconsistent here, cygpath turns them
--    # into '.;' and ';.', and winepath ignores them completely.
--    func_stripname : : "$1"
--    func_to_host_path_tmp1=$func_stripname_result
--    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
--    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
--    func_to_host_path_result="$func_cygpath_result"
--    func_convert_path_check : : \
--      "$func_to_host_path_tmp1" "$func_to_host_path_result"
--    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
--  fi
--}
--# end func_convert_path_nix_to_cygwin
--
--
- # func_mode_compile arg...
- func_mode_compile ()
- {
-@@ -1985,12 +1137,12 @@ func_mode_compile ()
- 	  ;;
- 
- 	-pie | -fpie | -fPIE)
--          func_append pie_flag " $arg"
-+          pie_flag="$pie_flag $arg"
- 	  continue
- 	  ;;
- 
- 	-shared | -static | -prefer-pic | -prefer-non-pic)
--	  func_append later " $arg"
-+	  later="$later $arg"
- 	  continue
- 	  ;;
- 
-@@ -2011,14 +1163,15 @@ func_mode_compile ()
- 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
- 	    IFS="$save_ifs"
--	    func_append_quoted lastarg "$arg"
-+	    func_quote_for_eval "$arg"
-+	    lastarg="$lastarg $func_quote_for_eval_result"
- 	  done
- 	  IFS="$save_ifs"
- 	  func_stripname ' ' '' "$lastarg"
- 	  lastarg=$func_stripname_result
- 
- 	  # Add the arguments to base_compile.
--	  func_append base_compile " $lastarg"
-+	  base_compile="$base_compile $lastarg"
- 	  continue
- 	  ;;
- 
-@@ -2034,7 +1187,8 @@ func_mode_compile ()
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--      func_append_quoted base_compile "$lastarg"
-+      func_quote_for_eval "$lastarg"
-+      base_compile="$base_compile $func_quote_for_eval_result"
-     done # for arg
- 
-     case $arg_mode in
-@@ -2059,7 +1213,7 @@ func_mode_compile ()
-     *.[cCFSifmso] | \
-     *.ada | *.adb | *.ads | *.asm | \
-     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
--    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-       func_xform "$libobj"
-       libobj=$func_xform_result
-       ;;
-@@ -2134,7 +1288,7 @@ func_mode_compile ()
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-@@ -2165,16 +1319,17 @@ compiler."
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
--      func_append removelist " $output_obj"
-+      removelist="$removelist $output_obj"
-       $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-     $opt_dry_run || $RM $removelist
--    func_append removelist " $lockfile"
-+    removelist="$removelist $lockfile"
-     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- 
--    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
--    srcfile=$func_to_tool_file_result
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-     func_quote_for_eval "$srcfile"
-     qsrcfile=$func_quote_for_eval_result
- 
-@@ -2194,7 +1349,7 @@ compiler."
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
--	func_append command " -o $lobj"
-+	command="$command -o $lobj"
-       fi
- 
-       func_show_eval_locale "$command"	\
-@@ -2241,11 +1396,11 @@ compiler."
- 	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
--	func_append command " -o $obj"
-+	command="$command -o $obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
--      func_append command "$suppress_output"
-+      command="$command$suppress_output"
-       func_show_eval_locale "$command" \
-         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-@@ -2290,13 +1445,13 @@ compiler."
- }
- 
- $opt_help || {
--  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
- {
-     # We need to display help for each of the modes.
--    case $opt_mode in
-+    case $mode in
-       "")
-         # Generic help is extracted from the usage comments
-         # at the start of this file.
-@@ -2327,11 +1482,10 @@ This mode accepts the following additional options:
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
--  -prefer-pic       try to build PIC objects only
--  -prefer-non-pic   try to build non-PIC objects only
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
--  -Wc,FLAG          pass FLAG directly to the compiler
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
- from the given SOURCEFILE.
-@@ -2384,7 +1538,7 @@ either the \`install' or \`cp' program.
- 
- The following components of INSTALL-COMMAND are treated specially:
- 
--  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
- The rest of the components are interpreted as arguments to that command (only
- BSD-compatible install options are recognized)."
-@@ -2404,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially:
- 
-   -all-static       do not do any dynamic linking at all
-   -avoid-version    do not add a version suffix if possible
--  -bindir BINDIR    specify path to binaries directory (for systems where
--                    libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -2434,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially:
-   -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
-   -weak LIBNAME     declare that the target provides the LIBNAME interface
--  -Wc,FLAG
--  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
--  -Wl,FLAG
--  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
--  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
- 
- All other options (arguments beginning with \`-') are ignored.
- 
-@@ -2472,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM."
-         ;;
- 
-       *)
--        func_fatal_help "invalid operation mode \`$opt_mode'"
-+        func_fatal_help "invalid operation mode \`$mode'"
-         ;;
-     esac
- 
--    echo
-+    $ECHO
-     $ECHO "Try \`$progname --help' for more information about other modes."
-+
-+    exit $?
- }
- 
--# Now that we've collected a possible --mode arg, show help if necessary
--if $opt_help; then
--  if test "$opt_help" = :; then
--    func_mode_help
--  else
--    {
--      func_help noexit
--      for opt_mode in compile link execute install finish uninstall clean; do
--	func_mode_help
--      done
--    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
--    {
--      func_help noexit
--      for opt_mode in compile link execute install finish uninstall clean; do
--	echo
--	func_mode_help
--      done
--    } |
--    sed '1d
--      /^When reporting/,/^Report/{
--	H
--	d
--      }
--      $x
--      /information about other modes/d
--      /more detailed .*MODE/d
--      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
--  fi
--  exit $?
--fi
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
- 
- 
- # func_mode_execute arg...
-@@ -2522,16 +1643,13 @@ func_mode_execute ()
-       func_fatal_help "you must specify a COMMAND"
- 
-     # Handle -dlopen flags immediately.
--    for file in $opt_dlopen; do
-+    for file in $execute_dlfiles; do
-       test -f "$file" \
- 	|| func_fatal_help "\`$file' is not a file"
- 
-       dir=
-       case $file in
-       *.la)
--	func_resolve_sysroot "$file"
--	file=$func_resolve_sysroot_result
--
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -2553,7 +1671,7 @@ func_mode_execute ()
- 	dir="$func_dirname_result"
- 
- 	if test -f "$dir/$objdir/$dlname"; then
--	  func_append dir "/$objdir"
-+	  dir="$dir/$objdir"
- 	else
- 	  if test ! -f "$dir/$dlname"; then
- 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -2594,7 +1712,7 @@ func_mode_execute ()
-     for file
-     do
-       case $file in
--      -* | *.la | *.lo ) ;;
-+      -*) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
- 	if func_ltwrapper_script_p "$file"; then
-@@ -2610,7 +1728,8 @@ func_mode_execute ()
- 	;;
-       esac
-       # Quote arguments (to preserve shell metacharacters).
--      func_append_quoted args "$file"
-+      func_quote_for_eval "$file"
-+      args="$args $func_quote_for_eval_result"
-     done
- 
-     if test "X$opt_dry_run" = Xfalse; then
-@@ -2635,66 +1754,29 @@ func_mode_execute ()
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
--	echo "export $shlibpath_var"
-+	$ECHO "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-     fi
- }
- 
--test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-+test "$mode" = execute && func_mode_execute ${1+"$@"}
- 
- 
- # func_mode_finish arg...
- func_mode_finish ()
- {
-     $opt_debug
--    libs=
--    libdirs=
-+    libdirs="$nonopt"
-     admincmds=
- 
--    for opt in "$nonopt" ${1+"$@"}
--    do
--      if test -d "$opt"; then
--	func_append libdirs " $opt"
--
--      elif test -f "$opt"; then
--	if func_lalib_unsafe_p "$opt"; then
--	  func_append libs " $opt"
--	else
--	  func_warning "\`$opt' is not a valid libtool archive"
--	fi
--
--      else
--	func_fatal_error "invalid argument \`$opt'"
--      fi
--    done
--
--    if test -n "$libs"; then
--      if test -n "$lt_sysroot"; then
--        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
--        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
--      else
--        sysroot_cmd=
--      fi
--
--      # Remove sysroot references
--      if $opt_dry_run; then
--        for lib in $libs; do
--          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
--        done
--      else
--        tmpdir=`func_mktempdir`
--        for lib in $libs; do
--	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
--	    > $tmpdir/tmp-la
--	  mv -f $tmpdir/tmp-la $lib
--	done
--        ${RM}r "$tmpdir"
--      fi
--    fi
--
-     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
-+
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
-@@ -2704,7 +1786,7 @@ func_mode_finish ()
- 	if test -n "$finish_eval"; then
- 	  # Do the single finish_eval.
- 	  eval cmds=\"$finish_eval\"
--	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-        $cmds"
- 	fi
-       done
-@@ -2713,55 +1795,53 @@ func_mode_finish ()
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
--    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
--      echo "----------------------------------------------------------------------"
--      echo "Libraries have been installed in:"
--      for libdir in $libdirs; do
--	$ECHO "   $libdir"
--      done
--      echo
--      echo "If you ever happen to want to link against installed libraries"
--      echo "in a given directory, LIBDIR, you must either use libtool, and"
--      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--      echo "flag during linking and do at least one of the following:"
--      if test -n "$shlibpath_var"; then
--	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--	echo "     during execution"
--      fi
--      if test -n "$runpath_var"; then
--	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--	echo "     during linking"
--      fi
--      if test -n "$hardcode_libdir_flag_spec"; then
--	libdir=LIBDIR
--	eval flag=\"$hardcode_libdir_flag_spec\"
--
--	$ECHO "   - use the \`$flag' linker flag"
--      fi
--      if test -n "$admincmds"; then
--	$ECHO "   - have your system administrator run these commands:$admincmds"
--      fi
--      if test -f /etc/ld.so.conf; then
--	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--      fi
--      echo
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    $ECHO "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      $ECHO "   $libdir"
-+    done
-+    $ECHO
-+    $ECHO "If you ever happen to want to link against installed libraries"
-+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $ECHO "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $ECHO "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $ECHO "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
- 
--      echo "See any operating system documentation about shared libraries for"
--      case $host in
--	solaris2.[6789]|solaris2.1[0-9])
--	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
--	  echo "pages."
--	  ;;
--	*)
--	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
--	  ;;
--      esac
--      echo "----------------------------------------------------------------------"
-+      $ECHO "   - use the \`$flag' linker flag"
-     fi
-+    if test -n "$admincmds"; then
-+      $ECHO "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    $ECHO
-+
-+    $ECHO "See any operating system documentation about shared libraries for"
-+    case $host in
-+      solaris2.[6789]|solaris2.1[0-9])
-+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	$ECHO "pages."
-+	;;
-+      *)
-+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-+        ;;
-+    esac
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-     exit $EXIT_SUCCESS
- }
- 
--test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-+test "$mode" = finish && func_mode_finish ${1+"$@"}
- 
- 
- # func_mode_install arg...
-@@ -2772,7 +1852,7 @@ func_mode_install ()
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       case $nonopt in *shtool*) :;; *) false;; esac; then
-+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-       # Aesthetically quote it.
-       func_quote_for_eval "$nonopt"
-       install_prog="$func_quote_for_eval_result "
-@@ -2786,12 +1866,7 @@ func_mode_install ()
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
--    func_append install_prog "$func_quote_for_eval_result"
--    install_shared_prog=$install_prog
--    case " $install_prog " in
--      *[\\\ /]cp\ *) install_cp=: ;;
--      *) install_cp=false ;;
--    esac
-+    install_prog="$install_prog$func_quote_for_eval_result"
- 
-     # We need to accept at least all the BSD install flags.
-     dest=
-@@ -2801,12 +1876,10 @@ func_mode_install ()
-     install_type=
-     isdir=no
-     stripme=
--    no_mode=:
-     for arg
-     do
--      arg2=
-       if test -n "$dest"; then
--	func_append files " $dest"
-+	files="$files $dest"
- 	dest=$arg
- 	continue
-       fi
-@@ -2814,9 +1887,10 @@ func_mode_install ()
-       case $arg in
-       -d) isdir=yes ;;
-       -f)
--	if $install_cp; then :; else
--	  prev=$arg
--	fi
-+	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
- 	;;
-       -g | -m | -o)
- 	prev=$arg
-@@ -2830,10 +1904,6 @@ func_mode_install ()
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
--	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
--	    arg2=$install_override_mode
--	    no_mode=false
--	  fi
- 	  prev=
- 	else
- 	  dest=$arg
-@@ -2844,11 +1914,7 @@ func_mode_install ()
- 
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
--      func_append install_prog " $func_quote_for_eval_result"
--      if test -n "$arg2"; then
--	func_quote_for_eval "$arg2"
--      fi
--      func_append install_shared_prog " $func_quote_for_eval_result"
-+      install_prog="$install_prog $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-@@ -2857,13 +1923,6 @@ func_mode_install ()
-     test -n "$prev" && \
-       func_fatal_help "the \`$prev' option requires an argument"
- 
--    if test -n "$install_override_mode" && $no_mode; then
--      if $install_cp; then :; else
--	func_quote_for_eval "$install_override_mode"
--	func_append install_shared_prog " -m $func_quote_for_eval_result"
--      fi
--    fi
--
-     if test -z "$files"; then
-       if test -z "$dest"; then
- 	func_fatal_help "no file or destination specified"
-@@ -2918,13 +1977,10 @@ func_mode_install ()
-       case $file in
-       *.$libext)
- 	# Do the static libraries later.
--	func_append staticlibs " $file"
-+	staticlibs="$staticlibs $file"
- 	;;
- 
-       *.la)
--	func_resolve_sysroot "$file"
--	file=$func_resolve_sysroot_result
--
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -2938,23 +1994,23 @@ func_mode_install ()
- 	if test "X$destdir" = "X$libdir"; then
- 	  case "$current_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) func_append current_libdirs " $libdir" ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
- 	  esac
- 	else
- 	  # Note the libdir as a future libdir.
- 	  case "$future_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) func_append future_libdirs " $libdir" ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
- 	  esac
- 	fi
- 
- 	func_dirname "$file" "/" ""
- 	dir="$func_dirname_result"
--	func_append dir "$objdir"
-+	dir="$dir$objdir"
- 
- 	if test -n "$relink_command"; then
- 	  # Determine the prefix the user has applied to our future dir.
--	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
- 
- 	  # Don't allow the user to place us outside of our expected
- 	  # location b/c this prevents finding dependent libraries that
-@@ -2967,9 +2023,9 @@ func_mode_install ()
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- 	  else
--	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
- 	  fi
- 
- 	  func_warning "relinking \`$file'"
-@@ -2987,7 +2043,7 @@ func_mode_install ()
- 	  test -n "$relink_command" && srcname="$realname"T
- 
- 	  # Install the shared library and build the symlinks.
--	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
-@@ -3027,7 +2083,7 @@ func_mode_install ()
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
- 
- 	# Maybe install the static library, too.
--	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- 	;;
- 
-       *.lo)
-@@ -3127,7 +2183,7 @@ func_mode_install ()
- 	    if test -f "$lib"; then
- 	      func_source "$lib"
- 	    fi
--	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
-@@ -3146,7 +2202,7 @@ func_mode_install ()
- 		file="$func_basename_result"
- 	        outputname="$tmpdir/$file"
- 	        # Replace the output file specification.
--	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
- 
- 	        $opt_silent || {
- 	          func_quote_for_expand "$relink_command"
-@@ -3165,7 +2221,7 @@ func_mode_install ()
- 	    }
- 	  else
- 	    # Install the binary that we compiled earlier.
--	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
-@@ -3224,7 +2280,7 @@ func_mode_install ()
-     fi
- }
- 
--test "$opt_mode" = install && func_mode_install ${1+"$@"}
-+test "$mode" = install && func_mode_install ${1+"$@"}
- 
- 
- # func_generate_dlsyms outputname originator pic_p
-@@ -3267,22 +2323,6 @@ func_generate_dlsyms ()
- extern \"C\" {
- #endif
- 
--#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
--#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
--#endif
--
--/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
--#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
--/* DATA imports from DLLs on WIN32 con't be const, because runtime
--   relocations are performed -- see ld's documentation on pseudo-relocs.  */
--# define LT_DLSYM_CONST
--#elif defined(__osf__)
--/* This system does not cope well with relocations in const data.  */
--# define LT_DLSYM_CONST
--#else
--# define LT_DLSYM_CONST const
--#endif
--
- /* External symbol declarations for the compiler. */\
- "
- 
-@@ -3292,11 +2332,10 @@ extern \"C\" {
- 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
- 
- 	  # Add our own program objects to the symbol list.
--	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 	  for progfile in $progfiles; do
--	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
--	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
--	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-+	    func_verbose "extracting global C symbols from \`$progfile'"
-+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
- 	  done
- 
- 	  if test -n "$exclude_expsyms"; then
-@@ -3332,7 +2371,7 @@ extern \"C\" {
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin* | *mingw* | *cegcc* )
-+	        *cygwin | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -3345,52 +2384,10 @@ extern \"C\" {
- 	  func_verbose "extracting global C symbols from \`$dlprefile'"
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
--          case $host in
--	    *cygwin* | *mingw* | *cegcc* )
--	      # if an import library, we need to obtain dlname
--	      if func_win32_import_lib_p "$dlprefile"; then
--	        func_tr_sh "$dlprefile"
--	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
--	        dlprefile_dlbasename=""
--	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
--	          # Use subshell, to avoid clobbering current variable values
--	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
--	          if test -n "$dlprefile_dlname" ; then
--	            func_basename "$dlprefile_dlname"
--	            dlprefile_dlbasename="$func_basename_result"
--	          else
--	            # no lafile. user explicitly requested -dlpreopen <import library>.
--	            $sharedlib_from_linklib_cmd "$dlprefile"
--	            dlprefile_dlbasename=$sharedlib_from_linklib_result
--	          fi
--	        fi
--	        $opt_dry_run || {
--	          if test -n "$dlprefile_dlbasename" ; then
--	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
--	          else
--	            func_warning "Could not compute DLL name from $name"
--	            eval '$ECHO ": $name " >> "$nlist"'
--	          fi
--	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
--	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
--	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
--	        }
--	      else # not an import lib
--	        $opt_dry_run || {
--	          eval '$ECHO ": $name " >> "$nlist"'
--	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
--	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
--	        }
--	      fi
--	    ;;
--	    *)
--	      $opt_dry_run || {
--	        eval '$ECHO ": $name " >> "$nlist"'
--	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
--	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
--	      }
--	    ;;
--          esac
-+	  $opt_dry_run || {
-+	    eval '$ECHO ": $name " >> "$nlist"'
-+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	  }
- 	done
- 
- 	$opt_dry_run || {
-@@ -3418,19 +2415,36 @@ extern \"C\" {
- 	  if test -f "$nlist"S; then
- 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
--	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
- 
--	  echo >> "$output_objdir/$my_dlsyms" "\
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
- 
- /* The mapping between symbol names and symbols.  */
- typedef struct {
-   const char *name;
-   void *address;
- } lt_dlsymlist;
--extern LT_DLSYM_CONST lt_dlsymlist
-+"
-+	  case $host in
-+	  *cygwin* | *mingw* | *cegcc* )
-+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-+/* DATA imports from DLLs on WIN32 con't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs.  */"
-+	    lt_dlsym_const= ;;
-+	  *osf5*)
-+	    echo >> "$output_objdir/$my_dlsyms" "\
-+/* This system does not cope well with relocations in const data */"
-+	    lt_dlsym_const= ;;
-+	  *)
-+	    lt_dlsym_const=const ;;
-+	  esac
-+
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+extern $lt_dlsym_const lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
--LT_DLSYM_CONST lt_dlsymlist
-+$lt_dlsym_const lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
-@@ -3443,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
- 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  esac
--	  echo >> "$output_objdir/$my_dlsyms" "\
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-   {0, (void *) 0}
- };
- 
-@@ -3486,7 +2500,7 @@ static const void *lt_preloaded_setup() {
- 	for arg in $LTCFLAGS; do
- 	  case $arg in
- 	  -pie | -fpie | -fPIE) ;;
--	  *) func_append symtab_cflags " $arg" ;;
-+	  *) symtab_cflags="$symtab_cflags $arg" ;;
- 	  esac
- 	done
- 
-@@ -3501,16 +2515,16 @@ static const void *lt_preloaded_setup() {
- 	case $host in
- 	*cygwin* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
--	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
--	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	  else
--	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
--	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  fi
- 	  ;;
- 	*)
--	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
--	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  ;;
- 	esac
- 	;;
-@@ -3524,8 +2538,8 @@ static const void *lt_preloaded_setup() {
-       # really was required.
- 
-       # Nullify the symbol file.
--      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
--      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-     fi
- }
- 
-@@ -3535,7 +2549,6 @@ static const void *lt_preloaded_setup() {
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--# Despite the name, also deal with 64 bit binaries.
- func_win32_libid ()
- {
-   $opt_debug
-@@ -3546,11 +2559,9 @@ func_win32_libid ()
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
--    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
--      func_to_tool_file "$1" func_convert_file_msys_to_w32
--      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+      win32_nmres=`eval $NM -f posix -A $1 |
- 	$SED -n -e '
- 	    1,100{
- 		/ I /{
-@@ -3579,131 +2590,6 @@ func_win32_libid ()
-   $ECHO "$win32_libid_type"
- }
- 
--# func_cygming_dll_for_implib ARG
--#
--# Platform-specific function to extract the
--# name of the DLL associated with the specified
--# import library ARG.
--# Invoked by eval'ing the libtool variable
--#    $sharedlib_from_linklib_cmd
--# Result is available in the variable
--#    $sharedlib_from_linklib_result
--func_cygming_dll_for_implib ()
--{
--  $opt_debug
--  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
--}
--
--# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
--#
--# The is the core of a fallback implementation of a
--# platform-specific function to extract the name of the
--# DLL associated with the specified import library LIBNAME.
--#
--# SECTION_NAME is either .idata$6 or .idata$7, depending
--# on the platform and compiler that created the implib.
--#
--# Echos the name of the DLL associated with the
--# specified import library.
--func_cygming_dll_for_implib_fallback_core ()
--{
--  $opt_debug
--  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
--  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
--    $SED '/^Contents of section '"$match_literal"':/{
--      # Place marker at beginning of archive member dllname section
--      s/.*/====MARK====/
--      p
--      d
--    }
--    # These lines can sometimes be longer than 43 characters, but
--    # are always uninteresting
--    /:[	 ]*file format pe[i]\{,1\}-/d
--    /^In archive [^:]*:/d
--    # Ensure marker is printed
--    /^====MARK====/p
--    # Remove all lines with less than 43 characters
--    /^.\{43\}/!d
--    # From remaining lines, remove first 43 characters
--    s/^.\{43\}//' |
--    $SED -n '
--      # Join marker and all lines until next marker into a single line
--      /^====MARK====/ b para
--      H
--      $ b para
--      b
--      :para
--      x
--      s/\n//g
--      # Remove the marker
--      s/^====MARK====//
--      # Remove trailing dots and whitespace
--      s/[\. \t]*$//
--      # Print
--      /./p' |
--    # we now have a list, one entry per line, of the stringified
--    # contents of the appropriate section of all members of the
--    # archive which possess that section. Heuristic: eliminate
--    # all those which have a first or second character that is
--    # a '.' (that is, objdump's representation of an unprintable
--    # character.) This should work for all archives with less than
--    # 0x302f exports -- but will fail for DLLs whose name actually
--    # begins with a literal '.' or a single character followed by
--    # a '.'.
--    #
--    # Of those that remain, print the first one.
--    $SED -e '/^\./d;/^.\./d;q'
--}
--
--# func_cygming_gnu_implib_p ARG
--# This predicate returns with zero status (TRUE) if
--# ARG is a GNU/binutils-style import library. Returns
--# with nonzero status (FALSE) otherwise.
--func_cygming_gnu_implib_p ()
--{
--  $opt_debug
--  func_to_tool_file "$1" func_convert_file_msys_to_w32
--  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
--  test -n "$func_cygming_gnu_implib_tmp"
--}
--
--# func_cygming_ms_implib_p ARG
--# This predicate returns with zero status (TRUE) if
--# ARG is an MS-style import library. Returns
--# with nonzero status (FALSE) otherwise.
--func_cygming_ms_implib_p ()
--{
--  $opt_debug
--  func_to_tool_file "$1" func_convert_file_msys_to_w32
--  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
--  test -n "$func_cygming_ms_implib_tmp"
--}
--
--# func_cygming_dll_for_implib_fallback ARG
--# Platform-specific function to extract the
--# name of the DLL associated with the specified
--# import library ARG.
--#
--# This fallback implementation is for use when $DLLTOOL
--# does not support the --identify-strict option.
--# Invoked by eval'ing the libtool variable
--#    $sharedlib_from_linklib_cmd
--# Result is available in the variable
--#    $sharedlib_from_linklib_result
--func_cygming_dll_for_implib_fallback ()
--{
--  $opt_debug
--  if func_cygming_gnu_implib_p "$1" ; then
--    # binutils import library
--    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
--  elif func_cygming_ms_implib_p "$1" ; then
--    # ms-generated import library
--    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
--  else
--    # unknown
--    sharedlib_from_linklib_result=""
--  fi
--}
- 
- 
- # func_extract_an_archive dir oldlib
-@@ -3712,18 +2598,7 @@ func_extract_an_archive ()
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
--    if test "$lock_old_archive_extraction" = yes; then
--      lockfile=$f_ex_an_ar_oldlib.lock
--      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
--	func_echo "Waiting for $lockfile to be removed"
--	sleep 2
--      done
--    fi
--    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
--		   'stat=$?; rm -f "$lockfile"; exit $stat'
--    if test "$lock_old_archive_extraction" = yes; then
--      $opt_dry_run || rm -f "$lockfile"
--    fi
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-      :
-     else
-@@ -3794,7 +2669,7 @@ func_extract_archives ()
- 	    darwin_file=
- 	    darwin_files=
- 	    for darwin_file in $darwin_filelist; do
--	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- 	      $LIPO -create -output "$darwin_file" $darwin_files
- 	    done # $darwin_filelist
- 	    $RM -rf unfat-$$
-@@ -3809,30 +2684,25 @@ func_extract_archives ()
-         func_extract_an_archive "$my_xdir" "$my_xabs"
- 	;;
-       esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
- }
- 
- 
--# func_emit_wrapper [arg=no]
--#
--# Emit a libtool wrapper script on stdout.
--# Don't directly open a file because we may want to
--# incorporate the script contents within a cygwin/mingw
--# wrapper executable.  Must ONLY be called from within
--# func_mode_link because it depends on a number of variables
--# set therein.
-+
-+# func_emit_wrapper_part1 [arg=no]
- #
--# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
--# variable will take.  If 'yes', then the emitted script
--# will assume that the directory in which it is stored is
--# the $objdir directory.  This is a cygwin/mingw-specific
--# behavior.
--func_emit_wrapper ()
-+# Emit the first part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part1 ()
- {
--	func_emit_wrapper_arg1=${1-no}
-+	func_emit_wrapper_part1_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part1_arg1=$1
-+	fi
- 
- 	$ECHO "\
- #! $SHELL
-@@ -3848,6 +2718,7 @@ func_emit_wrapper ()
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # Be Bourne compatible
-@@ -3878,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
- else
-   # When we are sourced in execute mode, \$file and \$ECHO are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
--    file=\"\$0\""
--
--    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
--    $ECHO "\
--
--# A function that is used when there is no print builtin or printf.
--func_fallback_echo ()
--{
--  eval 'cat <<_LTECHO_EOF
--\$1
--_LTECHO_EOF'
--}
--    ECHO=\"$qECHO\"
--  fi
--
--# Very basic option parsing. These options are (a) specific to
--# the libtool wrapper, (b) are identical between the wrapper
--# /script/ and the wrapper /executable/ which is used only on
--# windows platforms, and (c) all begin with the string "--lt-"
--# (application programs are unlikely to have options which match
--# this pattern).
--#
--# There are only two supported options: --lt-debug and
--# --lt-dump-script. There is, deliberately, no --lt-help.
--#
--# The first argument to this parsing function should be the
--# script's $0 value, followed by "$@".
--lt_option_debug=
--func_parse_lt_options ()
--{
--  lt_script_arg0=\$0
--  shift
--  for lt_opt
--  do
--    case \"\$lt_opt\" in
--    --lt-debug) lt_option_debug=1 ;;
--    --lt-dump-script)
--        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
--        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
--        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
--        cat \"\$lt_dump_D/\$lt_dump_F\"
--        exit 0
--      ;;
--    --lt-*)
--        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
--        exit 1
--      ;;
--    esac
--  done
--
--  # Print the debug banner immediately:
--  if test -n \"\$lt_option_debug\"; then
--    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
--  fi
--}
--
--# Used when --lt-debug. Prints its arguments to stdout
--# (redirection is the responsibility of the caller)
--func_lt_dump_args ()
--{
--  lt_dump_args_N=1;
--  for lt_arg
--  do
--    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
--    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
--  done
--}
--
--# Core function for launching the target application
--func_exec_program_core ()
--{
--"
--  case $host in
--  # Backslashes separate directories on plain windows
--  *-*-mingw | *-*-os2* | *-cegcc*)
--    $ECHO "\
--      if test -n \"\$lt_option_debug\"; then
--        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
--        func_lt_dump_args \${1+\"\$@\"} 1>&2
--      fi
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
--    ;;
--
--  *)
--    $ECHO "\
--      if test -n \"\$lt_option_debug\"; then
--        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
--        func_lt_dump_args \${1+\"\$@\"} 1>&2
--      fi
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+    ECHO=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$ECHO works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$ECHO will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
- "
--    ;;
--  esac
--  $ECHO "\
--      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
--      exit 1
--}
--
--# A function to encapsulate launching the target application
--# Strips options in the --lt-* namespace from \$@ and
--# launches target application with the remaining arguments.
--func_exec_program ()
--{
--  for lt_wr_arg
--  do
--    case \$lt_wr_arg in
--    --lt-*) ;;
--    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
--    esac
--    shift
--  done
--  func_exec_program_core \${1+\"\$@\"}
--}
--
--  # Parse options
--  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-+	$ECHO "\
- 
-   # Find the directory that this script lives in.
--  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
--    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-@@ -4013,13 +2783,30 @@ func_exec_program ()
-       esac
-     fi
- 
--    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-   done
-+"
-+}
-+# end: func_emit_wrapper_part1
-+
-+# func_emit_wrapper_part2 [arg=no]
-+#
-+# Emit the second part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part2 ()
-+{
-+	func_emit_wrapper_part2_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part2_arg1=$1
-+	fi
-+
-+	$ECHO "\
- 
-   # Usually 'no', except on cygwin/mingw when embedded into
-   # the cwrapper.
--  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-     # special case for '.'
-     if test \"\$thisdir\" = \".\"; then
-@@ -4027,7 +2814,7 @@ func_exec_program ()
-     fi
-     # remove .libs from thisdir
-     case \"\$thisdir\" in
--    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-     $objdir )   thisdir=. ;;
-     esac
-   fi
-@@ -4082,18 +2869,6 @@ func_exec_program ()
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
--	# fixup the dll searchpath if we need to.
--	#
--	# Fix the DLL searchpath if we need to.  Do this before prepending
--	# to shlibpath, because on Windows, both are PATH and uninstalled
--	# libraries must come first.
--	if test -n "$dllsearchpath"; then
--	  $ECHO "\
--    # Add the dll search path components to the executable PATH
--    PATH=$dllsearchpath:\$PATH
--"
--	fi
--
- 	# Export our shlibpath_var if we have one.
- 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- 	  $ECHO "\
-@@ -4102,28 +2877,253 @@ func_exec_program ()
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
--    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
- 
-     export $shlibpath_var
- "
- 	fi
- 
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
- 	$ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
--      func_exec_program \${1+\"\$@\"}
-+"
-+	case $host in
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-     fi
-   else
-     # The program doesn't exist.
-     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
--    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit 1
-   fi
- fi\
- "
- }
-+# end: func_emit_wrapper_part2
-+
-+
-+# func_emit_wrapper [arg=no]
-+#
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable.  Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory.  This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
-+{
-+	func_emit_wrapper_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_arg1=$1
-+	fi
-+
-+	# split this up so that func_emit_cwrapperexe_src
-+	# can call each part independently.
-+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-+}
-+
-+
-+# func_to_host_path arg
-+#
-+# Convert paths to host format when used with build tools.
-+# Intended for use with "native" mingw (where libtool itself
-+# is running under the msys shell), or in the following cross-
-+# build environments:
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+# where wine is equipped with the `winepath' executable.
-+# In the native mingw case, the (msys) shell automatically
-+# converts paths for any non-msys applications it launches,
-+# but that facility isn't available from inside the cwrapper.
-+# Similar accommodations are necessary for $host mingw and
-+# $build cygwin.  Calling this function does no harm for other
-+# $host/$build combinations not listed above.
-+#
-+# ARG is the path (on $build) that should be converted to
-+# the proper representation for $host. The result is stored
-+# in $func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  func_to_host_path_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        case $build in
-+          *mingw* ) # actually, msys
-+            # awkward: cmd appends spaces to result
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_path_tmp1=`cygpath -w "$1"`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # Unfortunately, winepath does not exit with a non-zero
-+            # error code, so we are forced to check the contents of
-+            # stdout. On the other hand, if the command is not
-+            # found, the shell will set an exit code of 127 and print
-+            # *an error message* to stdout. So we must check for both
-+            # error code of zero AND non-empty stdout, which explains
-+            # the odd construction:
-+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+                $SED -e "$lt_sed_naive_backslashify"`
-+            else
-+              # Allow warning below.
-+              func_to_host_path_result=""
-+            fi
-+            ;;
-+        esac
-+        if test -z "$func_to_host_path_result" ; then
-+          func_error "Could not determine host path corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback:
-+          func_to_host_path_result="$1"
-+        fi
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_path
- 
-+# func_to_host_pathlist arg
-+#
-+# Convert pathlists to host format when used with build tools.
-+# See func_to_host_path(), above. This function supports the
-+# following $build/$host combinations (but does no harm for
-+# combinations not listed here):
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+#
-+# Path separators are also converted from $build format to
-+# $host format. If ARG begins or ends with a path separator
-+# character, it is preserved (but converted to $host format)
-+# on output.
-+#
-+# ARG is a pathlist (on $build) that should be converted to
-+# the proper representation on $host. The result is stored
-+# in $func_to_host_pathlist_result.
-+func_to_host_pathlist ()
-+{
-+  func_to_host_pathlist_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        # Remove leading and trailing path separator characters from
-+        # ARG. msys behavior is inconsistent here, cygpath turns them
-+        # into '.;' and ';.', and winepath ignores them completely.
-+        func_to_host_pathlist_tmp2="$1"
-+        # Once set for this call, this variable should not be
-+        # reassigned. It is used in tha fallback case.
-+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-+          $SED -e 's|^:*||' -e 's|:*$||'`
-+        case $build in
-+          *mingw* ) # Actually, msys.
-+            # Awkward: cmd appends spaces to result.
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # unfortunately, winepath doesn't convert pathlists
-+            func_to_host_pathlist_result=""
-+            func_to_host_pathlist_oldIFS=$IFS
-+            IFS=:
-+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-+              IFS=$func_to_host_pathlist_oldIFS
-+              if test -n "$func_to_host_pathlist_f" ; then
-+                func_to_host_path "$func_to_host_pathlist_f"
-+                if test -n "$func_to_host_path_result" ; then
-+                  if test -z "$func_to_host_pathlist_result" ; then
-+                    func_to_host_pathlist_result="$func_to_host_path_result"
-+                  else
-+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-+                  fi
-+                fi
-+              fi
-+              IFS=:
-+            done
-+            IFS=$func_to_host_pathlist_oldIFS
-+            ;;
-+        esac
-+        if test -z "$func_to_host_pathlist_result" ; then
-+          func_error "Could not determine the host path(s) corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback. This may break if $1 contains DOS-style drive
-+          # specifications. The fix is not to complicate the expression
-+          # below, but for the user to provide a working wine installation
-+          # with winepath so that path translation in the cross-to-mingw
-+          # case works properly.
-+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-+        fi
-+        # Now, add the leading and trailing path separators back
-+        case "$1" in
-+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-+            ;;
-+        esac
-+        case "$1" in
-+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-+            ;;
-+        esac
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_pathlist
- 
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
-@@ -4141,23 +3141,31 @@ func_emit_cwrapperexe_src ()
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
-+
-+   Currently, it simply execs the wrapper *script* "$SHELL $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
- */
- EOF
- 	    cat <<"EOF"
--#ifdef _MSC_VER
--# define _CRT_SECURE_NO_DEPRECATE 1
--#endif
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- # include <direct.h>
- # include <process.h>
- # include <io.h>
-+# define setmode _setmode
- #else
- # include <unistd.h>
- # include <stdint.h>
- # ifdef __CYGWIN__
- #  include <io.h>
-+#  define HAVE_SETENV
-+#  ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+#  endif
- # endif
- #endif
- #include <malloc.h>
-@@ -4169,44 +3177,6 @@ EOF
- #include <fcntl.h>
- #include <sys/stat.h>
- 
--/* declarations of non-ANSI functions */
--#if defined(__MINGW32__)
--# ifdef __STRICT_ANSI__
--int _putenv (const char *);
--# endif
--#elif defined(__CYGWIN__)
--# ifdef __STRICT_ANSI__
--char *realpath (const char *, char *);
--int putenv (char *);
--int setenv (const char *, const char *, int);
--# endif
--/* #elif defined (other platforms) ... */
--#endif
--
--/* portability defines, excluding path handling macros */
--#if defined(_MSC_VER)
--# define setmode _setmode
--# define stat    _stat
--# define chmod   _chmod
--# define getcwd  _getcwd
--# define putenv  _putenv
--# define S_IXUSR _S_IEXEC
--# ifndef _INTPTR_T_DEFINED
--#  define _INTPTR_T_DEFINED
--#  define intptr_t int
--# endif
--#elif defined(__MINGW32__)
--# define setmode _setmode
--# define stat    _stat
--# define chmod   _chmod
--# define getcwd  _getcwd
--# define putenv  _putenv
--#elif defined(__CYGWIN__)
--# define HAVE_SETENV
--# define FOPEN_WB "wb"
--/* #elif defined (other platforms) ... */
--#endif
--
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
- #elif defined(MAXPATHLEN)
-@@ -4222,7 +3192,14 @@ int setenv (const char *, const char *, int);
- # define S_IXGRP 0
- #endif
- 
--/* path handling portability macros */
-+#ifdef _MSC_VER
-+# define S_IXUSR _S_IEXEC
-+# define stat _stat
-+# ifndef _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#endif
-+
- #ifndef DIR_SEPARATOR
- # define DIR_SEPARATOR '/'
- # define PATH_SEPARATOR ':'
-@@ -4253,6 +3230,10 @@ int setenv (const char *, const char *, int);
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
- #endif /* PATH_SEPARATOR_2 */
- 
-+#ifdef __CYGWIN__
-+# define FOPEN_WB "wb"
-+#endif
-+
- #ifndef FOPEN_WB
- # define FOPEN_WB "w"
- #endif
-@@ -4265,13 +3246,22 @@ int setenv (const char *, const char *, int);
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
--#if defined(LT_DEBUGWRAPPER)
--static int lt_debug = 1;
-+#undef LTWRAPPER_DEBUGPRINTF
-+#if defined DEBUGWRAPPER
-+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-+static void
-+ltwrapper_debugprintf (const char *fmt, ...)
-+{
-+    va_list args;
-+    va_start (args, fmt);
-+    (void) vfprintf (stderr, fmt, args);
-+    va_end (args);
-+}
- #else
--static int lt_debug = 0;
-+# define LTWRAPPER_DEBUGPRINTF(args)
- #endif
- 
--const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-+const char *program_name = NULL;
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
-@@ -4281,27 +3271,41 @@ char *chase_symlinks (const char *pathspec);
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
--void lt_debugprintf (const char *file, int line, const char *fmt, ...);
--void lt_fatal (const char *file, int line, const char *message, ...);
--static const char *nonnull (const char *s);
--static const char *nonempty (const char *s);
-+void lt_fatal (const char *message, ...);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-+void lt_opt_process_env_set (const char *arg);
-+void lt_opt_process_env_prepend (const char *arg);
-+void lt_opt_process_env_append (const char *arg);
-+int lt_split_name_value (const char *arg, char** name, char** value);
- void lt_update_exe_path (const char *name, const char *value);
- void lt_update_lib_path (const char *name, const char *value);
--char **prepare_spawn (char **argv);
--void lt_dump_script (FILE *f);
-+
-+static const char *script_text_part1 =
- EOF
- 
-+	    func_emit_wrapper_part1 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
- 	    cat <<EOF
--volatile const char * MAGIC_EXE = "$magic_exe";
-+
-+static const char *script_text_part2 =
-+EOF
-+	    func_emit_wrapper_part2 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+
-+	    cat <<EOF
-+const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
- 
- 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
--              func_to_host_path "$temp_rpath"
-+              func_to_host_pathlist "$temp_rpath"
- 	      cat <<EOF
--const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -4310,10 +3314,10 @@ EOF
- 	    fi
- 
- 	    if test -n "$dllsearchpath"; then
--              func_to_host_path "$dllsearchpath:"
-+              func_to_host_pathlist "$dllsearchpath:"
- 	      cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
--const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -4336,10 +3340,24 @@ EOF
- 	    cat <<"EOF"
- 
- #define LTWRAPPER_OPTION_PREFIX         "--lt-"
-+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
- 
-+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-+
- static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
--static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-+
-+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-+
-+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-+
-+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
- 
- int
- main (int argc, char *argv[])
-@@ -4356,13 +3374,10 @@ main (int argc, char *argv[])
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
--  newargz = XMALLOC (char *, argc + 1);
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- 
--  /* very simple arg parsing; don't want to rely on getopt
--   * also, copy all non cwrapper options to newargz, except
--   * argz[0], which is handled differently
--   */
--  newargc=0;
-+  /* very simple arg parsing; don't want to rely on getopt */
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -4376,57 +3391,25 @@ EOF
- 	      esac
- 
- 	    cat <<"EOF"
--	  lt_dump_script (stdout);
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
- 	  return 0;
- 	}
--      if (strcmp (argv[i], debug_opt) == 0)
--	{
--          lt_debug = 1;
--          continue;
--	}
--      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
--        {
--          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
--             namespace, but it is not one of the ones we know about and
--             have already dealt with, above (inluding dump-script), then
--             report an error. Otherwise, targets might begin to believe
--             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
--             namespace. The first time any user complains about this, we'll
--             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
--             or a configure.ac-settable value.
--           */
--          lt_fatal (__FILE__, __LINE__,
--		    "unrecognized %s option: '%s'",
--                    ltwrapper_option_prefix, argv[i]);
--        }
--      /* otherwise ... */
--      newargz[++newargc] = xstrdup (argv[i]);
-     }
--  newargz[++newargc] = NULL;
--
--EOF
--	    cat <<EOF
--  /* The GNU banner must be the first non-error debug message */
--  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
--EOF
--	    cat <<"EOF"
--  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
--  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
-+  newargz = XMALLOC (char *, argc + 1);
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
--    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
--  lt_debugprintf (__FILE__, __LINE__,
--                  "(main) found exe (before symlink chase) at: %s\n",
--		  tmp_pathspec);
-+    lt_fatal ("Couldn't find %s", argv[0]);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-+			  tmp_pathspec));
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
--  lt_debugprintf (__FILE__, __LINE__,
--                  "(main) found exe (after symlink chase) at: %s\n",
--		  actual_cwrapper_path);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-   XFREE (tmp_pathspec);
- 
--  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-@@ -4444,9 +3427,8 @@ EOF
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(main) libtool target name: %s\n",
--		  target_name);
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
- EOF
- 
- 	    cat <<EOF
-@@ -4496,19 +3478,80 @@ EOF
- 
-   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
--  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
--     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
--     because on Windows, both *_VARNAMEs are PATH but uninstalled
--     libraries must come first. */
--  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-   lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- 
--  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
--		  nonnull (lt_argv_zero));
-+  newargc=0;
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+        {
-+          if (argv[i][env_set_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_set_opt_len + 1;
-+              lt_opt_process_env_set (p);
-+            }
-+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_set (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_set_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+        {
-+          if (argv[i][env_prepend_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_prepend_opt_len + 1;
-+              lt_opt_process_env_prepend (p);
-+            }
-+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_prepend_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+        {
-+          if (argv[i][env_append_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_append_opt_len + 1;
-+              lt_opt_process_env_append (p);
-+            }
-+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_append (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_append_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-+    }
-+  newargz[++newargc] = NULL;
-+
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-   for (i = 0; i < newargc; i++)
-     {
--      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
--		      i, nonnull (newargz[i]));
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-     }
- 
- EOF
-@@ -4517,14 +3560,11 @@ EOF
- 	      mingw*)
- 		cat <<"EOF"
-   /* execv doesn't actually work on mingw as expected on unix */
--  newargz = prepare_spawn (newargz);
-   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-   if (rval == -1)
-     {
-       /* failed to start process */
--      lt_debugprintf (__FILE__, __LINE__,
--		      "(main) failed to launch target \"%s\": %s\n",
--		      lt_argv_zero, nonnull (strerror (errno)));
-+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-       return 127;
-     }
-   return rval;
-@@ -4546,7 +3586,7 @@ xmalloc (size_t num)
- {
-   void *p = (void *) malloc (num);
-   if (!p)
--    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-+    lt_fatal ("Memory exhausted");
- 
-   return p;
- }
-@@ -4580,8 +3620,8 @@ check_executable (const char *path)
- {
-   struct stat st;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
--                  nonempty (path));
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -4598,8 +3638,8 @@ make_executable (const char *path)
-   int rval = 0;
-   struct stat st;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
--                  nonempty (path));
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -4625,8 +3665,8 @@ find_executable (const char *wrapper)
-   int tmp_len;
-   char *concat_name;
- 
--  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
--                  nonempty (wrapper));
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
-@@ -4679,8 +3719,7 @@ find_executable (const char *wrapper)
- 		{
- 		  /* empty path: current directory */
- 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
--		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
--                              nonnull (strerror (errno)));
-+		    lt_fatal ("getcwd failed");
- 		  tmp_len = strlen (tmp);
- 		  concat_name =
- 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -4705,8 +3744,7 @@ find_executable (const char *wrapper)
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
--              nonnull (strerror (errno)));
-+    lt_fatal ("getcwd failed");
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-@@ -4732,9 +3770,8 @@ chase_symlinks (const char *pathspec)
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
--      lt_debugprintf (__FILE__, __LINE__,
--		      "checking path component for symlinks: %s\n",
--		      tmp_pathspec);
-+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-+			      tmp_pathspec));
-       if (lstat (tmp_pathspec, &s) == 0)
- 	{
- 	  if (S_ISLNK (s.st_mode) != 0)
-@@ -4756,9 +3793,8 @@ chase_symlinks (const char *pathspec)
- 	}
-       else
- 	{
--	  lt_fatal (__FILE__, __LINE__,
--		    "error accessing file \"%s\": %s",
--		    tmp_pathspec, nonnull (strerror (errno)));
-+	  char *errstr = strerror (errno);
-+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
- 	}
-     }
-   XFREE (tmp_pathspec);
-@@ -4771,8 +3807,7 @@ chase_symlinks (const char *pathspec)
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
--      lt_fatal (__FILE__, __LINE__,
--		"could not follow symlinks for %s", pathspec);
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
-@@ -4798,25 +3833,11 @@ strendzap (char *str, const char *pat)
-   return str;
- }
- 
--void
--lt_debugprintf (const char *file, int line, const char *fmt, ...)
--{
--  va_list args;
--  if (lt_debug)
--    {
--      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
--      va_start (args, fmt);
--      (void) vfprintf (stderr, fmt, args);
--      va_end (args);
--    }
--}
--
- static void
--lt_error_core (int exit_status, const char *file,
--	       int line, const char *mode,
-+lt_error_core (int exit_status, const char *mode,
- 	       const char *message, va_list ap)
- {
--  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-@@ -4825,32 +3846,20 @@ lt_error_core (int exit_status, const char *file,
- }
- 
- void
--lt_fatal (const char *file, int line, const char *message, ...)
-+lt_fatal (const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-   va_end (ap);
- }
- 
--static const char *
--nonnull (const char *s)
--{
--  return s ? s : "(null)";
--}
--
--static const char *
--nonempty (const char *s)
--{
--  return (s && !*s) ? "(empty)" : nonnull (s);
--}
--
- void
- lt_setenv (const char *name, const char *value)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_setenv) setting '%s' to '%s'\n",
--                  nonnull (name), nonnull (value));
-+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-   {
- #ifdef HAVE_SETENV
-     /* always make a copy, for consistency with !HAVE_SETENV */
-@@ -4895,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
-   return new_value;
- }
- 
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+  const char *p;
-+  int len;
-+  if (!arg || !*arg)
-+    return 1;
-+
-+  p = strchr (arg, (int)'=');
-+
-+  if (!p)
-+    return 1;
-+
-+  *value = xstrdup (++p);
-+
-+  len = strlen (arg) - strlen (*value);
-+  *name = XMALLOC (char, len);
-+  strncpy (*name, arg, len-1);
-+  (*name)[len - 1] = '\0';
-+
-+  return 0;
-+}
-+
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+    }
-+
-+  lt_setenv (name, value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 0);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 1);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
- void
- lt_update_exe_path (const char *name, const char *value)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
--                  nonnull (name), nonnull (value));
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4919,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value)
- void
- lt_update_lib_path (const char *name, const char *value)
- {
--  lt_debugprintf (__FILE__, __LINE__,
--		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
--                  nonnull (name), nonnull (value));
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4931,152 +4023,11 @@ lt_update_lib_path (const char *name, const char *value)
-     }
- }
- 
--EOF
--	    case $host_os in
--	      mingw*)
--		cat <<"EOF"
--
--/* Prepares an argument vector before calling spawn().
--   Note that spawn() does not by itself call the command interpreter
--     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
--      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
--         GetVersionEx(&v);
--         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
--      }) ? "cmd.exe" : "command.com").
--   Instead it simply concatenates the arguments, separated by ' ', and calls
--   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
--   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
--   special way:
--   - Space and tab are interpreted as delimiters. They are not treated as
--     delimiters if they are surrounded by double quotes: "...".
--   - Unescaped double quotes are removed from the input. Their only effect is
--     that within double quotes, space and tab are treated like normal
--     characters.
--   - Backslashes not followed by double quotes are not special.
--   - But 2*n+1 backslashes followed by a double quote become
--     n backslashes followed by a double quote (n >= 0):
--       \" -> "
--       \\\" -> \"
--       \\\\\" -> \\"
-- */
--#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
--#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
--char **
--prepare_spawn (char **argv)
--{
--  size_t argc;
--  char **new_argv;
--  size_t i;
--
--  /* Count number of arguments.  */
--  for (argc = 0; argv[argc] != NULL; argc++)
--    ;
--
--  /* Allocate new argument vector.  */
--  new_argv = XMALLOC (char *, argc + 1);
--
--  /* Put quoted arguments into the new argument vector.  */
--  for (i = 0; i < argc; i++)
--    {
--      const char *string = argv[i];
--
--      if (string[0] == '\0')
--	new_argv[i] = xstrdup ("\"\"");
--      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
--	{
--	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
--	  size_t length;
--	  unsigned int backslashes;
--	  const char *s;
--	  char *quoted_string;
--	  char *p;
--
--	  length = 0;
--	  backslashes = 0;
--	  if (quote_around)
--	    length++;
--	  for (s = string; *s != '\0'; s++)
--	    {
--	      char c = *s;
--	      if (c == '"')
--		length += backslashes + 1;
--	      length++;
--	      if (c == '\\')
--		backslashes++;
--	      else
--		backslashes = 0;
--	    }
--	  if (quote_around)
--	    length += backslashes + 1;
- 
--	  quoted_string = XMALLOC (char, length + 1);
--
--	  p = quoted_string;
--	  backslashes = 0;
--	  if (quote_around)
--	    *p++ = '"';
--	  for (s = string; *s != '\0'; s++)
--	    {
--	      char c = *s;
--	      if (c == '"')
--		{
--		  unsigned int j;
--		  for (j = backslashes + 1; j > 0; j--)
--		    *p++ = '\\';
--		}
--	      *p++ = c;
--	      if (c == '\\')
--		backslashes++;
--	      else
--		backslashes = 0;
--	    }
--	  if (quote_around)
--	    {
--	      unsigned int j;
--	      for (j = backslashes; j > 0; j--)
--		*p++ = '\\';
--	      *p++ = '"';
--	    }
--	  *p = '\0';
--
--	  new_argv[i] = quoted_string;
--	}
--      else
--	new_argv[i] = (char *) string;
--    }
--  new_argv[argc] = NULL;
--
--  return new_argv;
--}
--EOF
--		;;
--	    esac
--
--            cat <<"EOF"
--void lt_dump_script (FILE* f)
--{
--EOF
--	    func_emit_wrapper yes |
--              $SED -e 's/\([\\"]\)/\\\1/g' \
--	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
--
--            cat <<"EOF"
--}
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
--# func_win32_import_lib_p ARG
--# True if ARG is an import lib, as indicated by $file_magic_cmd
--func_win32_import_lib_p ()
--{
--    $opt_debug
--    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
--    *import*) : ;;
--    *) false ;;
--    esac
--}
--
- # func_mode_link arg...
- func_mode_link ()
- {
-@@ -5121,7 +4072,6 @@ func_mode_link ()
-     new_inherited_linker_flags=
- 
-     avoid_version=no
--    bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-@@ -5214,11 +4164,6 @@ func_mode_link ()
- 	esac
- 
- 	case $prev in
--	bindir)
--	  bindir="$arg"
--	  prev=
--	  continue
--	  ;;
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
-@@ -5250,9 +4195,9 @@ func_mode_link ()
- 	    ;;
- 	  *)
- 	    if test "$prev" = dlfiles; then
--	      func_append dlfiles " $arg"
-+	      dlfiles="$dlfiles $arg"
- 	    else
--	      func_append dlprefiles " $arg"
-+	      dlprefiles="$dlprefiles $arg"
- 	    fi
- 	    prev=
- 	    continue
-@@ -5276,7 +4221,7 @@ func_mode_link ()
- 	    *-*-darwin*)
- 	      case "$deplibs " in
- 		*" $qarg.ltframework "*) ;;
--		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
- 		   ;;
- 	      esac
- 	      ;;
-@@ -5295,7 +4240,7 @@ func_mode_link ()
- 	    moreargs=
- 	    for fil in `cat "$save_arg"`
- 	    do
--#	      func_append moreargs " $fil"
-+#	      moreargs="$moreargs $fil"
- 	      arg=$fil
- 	      # A libtool-controlled object.
- 
-@@ -5324,7 +4269,7 @@ func_mode_link ()
- 
- 		  if test "$prev" = dlfiles; then
- 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		      func_append dlfiles " $pic_object"
-+		      dlfiles="$dlfiles $pic_object"
- 		      prev=
- 		      continue
- 		    else
-@@ -5336,7 +4281,7 @@ func_mode_link ()
- 		  # CHECK ME:  I think I busted this.  -Ossama
- 		  if test "$prev" = dlprefiles; then
- 		    # Preload the old-style object.
--		    func_append dlprefiles " $pic_object"
-+		    dlprefiles="$dlprefiles $pic_object"
- 		    prev=
- 		  fi
- 
-@@ -5406,12 +4351,12 @@ func_mode_link ()
- 	  if test "$prev" = rpath; then
- 	    case "$rpath " in
- 	    *" $arg "*) ;;
--	    *) func_append rpath " $arg" ;;
-+	    *) rpath="$rpath $arg" ;;
- 	    esac
- 	  else
- 	    case "$xrpath " in
- 	    *" $arg "*) ;;
--	    *) func_append xrpath " $arg" ;;
-+	    *) xrpath="$xrpath $arg" ;;
- 	    esac
- 	  fi
- 	  prev=
-@@ -5423,28 +4368,28 @@ func_mode_link ()
- 	  continue
- 	  ;;
- 	weak)
--	  func_append weak_libs " $arg"
-+	  weak_libs="$weak_libs $arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	xcclinker)
--	  func_append linker_flags " $qarg"
--	  func_append compiler_flags " $qarg"
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xcompiler)
--	  func_append compiler_flags " $qarg"
-+	  compiler_flags="$compiler_flags $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xlinker)
--	  func_append linker_flags " $qarg"
--	  func_append compiler_flags " $wl$qarg"
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
- 	  prev=
- 	  func_append compile_command " $wl$qarg"
- 	  func_append finalize_command " $wl$qarg"
-@@ -5480,11 +4425,6 @@ func_mode_link ()
- 	continue
- 	;;
- 
--      -bindir)
--	prev=bindir
--	continue
--	;;
--
-       -dlopen)
- 	prev=dlfiles
- 	continue
-@@ -5535,16 +4475,15 @@ func_mode_link ()
- 	;;
- 
-       -L*)
--	func_stripname "-L" '' "$arg"
--	if test -z "$func_stripname_result"; then
-+	func_stripname '-L' '' "$arg"
-+	dir=$func_stripname_result
-+	if test -z "$dir"; then
- 	  if test "$#" -gt 0; then
- 	    func_fatal_error "require no space between \`-L' and \`$1'"
- 	  else
- 	    func_fatal_error "need path for \`-L' option"
- 	  fi
- 	fi
--	func_resolve_sysroot "$func_stripname_result"
--	dir=$func_resolve_sysroot_result
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -5556,30 +4495,24 @@ func_mode_link ()
- 	  ;;
- 	esac
- 	case "$deplibs " in
--	*" -L$dir "* | *" $arg "*)
--	  # Will only happen for absolute or sysroot arguments
--	  ;;
-+	*" -L$dir "*) ;;
- 	*)
--	  # Preserve sysroot, but never include relative directories
--	  case $dir in
--	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
--	    *) func_append deplibs " -L$dir" ;;
--	  esac
--	  func_append lib_search_path " $dir"
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
- 	  ;;
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
--	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  ::) dllsearchpath=$dir;;
--	  *) func_append dllsearchpath ":$dir";;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) func_append dllsearchpath ":$testbindir";;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -5589,7 +4522,7 @@ func_mode_link ()
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -5603,7 +4536,7 @@ func_mode_link ()
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C and math libraries are in the System framework
--	    func_append deplibs " System.ltframework"
-+	    deplibs="$deplibs System.ltframework"
- 	    continue
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -5623,7 +4556,7 @@ func_mode_link ()
- 	   ;;
- 	 esac
- 	fi
--	func_append deplibs " $arg"
-+	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
-@@ -5635,8 +4568,8 @@ func_mode_link ()
-       # Tru64 UNIX uses -model [arg] to determine the layout of C++
-       # classes, name mangling, and exception handling.
-       # Darwin uses the -arch flag to determine output architecture.
--      -model|-arch|-isysroot|--sysroot)
--	func_append compiler_flags " $arg"
-+      -model|-arch|-isysroot)
-+	compiler_flags="$compiler_flags $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	prev=xcompiler
-@@ -5644,12 +4577,12 @@ func_mode_link ()
- 	;;
- 
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
--	func_append compiler_flags " $arg"
-+	compiler_flags="$compiler_flags $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	case "$new_inherited_linker_flags " in
- 	    *" $arg "*) ;;
--	    * ) func_append new_inherited_linker_flags " $arg" ;;
-+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
- 	esac
- 	continue
- 	;;
-@@ -5716,17 +4649,13 @@ func_mode_link ()
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
--	=*)
--	  func_stripname '=' '' "$dir"
--	  dir=$lt_sysroot$func_stripname_result
--	  ;;
- 	*)
- 	  func_fatal_error "only absolute run-paths are allowed"
- 	  ;;
- 	esac
- 	case "$xrpath " in
- 	*" $dir "*) ;;
--	*) func_append xrpath " $dir" ;;
-+	*) xrpath="$xrpath $dir" ;;
- 	esac
- 	continue
- 	;;
-@@ -5779,8 +4708,8 @@ func_mode_link ()
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  func_append arg " $func_quote_for_eval_result"
--	  func_append compiler_flags " $func_quote_for_eval_result"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -5795,9 +4724,9 @@ func_mode_link ()
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  func_append arg " $wl$func_quote_for_eval_result"
--	  func_append compiler_flags " $wl$func_quote_for_eval_result"
--	  func_append linker_flags " $func_quote_for_eval_result"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-+	  linker_flags="$linker_flags $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -5825,27 +4754,23 @@ func_mode_link ()
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
--      # Flags to be passed through unchanged, with rationale:
--      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
--      # -r[0-9][0-9]*        specify processor for the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
--      # +DA*, +DD*           enable 64-bit mode for the HP compiler
--      # -q*                  compiler args for the IBM compiler
--      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
--      # -F/path              path to uninstalled frameworks, gcc on darwin
--      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
--      # @file                GCC response files
--      # -tp=*                Portland pgcc target processor selection
--      # --sysroot=*          for sysroot support
--      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -F/path gives path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+      # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
--        func_append compiler_flags " $arg"
-+        compiler_flags="$compiler_flags $arg"
-         continue
-         ;;
- 
-@@ -5857,7 +4782,7 @@ func_mode_link ()
- 
-       *.$objext)
- 	# A standard object.
--	func_append objs " $arg"
-+	objs="$objs $arg"
- 	;;
- 
-       *.lo)
-@@ -5888,7 +4813,7 @@ func_mode_link ()
- 
- 	    if test "$prev" = dlfiles; then
- 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		func_append dlfiles " $pic_object"
-+		dlfiles="$dlfiles $pic_object"
- 		prev=
- 		continue
- 	      else
-@@ -5900,7 +4825,7 @@ func_mode_link ()
- 	    # CHECK ME:  I think I busted this.  -Ossama
- 	    if test "$prev" = dlprefiles; then
- 	      # Preload the old-style object.
--	      func_append dlprefiles " $pic_object"
-+	      dlprefiles="$dlprefiles $pic_object"
- 	      prev=
- 	    fi
- 
-@@ -5945,25 +4870,24 @@ func_mode_link ()
- 
-       *.$libext)
- 	# An archive.
--	func_append deplibs " $arg"
--	func_append old_deplibs " $arg"
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
- 	continue
- 	;;
- 
-       *.la)
- 	# A libtool-controlled library.
- 
--	func_resolve_sysroot "$arg"
- 	if test "$prev" = dlfiles; then
- 	  # This library was specified with -dlopen.
--	  func_append dlfiles " $func_resolve_sysroot_result"
-+	  dlfiles="$dlfiles $arg"
- 	  prev=
- 	elif test "$prev" = dlprefiles; then
- 	  # The library was specified with -dlpreopen.
--	  func_append dlprefiles " $func_resolve_sysroot_result"
-+	  dlprefiles="$dlprefiles $arg"
- 	  prev=
- 	else
--	  func_append deplibs " $func_resolve_sysroot_result"
-+	  deplibs="$deplibs $arg"
- 	fi
- 	continue
- 	;;
-@@ -6001,7 +4925,7 @@ func_mode_link ()
- 
-     if test -n "$shlibpath_var"; then
-       # get the directories listed in $shlibpath_var
--      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-     else
-       shlib_search_path=
-     fi
-@@ -6010,8 +4934,6 @@ func_mode_link ()
- 
-     func_dirname "$output" "/" ""
-     output_objdir="$func_dirname_result$objdir"
--    func_to_tool_file "$output_objdir/"
--    tool_output_objdir=$func_to_tool_file_result
-     # Create the object directory.
-     func_mkdir_p "$output_objdir"
- 
-@@ -6032,12 +4954,12 @@ func_mode_link ()
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      if $opt_preserve_dup_deps ; then
-+      if $opt_duplicate_deps ; then
- 	case "$libs " in
--	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- 	esac
-       fi
--      func_append libs " $deplib"
-+      libs="$libs $deplib"
-     done
- 
-     if test "$linkmode" = lib; then
-@@ -6050,9 +4972,9 @@ func_mode_link ()
-       if $opt_duplicate_compiler_generated_deps; then
- 	for pre_post_dep in $predeps $postdeps; do
- 	  case "$pre_post_deps " in
--	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
- 	  esac
--	  func_append pre_post_deps " $pre_post_dep"
-+	  pre_post_deps="$pre_post_deps $pre_post_dep"
- 	done
-       fi
-       pre_post_deps=
-@@ -6122,19 +5044,17 @@ func_mode_link ()
- 	for lib in $dlprefiles; do
- 	  # Ignore non-libtool-libs
- 	  dependency_libs=
--	  func_resolve_sysroot "$lib"
- 	  case $lib in
--	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-+	  *.la)	func_source "$lib" ;;
- 	  esac
- 
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
--	    func_basename "$deplib"
--            deplib_base=$func_basename_result
-+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
- 	    case " $weak_libs " in
- 	    *" $deplib_base "*) ;;
--	    *) func_append deplibs " $deplib" ;;
-+	    *) deplibs="$deplibs $deplib" ;;
- 	    esac
- 	  done
- 	done
-@@ -6155,11 +5075,11 @@ func_mode_link ()
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    func_append compiler_flags " $deplib"
-+	    compiler_flags="$compiler_flags $deplib"
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -6244,7 +5164,7 @@ func_mode_link ()
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -6257,8 +5177,7 @@ func_mode_link ()
- 	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    func_stripname '-L' '' "$deplib"
--	    func_resolve_sysroot "$func_stripname_result"
--	    func_append newlib_search_path " $func_resolve_sysroot_result"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
- 	    ;;
- 	  prog)
- 	    if test "$pass" = conv; then
-@@ -6272,8 +5191,7 @@ func_mode_link ()
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    func_stripname '-L' '' "$deplib"
--	    func_resolve_sysroot "$func_stripname_result"
--	    func_append newlib_search_path " $func_resolve_sysroot_result"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
- 	    ;;
- 	  *)
- 	    func_warning "\`-L' is ignored for archives/objects"
-@@ -6284,21 +5202,17 @@ func_mode_link ()
- 	-R*)
- 	  if test "$pass" = link; then
- 	    func_stripname '-R' '' "$deplib"
--	    func_resolve_sysroot "$func_stripname_result"
--	    dir=$func_resolve_sysroot_result
-+	    dir=$func_stripname_result
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
- 	    *" $dir "*) ;;
--	    *) func_append xrpath " $dir" ;;
-+	    *) xrpath="$xrpath $dir" ;;
- 	    esac
- 	  fi
- 	  deplibs="$deplib $deplibs"
- 	  continue
- 	  ;;
--	*.la)
--	  func_resolve_sysroot "$deplib"
--	  lib=$func_resolve_sysroot_result
--	  ;;
-+	*.la) lib="$deplib" ;;
- 	*.$libext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
-@@ -6316,7 +5230,7 @@ func_mode_link ()
- 		match_pattern*)
- 		  set dummy $deplibs_check_method; shift
- 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
--		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
- 		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=yes
- 		  fi
-@@ -6326,15 +5240,15 @@ func_mode_link ()
- 		;;
- 	      esac
- 	      if test "$valid_a_lib" != yes; then
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because the file extensions .$libext of this argument makes me believe"
--		echo "*** that it is just a static archive that I should not use here."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-+		$ECHO "*** that it is just a static archive that I should not use here."
- 	      else
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
-@@ -6361,11 +5275,11 @@ func_mode_link ()
- 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- 	      # If there is no dlopen support or we're linking statically,
- 	      # we need to preload.
--	      func_append newdlprefiles " $deplib"
-+	      newdlprefiles="$newdlprefiles $deplib"
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
--	      func_append newdlfiles " $deplib"
-+	      newdlfiles="$newdlfiles $deplib"
- 	    fi
- 	  fi
- 	  continue
-@@ -6407,20 +5321,20 @@ func_mode_link ()
- 
- 	# Convert "-framework foo" to "foo.ltframework"
- 	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
- 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- 	    case " $new_inherited_linker_flags " in
- 	      *" $tmp_inherited_linker_flag "*) ;;
--	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
- 	    esac
- 	  done
- 	fi
--	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--	  test -n "$dlopen" && func_append dlfiles " $dlopen"
--	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- 	fi
- 
- 	if test "$pass" = conv; then
-@@ -6431,17 +5345,17 @@ func_mode_link ()
- 	      func_fatal_error "cannot find name of link library for \`$lib'"
- 	    fi
- 	    # It is a libtool convenience library, so add in its objects.
--	    func_append convenience " $ladir/$objdir/$old_library"
--	    func_append old_convenience " $ladir/$objdir/$old_library"
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
- 	    tmp_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
--	      if $opt_preserve_dup_deps ; then
-+	      if $opt_duplicate_deps ; then
- 		case "$tmp_libs " in
--		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- 		esac
- 	      fi
--	      func_append tmp_libs " $deplib"
-+	      tmp_libs="$tmp_libs $deplib"
- 	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
-@@ -6452,15 +5366,9 @@ func_mode_link ()
- 
- 	# Get the name of the library we link against.
- 	linklib=
--	if test -n "$old_library" &&
--	   { test "$prefer_static_libs" = yes ||
--	     test "$prefer_static_libs,$installed" = "built,no"; }; then
--	  linklib=$old_library
--	else
--	  for l in $old_library $library_names; do
--	    linklib="$l"
--	  done
--	fi
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
- 	if test -z "$linklib"; then
- 	  func_fatal_error "cannot find name of link library for \`$lib'"
- 	fi
-@@ -6477,9 +5385,9 @@ func_mode_link ()
- 	    # statically, we need to preload.  We also need to preload any
- 	    # dependent libraries so libltdl's deplib preloader doesn't
- 	    # bomb out in the load deplibs phase.
--	    func_append dlprefiles " $lib $dependency_libs"
-+	    dlprefiles="$dlprefiles $lib $dependency_libs"
- 	  else
--	    func_append newdlfiles " $lib"
-+	    newdlfiles="$newdlfiles $lib"
- 	  fi
- 	  continue
- 	fi # $pass = dlopen
-@@ -6501,14 +5409,14 @@ func_mode_link ()
- 
- 	# Find the relevant object directory and library name.
- 	if test "X$installed" = Xyes; then
--	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    func_warning "library \`$lib' was moved."
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$lt_sysroot$libdir"
--	    absdir="$lt_sysroot$libdir"
-+	    dir="$libdir"
-+	    absdir="$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
-@@ -6516,12 +5424,12 @@ func_mode_link ()
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    # Remove this search path later
--	    func_append notinst_path " $abs_ladir"
-+	    notinst_path="$notinst_path $abs_ladir"
- 	  else
- 	    dir="$ladir/$objdir"
- 	    absdir="$abs_ladir/$objdir"
- 	    # Remove this search path later
--	    func_append notinst_path " $abs_ladir"
-+	    notinst_path="$notinst_path $abs_ladir"
- 	  fi
- 	fi # $installed = yes
- 	func_stripname 'lib' '.la' "$laname"
-@@ -6532,46 +5440,20 @@ func_mode_link ()
- 	  if test -z "$libdir" && test "$linkmode" = prog; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
- 	  fi
--	  case "$host" in
--	    # special handling for platforms with PE-DLLs.
--	    *cygwin* | *mingw* | *cegcc* )
--	      # Linker will automatically link against shared library if both
--	      # static and shared are present.  Therefore, ensure we extract
--	      # symbols from the import library if a shared library is present
--	      # (otherwise, the dlopen module name will be incorrect).  We do
--	      # this by putting the import library name into $newdlprefiles.
--	      # We recover the dlopen module name by 'saving' the la file
--	      # name in a special purpose variable, and (later) extracting the
--	      # dlname from the la file.
--	      if test -n "$dlname"; then
--	        func_tr_sh "$dir/$linklib"
--	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
--	        func_append newdlprefiles " $dir/$linklib"
--	      else
--	        func_append newdlprefiles " $dir/$old_library"
--	        # Keep a list of preopened convenience libraries to check
--	        # that they are being used correctly in the link pass.
--	        test -z "$libdir" && \
--	          func_append dlpreconveniencelibs " $dir/$old_library"
--	      fi
--	    ;;
--	    * )
--	      # Prefer using a static library (so that no silly _DYNAMIC symbols
--	      # are required to link).
--	      if test -n "$old_library"; then
--	        func_append newdlprefiles " $dir/$old_library"
--	        # Keep a list of preopened convenience libraries to check
--	        # that they are being used correctly in the link pass.
--	        test -z "$libdir" && \
--	          func_append dlpreconveniencelibs " $dir/$old_library"
--	      # Otherwise, use the dlname, so that lt_dlopen finds it.
--	      elif test -n "$dlname"; then
--	        func_append newdlprefiles " $dir/$dlname"
--	      else
--	        func_append newdlprefiles " $dir/$linklib"
--	      fi
--	    ;;
--	  esac
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	    # Keep a list of preopened convenience libraries to check
-+	    # that they are being used correctly in the link pass.
-+	    test -z "$libdir" && \
-+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
- 	fi # $pass = dlpreopen
- 
- 	if test -z "$libdir"; then
-@@ -6589,7 +5471,7 @@ func_mode_link ()
- 
- 
- 	if test "$linkmode" = prog && test "$pass" != link; then
--	  func_append newlib_search_path " $ladir"
-+	  newlib_search_path="$newlib_search_path $ladir"
- 	  deplibs="$lib $deplibs"
- 
- 	  linkalldeplibs=no
-@@ -6602,8 +5484,7 @@ func_mode_link ()
- 	  for deplib in $dependency_libs; do
- 	    case $deplib in
- 	    -L*) func_stripname '-L' '' "$deplib"
--	         func_resolve_sysroot "$func_stripname_result"
--	         func_append newlib_search_path " $func_resolve_sysroot_result"
-+	         newlib_search_path="$newlib_search_path $func_stripname_result"
- 		 ;;
- 	    esac
- 	    # Need to link against all dependency_libs?
-@@ -6614,12 +5495,12 @@ func_mode_link ()
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
--	    if $opt_preserve_dup_deps ; then
-+	    if $opt_duplicate_deps ; then
- 	      case "$tmp_libs " in
--	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- 	      esac
- 	    fi
--	    func_append tmp_libs " $deplib"
-+	    tmp_libs="$tmp_libs $deplib"
- 	  done # for deplib
- 	  continue
- 	fi # $linkmode = prog...
-@@ -6634,7 +5515,7 @@ func_mode_link ()
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath:" in
- 	      *"$absdir:"*) ;;
--	      *) func_append temp_rpath "$absdir:" ;;
-+	      *) temp_rpath="$temp_rpath$absdir:" ;;
- 	      esac
- 	    fi
- 
-@@ -6646,7 +5527,7 @@ func_mode_link ()
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) func_append compile_rpath " $absdir" ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
- 	      esac
- 	      ;;
- 	    esac
-@@ -6655,7 +5536,7 @@ func_mode_link ()
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) func_append finalize_rpath " $libdir" ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
- 	      esac
- 	      ;;
- 	    esac
-@@ -6680,12 +5561,12 @@ func_mode_link ()
- 	  case $host in
- 	  *cygwin* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
--	      func_append notinst_deplibs " $lib"
-+	      notinst_deplibs="$notinst_deplibs $lib"
- 	      need_relink=no
- 	    ;;
- 	  *)
- 	    if test "$installed" = no; then
--	      func_append notinst_deplibs " $lib"
-+	      notinst_deplibs="$notinst_deplibs $lib"
- 	      need_relink=yes
- 	    fi
- 	    ;;
-@@ -6702,7 +5583,7 @@ func_mode_link ()
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
--	    echo
-+	    $ECHO
- 	    if test "$linkmode" = prog; then
- 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
- 	    else
-@@ -6720,7 +5601,7 @@ func_mode_link ()
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) func_append compile_rpath " $absdir" ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
- 	      esac
- 	      ;;
- 	    esac
-@@ -6729,7 +5610,7 @@ func_mode_link ()
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) func_append finalize_rpath " $libdir" ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
- 	      esac
- 	      ;;
- 	    esac
-@@ -6783,7 +5664,7 @@ func_mode_link ()
- 	    linklib=$newlib
- 	  fi # test -n "$old_archive_from_expsyms_cmds"
- 
--	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-+	  if test "$linkmode" = prog || test "$mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -6805,9 +5686,9 @@ func_mode_link ()
- 		      if test "X$dlopenmodule" != "X$lib"; then
- 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library" ; then
--			  echo
--			  echo "*** And there doesn't seem to be a static archive available"
--			  echo "*** The link will probably fail, sorry"
-+			  $ECHO
-+			  $ECHO "*** And there doesn't seem to be a static archive available"
-+			  $ECHO "*** The link will probably fail, sorry"
- 			else
- 			  add="$dir/$old_library"
- 			fi
-@@ -6839,7 +5720,7 @@ func_mode_link ()
- 		if test -n "$inst_prefix_dir"; then
- 		  case $libdir in
- 		    [\\/]*)
--		      func_append add_dir " -L$inst_prefix_dir$libdir"
-+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
- 		  esac
- 		fi
-@@ -6861,7 +5742,7 @@ func_mode_link ()
- 	    if test -n "$add_shlibpath"; then
- 	      case :$compile_shlibpath: in
- 	      *":$add_shlibpath:"*) ;;
--	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- 	      esac
- 	    fi
- 	    if test "$linkmode" = prog; then
-@@ -6875,13 +5756,13 @@ func_mode_link ()
- 		 test "$hardcode_shlibpath_var" = yes; then
- 		case :$finalize_shlibpath: in
- 		*":$libdir:"*) ;;
--		*) func_append finalize_shlibpath "$libdir:" ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- 		esac
- 	      fi
- 	    fi
- 	  fi
- 
--	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-+	  if test "$linkmode" = prog || test "$mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -6895,7 +5776,7 @@ func_mode_link ()
- 	    elif test "$hardcode_shlibpath_var" = yes; then
- 	      case :$finalize_shlibpath: in
- 	      *":$libdir:"*) ;;
--	      *) func_append finalize_shlibpath "$libdir:" ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- 	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
-@@ -6912,7 +5793,7 @@ func_mode_link ()
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
- 		  [\\/]*)
--		    func_append add_dir " -L$inst_prefix_dir$libdir"
-+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
- 		esac
- 	      fi
-@@ -6947,21 +5828,21 @@ func_mode_link ()
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
--	    echo
-+	    $ECHO
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
--	    echo "*** I have the capability to make that library automatically link in when"
--	    echo "*** you link to this library.  But I can only do this if you have a"
--	    echo "*** shared version of the library, which you do not appear to have."
-+	    $ECHO "*** I have the capability to make that library automatically link in when"
-+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+	    $ECHO "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
--	      echo "*** But as you try to build a module library, libtool will still create "
--	      echo "*** a static module, that should work as long as the dlopening application"
--	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      $ECHO "*** But as you try to build a module library, libtool will still create "
-+	      $ECHO "*** a static module, that should work as long as the dlopening application"
-+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
--		echo
--		echo "*** However, this would only work if libtool was able to extract symbol"
--		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--		echo "*** not find such a program.  So, this module is probably useless."
--		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+		$ECHO
-+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		$ECHO "*** not find such a program.  So, this module is probably useless."
-+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
-@@ -6989,33 +5870,27 @@ func_mode_link ()
- 	           temp_xrpath=$func_stripname_result
- 		   case " $xrpath " in
- 		   *" $temp_xrpath "*) ;;
--		   *) func_append xrpath " $temp_xrpath";;
-+		   *) xrpath="$xrpath $temp_xrpath";;
- 		   esac;;
--	      *) func_append temp_deplibs " $libdir";;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
- 	      esac
- 	    done
- 	    dependency_libs="$temp_deplibs"
- 	  fi
- 
--	  func_append newlib_search_path " $absdir"
-+	  newlib_search_path="$newlib_search_path $absdir"
- 	  # Link against this library
- 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- 	  # ... and its dependency_libs
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
--	    case $deplib in
--              -L*) func_stripname '-L' '' "$deplib"
--                   func_resolve_sysroot "$func_stripname_result";;
--              *) func_resolve_sysroot "$deplib" ;;
--            esac
--	    if $opt_preserve_dup_deps ; then
-+	    if $opt_duplicate_deps ; then
- 	      case "$tmp_libs " in
--	      *" $func_resolve_sysroot_result "*)
--                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- 	      esac
- 	    fi
--	    func_append tmp_libs " $func_resolve_sysroot_result"
-+	    tmp_libs="$tmp_libs $deplib"
- 	  done
- 
- 	  if test "$link_all_deplibs" != no; then
-@@ -7025,10 +5900,8 @@ func_mode_link ()
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
--	        func_resolve_sysroot "$deplib"
--	        deplib=$func_resolve_sysroot_result
- 	        func_dirname "$deplib" "" "."
--		dir=$func_dirname_result
-+		dir="$func_dirname_result"
- 		# We need an absolute path.
- 		case $dir in
- 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -7055,8 +5928,8 @@ func_mode_link ()
-                       if test -z "$darwin_install_name"; then
-                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                       fi
--		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
--		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
- 		      path=
- 		    fi
- 		  fi
-@@ -7089,7 +5962,7 @@ func_mode_link ()
- 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- 	else
--	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	fi
-       fi
-       dependency_libs="$newdependency_libs"
-@@ -7106,7 +5979,7 @@ func_mode_link ()
- 	  for dir in $newlib_search_path; do
- 	    case "$lib_search_path " in
- 	    *" $dir "*) ;;
--	    *) func_append lib_search_path " $dir" ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
- 	    esac
- 	  done
- 	  newlib_search_path=
-@@ -7164,10 +6037,10 @@ func_mode_link ()
- 	    -L*)
- 	      case " $tmp_libs " in
- 	      *" $deplib "*) ;;
--	      *) func_append tmp_libs " $deplib" ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
- 	      esac
- 	      ;;
--	    *) func_append tmp_libs " $deplib" ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
- 	    esac
- 	  done
- 	  eval $var=\"$tmp_libs\"
-@@ -7183,7 +6056,7 @@ func_mode_link ()
- 	  ;;
- 	esac
- 	if test -n "$i" ; then
--	  func_append tmp_libs " $i"
-+	  tmp_libs="$tmp_libs $i"
- 	fi
-       done
-       dependency_libs=$tmp_libs
-@@ -7224,7 +6097,7 @@ func_mode_link ()
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
--      func_append objs "$old_deplibs"
-+      objs="$objs$old_deplibs"
-       ;;
- 
-     lib)
-@@ -7257,10 +6130,10 @@ func_mode_link ()
- 	if test "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
- 	else
--	  echo
-+	  $ECHO
- 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- 	  $ECHO "*** objects $objs is not portable!"
--	  func_append libobjs " $objs"
-+	  libobjs="$libobjs $objs"
- 	fi
-       fi
- 
-@@ -7325,7 +6198,7 @@ func_mode_link ()
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|qnx|sunos)
-+	  freebsd-aout|freebsd-elf|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -7461,7 +6334,7 @@ func_mode_link ()
- 	  done
- 
- 	  # Make executables depend on our current version.
--	  func_append verstring ":${current}.0"
-+	  verstring="$verstring:${current}.0"
- 	  ;;
- 
- 	qnx)
-@@ -7529,10 +6402,10 @@ func_mode_link ()
-       fi
- 
-       func_generate_dlsyms "$libname" "$libname" "yes"
--      func_append libobjs " $symfileobj"
-+      libobjs="$libobjs $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
- 
--      if test "$opt_mode" != relink; then
-+      if test "$mode" != relink; then
- 	# Remove our outputs, but don't remove object files since they
- 	# may have been created when compiling PIC objects.
- 	removelist=
-@@ -7548,7 +6421,7 @@ func_mode_link ()
- 		   continue
- 		 fi
- 	       fi
--	       func_append removelist " $p"
-+	       removelist="$removelist $p"
- 	       ;;
- 	    *) ;;
- 	  esac
-@@ -7559,28 +6432,27 @@ func_mode_link ()
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	func_append oldlibs " $output_objdir/$libname.$libext"
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
--	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-       fi
- 
-       # Eliminate all temporary directories.
-       #for path in $notinst_path; do
--      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
--      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
--      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-       #done
- 
-       if test -n "$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	temp_xrpath=
- 	for libdir in $xrpath; do
--	  func_replace_sysroot "$libdir"
--	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-+	  temp_xrpath="$temp_xrpath -R$libdir"
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) func_append finalize_rpath " $libdir" ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
- 	  esac
- 	done
- 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -7594,7 +6466,7 @@ func_mode_link ()
-       for lib in $old_dlfiles; do
- 	case " $dlprefiles $dlfiles " in
- 	*" $lib "*) ;;
--	*) func_append dlfiles " $lib" ;;
-+	*) dlfiles="$dlfiles $lib" ;;
- 	esac
-       done
- 
-@@ -7604,19 +6476,19 @@ func_mode_link ()
-       for lib in $old_dlprefiles; do
- 	case "$dlprefiles " in
- 	*" $lib "*) ;;
--	*) func_append dlprefiles " $lib" ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
- 	esac
-       done
- 
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
--	    func_append deplibs " System.ltframework"
-+	    deplibs="$deplibs System.ltframework"
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
-@@ -7633,7 +6505,7 @@ func_mode_link ()
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
--	      func_append deplibs " -lc"
-+	      deplibs="$deplibs -lc"
- 	    fi
- 	    ;;
- 	  esac
-@@ -7682,7 +6554,7 @@ EOF
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		  case " $predeps $postdeps " in
- 		  *" $i "*)
--		    func_append newdeplibs " $i"
-+		    newdeplibs="$newdeplibs $i"
- 		    i=""
- 		    ;;
- 		  esac
-@@ -7693,21 +6565,21 @@ EOF
- 		  set dummy $deplib_matches; shift
- 		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		    func_append newdeplibs " $i"
-+		    newdeplibs="$newdeplibs $i"
- 		  else
- 		    droppeddeps=yes
--		    echo
-+		    $ECHO
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		    echo "*** I have the capability to make that library automatically link in when"
--		    echo "*** you link to this library.  But I can only do this if you have a"
--		    echo "*** shared version of the library, which I believe you do not have"
--		    echo "*** because a test_compile did reveal that the linker did not use it for"
--		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+		    $ECHO "*** I have the capability to make that library automatically link in when"
-+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		    $ECHO "*** shared version of the library, which I believe you do not have"
-+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
- 		;;
- 	      *)
--		func_append newdeplibs " $i"
-+		newdeplibs="$newdeplibs $i"
- 		;;
- 	      esac
- 	    done
-@@ -7725,7 +6597,7 @@ EOF
- 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		    case " $predeps $postdeps " in
- 		    *" $i "*)
--		      func_append newdeplibs " $i"
-+		      newdeplibs="$newdeplibs $i"
- 		      i=""
- 		      ;;
- 		    esac
-@@ -7736,29 +6608,29 @@ EOF
- 		    set dummy $deplib_matches; shift
- 		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		      func_append newdeplibs " $i"
-+		      newdeplibs="$newdeplibs $i"
- 		    else
- 		      droppeddeps=yes
--		      echo
-+		      $ECHO
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		      echo "*** I have the capability to make that library automatically link in when"
--		      echo "*** you link to this library.  But I can only do this if you have a"
--		      echo "*** shared version of the library, which you do not appear to have"
--		      echo "*** because a test_compile did reveal that the linker did not use this one"
--		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		      $ECHO "*** I have the capability to make that library automatically link in when"
-+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		      $ECHO "*** shared version of the library, which you do not appear to have"
-+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  echo
-+		  $ECHO
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
--		  echo "*** make it link in!  You will probably need to install it or some"
--		  echo "*** library that it depends on before this library will be fully"
--		  echo "*** functional.  Installing it before continuing would be even better."
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
- 		fi
- 		;;
- 	      *)
--		func_append newdeplibs " $i"
-+		newdeplibs="$newdeplibs $i"
- 		;;
- 	      esac
- 	    done
-@@ -7775,27 +6647,15 @@ EOF
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  func_append newdeplibs " $a_deplib"
-+		  newdeplibs="$newdeplibs $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		libname=`eval "\\$ECHO \"$libname_spec\""`
--		if test -n "$file_magic_glob"; then
--		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
--		else
--		  libnameglob=$libname
--		fi
--		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
- 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--		  if test "$want_nocaseglob" = yes; then
--		    shopt -s nocaseglob
--		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
--		    $nocaseglob
--		  else
--		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
--		  fi
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -7812,13 +6672,13 @@ EOF
- 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
--			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
- 			 $SED -e 10q |
- 			 $EGREP "$file_magic_regex" > /dev/null; then
--			func_append newdeplibs " $a_deplib"
-+			newdeplibs="$newdeplibs $a_deplib"
- 			a_deplib=""
- 			break 2
- 		      fi
-@@ -7827,12 +6687,12 @@ EOF
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because I did check the linker path looking for a file starting"
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
- 		else
-@@ -7843,7 +6703,7 @@ EOF
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      func_append newdeplibs " $a_deplib"
-+	      newdeplibs="$newdeplibs $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
-@@ -7859,7 +6719,7 @@ EOF
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  func_append newdeplibs " $a_deplib"
-+		  newdeplibs="$newdeplibs $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
-@@ -7870,9 +6730,9 @@ EOF
- 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		    potlib="$potent_lib" # see symlink-check above in file_magic test
--		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
- 		       $EGREP "$match_pattern_regex" > /dev/null; then
--		      func_append newdeplibs " $a_deplib"
-+		      newdeplibs="$newdeplibs $a_deplib"
- 		      a_deplib=""
- 		      break 2
- 		    fi
-@@ -7881,12 +6741,12 @@ EOF
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
-+		$ECHO
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have"
--		echo "*** because I did check the linker path looking for a file starting"
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
- 		else
-@@ -7897,32 +6757,32 @@ EOF
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      func_append newdeplibs " $a_deplib"
-+	      newdeplibs="$newdeplibs $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
--	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
- 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
- 	      # can't use Xsed below, because $i might contain '/'
--	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
- 	    done
- 	  fi
--	  case $tmp_deplibs in
--	  *[!\	\ ]*)
--	    echo
-+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-+	     $GREP . >/dev/null; then
-+	    $ECHO
- 	    if test "X$deplibs_check_method" = "Xnone"; then
--	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
--	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
--	    echo "*** All declared inter-library dependencies are being dropped."
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
--	    ;;
--	  esac
-+	  fi
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
-@@ -7934,23 +6794,23 @@ EOF
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library with the System framework
--	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- 	  ;;
- 	esac
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
--	    echo
--	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    $ECHO
-+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
- 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
--	    echo "*** a static module, that should work as long as the dlopening"
--	    echo "*** application is linked with the -dlopen flag."
-+	    $ECHO "*** a static module, that should work as long as the dlopening"
-+	    $ECHO "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
--	      echo
--	      echo "*** However, this would only work if libtool was able to extract symbol"
--	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--	      echo "*** not find such a program.  So, this module is probably useless."
--	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      $ECHO
-+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      $ECHO "*** not find such a program.  So, this module is probably useless."
-+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
-@@ -7960,16 +6820,16 @@ EOF
- 	      build_libtool_libs=no
- 	    fi
- 	  else
--	    echo "*** The inter-library dependencies that have been dropped here will be"
--	    echo "*** automatically added whenever a program is linked with this library"
--	    echo "*** or is declared to -dlopen it."
-+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-+	    $ECHO "*** automatically added whenever a program is linked with this library"
-+	    $ECHO "*** or is declared to -dlopen it."
- 
- 	    if test "$allow_undefined" = no; then
--	      echo
--	      echo "*** Since this library must not contain undefined symbols,"
--	      echo "*** because either the platform does not support them or"
--	      echo "*** it was explicitly requested with -no-undefined,"
--	      echo "*** libtool will only create a static version of it."
-+	      $ECHO
-+	      $ECHO "*** Since this library must not contain undefined symbols,"
-+	      $ECHO "*** because either the platform does not support them or"
-+	      $ECHO "*** it was explicitly requested with -no-undefined,"
-+	      $ECHO "*** libtool will only create a static version of it."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
-@@ -7986,9 +6846,9 @@ EOF
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       case $host in
- 	*-*-darwin*)
--	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  ;;
-       esac
- 
-@@ -8001,7 +6861,7 @@ EOF
- 	*)
- 	  case " $deplibs " in
- 	  *" -L$path/$objdir "*)
--	    func_append new_libs " -L$path/$objdir" ;;
-+	    new_libs="$new_libs -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -8011,10 +6871,10 @@ EOF
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) func_append new_libs " $deplib" ;;
-+	  *) new_libs="$new_libs $deplib" ;;
- 	  esac
- 	  ;;
--	*) func_append new_libs " $deplib" ;;
-+	*) new_libs="$new_libs $deplib" ;;
- 	esac
-       done
-       deplibs="$new_libs"
-@@ -8031,12 +6891,10 @@ EOF
- 	  hardcode_libdirs=
- 	  dep_rpath=
- 	  rpath="$finalize_rpath"
--	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
--		func_replace_sysroot "$libdir"
--		libdir=$func_replace_sysroot_result
- 		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs="$libdir"
- 		else
-@@ -8045,18 +6903,18 @@ EOF
- 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		    ;;
- 		  *)
--		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- 		    ;;
- 		  esac
- 		fi
- 	      else
- 		eval flag=\"$hardcode_libdir_flag_spec\"
--		func_append dep_rpath " $flag"
-+		dep_rpath="$dep_rpath $flag"
- 	      fi
- 	    elif test -n "$runpath_var"; then
- 	      case "$perm_rpath " in
- 	      *" $libdir "*) ;;
--	      *) func_apped perm_rpath " $libdir" ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
- 	      esac
- 	    fi
- 	  done
-@@ -8074,7 +6932,7 @@ EOF
- 	    # We should set the runpath_var.
- 	    rpath=
- 	    for dir in $perm_rpath; do
--	      func_append rpath "$dir:"
-+	      rpath="$rpath$dir:"
- 	    done
- 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- 	  fi
-@@ -8082,7 +6940,7 @@ EOF
- 	fi
- 
- 	shlibpath="$finalize_shlibpath"
--	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- 	if test -n "$shlibpath"; then
- 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- 	fi
-@@ -8108,18 +6966,18 @@ EOF
- 	linknames=
- 	for link
- 	do
--	  func_append linknames " $link"
-+	  linknames="$linknames $link"
- 	done
- 
- 	# Use standard objects if they are pic
--	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 	test "X$libobjs" = "X " && libobjs=
- 
- 	delfiles=
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- 	  export_symbols="$output_objdir/$libname.uexp"
--	  func_append delfiles " $export_symbols"
-+	  delfiles="$delfiles $export_symbols"
- 	fi
- 
- 	orig_export_symbols=
-@@ -8150,45 +7008,13 @@ EOF
- 	    $opt_dry_run || $RM $export_symbols
- 	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
--	    for cmd1 in $cmds; do
-+	    for cmd in $cmds; do
- 	      IFS="$save_ifs"
--	      # Take the normal branch if the nm_file_list_spec branch
--	      # doesn't work or if tool conversion is not needed.
--	      case $nm_file_list_spec~$to_tool_file_cmd in
--		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
--		  try_normal_branch=yes
--		  eval cmd=\"$cmd1\"
--		  func_len " $cmd"
--		  len=$func_len_result
--		  ;;
--		*)
--		  try_normal_branch=no
--		  ;;
--	      esac
--	      if test "$try_normal_branch" = yes \
--		 && { test "$len" -lt "$max_cmd_len" \
--		      || test "$max_cmd_len" -le -1; }
--	      then
--		func_show_eval "$cmd" 'exit $?'
--		skipped_export=false
--	      elif test -n "$nm_file_list_spec"; then
--		func_basename "$output"
--		output_la=$func_basename_result
--		save_libobjs=$libobjs
--		save_output=$output
--		output=${output_objdir}/${output_la}.nm
--		func_to_tool_file "$output"
--		libobjs=$nm_file_list_spec$func_to_tool_file_result
--		func_append delfiles " $output"
--		func_verbose "creating $NM input file list: $output"
--		for obj in $save_libobjs; do
--		  func_to_tool_file "$obj"
--		  $ECHO "$func_to_tool_file_result"
--		done > "$output"
--		eval cmd=\"$cmd1\"
-+	      eval cmd=\"$cmd\"
-+	      func_len " $cmd"
-+	      len=$func_len_result
-+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 		func_show_eval "$cmd" 'exit $?'
--		output=$save_output
--		libobjs=$save_libobjs
- 		skipped_export=false
- 	      else
- 		# The command line is too long to execute in one step.
-@@ -8210,7 +7036,7 @@ EOF
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols="$export_symbols"
- 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
- 	fi
- 
- 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -8222,7 +7048,7 @@ EOF
- 	  # global variables. join(1) would be nice here, but unfortunately
- 	  # isn't a blessed tool.
- 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
- 	  export_symbols=$output_objdir/$libname.def
- 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	fi
-@@ -8232,7 +7058,7 @@ EOF
- 	  case " $convenience " in
- 	  *" $test_deplib "*) ;;
- 	  *)
--	    func_append tmp_deplibs " $test_deplib"
-+	    tmp_deplibs="$tmp_deplibs $test_deplib"
- 	    ;;
- 	  esac
- 	done
-@@ -8252,21 +7078,21 @@ EOF
- 	    test "X$libobjs" = "X " && libobjs=
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    func_append generated " $gentop"
-+	    generated="$generated $gentop"
- 
- 	    func_extract_archives $gentop $convenience
--	    func_append libobjs " $func_extract_archives_result"
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  fi
- 	fi
- 
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
--	  func_append linker_flags " $flag"
-+	  linker_flags="$linker_flags $flag"
- 	fi
- 
- 	# Make a backup of the uninstalled library when relinking
--	if test "$opt_mode" = relink; then
-+	if test "$mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
- 	fi
- 
-@@ -8311,8 +7137,7 @@ EOF
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
--	  func_basename "$output"
--	  output_la=$func_basename_result
-+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -8325,16 +7150,13 @@ EOF
- 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
- 	    func_verbose "creating GNU ld script: $output"
--	    echo 'INPUT (' > $output
-+	    $ECHO 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
--	      func_to_tool_file "$obj"
--	      $ECHO "$func_to_tool_file_result" >> $output
-+	      $ECHO "$obj" >> $output
- 	    done
--	    echo ')' >> $output
--	    func_append delfiles " $output"
--	    func_to_tool_file "$output"
--	    output=$func_to_tool_file_result
-+	    $ECHO ')' >> $output
-+	    delfiles="$delfiles $output"
- 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
- 	    func_verbose "creating linker input file list: $output"
-@@ -8348,12 +7170,10 @@ EOF
- 	    fi
- 	    for obj
- 	    do
--	      func_to_tool_file "$obj"
--	      $ECHO "$func_to_tool_file_result" >> $output
-+	      $ECHO "$obj" >> $output
- 	    done
--	    func_append delfiles " $output"
--	    func_to_tool_file "$output"
--	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-+	    delfiles="$delfiles $output"
-+	    output=$firstobj\"$file_list_spec$output\"
- 	  else
- 	    if test -n "$save_libobjs"; then
- 	      func_verbose "creating reloadable object files..."
-@@ -8377,19 +7197,17 @@ EOF
- 		  # command to the queue.
- 		  if test "$k" -eq 1 ; then
- 		    # The first file doesn't have a previous command to add.
--		    reload_objs=$objlist
--		    eval concat_cmds=\"$reload_cmds\"
-+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
- 		  else
- 		    # All subsequent reloadable object files will link in
- 		    # the last one created.
--		    reload_objs="$objlist $last_robj"
--		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
- 		  fi
- 		  last_robj=$output_objdir/$output_la-${k}.$objext
- 		  func_arith $k + 1
- 		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-${k}.$objext
--		  objlist=" $obj"
-+		  objlist=$obj
- 		  func_len " $last_robj"
- 		  func_arith $len0 + $func_len_result
- 		  len=$func_arith_result
-@@ -8399,12 +7217,11 @@ EOF
- 	      # reloadable object file.  All subsequent reloadable object
- 	      # files will link in the last one created.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--	      reload_objs="$objlist $last_robj"
--	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
- 	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- 	      fi
--	      func_append delfiles " $output"
-+	      delfiles="$delfiles $output"
- 
- 	    else
- 	      output=
-@@ -8438,7 +7255,7 @@ EOF
- 		lt_exit=$?
- 
- 		# Restore the uninstalled library and exit
--		if test "$opt_mode" = relink; then
-+		if test "$mode" = relink; then
- 		  ( cd "$output_objdir" && \
- 		    $RM "${realname}T" && \
- 		    $MV "${realname}U" "$realname" )
-@@ -8459,7 +7276,7 @@ EOF
- 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols="$export_symbols"
- 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
- 	    fi
- 
- 	    if test -n "$orig_export_symbols"; then
-@@ -8471,7 +7288,7 @@ EOF
- 	      # global variables. join(1) would be nice here, but unfortunately
- 	      # isn't a blessed tool.
- 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
- 	      export_symbols=$output_objdir/$libname.def
- 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	    fi
-@@ -8512,10 +7329,10 @@ EOF
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  func_append generated " $gentop"
-+	  generated="$generated $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  func_append libobjs " $func_extract_archives_result"
-+	  libobjs="$libobjs $func_extract_archives_result"
- 	  test "X$libobjs" = "X " && libobjs=
- 	fi
- 
-@@ -8531,7 +7348,7 @@ EOF
- 	    lt_exit=$?
- 
- 	    # Restore the uninstalled library and exit
--	    if test "$opt_mode" = relink; then
-+	    if test "$mode" = relink; then
- 	      ( cd "$output_objdir" && \
- 	        $RM "${realname}T" && \
- 		$MV "${realname}U" "$realname" )
-@@ -8543,7 +7360,7 @@ EOF
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
--	if test "$opt_mode" = relink; then
-+	if test "$mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
- 	  if test -n "$convenience"; then
-@@ -8624,21 +7441,18 @@ EOF
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
- 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
--	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  func_append generated " $gentop"
-+	  generated="$generated $gentop"
- 
- 	  func_extract_archives $gentop $convenience
- 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
--      # If we're not building shared, we need to use non_pic_objs
--      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
--
-       # Create the old-style object.
--      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -8698,8 +7512,8 @@ EOF
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
--	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- 	;;
-       esac
- 
-@@ -8710,14 +7524,14 @@ EOF
- 	if test "$tagname" = CXX ; then
- 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 	    10.[0123])
--	      func_append compile_command " ${wl}-bind_at_load"
--	      func_append finalize_command " ${wl}-bind_at_load"
-+	      compile_command="$compile_command ${wl}-bind_at_load"
-+	      finalize_command="$finalize_command ${wl}-bind_at_load"
- 	    ;;
- 	  esac
- 	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
--	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	;;
-       esac
- 
-@@ -8731,7 +7545,7 @@ EOF
- 	*)
- 	  case " $compile_deplibs " in
- 	  *" -L$path/$objdir "*)
--	    func_append new_libs " -L$path/$objdir" ;;
-+	    new_libs="$new_libs -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -8741,17 +7555,17 @@ EOF
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) func_append new_libs " $deplib" ;;
-+	  *) new_libs="$new_libs $deplib" ;;
- 	  esac
- 	  ;;
--	*) func_append new_libs " $deplib" ;;
-+	*) new_libs="$new_libs $deplib" ;;
- 	esac
-       done
-       compile_deplibs="$new_libs"
- 
- 
--      func_append compile_command " $compile_deplibs"
--      func_append finalize_command " $finalize_deplibs"
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
- 
-       if test -n "$rpath$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
-@@ -8759,7 +7573,7 @@ EOF
- 	  # This is the magic to use -rpath.
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) func_append finalize_rpath " $libdir" ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
- 	  esac
- 	done
-       fi
-@@ -8778,18 +7592,18 @@ EOF
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    func_append rpath " $flag"
-+	    rpath="$rpath $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) func_append perm_rpath " $libdir" ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
- 	  esac
- 	fi
- 	case $host in
-@@ -8798,12 +7612,12 @@ EOF
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
- 	  ::) dllsearchpath=$libdir;;
--	  *) func_append dllsearchpath ":$libdir";;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) func_append dllsearchpath ":$testbindir";;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -8829,18 +7643,18 @@ EOF
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    func_append rpath " $flag"
-+	    rpath="$rpath $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$finalize_perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) func_append finalize_perm_rpath " $libdir" ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
- 	  esac
- 	fi
-       done
-@@ -8854,8 +7668,8 @@ EOF
- 
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
--	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
--	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-       fi
- 
-       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -8867,15 +7681,15 @@ EOF
- 
-       wrappers_required=yes
-       case $host in
--      *cegcc* | *mingw32ce*)
--        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
--        wrappers_required=no
--        ;;
-       *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
-+      *cegcc)
-+        # Disable wrappers for cegcc, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-       *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-@@ -8884,19 +7698,13 @@ EOF
-       esac
-       if test "$wrappers_required" = no; then
- 	# Replace the output file specification.
--	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
- 
- 	# We have no uninstalled library dependencies, so finalize right now.
- 	exit_status=0
- 	func_show_eval "$link_command" 'exit_status=$?'
- 
--	if test -n "$postlink_cmds"; then
--	  func_to_tool_file "$output"
--	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
--	  func_execute_cmds "$postlink_cmds" 'exit $?'
--	fi
--
- 	# Delete the generated files.
- 	if test -f "$output_objdir/${outputname}S.${objext}"; then
- 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -8919,7 +7727,7 @@ EOF
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $perm_rpath; do
--	    func_append rpath "$dir:"
-+	    rpath="$rpath$dir:"
- 	  done
- 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -8927,7 +7735,7 @@ EOF
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $finalize_perm_rpath; do
--	    func_append rpath "$dir:"
-+	    rpath="$rpath$dir:"
- 	  done
- 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -8937,18 +7745,11 @@ EOF
- 	# We don't need to create a wrapper script.
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	# Replace the output file specification.
--	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 	# Delete the old output file.
- 	$opt_dry_run || $RM $output
- 	# Link the executable and exit
- 	func_show_eval "$link_command" 'exit $?'
--
--	if test -n "$postlink_cmds"; then
--	  func_to_tool_file "$output"
--	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
--	  func_execute_cmds "$postlink_cmds" 'exit $?'
--	fi
--
- 	exit $EXIT_SUCCESS
-       fi
- 
-@@ -8963,7 +7764,7 @@ EOF
- 	if test "$fast_install" != no; then
- 	  link_command="$finalize_var$compile_command$finalize_rpath"
- 	  if test "$fast_install" = yes; then
--	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
- 	  else
- 	    # fast_install is set to needless
- 	    relink_command=
-@@ -8975,19 +7776,13 @@ EOF
-       fi
- 
-       # Replace the output file specification.
--      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
-       # Delete the old output files.
-       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
-       func_show_eval "$link_command" 'exit $?'
- 
--      if test -n "$postlink_cmds"; then
--	func_to_tool_file "$output_objdir/$outputname"
--	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
--	func_execute_cmds "$postlink_cmds" 'exit $?'
--      fi
--
-       # Now create the wrapper script.
-       func_verbose "creating $output"
- 
-@@ -9005,7 +7800,18 @@ EOF
- 	  fi
- 	done
- 	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $ECHO for shipping.
-+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-+	esac
-+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -9085,7 +7891,7 @@ EOF
- 	else
- 	  oldobjs="$old_deplibs $non_pic_objects"
- 	  if test "$preload" = yes && test -f "$symfileobj"; then
--	    func_append oldobjs " $symfileobj"
-+	    oldobjs="$oldobjs $symfileobj"
- 	  fi
- 	fi
- 	addlibs="$old_convenience"
-@@ -9093,10 +7899,10 @@ EOF
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	func_append generated " $gentop"
-+	generated="$generated $gentop"
- 
- 	func_extract_archives $gentop $addlibs
--	func_append oldobjs " $func_extract_archives_result"
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-@@ -9107,10 +7913,10 @@ EOF
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  func_append generated " $gentop"
-+	  generated="$generated $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  func_append oldobjs " $func_extract_archives_result"
-+	  oldobjs="$oldobjs $func_extract_archives_result"
- 	fi
- 
- 	# POSIX demands no paths to be encoded in archives.  We have
-@@ -9126,9 +7932,9 @@ EOF
- 	    done | sort | sort -uc >/dev/null 2>&1); then
- 	  :
- 	else
--	  echo "copying selected object files to avoid basename conflicts..."
-+	  $ECHO "copying selected object files to avoid basename conflicts..."
- 	  gentop="$output_objdir/${outputname}x"
--	  func_append generated " $gentop"
-+	  generated="$generated $gentop"
- 	  func_mkdir_p "$gentop"
- 	  save_oldobjs=$oldobjs
- 	  oldobjs=
-@@ -9152,9 +7958,9 @@ EOF
- 		esac
- 	      done
- 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
--	      func_append oldobjs " $gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
- 	      ;;
--	    *) func_append oldobjs " $obj" ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
- 	    esac
- 	  done
- 	fi
-@@ -9164,16 +7970,6 @@ EOF
- 	len=$func_len_result
- 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  cmds=$old_archive_cmds
--	elif test -n "$archiver_list_spec"; then
--	  func_verbose "using command file archive linking..."
--	  for obj in $oldobjs
--	  do
--	    func_to_tool_file "$obj"
--	    $ECHO "$func_to_tool_file_result"
--	  done > $output_objdir/$libname.libcmd
--	  func_to_tool_file "$output_objdir/$libname.libcmd"
--	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
--	  cmds=$old_archive_cmds
- 	else
- 	  # the command line is too long to link in one step, link in parts
- 	  func_verbose "using piecewise archive linking..."
-@@ -9247,7 +8043,7 @@ EOF
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
- 	relink_command=
-       fi
-@@ -9270,19 +8066,9 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
--		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
--		;;
--	      -L*)
--		func_stripname -L '' "$deplib"
--		func_replace_sysroot "$func_stripname_result"
--		func_append newdependency_libs " -L$func_replace_sysroot_result"
--		;;
--	      -R*)
--		func_stripname -R '' "$deplib"
--		func_replace_sysroot "$func_stripname_result"
--		func_append newdependency_libs " -R$func_replace_sysroot_result"
-+		newdependency_libs="$newdependency_libs $libdir/$name"
- 		;;
--	      *) func_append newdependency_libs " $deplib" ;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
- 	      esac
- 	    done
- 	    dependency_libs="$newdependency_libs"
-@@ -9296,9 +8082,9 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-+		newdlfiles="$newdlfiles $libdir/$name"
- 		;;
--	      *) func_append newdlfiles " $lib" ;;
-+	      *) newdlfiles="$newdlfiles $lib" ;;
- 	      esac
- 	    done
- 	    dlfiles="$newdlfiles"
-@@ -9315,7 +8101,7 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-+		newdlprefiles="$newdlprefiles $libdir/$name"
- 		;;
- 	      esac
- 	    done
-@@ -9327,7 +8113,7 @@ EOF
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      func_append newdlfiles " $abs"
-+	      newdlfiles="$newdlfiles $abs"
- 	    done
- 	    dlfiles="$newdlfiles"
- 	    newdlprefiles=
-@@ -9336,33 +8122,15 @@ EOF
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      func_append newdlprefiles " $abs"
-+	      newdlprefiles="$newdlprefiles $abs"
- 	    done
- 	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $RM $output
- 	  # place dlname in correct position for cygwin
--	  # In fact, it would be nice if we could use this code for all target
--	  # systems that can't hard-code library paths into their executables
--	  # and that have no shared library path variable independent of PATH,
--	  # but it turns out we can't easily determine that from inspecting
--	  # libtool variables, so we have to hard-code the OSs to which it
--	  # applies here; at the moment, that means platforms that use the PE
--	  # object format with DLL files.  See the long comment at the top of
--	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
--	      # If a -bindir argument was supplied, place the dll there.
--	      if test "x$bindir" != x ;
--	      then
--		func_relative_path "$install_libdir" "$bindir"
--		tdlname=$func_relative_path_result$dlname
--	      else
--		# Otherwise fall back on heuristic.
--		tdlname=../bin/$dlname
--	      fi
--	      ;;
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- 	  esac
- 	  $ECHO > $output "\
- # $outputname - a libtool library file
-@@ -9421,7 +8189,7 @@ relink_command=\"$relink_command\""
-     exit $EXIT_SUCCESS
- }
- 
--{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-+{ test "$mode" = link || test "$mode" = relink; } &&
-     func_mode_link ${1+"$@"}
- 
- 
-@@ -9441,9 +8209,9 @@ func_mode_uninstall ()
-     for arg
-     do
-       case $arg in
--      -f) func_append RM " $arg"; rmforce=yes ;;
--      -*) func_append RM " $arg" ;;
--      *) func_append files " $arg" ;;
-+      -f) RM="$RM $arg"; rmforce=yes ;;
-+      -*) RM="$RM $arg" ;;
-+      *) files="$files $arg" ;;
-       esac
-     done
- 
-@@ -9452,23 +8220,24 @@ func_mode_uninstall ()
- 
-     rmdirs=
- 
-+    origobjdir="$objdir"
-     for file in $files; do
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       if test "X$dir" = X.; then
--	odir="$objdir"
-+	objdir="$origobjdir"
-       else
--	odir="$dir/$objdir"
-+	objdir="$dir/$origobjdir"
-       fi
-       func_basename "$file"
-       name="$func_basename_result"
--      test "$opt_mode" = uninstall && odir="$dir"
-+      test "$mode" = uninstall && objdir="$dir"
- 
--      # Remember odir for removal later, being careful to avoid duplicates
--      if test "$opt_mode" = clean; then
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test "$mode" = clean; then
- 	case " $rmdirs " in
--	  *" $odir "*) ;;
--	  *) func_append rmdirs " $odir" ;;
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
- 	esac
-       fi
- 
-@@ -9494,17 +8263,18 @@ func_mode_uninstall ()
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
--	    func_append rmfiles " $odir/$n"
-+	    rmfiles="$rmfiles $objdir/$n"
- 	  done
--	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- 
--	  case "$opt_mode" in
-+	  case "$mode" in
- 	  clean)
--	    case " $library_names " in
-+	    case "  $library_names " in
-+	    # "  " in the beginning catches empty $dlname
- 	    *" $dlname "*) ;;
--	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
- 	    esac
--	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- 	    ;;
- 	  uninstall)
- 	    if test -n "$library_names"; then
-@@ -9532,19 +8302,19 @@ func_mode_uninstall ()
- 	  # Add PIC object to the list of files to remove.
- 	  if test -n "$pic_object" &&
- 	     test "$pic_object" != none; then
--	    func_append rmfiles " $dir/$pic_object"
-+	    rmfiles="$rmfiles $dir/$pic_object"
- 	  fi
- 
- 	  # Add non-PIC object to the list of files to remove.
- 	  if test -n "$non_pic_object" &&
- 	     test "$non_pic_object" != none; then
--	    func_append rmfiles " $dir/$non_pic_object"
-+	    rmfiles="$rmfiles $dir/$non_pic_object"
- 	  fi
- 	fi
- 	;;
- 
-       *)
--	if test "$opt_mode" = clean ; then
-+	if test "$mode" = clean ; then
- 	  noexename=$name
- 	  case $file in
- 	  *.exe)
-@@ -9554,7 +8324,7 @@ func_mode_uninstall ()
- 	    noexename=$func_stripname_result
- 	    # $file with .exe has already been added to rmfiles,
- 	    # add $file without .exe
--	    func_append rmfiles " $file"
-+	    rmfiles="$rmfiles $file"
- 	    ;;
- 	  esac
- 	  # Do a test to see if this is a libtool program.
-@@ -9563,7 +8333,7 @@ func_mode_uninstall ()
- 	      func_ltwrapper_scriptname "$file"
- 	      relink_command=
- 	      func_source $func_ltwrapper_scriptname_result
--	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
- 	    else
- 	      relink_command=
- 	      func_source $dir/$noexename
-@@ -9571,12 +8341,12 @@ func_mode_uninstall ()
- 
- 	    # note $name still contains .exe if it was in $file originally
- 	    # as does the version of $file that was added into $rmfiles
--	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
- 	    if test "$fast_install" = yes && test -n "$relink_command"; then
--	      func_append rmfiles " $odir/lt-$name"
-+	      rmfiles="$rmfiles $objdir/lt-$name"
- 	    fi
- 	    if test "X$noexename" != "X$name" ; then
--	      func_append rmfiles " $odir/lt-${noexename}.c"
-+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
- 	    fi
- 	  fi
- 	fi
-@@ -9584,6 +8354,7 @@ func_mode_uninstall ()
-       esac
-       func_show_eval "$RM $rmfiles" 'exit_status=1'
-     done
-+    objdir="$origobjdir"
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-@@ -9595,16 +8366,16 @@ func_mode_uninstall ()
-     exit $exit_status
- }
- 
--{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-+{ test "$mode" = uninstall || test "$mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
- 
--test -z "$opt_mode" && {
-+test -z "$mode" && {
-   help="$generic_help"
-   func_fatal_help "you must specify a MODE"
- }
- 
- test -z "$exec_cmd" && \
--  func_fatal_help "invalid operation mode \`$opt_mode'"
-+  func_fatal_help "invalid operation mode \`$mode'"
- 
- if test -n "$exec_cmd"; then
-   eval exec "$exec_cmd"
-diff --git a/src/actions.c b/src/actions.c
-index 600a70e..723b7a5 100644
---- a/src/actions.c
-+++ b/src/actions.c
-@@ -28,7 +28,8 @@
- #include <gtk/gtk.h>
- 
- /* Xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+//#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- /* Package includes */
- #include <middlelayer.h>
-diff --git a/src/callbacks.c b/src/callbacks.c
-index fa87b39..8681f13 100644
---- a/src/callbacks.c
-+++ b/src/callbacks.c
-@@ -27,7 +27,8 @@
- #include <stdlib.h>
- 
- /* Xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+//#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- /* Package includes */
- #include <sensors-interface.h>
-diff --git a/src/interface.c b/src/interface.c
-index a81bef7..0799848 100644
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -24,7 +24,8 @@
- #endif
- 
- /* Xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+//#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- /* Package includes */
- #include <cpu.h>
---
-cgit 
-From d3e83a4991876bcfadf90e8c781f0bb82c30230d Mon Sep 17 00:00:00 2001
-From: Fabian Nowak <nowak@kit.edu>
-Date: Tue, 10 May 2011 09:24:31 +0000
-Subject: try replacing #elseif with #elif because the former does no longer seem to be supported on some compilers
-
----
-diff --git a/lib/hddtemp.c b/lib/hddtemp.c
-index ba70ab4..052f943 100644
---- a/lib/hddtemp.c
-+++ b/lib/hddtemp.c
-@@ -117,7 +117,7 @@ void quick_message_notify (gchar *message)
- 
- #ifdef HAVE_LIBNOTIFY7
-     nn = notify_notification_new (summary, body, icon);
--#elseif HAVE_LIBNOTIFY4
-+#elif HAVE_LIBNOTIFY4
-     nn = notify_notification_new (summary, body, icon, NULL);
- #endif
-     /* FIXME: Use channels or propagate private object or use static global variable */
-diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c
-index 1485e34..3ae927c 100644
---- a/lib/sensors-interface.c
-+++ b/lib/sensors-interface.c
-@@ -108,7 +108,7 @@ fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale, t_senso
- 
- #ifdef HAVE_LIBNOTIFY7
-                 nn = notify_notification_new (summary, body, icon);
--#elseif HAVE_LIBNOTIFY4
-+#elif HAVE_LIBNOTIFY4
-                 nn = notify_notification_new (summary, body, icon, NULL);
- #endif
-                 notify_notification_show(nn, &error);
---
-cgit 
-From eecce36b535fb189bc2a7e4da19a6be3221235de Mon Sep 17 00:00:00 2001
-From: Fabian <timystery@arcor.de>
-Date: Mon, 09 May 2011 22:05:45 +0000
-Subject: remove libxfcegui4 from sensors-interface-common
-
----
-diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c
-index b0e40c1..f501a54 100644
---- a/lib/sensors-interface.c
-+++ b/lib/sensors-interface.c
-@@ -34,7 +34,8 @@
- #include <gtk/gtk.h>
- 
- /* Xfce includes */
--#include <libxfcegui4/libxfcegui4.h>
-+//#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- /* Package includes */
- #include <sensors-interface-common.h>
---
-cgit 
-From e8037664c3ea24df9bb4c4ef03707e64ab6cfa48 Mon Sep 17 00:00:00 2001
-From: Fabian <timystery@arcor.de>
-Date: Wed, 11 May 2011 21:11:24 +0000
-Subject: use old debian ltmain.sh again
-
----
-diff --git a/ltmain.sh b/ltmain.sh
-index 7ed280b..6f650ae 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -1,9 +1,9 @@
--# Generated from ltmain.m4sh.
- 
--# ltmain.sh (GNU libtool) 2.2.6b
-+# libtool (GNU libtool) 2.4
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions.  There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-@@ -32,50 +32,56 @@
- #
- # Provide generalized library-building support services.
- #
--#     --config             show all configuration variables
--#     --debug              enable verbose shell tracing
--# -n, --dry-run            display commands without modifying any files
--#     --features           display basic configuration information and exit
--#     --mode=MODE          use operation mode MODE
--#     --preserve-dup-deps  don't remove duplicate dependency libraries
--#     --quiet, --silent    don't print informational messages
--#     --tag=TAG            use configuration variables from tag TAG
--# -v, --verbose            print informational messages (default)
--#     --version            print version information
--# -h, --help               print short or long help message
-+#       --config             show all configuration variables
-+#       --debug              enable verbose shell tracing
-+#   -n, --dry-run            display commands without modifying any files
-+#       --features           display basic configuration information and exit
-+#       --mode=MODE          use operation mode MODE
-+#       --preserve-dup-deps  don't remove duplicate dependency libraries
-+#       --quiet, --silent    don't print informational messages
-+#       --no-quiet, --no-silent
-+#                            print informational messages (default)
-+#       --tag=TAG            use configuration variables from tag TAG
-+#   -v, --verbose            print more informational messages than default
-+#       --no-verbose         don't print the extra informational messages
-+#       --version            print version information
-+#   -h, --help, --help-all   print short, long, or detailed help message
- #
- # MODE must be one of the following:
- #
--#       clean              remove files from the build directory
--#       compile            compile a source file into a libtool object
--#       execute            automatically set library path, then run a program
--#       finish             complete the installation of libtool libraries
--#       install            install libraries or executables
--#       link               create a library or an executable
--#       uninstall          remove libraries from an installed directory
-+#         clean              remove files from the build directory
-+#         compile            compile a source file into a libtool object
-+#         execute            automatically set library path, then run a program
-+#         finish             complete the installation of libtool libraries
-+#         install            install libraries or executables
-+#         link               create a library or an executable
-+#         uninstall          remove libraries from an installed directory
- #
--# MODE-ARGS vary depending on the MODE.
-+# MODE-ARGS vary depending on the MODE.  When passed as first option,
-+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
- # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
- #
- # When reporting a bug, please describe a test case to reproduce it and
- # include the following information:
- #
--#       host-triplet:	$host
--#       shell:		$SHELL
--#       compiler:		$LTCC
--#       compiler flags:		$LTCFLAGS
--#       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
--#       automake:		$automake_version
--#       autoconf:		$autoconf_version
-+#         host-triplet:	$host
-+#         shell:		$SHELL
-+#         compiler:		$LTCC
-+#         compiler flags:		$LTCFLAGS
-+#         linker:		$LD (gnu? $with_gnu_ld)
-+#         $progname:	(GNU libtool) 2.4 Debian-2.4-2
-+#         automake:	$automake_version
-+#         autoconf:	$autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
-+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-+# General help using GNU software: <http://www.gnu.org/gethelp/>.
- 
--PROGRAM=ltmain.sh
-+PROGRAM=libtool
- PACKAGE=libtool
--VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-+VERSION="2.4 Debian-2.4-2"
- TIMESTAMP=""
--package_revision=1.3017
-+package_revision=1.3293
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +97,15 @@ fi
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+}
-+
- # NLS nuisances: We save the old values to restore during execute mode.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,15 +118,24 @@ do
- 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- 	fi"
- done
-+LC_ALL=C
-+LANGUAGE=C
-+export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
- 
- 
- 
- : ${CP="cp -f"}
--: ${ECHO="echo"}
-+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -144,6 +164,27 @@ IFS=" 	$lt_nl"
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
- 
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+} # func_dirname may be replaced by extended shell implementation
-+
-+
-+# func_basename file
-+func_basename ()
-+{
-+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+} # func_basename may be replaced by extended shell implementation
-+
-+
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
-@@ -158,33 +199,183 @@ basename="s,^.*/,,"
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+    # Extract subdirectory from the argument.
-+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+} # func_dirname_and_basename may be replaced by extended shell implementation
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+    case ${2} in
-+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    esac
-+} # func_stripname may be replaced by extended shell implementation
-+
-+
-+# These SED scripts presuppose an absolute path with a trailing slash.
-+pathcar='s,^/\([^/]*\).*$,\1,'
-+pathcdr='s,^/[^/]*,,'
-+removedotparts=':dotsl
-+		s@/\./@/@g
-+		t dotsl
-+		s,/\.$,/,'
-+collapseslashes='s@/\{1,\}@/@g'
-+finalslash='s,/*$,/,'
-+
-+# func_normal_abspath PATH
-+# Remove doubled-up and trailing slashes, "." path components,
-+# and cancel out any ".." path components in PATH after making
-+# it an absolute path.
-+#             value returned in "$func_normal_abspath_result"
-+func_normal_abspath ()
-+{
-+  # Start from root dir and reassemble the path.
-+  func_normal_abspath_result=
-+  func_normal_abspath_tpath=$1
-+  func_normal_abspath_altnamespace=
-+  case $func_normal_abspath_tpath in
-+    "")
-+      # Empty path, that just means $cwd.
-+      func_stripname '' '/' "`pwd`"
-+      func_normal_abspath_result=$func_stripname_result
-+      return
-+    ;;
-+    # The next three entries are used to spot a run of precisely
-+    # two leading slashes without using negated character classes;
-+    # we take advantage of case's first-match behaviour.
-+    ///*)
-+      # Unusual form of absolute path, do nothing.
-+    ;;
-+    //*)
-+      # Not necessarily an ordinary path; POSIX reserves leading '//'
-+      # and for example Cygwin uses it to access remote file shares
-+      # over CIFS/SMB, so we conserve a leading double slash if found.
-+      func_normal_abspath_altnamespace=/
-+    ;;
-+    /*)
-+      # Absolute path, do nothing.
-+    ;;
-+    *)
-+      # Relative path, prepend $cwd.
-+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-+    ;;
-+  esac
-+  # Cancel out all the simple stuff to save iterations.  We also want
-+  # the path to end with a slash for ease of parsing, so make sure
-+  # there is one (and only one) here.
-+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-+  while :; do
-+    # Processed it all yet?
-+    if test "$func_normal_abspath_tpath" = / ; then
-+      # If we ascended to the root using ".." the result may be empty now.
-+      if test -z "$func_normal_abspath_result" ; then
-+        func_normal_abspath_result=/
-+      fi
-+      break
-+    fi
-+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcar"`
-+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcdr"`
-+    # Figure out what to do with it
-+    case $func_normal_abspath_tcomponent in
-+      "")
-+        # Trailing empty path component, ignore it.
-+      ;;
-+      ..)
-+        # Parent dir; strip last assembled component from result.
-+        func_dirname "$func_normal_abspath_result"
-+        func_normal_abspath_result=$func_dirname_result
-+      ;;
-+      *)
-+        # Actual path component, append it.
-+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-+      ;;
-+    esac
-+  done
-+  # Restore leading double-slash if one was found on entry.
-+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
- }
- 
--# Generated shell functions inserted here.
-+# func_relative_path SRCDIR DSTDIR
-+# generates a relative path from SRCDIR to DSTDIR, with a trailing
-+# slash if non-empty, suitable for immediately appending a filename
-+# without needing to append a separator.
-+#             value returned in "$func_relative_path_result"
-+func_relative_path ()
-+{
-+  func_relative_path_result=
-+  func_normal_abspath "$1"
-+  func_relative_path_tlibdir=$func_normal_abspath_result
-+  func_normal_abspath "$2"
-+  func_relative_path_tbindir=$func_normal_abspath_result
-+
-+  # Ascend the tree starting from libdir
-+  while :; do
-+    # check if we have found a prefix of bindir
-+    case $func_relative_path_tbindir in
-+      $func_relative_path_tlibdir)
-+        # found an exact match
-+        func_relative_path_tcancelled=
-+        break
-+        ;;
-+      $func_relative_path_tlibdir*)
-+        # found a matching prefix
-+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-+        func_relative_path_tcancelled=$func_stripname_result
-+        if test -z "$func_relative_path_result"; then
-+          func_relative_path_result=.
-+        fi
-+        break
-+        ;;
-+      *)
-+        func_dirname $func_relative_path_tlibdir
-+        func_relative_path_tlibdir=${func_dirname_result}
-+        if test "x$func_relative_path_tlibdir" = x ; then
-+          # Have to descend all the way to the root!
-+          func_relative_path_result=../$func_relative_path_result
-+          func_relative_path_tcancelled=$func_relative_path_tbindir
-+          break
-+        fi
-+        func_relative_path_result=../$func_relative_path_result
-+        ;;
-+    esac
-+  done
- 
--# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--# is ksh but when the shell is invoked as "sh" and the current value of
--# the _XPG environment variable is not equal to 1 (one), the special
--# positional parameter $0, within a function call, is the name of the
--# function.
--progpath="$0"
-+  # Now calculate path; take care to avoid doubling-up slashes.
-+  func_stripname '' '/' "$func_relative_path_result"
-+  func_relative_path_result=$func_stripname_result
-+  func_stripname '/' '/' "$func_relative_path_tcancelled"
-+  if test "x$func_stripname_result" != x ; then
-+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-+  fi
-+
-+  # Normalisation. If bindir is libdir, return empty string,
-+  # else relative path ending with a slash; either way, target
-+  # file name can be directly appended.
-+  if test ! -z "$func_relative_path_result"; then
-+    func_stripname './' '' "$func_relative_path_result/"
-+    func_relative_path_result=$func_stripname_result
-+  fi
-+}
- 
- # The name of this program:
--# In the unlikely event $progname began with a '-', it would play havoc with
--# func_echo (imagine progname=-n), so we prepend ./ in that case:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
--case $progname in
--  -*) progname=./$progname ;;
--esac
- 
- # Make sure we have an absolute path for reexecution:
- case $progpath in
-@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
- 
-+# Sed substitution that turns a string into a regex matching for the
-+# string literally.
-+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-+
-+# Sed substitution that converts a w32 file name or path
-+# which contains forward slashes, into one that contains
-+# (escaped) backslashes.  A very naive implementation.
-+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
-@@ -243,7 +443,7 @@ opt_warning=:
- # name if it has been set yet.
- func_echo ()
- {
--    $ECHO "$progname${mode+: }$mode: $*"
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
- }
- 
- # func_verbose arg...
-@@ -258,18 +458,25 @@ func_verbose ()
-     :
- }
- 
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "$*"
-+}
-+
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
- {
--    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
- 
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
--    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
- 
-     # bash bug again:
-     :
-@@ -326,9 +533,9 @@ func_mkdir_p ()
-         case $my_directory_path in */*) ;; *) break ;; esac
- 
-         # ...otherwise throw away the child directory and loop
--        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-       done
--      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
- 
-       save_mkdir_p_IFS="$IFS"; IFS=':'
-       for my_dir in $my_dir_list; do
-@@ -378,7 +585,7 @@ func_mktempdir ()
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
--    $ECHO "X$my_tmpdir" | $Xsed
-+    $ECHO "$my_tmpdir"
- }
- 
- 
-@@ -392,7 +599,7 @@ func_quote_for_eval ()
- {
-     case $1 in
-       *[\\\`\"\$]*)
--	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
-@@ -419,7 +626,7 @@ func_quote_for_expand ()
- {
-     case $1 in
-       *[\\\`\"]*)
--	my_arg=`$ECHO "X$1" | $Xsed \
-+	my_arg=`$ECHO "$1" | $SED \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-@@ -488,15 +695,39 @@ func_show_eval_locale ()
-     fi
- }
- 
--
--
-+# func_tr_sh
-+# Turn $1 into a string suitable for a shell variable name.
-+# Result is stored in $func_tr_sh_result.  All characters
-+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-+# if $1 begins with a digit, a '_' is prepended as well.
-+func_tr_sh ()
-+{
-+  case $1 in
-+  [0-9]* | *[!a-zA-Z0-9_]*)
-+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-+    ;;
-+  * )
-+    func_tr_sh_result=$1
-+    ;;
-+  esac
-+}
- 
- 
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
--    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-+    $opt_debug
-+
-+    $SED -n '/(C)/!b go
-+	:more
-+	/\./!{
-+	  N
-+	  s/\n# / /
-+	  b more
-+	}
-+	:go
-+	/^# '$PROGRAM' (GNU /,/# warranty; / {
-         s/^# //
- 	s/^# *$//
-         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +740,28 @@ func_version ()
- # Echo short help message to standard output and exit.
- func_usage ()
- {
--    $SED -n '/^# Usage:/,/# -h/ {
-+    $opt_debug
-+
-+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
--    $ECHO
-+    echo
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
--# func_help
--# Echo long help message to standard output and exit.
-+# func_help [NOEXIT]
-+# Echo long help message to standard output and exit,
-+# unless 'noexit' is passed as argument.
- func_help ()
- {
-+    $opt_debug
-+
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
-+	:print
-         s/^# //
- 	s/^# *$//
- 	s*\$progname*'$progname'*
-@@ -537,8 +774,15 @@ func_help ()
- 	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
- 	p
--     }' < "$progpath"
--    exit $?
-+	d
-+     }
-+     /^# .* home page:/b print
-+     /^# General help using/b print
-+     ' < "$progpath"
-+    ret=$?
-+    if test -z "$1"; then
-+      exit $ret
-+    fi
- }
- 
- # func_missing_arg argname
-@@ -546,63 +790,106 @@ func_help ()
- # exit_cmd.
- func_missing_arg ()
- {
--    func_error "missing argument for $1"
-+    $opt_debug
-+
-+    func_error "missing argument for $1."
-     exit_cmd=exit
- }
- 
--exit_cmd=:
- 
-+# func_split_short_opt shortopt
-+# Set func_split_short_opt_name and func_split_short_opt_arg shell
-+# variables after splitting SHORTOPT after the 2nd character.
-+func_split_short_opt ()
-+{
-+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-+
-+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-+} # func_split_short_opt may be replaced by extended shell implementation
- 
- 
-+# func_split_long_opt longopt
-+# Set func_split_long_opt_name and func_split_long_opt_arg shell
-+# variables after splitting LONGOPT at the `=' sign.
-+func_split_long_opt ()
-+{
-+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-+    my_sed_long_arg='1s/^--[^=]*=//'
-+
-+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-+} # func_split_long_opt may be replaced by extended shell implementation
-+
-+exit_cmd=:
-+
- 
- 
--# Check that we have a working $ECHO.
--if test "X$1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X$1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
--  # Yippee, $ECHO works!
--  :
--else
--  # Restart under the correct shell, and then maybe $ECHO will work.
--  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
--fi
- 
--if test "X$1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<EOF
--$*
--EOF
--  exit $EXIT_SUCCESS
--fi
- 
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
- 
- # Global variables.
--# $mode is unset
- nonopt=
--execute_dlfiles=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
- 
--opt_dry_run=false
--opt_duplicate_deps=false
--opt_silent=false
--opt_debug=:
--
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+    eval "${1}=\$${1}\${2}"
-+} # func_append may be replaced by extended shell implementation
-+
-+# func_append_quoted var value
-+# Quote VALUE and append to the end of shell variable VAR, separated
-+# by a space.
-+func_append_quoted ()
-+{
-+    func_quote_for_eval "${2}"
-+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-+} # func_append_quoted may be replaced by extended shell implementation
-+
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+    func_arith_result=`expr "${@}"`
-+} # func_arith may be replaced by extended shell implementation
-+
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-+} # func_len may be replaced by extended shell implementation
-+
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+} # func_lo2o may be replaced by extended shell implementation
-+
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+} # func_xform may be replaced by extended shell implementation
-+
-+
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
-@@ -636,16 +923,16 @@ func_config ()
- # Display the features supported by this script.
- func_features ()
- {
--    $ECHO "host: $host"
-+    echo "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      $ECHO "enable shared libraries"
-+      echo "enable shared libraries"
-     else
--      $ECHO "disable shared libraries"
-+      echo "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      $ECHO "enable static libraries"
-+      echo "enable static libraries"
-     else
--      $ECHO "disable static libraries"
-+      echo "disable static libraries"
-     fi
- 
-     exit $?
-@@ -692,117 +979,204 @@ func_enable_tag ()
-   esac
- }
- 
--# Parse options once, thoroughly.  This comes as soon as possible in
--# the script to make things like `libtool --version' happen quickly.
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
- {
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-+    fi
- 
--  # Shorthand for --mode=foo, only valid as the first argument
--  case $1 in
--  clean|clea|cle|cl)
--    shift; set dummy --mode clean ${1+"$@"}; shift
--    ;;
--  compile|compil|compi|comp|com|co|c)
--    shift; set dummy --mode compile ${1+"$@"}; shift
--    ;;
--  execute|execut|execu|exec|exe|ex|e)
--    shift; set dummy --mode execute ${1+"$@"}; shift
--    ;;
--  finish|finis|fini|fin|fi|f)
--    shift; set dummy --mode finish ${1+"$@"}; shift
--    ;;
--  install|instal|insta|inst|ins|in|i)
--    shift; set dummy --mode install ${1+"$@"}; shift
--    ;;
--  link|lin|li|l)
--    shift; set dummy --mode link ${1+"$@"}; shift
--    ;;
--  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
--    shift; set dummy --mode uninstall ${1+"$@"}; shift
--    ;;
--  esac
-+    exit $EXIT_MISMATCH
-+  fi
-+}
-+
-+
-+# Shorthand for --mode=foo, only valid as the first argument
-+case $1 in
-+clean|clea|cle|cl)
-+  shift; set dummy --mode clean ${1+"$@"}; shift
-+  ;;
-+compile|compil|compi|comp|com|co|c)
-+  shift; set dummy --mode compile ${1+"$@"}; shift
-+  ;;
-+execute|execut|execu|exec|exe|ex|e)
-+  shift; set dummy --mode execute ${1+"$@"}; shift
-+  ;;
-+finish|finis|fini|fin|fi|f)
-+  shift; set dummy --mode finish ${1+"$@"}; shift
-+  ;;
-+install|instal|insta|inst|ins|in|i)
-+  shift; set dummy --mode install ${1+"$@"}; shift
-+  ;;
-+link|lin|li|l)
-+  shift; set dummy --mode link ${1+"$@"}; shift
-+  ;;
-+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+  shift; set dummy --mode uninstall ${1+"$@"}; shift
-+  ;;
-+esac
- 
--  # Parse non-mode specific arguments:
--  while test "$#" -gt 0; do
-+
-+
-+# Option defaults:
-+opt_debug=:
-+opt_dry_run=false
-+opt_config=false
-+opt_preserve_dup_deps=false
-+opt_features=false
-+opt_finish=false
-+opt_help=false
-+opt_help_all=false
-+opt_silent=:
-+opt_verbose=:
-+opt_silent=false
-+opt_verbose=false
-+
-+
-+# Parse options once, thoroughly.  This comes as soon as possible in the
-+# script to make things like `--version' happen as quickly as we can.
-+{
-+  # this just eases exit handling
-+  while test $# -gt 0; do
-     opt="$1"
-     shift
--
-     case $opt in
--      --config)		func_config					;;
--
--      --debug)		preserve_args="$preserve_args $opt"
-+      --debug|-x)	opt_debug='set -x'
- 			func_echo "enabling shell trace mode"
--			opt_debug='set -x'
- 			$opt_debug
- 			;;
--
--      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			execute_dlfiles="$execute_dlfiles $1"
--			shift
-+      --dry-run|--dryrun|-n)
-+			opt_dry_run=:
- 			;;
--
--      --dry-run | -n)	opt_dry_run=:					;;
--      --features)       func_features					;;
--      --finish)		mode="finish"					;;
--
--      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			case $1 in
--			  # Valid mode arguments:
--			  clean)	;;
--			  compile)	;;
--			  execute)	;;
--			  finish)	;;
--			  install)	;;
--			  link)		;;
--			  relink)	;;
--			  uninstall)	;;
--
--			  # Catch anything else as an error
--			  *) func_error "invalid argument for $opt"
--			     exit_cmd=exit
--			     break
--			     ;;
--		        esac
--
--			mode="$1"
-+      --config)
-+			opt_config=:
-+func_config
-+			;;
-+      --dlopen|-dlopen)
-+			optarg="$1"
-+			opt_dlopen="${opt_dlopen+$opt_dlopen
-+}$optarg"
- 			shift
- 			;;
--
-       --preserve-dup-deps)
--			opt_duplicate_deps=:				;;
--
--      --quiet|--silent)	preserve_args="$preserve_args $opt"
--			opt_silent=:
-+			opt_preserve_dup_deps=:
- 			;;
--
--      --verbose| -v)	preserve_args="$preserve_args $opt"
-+      --features)
-+			opt_features=:
-+func_features
-+			;;
-+      --finish)
-+			opt_finish=:
-+set dummy --mode finish ${1+"$@"}; shift
-+			;;
-+      --help)
-+			opt_help=:
-+			;;
-+      --help-all)
-+			opt_help_all=:
-+opt_help=': help-all'
-+			;;
-+      --mode)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_mode="$optarg"
-+case $optarg in
-+  # Valid mode arguments:
-+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-+
-+  # Catch anything else as an error
-+  *) func_error "invalid argument for $opt"
-+     exit_cmd=exit
-+     break
-+     ;;
-+esac
-+			shift
-+			;;
-+      --no-silent|--no-quiet)
- 			opt_silent=false
-+func_append preserve_args " $opt"
- 			;;
--
--      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			preserve_args="$preserve_args $opt $1"
--			func_enable_tag "$1"	# tagname is set here
-+      --no-verbose)
-+			opt_verbose=false
-+func_append preserve_args " $opt"
-+			;;
-+      --silent|--quiet)
-+			opt_silent=:
-+func_append preserve_args " $opt"
-+        opt_verbose=false
-+			;;
-+      --verbose|-v)
-+			opt_verbose=:
-+func_append preserve_args " $opt"
-+opt_silent=false
-+			;;
-+      --tag)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_tag="$optarg"
-+func_append preserve_args " $opt $optarg"
-+func_enable_tag "$optarg"
- 			shift
- 			;;
- 
-+      -\?|-h)		func_usage				;;
-+      --help)		func_help				;;
-+      --version)	func_version				;;
-+
-       # Separate optargs to long options:
--      -dlopen=*|--mode=*|--tag=*)
--			func_opt_split "$opt"
--			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+      --*=*)
-+			func_split_long_opt "$opt"
-+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- 			shift
- 			;;
- 
--      -\?|-h)		func_usage					;;
--      --help)		opt_help=:					;;
--      --version)	func_version					;;
--
--      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
--
--      *)		nonopt="$opt"
--			break
-+      # Separate non-argument short options:
-+      -\?*|-h*|-n*|-v*)
-+			func_split_short_opt "$opt"
-+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-+			shift
- 			;;
-+
-+      --)		break					;;
-+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-     esac
-   done
- 
-+  # Validate options:
-+
-+  # save first non-option argument
-+  if test "$#" -gt 0; then
-+    nonopt="$opt"
-+    shift
-+  fi
-+
-+  # preserve --debug
-+  test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
-     *cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1184,44 @@ func_enable_tag ()
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-     *)
--      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-       ;;
-   esac
- 
--  # Having warned about all mis-specified options, bail out if
--  # anything was wrong.
--  $exit_cmd $EXIT_FAILURE
--}
-+  $opt_help || {
-+    # Sanity checks first:
-+    func_check_version_match
- 
--# func_check_version_match
--# Ensure that we are using m4 macros, and libtool script from the same
--# release of libtool.
--func_check_version_match ()
--{
--  if test "$package_revision" != "$macro_revision"; then
--    if test "$VERSION" != "$macro_version"; then
--      if test -z "$macro_version"; then
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from an older release.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      else
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      fi
--    else
--      cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
--$progname: but the definition of this LT_INIT comes from revision $macro_revision.
--$progname: You should recreate aclocal.m4 with macros from revision $package_revision
--$progname: of $PACKAGE $VERSION and run autoconf again.
--_LT_EOF
-+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+      func_fatal_configuration "not configured to build any kind of library"
-     fi
- 
--    exit $EXIT_MISMATCH
--  fi
--}
--
--
--## ----------- ##
--##    Main.    ##
--## ----------- ##
-+    # Darwin sucks
-+    eval std_shrext=\"$shrext_cmds\"
- 
--$opt_help || {
--  # Sanity checks first:
--  func_check_version_match
-+    # Only execute mode is allowed to have -dlopen flags.
-+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-+      func_error "unrecognized option \`-dlopen'"
-+      $ECHO "$help" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
- 
--  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--    func_fatal_configuration "not configured to build any kind of library"
--  fi
-+    # Change the help message to a mode-specific one.
-+    generic_help="$help"
-+    help="Try \`$progname --help --mode=$opt_mode' for more information."
-+  }
- 
--  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
- 
-+  # Bail if the options were screwed
-+  $exit_cmd $EXIT_FAILURE
-+}
- 
--  # Darwin sucks
--  eval std_shrext=\"$shrext_cmds\"
- 
- 
--  # Only execute mode is allowed to have -dlopen flags.
--  if test -n "$execute_dlfiles" && test "$mode" != execute; then
--    func_error "unrecognized option \`-dlopen'"
--    $ECHO "$help" 1>&2
--    exit $EXIT_FAILURE
--  fi
--
--  # Change the help message to a mode-specific one.
--  generic_help="$help"
--  help="Try \`$progname --help --mode=$mode' for more information."
--}
- 
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
- 
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
--    func_ltwrapper_scriptname_result=""
--    if func_ltwrapper_executable_p "$1"; then
--	func_dirname_and_basename "$1" "" "."
--	func_stripname '' '.exe' "$func_basename_result"
--	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
--    fi
-+    func_dirname_and_basename "$1" "" "."
-+    func_stripname '' '.exe' "$func_basename_result"
-+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- }
- 
- # func_ltwrapper_p file
-@@ -1001,6 +1334,37 @@ func_source ()
- }
- 
- 
-+# func_resolve_sysroot PATH
-+# Replace a leading = in PATH with a sysroot.  Store the result into
-+# func_resolve_sysroot_result
-+func_resolve_sysroot ()
-+{
-+  func_resolve_sysroot_result=$1
-+  case $func_resolve_sysroot_result in
-+  =*)
-+    func_stripname '=' '' "$func_resolve_sysroot_result"
-+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-+    ;;
-+  esac
-+}
-+
-+# func_replace_sysroot PATH
-+# If PATH begins with the sysroot, replace it with = and
-+# store the result into func_replace_sysroot_result.
-+func_replace_sysroot ()
-+{
-+  case "$lt_sysroot:$1" in
-+  ?*:"$lt_sysroot"*)
-+    func_stripname "$lt_sysroot" '' "$1"
-+    func_replace_sysroot_result="=$func_stripname_result"
-+    ;;
-+  *)
-+    # Including no sysroot.
-+    func_replace_sysroot_result=$1
-+    ;;
-+  esac
-+}
-+
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
-@@ -1013,13 +1377,15 @@ func_infer_tag ()
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
--        func_quote_for_eval "$arg"
--	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+	func_append_quoted CC_quoted "$arg"
-       done
-+      CC_expanded=`func_echo_all $CC`
-+      CC_quoted_expanded=`func_echo_all $CC_quoted`
-       case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
-@@ -1030,11 +1396,13 @@ func_infer_tag ()
- 	    CC_quoted=
- 	    for arg in $CC; do
- 	      # Double-quote args containing other shell metacharacters.
--	      func_quote_for_eval "$arg"
--	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+	      func_append_quoted CC_quoted "$arg"
- 	    done
-+	    CC_expanded=`func_echo_all $CC`
-+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
- 	    case "$@ " in
--	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
-@@ -1097,6 +1465,486 @@ EOF
-     }
- }
- 
-+
-+##################################################
-+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-+##################################################
-+
-+# func_convert_core_file_wine_to_w32 ARG
-+# Helper function used by file name conversion functions when $build is *nix,
-+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-+# correctly configured wine environment available, with the winepath program
-+# in $build's $PATH.
-+#
-+# ARG is the $build file name to be converted to w32 format.
-+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-+# be empty on error (or when ARG is empty)
-+func_convert_core_file_wine_to_w32 ()
-+{
-+  $opt_debug
-+  func_convert_core_file_wine_to_w32_result="$1"
-+  if test -n "$1"; then
-+    # Unfortunately, winepath does not exit with a non-zero error code, so we
-+    # are forced to check the contents of stdout. On the other hand, if the
-+    # command is not found, the shell will set an exit code of 127 and print
-+    # *an error message* to stdout. So we must check for both error code of
-+    # zero AND non-empty stdout, which explains the odd construction:
-+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-+        $SED -e "$lt_sed_naive_backslashify"`
-+    else
-+      func_convert_core_file_wine_to_w32_result=
-+    fi
-+  fi
-+}
-+# end: func_convert_core_file_wine_to_w32
-+
-+
-+# func_convert_core_path_wine_to_w32 ARG
-+# Helper function used by path conversion functions when $build is *nix, and
-+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-+# configured wine environment available, with the winepath program in $build's
-+# $PATH. Assumes ARG has no leading or trailing path separator characters.
-+#
-+# ARG is path to be converted from $build format to win32.
-+# Result is available in $func_convert_core_path_wine_to_w32_result.
-+# Unconvertible file (directory) names in ARG are skipped; if no directory names
-+# are convertible, then the result may be empty.
-+func_convert_core_path_wine_to_w32 ()
-+{
-+  $opt_debug
-+  # unfortunately, winepath doesn't convert paths, only file names
-+  func_convert_core_path_wine_to_w32_result=""
-+  if test -n "$1"; then
-+    oldIFS=$IFS
-+    IFS=:
-+    for func_convert_core_path_wine_to_w32_f in $1; do
-+      IFS=$oldIFS
-+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-+        else
-+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-+        fi
-+      fi
-+    done
-+    IFS=$oldIFS
-+  fi
-+}
-+# end: func_convert_core_path_wine_to_w32
-+
-+
-+# func_cygpath ARGS...
-+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-+# (2), returns the Cygwin file name or path in func_cygpath_result (input
-+# file name or path is assumed to be in w32 format, as previously converted
-+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-+# or path in func_cygpath_result (input file name or path is assumed to be in
-+# Cygwin format). Returns an empty string on error.
-+#
-+# ARGS are passed to cygpath, with the last one being the file name or path to
-+# be converted.
-+#
-+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-+# environment variable; do not put it in $PATH.
-+func_cygpath ()
-+{
-+  $opt_debug
-+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-+    if test "$?" -ne 0; then
-+      # on failure, ensure result is empty
-+      func_cygpath_result=
-+    fi
-+  else
-+    func_cygpath_result=
-+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-+  fi
-+}
-+#end: func_cygpath
-+
-+
-+# func_convert_core_msys_to_w32 ARG
-+# Convert file name or path ARG from MSYS format to w32 format.  Return
-+# result in func_convert_core_msys_to_w32_result.
-+func_convert_core_msys_to_w32 ()
-+{
-+  $opt_debug
-+  # awkward: cmd appends spaces to result
-+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-+}
-+#end: func_convert_core_msys_to_w32
-+
-+
-+# func_convert_file_check ARG1 ARG2
-+# Verify that ARG1 (a file name in $build format) was converted to $host
-+# format in ARG2. Otherwise, emit an error message, but continue (resetting
-+# func_to_host_file_result to ARG1).
-+func_convert_file_check ()
-+{
-+  $opt_debug
-+  if test -z "$2" && test -n "$1" ; then
-+    func_error "Could not determine host file name corresponding to"
-+    func_error "  \`$1'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback:
-+    func_to_host_file_result="$1"
-+  fi
-+}
-+# end func_convert_file_check
-+
-+
-+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-+# Verify that FROM_PATH (a path in $build format) was converted to $host
-+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-+# func_to_host_file_result to a simplistic fallback value (see below).
-+func_convert_path_check ()
-+{
-+  $opt_debug
-+  if test -z "$4" && test -n "$3"; then
-+    func_error "Could not determine the host path corresponding to"
-+    func_error "  \`$3'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback.  This is a deliberately simplistic "conversion" and
-+    # should not be "improved".  See libtool.info.
-+    if test "x$1" != "x$2"; then
-+      lt_replace_pathsep_chars="s|$1|$2|g"
-+      func_to_host_path_result=`echo "$3" |
-+        $SED -e "$lt_replace_pathsep_chars"`
-+    else
-+      func_to_host_path_result="$3"
-+    fi
-+  fi
-+}
-+# end func_convert_path_check
-+
-+
-+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-+# and appending REPL if ORIG matches BACKPAT.
-+func_convert_path_front_back_pathsep ()
-+{
-+  $opt_debug
-+  case $4 in
-+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-+    ;;
-+  esac
-+  case $4 in
-+  $2 ) func_append func_to_host_path_result "$3"
-+    ;;
-+  esac
-+}
-+# end func_convert_path_front_back_pathsep
-+
-+
-+##################################################
-+# $build to $host FILE NAME CONVERSION FUNCTIONS #
-+##################################################
-+# invoked via `$to_host_file_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# Result will be available in $func_to_host_file_result.
-+
-+
-+# func_to_host_file ARG
-+# Converts the file name ARG from $build format to $host format. Return result
-+# in func_to_host_file_result.
-+func_to_host_file ()
-+{
-+  $opt_debug
-+  $to_host_file_cmd "$1"
-+}
-+# end func_to_host_file
-+
-+
-+# func_to_tool_file ARG LAZY
-+# converts the file name ARG from $build format to toolchain format. Return
-+# result in func_to_tool_file_result.  If the conversion in use is listed
-+# in (the comma separated) LAZY, no conversion takes place.
-+func_to_tool_file ()
-+{
-+  $opt_debug
-+  case ,$2, in
-+    *,"$to_tool_file_cmd",*)
-+      func_to_tool_file_result=$1
-+      ;;
-+    *)
-+      $to_tool_file_cmd "$1"
-+      func_to_tool_file_result=$func_to_host_file_result
-+      ;;
-+  esac
-+}
-+# end func_to_tool_file
-+
-+
-+# func_convert_file_noop ARG
-+# Copy ARG to func_to_host_file_result.
-+func_convert_file_noop ()
-+{
-+  func_to_host_file_result="$1"
-+}
-+# end func_convert_file_noop
-+
-+
-+# func_convert_file_msys_to_w32 ARG
-+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_w32
-+
-+
-+# func_convert_file_cygwin_to_w32 ARG
-+# Convert file name ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-+    # LT_CYGPATH in this case.
-+    func_to_host_file_result=`cygpath -m "$1"`
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_cygwin_to_w32
-+
-+
-+# func_convert_file_nix_to_w32 ARG
-+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-+# and a working winepath. Returns result in func_to_host_file_result.
-+func_convert_file_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_w32
-+
-+
-+# func_convert_file_msys_to_cygwin ARG
-+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_file_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_cygwin
-+
-+
-+# func_convert_file_nix_to_cygwin ARG
-+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-+# in func_to_host_file_result.
-+func_convert_file_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_cygwin
-+
-+
-+#############################################
-+# $build to $host PATH CONVERSION FUNCTIONS #
-+#############################################
-+# invoked via `$to_host_path_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# The result will be available in $func_to_host_path_result.
-+#
-+# Path separators are also converted from $build format to $host format.  If
-+# ARG begins or ends with a path separator character, it is preserved (but
-+# converted to $host format) on output.
-+#
-+# All path conversion functions are named using the following convention:
-+#   file name conversion function    : func_convert_file_X_to_Y ()
-+#   path conversion function         : func_convert_path_X_to_Y ()
-+# where, for any given $build/$host combination the 'X_to_Y' value is the
-+# same.  If conversion functions are added for new $build/$host combinations,
-+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-+# will break.
-+
-+
-+# func_init_to_host_path_cmd
-+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-+# appropriate value, based on the value of $to_host_file_cmd.
-+to_host_path_cmd=
-+func_init_to_host_path_cmd ()
-+{
-+  $opt_debug
-+  if test -z "$to_host_path_cmd"; then
-+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-+  fi
-+}
-+
-+
-+# func_to_host_path ARG
-+# Converts the path ARG from $build format to $host format. Return result
-+# in func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  $opt_debug
-+  func_init_to_host_path_cmd
-+  $to_host_path_cmd "$1"
-+}
-+# end func_to_host_path
-+
-+
-+# func_convert_path_noop ARG
-+# Copy ARG to func_to_host_path_result.
-+func_convert_path_noop ()
-+{
-+  func_to_host_path_result="$1"
-+}
-+# end func_convert_path_noop
-+
-+
-+# func_convert_path_msys_to_w32 ARG
-+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_path_result.
-+func_convert_path_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from ARG.  MSYS
-+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-+    # and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_w32
-+
-+
-+# func_convert_path_cygwin_to_w32 ARG
-+# Convert path ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_cygwin_to_w32
-+
-+
-+# func_convert_path_nix_to_w32 ARG
-+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-+# a working winepath.  Returns result in func_to_host_file_result.
-+func_convert_path_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_w32
-+
-+
-+# func_convert_path_msys_to_cygwin ARG
-+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_path_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_cygwin
-+
-+
-+# func_convert_path_nix_to_cygwin ARG
-+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from
-+    # ARG. msys behavior is inconsistent here, cygpath turns them
-+    # into '.;' and ';.', and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_cygwin
-+
-+
- # func_mode_compile arg...
- func_mode_compile ()
- {
-@@ -1137,12 +1985,12 @@ func_mode_compile ()
- 	  ;;
- 
- 	-pie | -fpie | -fPIE)
--          pie_flag="$pie_flag $arg"
-+          func_append pie_flag " $arg"
- 	  continue
- 	  ;;
- 
- 	-shared | -static | -prefer-pic | -prefer-non-pic)
--	  later="$later $arg"
-+	  func_append later " $arg"
- 	  continue
- 	  ;;
- 
-@@ -1163,15 +2011,14 @@ func_mode_compile ()
- 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
- 	    IFS="$save_ifs"
--	    func_quote_for_eval "$arg"
--	    lastarg="$lastarg $func_quote_for_eval_result"
-+	    func_append_quoted lastarg "$arg"
- 	  done
- 	  IFS="$save_ifs"
- 	  func_stripname ' ' '' "$lastarg"
- 	  lastarg=$func_stripname_result
- 
- 	  # Add the arguments to base_compile.
--	  base_compile="$base_compile $lastarg"
-+	  func_append base_compile " $lastarg"
- 	  continue
- 	  ;;
- 
-@@ -1187,8 +2034,7 @@ func_mode_compile ()
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--      func_quote_for_eval "$lastarg"
--      base_compile="$base_compile $func_quote_for_eval_result"
-+      func_append_quoted base_compile "$lastarg"
-     done # for arg
- 
-     case $arg_mode in
-@@ -1213,7 +2059,7 @@ func_mode_compile ()
-     *.[cCFSifmso] | \
-     *.ada | *.adb | *.ads | *.asm | \
-     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
--    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
-       func_xform "$libobj"
-       libobj=$func_xform_result
-       ;;
-@@ -1288,7 +2134,7 @@ func_mode_compile ()
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-@@ -1319,17 +2165,16 @@ compiler."
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
--      removelist="$removelist $output_obj"
-+      func_append removelist " $output_obj"
-       $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-     $opt_dry_run || $RM $removelist
--    removelist="$removelist $lockfile"
-+    func_append removelist " $lockfile"
-     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- 
--    if test -n "$fix_srcfile_path"; then
--      eval srcfile=\"$fix_srcfile_path\"
--    fi
-+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-+    srcfile=$func_to_tool_file_result
-     func_quote_for_eval "$srcfile"
-     qsrcfile=$func_quote_for_eval_result
- 
-@@ -1349,7 +2194,7 @@ compiler."
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
--	command="$command -o $lobj"
-+	func_append command " -o $lobj"
-       fi
- 
-       func_show_eval_locale "$command"	\
-@@ -1396,11 +2241,11 @@ compiler."
- 	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
--	command="$command -o $obj"
-+	func_append command " -o $obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
--      command="$command$suppress_output"
-+      func_append command "$suppress_output"
-       func_show_eval_locale "$command" \
-         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-@@ -1445,13 +2290,13 @@ compiler."
- }
- 
- $opt_help || {
--test "$mode" = compile && func_mode_compile ${1+"$@"}
-+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
- {
-     # We need to display help for each of the modes.
--    case $mode in
-+    case $opt_mode in
-       "")
-         # Generic help is extracted from the usage comments
-         # at the start of this file.
-@@ -1482,10 +2327,11 @@ This mode accepts the following additional options:
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
--  -prefer-pic       try to building PIC objects only
--  -prefer-non-pic   try to building non-PIC objects only
-+  -prefer-pic       try to build PIC objects only
-+  -prefer-non-pic   try to build non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
-+  -Wc,FLAG          pass FLAG directly to the compiler
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
- from the given SOURCEFILE.
-@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.
- 
- The following components of INSTALL-COMMAND are treated specially:
- 
--  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
- The rest of the components are interpreted as arguments to that command (only
- BSD-compatible install options are recognized)."
-@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND are treated specially:
- 
-   -all-static       do not do any dynamic linking at all
-   -avoid-version    do not add a version suffix if possible
-+  -bindir BINDIR    specify path to binaries directory (for systems where
-+                    libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND are treated specially:
-   -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
-   -weak LIBNAME     declare that the target provides the LIBNAME interface
-+  -Wc,FLAG
-+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-+  -Wl,FLAG
-+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
- 
- All other options (arguments beginning with \`-') are ignored.
- 
-@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM."
-         ;;
- 
-       *)
--        func_fatal_help "invalid operation mode \`$mode'"
-+        func_fatal_help "invalid operation mode \`$opt_mode'"
-         ;;
-     esac
- 
--    $ECHO
-+    echo
-     $ECHO "Try \`$progname --help' for more information about other modes."
--
--    exit $?
- }
- 
--  # Now that we've collected a possible --mode arg, show help if necessary
--  $opt_help && func_mode_help
-+# Now that we've collected a possible --mode arg, show help if necessary
-+if $opt_help; then
-+  if test "$opt_help" = :; then
-+    func_mode_help
-+  else
-+    {
-+      func_help noexit
-+      for opt_mode in compile link execute install finish uninstall clean; do
-+	func_mode_help
-+      done
-+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-+    {
-+      func_help noexit
-+      for opt_mode in compile link execute install finish uninstall clean; do
-+	echo
-+	func_mode_help
-+      done
-+    } |
-+    sed '1d
-+      /^When reporting/,/^Report/{
-+	H
-+	d
-+      }
-+      $x
-+      /information about other modes/d
-+      /more detailed .*MODE/d
-+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-+  fi
-+  exit $?
-+fi
- 
- 
- # func_mode_execute arg...
-@@ -1643,13 +2522,16 @@ func_mode_execute ()
-       func_fatal_help "you must specify a COMMAND"
- 
-     # Handle -dlopen flags immediately.
--    for file in $execute_dlfiles; do
-+    for file in $opt_dlopen; do
-       test -f "$file" \
- 	|| func_fatal_help "\`$file' is not a file"
- 
-       dir=
-       case $file in
-       *.la)
-+	func_resolve_sysroot "$file"
-+	file=$func_resolve_sysroot_result
-+
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1671,7 +2553,7 @@ func_mode_execute ()
- 	dir="$func_dirname_result"
- 
- 	if test -f "$dir/$objdir/$dlname"; then
--	  dir="$dir/$objdir"
-+	  func_append dir "/$objdir"
- 	else
- 	  if test ! -f "$dir/$dlname"; then
- 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2594,7 @@ func_mode_execute ()
-     for file
-     do
-       case $file in
--      -*) ;;
-+      -* | *.la | *.lo ) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
- 	if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2610,7 @@ func_mode_execute ()
- 	;;
-       esac
-       # Quote arguments (to preserve shell metacharacters).
--      func_quote_for_eval "$file"
--      args="$args $func_quote_for_eval_result"
-+      func_append_quoted args "$file"
-     done
- 
-     if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2635,66 @@ func_mode_execute ()
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
--	$ECHO "export $shlibpath_var"
-+	echo "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-     fi
- }
- 
--test "$mode" = execute && func_mode_execute ${1+"$@"}
-+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
- 
- 
- # func_mode_finish arg...
- func_mode_finish ()
- {
-     $opt_debug
--    libdirs="$nonopt"
-+    libs=
-+    libdirs=
-     admincmds=
- 
--    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
--      for dir
--      do
--	libdirs="$libdirs $dir"
--      done
-+    for opt in "$nonopt" ${1+"$@"}
-+    do
-+      if test -d "$opt"; then
-+	func_append libdirs " $opt"
-+
-+      elif test -f "$opt"; then
-+	if func_lalib_unsafe_p "$opt"; then
-+	  func_append libs " $opt"
-+	else
-+	  func_warning "\`$opt' is not a valid libtool archive"
-+	fi
-+
-+      else
-+	func_fatal_error "invalid argument \`$opt'"
-+      fi
-+    done
-+
-+    if test -n "$libs"; then
-+      if test -n "$lt_sysroot"; then
-+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-+      else
-+        sysroot_cmd=
-+      fi
-+
-+      # Remove sysroot references
-+      if $opt_dry_run; then
-+        for lib in $libs; do
-+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-+        done
-+      else
-+        tmpdir=`func_mktempdir`
-+        for lib in $libs; do
-+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-+	    > $tmpdir/tmp-la
-+	  mv -f $tmpdir/tmp-la $lib
-+	done
-+        ${RM}r "$tmpdir"
-+      fi
-+    fi
- 
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
-@@ -1786,7 +2704,7 @@ func_mode_finish ()
- 	if test -n "$finish_eval"; then
- 	  # Do the single finish_eval.
- 	  eval cmds=\"$finish_eval\"
--	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-        $cmds"
- 	fi
-       done
-@@ -1795,53 +2713,55 @@ func_mode_finish ()
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
--    $ECHO "X----------------------------------------------------------------------" | $Xsed
--    $ECHO "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $ECHO "   $libdir"
--    done
--    $ECHO
--    $ECHO "If you ever happen to want to link against installed libraries"
--    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
--    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    $ECHO "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      $ECHO "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
--      $ECHO "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      echo "----------------------------------------------------------------------"
-+      echo "Libraries have been installed in:"
-+      for libdir in $libdirs; do
-+	$ECHO "   $libdir"
-+      done
-+      echo
-+      echo "If you ever happen to want to link against installed libraries"
-+      echo "in a given directory, LIBDIR, you must either use libtool, and"
-+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+      echo "flag during linking and do at least one of the following:"
-+      if test -n "$shlibpath_var"; then
-+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+	echo "     during execution"
-+      fi
-+      if test -n "$runpath_var"; then
-+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+	echo "     during linking"
-+      fi
-+      if test -n "$hardcode_libdir_flag_spec"; then
-+	libdir=LIBDIR
-+	eval flag=\"$hardcode_libdir_flag_spec\"
- 
--      $ECHO "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      $ECHO "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    $ECHO
-+	$ECHO "   - use the \`$flag' linker flag"
-+      fi
-+      if test -n "$admincmds"; then
-+	$ECHO "   - have your system administrator run these commands:$admincmds"
-+      fi
-+      if test -f /etc/ld.so.conf; then
-+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      fi
-+      echo
- 
--    $ECHO "See any operating system documentation about shared libraries for"
--    case $host in
--      solaris2.[6789]|solaris2.1[0-9])
--        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
--	$ECHO "pages."
--	;;
--      *)
--        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
--        ;;
--    esac
--    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+      echo "See any operating system documentation about shared libraries for"
-+      case $host in
-+	solaris2.[6789]|solaris2.1[0-9])
-+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	  echo "pages."
-+	  ;;
-+	*)
-+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+	  ;;
-+      esac
-+      echo "----------------------------------------------------------------------"
-+    fi
-     exit $EXIT_SUCCESS
- }
- 
--test "$mode" = finish && func_mode_finish ${1+"$@"}
-+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
- 
- 
- # func_mode_install arg...
-@@ -1852,7 +2772,7 @@ func_mode_install ()
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+       case $nonopt in *shtool*) :;; *) false;; esac; then
-       # Aesthetically quote it.
-       func_quote_for_eval "$nonopt"
-       install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2786,12 @@ func_mode_install ()
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
--    install_prog="$install_prog$func_quote_for_eval_result"
-+    func_append install_prog "$func_quote_for_eval_result"
-+    install_shared_prog=$install_prog
-+    case " $install_prog " in
-+      *[\\\ /]cp\ *) install_cp=: ;;
-+      *) install_cp=false ;;
-+    esac
- 
-     # We need to accept at least all the BSD install flags.
-     dest=
-@@ -1876,10 +2801,12 @@ func_mode_install ()
-     install_type=
-     isdir=no
-     stripme=
-+    no_mode=:
-     for arg
-     do
-+      arg2=
-       if test -n "$dest"; then
--	files="$files $dest"
-+	func_append files " $dest"
- 	dest=$arg
- 	continue
-       fi
-@@ -1887,10 +2814,9 @@ func_mode_install ()
-       case $arg in
-       -d) isdir=yes ;;
-       -f)
--	case " $install_prog " in
--	*[\\\ /]cp\ *) ;;
--	*) prev=$arg ;;
--	esac
-+	if $install_cp; then :; else
-+	  prev=$arg
-+	fi
- 	;;
-       -g | -m | -o)
- 	prev=$arg
-@@ -1904,6 +2830,10 @@ func_mode_install ()
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
-+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-+	    arg2=$install_override_mode
-+	    no_mode=false
-+	  fi
- 	  prev=
- 	else
- 	  dest=$arg
-@@ -1914,7 +2844,11 @@ func_mode_install ()
- 
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
--      install_prog="$install_prog $func_quote_for_eval_result"
-+      func_append install_prog " $func_quote_for_eval_result"
-+      if test -n "$arg2"; then
-+	func_quote_for_eval "$arg2"
-+      fi
-+      func_append install_shared_prog " $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-@@ -1923,6 +2857,13 @@ func_mode_install ()
-     test -n "$prev" && \
-       func_fatal_help "the \`$prev' option requires an argument"
- 
-+    if test -n "$install_override_mode" && $no_mode; then
-+      if $install_cp; then :; else
-+	func_quote_for_eval "$install_override_mode"
-+	func_append install_shared_prog " -m $func_quote_for_eval_result"
-+      fi
-+    fi
-+
-     if test -z "$files"; then
-       if test -z "$dest"; then
- 	func_fatal_help "no file or destination specified"
-@@ -1977,10 +2918,13 @@ func_mode_install ()
-       case $file in
-       *.$libext)
- 	# Do the static libraries later.
--	staticlibs="$staticlibs $file"
-+	func_append staticlibs " $file"
- 	;;
- 
-       *.la)
-+	func_resolve_sysroot "$file"
-+	file=$func_resolve_sysroot_result
-+
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -1994,23 +2938,23 @@ func_mode_install ()
- 	if test "X$destdir" = "X$libdir"; then
- 	  case "$current_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  *) func_append current_libdirs " $libdir" ;;
- 	  esac
- 	else
- 	  # Note the libdir as a future libdir.
- 	  case "$future_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  *) func_append future_libdirs " $libdir" ;;
- 	  esac
- 	fi
- 
- 	func_dirname "$file" "/" ""
- 	dir="$func_dirname_result"
--	dir="$dir$objdir"
-+	func_append dir "$objdir"
- 
- 	if test -n "$relink_command"; then
- 	  # Determine the prefix the user has applied to our future dir.
--	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- 
- 	  # Don't allow the user to place us outside of our expected
- 	  # location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2967,9 @@ func_mode_install ()
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- 	  else
--	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
- 	  fi
- 
- 	  func_warning "relinking \`$file'"
-@@ -2043,7 +2987,7 @@ func_mode_install ()
- 	  test -n "$relink_command" && srcname="$realname"T
- 
- 	  # Install the shared library and build the symlinks.
--	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
-@@ -2083,7 +3027,7 @@ func_mode_install ()
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
- 
- 	# Maybe install the static library, too.
--	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
- 	;;
- 
-       *.lo)
-@@ -2183,7 +3127,7 @@ func_mode_install ()
- 	    if test -f "$lib"; then
- 	      func_source "$lib"
- 	    fi
--	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
-@@ -2202,7 +3146,7 @@ func_mode_install ()
- 		file="$func_basename_result"
- 	        outputname="$tmpdir/$file"
- 	        # Replace the output file specification.
--	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- 
- 	        $opt_silent || {
- 	          func_quote_for_expand "$relink_command"
-@@ -2221,7 +3165,7 @@ func_mode_install ()
- 	    }
- 	  else
- 	    # Install the binary that we compiled earlier.
--	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
-@@ -2280,7 +3224,7 @@ func_mode_install ()
-     fi
- }
- 
--test "$mode" = install && func_mode_install ${1+"$@"}
-+test "$opt_mode" = install && func_mode_install ${1+"$@"}
- 
- 
- # func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
- extern \"C\" {
- #endif
- 
-+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-+#endif
-+
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT_DLSYM_CONST
-+#else
-+# define LT_DLSYM_CONST const
-+#endif
-+
- /* External symbol declarations for the compiler. */\
- "
- 
-@@ -2332,10 +3292,11 @@ extern \"C\" {
- 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
- 
- 	  # Add our own program objects to the symbol list.
--	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	  for progfile in $progfiles; do
--	    func_verbose "extracting global C symbols from \`$progfile'"
--	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
- 	  done
- 
- 	  if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3332,7 @@ extern \"C\" {
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin | *mingw* | *cegcc* )
-+	        *cygwin* | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -2384,10 +3345,52 @@ extern \"C\" {
- 	  func_verbose "extracting global C symbols from \`$dlprefile'"
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
--	  $opt_dry_run || {
--	    eval '$ECHO ": $name " >> "$nlist"'
--	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
--	  }
-+          case $host in
-+	    *cygwin* | *mingw* | *cegcc* )
-+	      # if an import library, we need to obtain dlname
-+	      if func_win32_import_lib_p "$dlprefile"; then
-+	        func_tr_sh "$dlprefile"
-+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-+	        dlprefile_dlbasename=""
-+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-+	          # Use subshell, to avoid clobbering current variable values
-+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-+	          if test -n "$dlprefile_dlname" ; then
-+	            func_basename "$dlprefile_dlname"
-+	            dlprefile_dlbasename="$func_basename_result"
-+	          else
-+	            # no lafile. user explicitly requested -dlpreopen <import library>.
-+	            $sharedlib_from_linklib_cmd "$dlprefile"
-+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-+	          fi
-+	        fi
-+	        $opt_dry_run || {
-+	          if test -n "$dlprefile_dlbasename" ; then
-+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-+	          else
-+	            func_warning "Could not compute DLL name from $name"
-+	            eval '$ECHO ": $name " >> "$nlist"'
-+	          fi
-+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-+	        }
-+	      else # not an import lib
-+	        $opt_dry_run || {
-+	          eval '$ECHO ": $name " >> "$nlist"'
-+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	        }
-+	      fi
-+	    ;;
-+	    *)
-+	      $opt_dry_run || {
-+	        eval '$ECHO ": $name " >> "$nlist"'
-+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	      }
-+	    ;;
-+          esac
- 	done
- 
- 	$opt_dry_run || {
-@@ -2415,36 +3418,19 @@ extern \"C\" {
- 	  if test -f "$nlist"S; then
- 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
--	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
- 
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+	  echo >> "$output_objdir/$my_dlsyms" "\
- 
- /* The mapping between symbol names and symbols.  */
- typedef struct {
-   const char *name;
-   void *address;
- } lt_dlsymlist;
--"
--	  case $host in
--	  *cygwin* | *mingw* | *cegcc* )
--	    $ECHO >> "$output_objdir/$my_dlsyms" "\
--/* DATA imports from DLLs on WIN32 con't be const, because
--   runtime relocations are performed -- see ld's documentation
--   on pseudo-relocs.  */"
--	    lt_dlsym_const= ;;
--	  *osf5*)
--	    echo >> "$output_objdir/$my_dlsyms" "\
--/* This system does not cope well with relocations in const data */"
--	    lt_dlsym_const= ;;
--	  *)
--	    lt_dlsym_const=const ;;
--	  esac
--
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
--extern $lt_dlsym_const lt_dlsymlist
-+extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
--$lt_dlsym_const lt_dlsymlist
-+LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
- 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  esac
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+	  echo >> "$output_objdir/$my_dlsyms" "\
-   {0, (void *) 0}
- };
- 
-@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() {
- 	for arg in $LTCFLAGS; do
- 	  case $arg in
- 	  -pie | -fpie | -fPIE) ;;
--	  *) symtab_cflags="$symtab_cflags $arg" ;;
-+	  *) func_append symtab_cflags " $arg" ;;
- 	  esac
- 	done
- 
-@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() {
- 	case $host in
- 	*cygwin* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
--	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
--	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	  else
--	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
--	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  fi
- 	  ;;
- 	*)
--	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
--	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  ;;
- 	esac
- 	;;
-@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() {
-       # really was required.
- 
-       # Nullify the symbol file.
--      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
--      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-     fi
- }
- 
-@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() {
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
-+# Despite the name, also deal with 64 bit binaries.
- func_win32_libid ()
- {
-   $opt_debug
-@@ -2559,9 +3546,11 @@ func_win32_libid ()
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
-+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
--      win32_nmres=`eval $NM -f posix -A $1 |
-+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-+      func_to_tool_file "$1" func_convert_file_msys_to_w32
-+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- 	$SED -n -e '
- 	    1,100{
- 		/ I /{
-@@ -2590,6 +3579,131 @@ func_win32_libid ()
-   $ECHO "$win32_libid_type"
- }
- 
-+# func_cygming_dll_for_implib ARG
-+#
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib ()
-+{
-+  $opt_debug
-+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-+}
-+
-+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-+#
-+# The is the core of a fallback implementation of a
-+# platform-specific function to extract the name of the
-+# DLL associated with the specified import library LIBNAME.
-+#
-+# SECTION_NAME is either .idata$6 or .idata$7, depending
-+# on the platform and compiler that created the implib.
-+#
-+# Echos the name of the DLL associated with the
-+# specified import library.
-+func_cygming_dll_for_implib_fallback_core ()
-+{
-+  $opt_debug
-+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-+    $SED '/^Contents of section '"$match_literal"':/{
-+      # Place marker at beginning of archive member dllname section
-+      s/.*/====MARK====/
-+      p
-+      d
-+    }
-+    # These lines can sometimes be longer than 43 characters, but
-+    # are always uninteresting
-+    /:[	 ]*file format pe[i]\{,1\}-/d
-+    /^In archive [^:]*:/d
-+    # Ensure marker is printed
-+    /^====MARK====/p
-+    # Remove all lines with less than 43 characters
-+    /^.\{43\}/!d
-+    # From remaining lines, remove first 43 characters
-+    s/^.\{43\}//' |
-+    $SED -n '
-+      # Join marker and all lines until next marker into a single line
-+      /^====MARK====/ b para
-+      H
-+      $ b para
-+      b
-+      :para
-+      x
-+      s/\n//g
-+      # Remove the marker
-+      s/^====MARK====//
-+      # Remove trailing dots and whitespace
-+      s/[\. \t]*$//
-+      # Print
-+      /./p' |
-+    # we now have a list, one entry per line, of the stringified
-+    # contents of the appropriate section of all members of the
-+    # archive which possess that section. Heuristic: eliminate
-+    # all those which have a first or second character that is
-+    # a '.' (that is, objdump's representation of an unprintable
-+    # character.) This should work for all archives with less than
-+    # 0x302f exports -- but will fail for DLLs whose name actually
-+    # begins with a literal '.' or a single character followed by
-+    # a '.'.
-+    #
-+    # Of those that remain, print the first one.
-+    $SED -e '/^\./d;/^.\./d;q'
-+}
-+
-+# func_cygming_gnu_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is a GNU/binutils-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_gnu_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-+  test -n "$func_cygming_gnu_implib_tmp"
-+}
-+
-+# func_cygming_ms_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is an MS-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_ms_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-+  test -n "$func_cygming_ms_implib_tmp"
-+}
-+
-+# func_cygming_dll_for_implib_fallback ARG
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+#
-+# This fallback implementation is for use when $DLLTOOL
-+# does not support the --identify-strict option.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib_fallback ()
-+{
-+  $opt_debug
-+  if func_cygming_gnu_implib_p "$1" ; then
-+    # binutils import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-+  elif func_cygming_ms_implib_p "$1" ; then
-+    # ms-generated import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-+  else
-+    # unknown
-+    sharedlib_from_linklib_result=""
-+  fi
-+}
- 
- 
- # func_extract_an_archive dir oldlib
-@@ -2598,7 +3712,18 @@ func_extract_an_archive ()
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
--    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-+    if test "$lock_old_archive_extraction" = yes; then
-+      lockfile=$f_ex_an_ar_oldlib.lock
-+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-+	func_echo "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    fi
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-+		   'stat=$?; rm -f "$lockfile"; exit $stat'
-+    if test "$lock_old_archive_extraction" = yes; then
-+      $opt_dry_run || rm -f "$lockfile"
-+    fi
-     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-      :
-     else
-@@ -2669,7 +3794,7 @@ func_extract_archives ()
- 	    darwin_file=
- 	    darwin_files=
- 	    for darwin_file in $darwin_filelist; do
--	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
- 	      $LIPO -create -output "$darwin_file" $darwin_files
- 	    done # $darwin_filelist
- 	    $RM -rf unfat-$$
-@@ -2684,25 +3809,30 @@ func_extract_archives ()
-         func_extract_an_archive "$my_xdir" "$my_xabs"
- 	;;
-       esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
- }
- 
- 
--
--# func_emit_wrapper_part1 [arg=no]
-+# func_emit_wrapper [arg=no]
- #
--# Emit the first part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part1 ()
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable.  Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory.  This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
- {
--	func_emit_wrapper_part1_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_part1_arg1=$1
--	fi
-+	func_emit_wrapper_arg1=${1-no}
- 
- 	$ECHO "\
- #! $SHELL
-@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # Be Bourne compatible
-@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
- else
-   # When we are sourced in execute mode, \$file and \$ECHO are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
--    ECHO=\"$qecho\"
--    file=\"\$0\"
--    # Make sure echo works.
--    if test \"X\$1\" = X--no-reexec; then
--      # Discard the --no-reexec flag, and continue.
--      shift
--    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
--      # Yippee, \$ECHO works!
--      :
--    else
--      # Restart under the correct shell, and then maybe \$ECHO will work.
--      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
--    fi
--  fi\
-+    file=\"\$0\""
-+
-+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-+    $ECHO "\
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$1
-+_LTECHO_EOF'
-+}
-+    ECHO=\"$qECHO\"
-+  fi
-+
-+# Very basic option parsing. These options are (a) specific to
-+# the libtool wrapper, (b) are identical between the wrapper
-+# /script/ and the wrapper /executable/ which is used only on
-+# windows platforms, and (c) all begin with the string "--lt-"
-+# (application programs are unlikely to have options which match
-+# this pattern).
-+#
-+# There are only two supported options: --lt-debug and
-+# --lt-dump-script. There is, deliberately, no --lt-help.
-+#
-+# The first argument to this parsing function should be the
-+# script's $0 value, followed by "$@".
-+lt_option_debug=
-+func_parse_lt_options ()
-+{
-+  lt_script_arg0=\$0
-+  shift
-+  for lt_opt
-+  do
-+    case \"\$lt_opt\" in
-+    --lt-debug) lt_option_debug=1 ;;
-+    --lt-dump-script)
-+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-+        cat \"\$lt_dump_D/\$lt_dump_F\"
-+        exit 0
-+      ;;
-+    --lt-*)
-+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-+        exit 1
-+      ;;
-+    esac
-+  done
-+
-+  # Print the debug banner immediately:
-+  if test -n \"\$lt_option_debug\"; then
-+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-+  fi
-+}
-+
-+# Used when --lt-debug. Prints its arguments to stdout
-+# (redirection is the responsibility of the caller)
-+func_lt_dump_args ()
-+{
-+  lt_dump_args_N=1;
-+  for lt_arg
-+  do
-+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-+  done
-+}
-+
-+# Core function for launching the target application
-+func_exec_program_core ()
-+{
- "
--	$ECHO "\
-+  case $host in
-+  # Backslashes separate directories on plain windows
-+  *-*-mingw | *-*-os2* | *-cegcc*)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+
-+  *)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+  esac
-+  $ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+}
-+
-+# A function to encapsulate launching the target application
-+# Strips options in the --lt-* namespace from \$@ and
-+# launches target application with the remaining arguments.
-+func_exec_program ()
-+{
-+  for lt_wr_arg
-+  do
-+    case \$lt_wr_arg in
-+    --lt-*) ;;
-+    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-+    esac
-+    shift
-+  done
-+  func_exec_program_core \${1+\"\$@\"}
-+}
-+
-+  # Parse options
-+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
- 
-   # Find the directory that this script lives in.
--  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
--    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4013,13 @@ else
-       esac
-     fi
- 
--    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-   done
--"
--}
--# end: func_emit_wrapper_part1
--
--# func_emit_wrapper_part2 [arg=no]
--#
--# Emit the second part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part2 ()
--{
--	func_emit_wrapper_part2_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_part2_arg1=$1
--	fi
--
--	$ECHO "\
- 
-   # Usually 'no', except on cygwin/mingw when embedded into
-   # the cwrapper.
--  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-     # special case for '.'
-     if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
-     fi
-     # remove .libs from thisdir
-     case \"\$thisdir\" in
--    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-     $objdir )   thisdir=. ;;
-     esac
-   fi
-@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
-+	# fixup the dll searchpath if we need to.
-+	#
-+	# Fix the DLL searchpath if we need to.  Do this before prepending
-+	# to shlibpath, because on Windows, both are PATH and uninstalled
-+	# libraries must come first.
-+	if test -n "$dllsearchpath"; then
-+	  $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
- 	# Export our shlibpath_var if we have one.
- 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- 	  $ECHO "\
-@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
--    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
- 
-     export $shlibpath_var
- "
- 	fi
- 
--	# fixup the dll searchpath if we need to.
--	if test -n "$dllsearchpath"; then
--	  $ECHO "\
--    # Add the dll search path components to the executable PATH
--    PATH=$dllsearchpath:\$PATH
--"
--	fi
--
- 	$ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
--"
--	case $host in
--	# Backslashes separate directories on plain windows
--	*-*-mingw | *-*-os2* | *-cegcc*)
--	  $ECHO "\
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
--	  ;;
--
--	*)
--	  $ECHO "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
--"
--	  ;;
--	esac
--	$ECHO "\
--      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
--      exit 1
-+      func_exec_program \${1+\"\$@\"}
-     fi
-   else
-     # The program doesn't exist.
-     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
--    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit 1
-   fi
- fi\
- "
- }
--# end: func_emit_wrapper_part2
--
--
--# func_emit_wrapper [arg=no]
--#
--# Emit a libtool wrapper script on stdout.
--# Don't directly open a file because we may want to
--# incorporate the script contents within a cygwin/mingw
--# wrapper executable.  Must ONLY be called from within
--# func_mode_link because it depends on a number of variables
--# set therein.
--#
--# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
--# variable will take.  If 'yes', then the emitted script
--# will assume that the directory in which it is stored is
--# the $objdir directory.  This is a cygwin/mingw-specific
--# behavior.
--func_emit_wrapper ()
--{
--	func_emit_wrapper_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_arg1=$1
--	fi
--
--	# split this up so that func_emit_cwrapperexe_src
--	# can call each part independently.
--	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
--	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
--}
--
--
--# func_to_host_path arg
--#
--# Convert paths to host format when used with build tools.
--# Intended for use with "native" mingw (where libtool itself
--# is running under the msys shell), or in the following cross-
--# build environments:
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--# where wine is equipped with the `winepath' executable.
--# In the native mingw case, the (msys) shell automatically
--# converts paths for any non-msys applications it launches,
--# but that facility isn't available from inside the cwrapper.
--# Similar accommodations are necessary for $host mingw and
--# $build cygwin.  Calling this function does no harm for other
--# $host/$build combinations not listed above.
--#
--# ARG is the path (on $build) that should be converted to
--# the proper representation for $host. The result is stored
--# in $func_to_host_path_result.
--func_to_host_path ()
--{
--  func_to_host_path_result="$1"
--  if test -n "$1" ; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        case $build in
--          *mingw* ) # actually, msys
--            # awkward: cmd appends spaces to result
--            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
--            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
--              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
--            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_path_tmp1=`cygpath -w "$1"`
--            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # Unfortunately, winepath does not exit with a non-zero
--            # error code, so we are forced to check the contents of
--            # stdout. On the other hand, if the command is not
--            # found, the shell will set an exit code of 127 and print
--            # *an error message* to stdout. So we must check for both
--            # error code of zero AND non-empty stdout, which explains
--            # the odd construction:
--            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
--            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
--              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--                $SED -e "$lt_sed_naive_backslashify"`
--            else
--              # Allow warning below.
--              func_to_host_path_result=""
--            fi
--            ;;
--        esac
--        if test -z "$func_to_host_path_result" ; then
--          func_error "Could not determine host path corresponding to"
--          func_error "  '$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback:
--          func_to_host_path_result="$1"
--        fi
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_path
- 
--# func_to_host_pathlist arg
--#
--# Convert pathlists to host format when used with build tools.
--# See func_to_host_path(), above. This function supports the
--# following $build/$host combinations (but does no harm for
--# combinations not listed here):
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--#
--# Path separators are also converted from $build format to
--# $host format. If ARG begins or ends with a path separator
--# character, it is preserved (but converted to $host format)
--# on output.
--#
--# ARG is a pathlist (on $build) that should be converted to
--# the proper representation on $host. The result is stored
--# in $func_to_host_pathlist_result.
--func_to_host_pathlist ()
--{
--  func_to_host_pathlist_result="$1"
--  if test -n "$1" ; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        # Remove leading and trailing path separator characters from
--        # ARG. msys behavior is inconsistent here, cygpath turns them
--        # into '.;' and ';.', and winepath ignores them completely.
--        func_to_host_pathlist_tmp2="$1"
--        # Once set for this call, this variable should not be
--        # reassigned. It is used in tha fallback case.
--        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
--          $SED -e 's|^:*||' -e 's|:*$||'`
--        case $build in
--          *mingw* ) # Actually, msys.
--            # Awkward: cmd appends spaces to result.
--            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
--            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
--              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
--            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
--            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # unfortunately, winepath doesn't convert pathlists
--            func_to_host_pathlist_result=""
--            func_to_host_pathlist_oldIFS=$IFS
--            IFS=:
--            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
--              IFS=$func_to_host_pathlist_oldIFS
--              if test -n "$func_to_host_pathlist_f" ; then
--                func_to_host_path "$func_to_host_pathlist_f"
--                if test -n "$func_to_host_path_result" ; then
--                  if test -z "$func_to_host_pathlist_result" ; then
--                    func_to_host_pathlist_result="$func_to_host_path_result"
--                  else
--                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
--                  fi
--                fi
--              fi
--              IFS=:
--            done
--            IFS=$func_to_host_pathlist_oldIFS
--            ;;
--        esac
--        if test -z "$func_to_host_pathlist_result" ; then
--          func_error "Could not determine the host path(s) corresponding to"
--          func_error "  '$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback. This may break if $1 contains DOS-style drive
--          # specifications. The fix is not to complicate the expression
--          # below, but for the user to provide a working wine installation
--          # with winepath so that path translation in the cross-to-mingw
--          # case works properly.
--          lt_replace_pathsep_nix_to_dos="s|:|;|g"
--          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
--            $SED -e "$lt_replace_pathsep_nix_to_dos"`
--        fi
--        # Now, add the leading and trailing path separators back
--        case "$1" in
--          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
--            ;;
--        esac
--        case "$1" in
--          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
--            ;;
--        esac
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_pathlist
- 
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
-@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
--
--   Currently, it simply execs the wrapper *script* "$SHELL $output",
--   but could eventually absorb all of the scripts functionality and
--   exec $objdir/$outputname directly.
- */
- EOF
- 	    cat <<"EOF"
-+#ifdef _MSC_VER
-+# define _CRT_SECURE_NO_DEPRECATE 1
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- # include <direct.h>
- # include <process.h>
- # include <io.h>
--# define setmode _setmode
- #else
- # include <unistd.h>
- # include <stdint.h>
- # ifdef __CYGWIN__
- #  include <io.h>
--#  define HAVE_SETENV
--#  ifdef __STRICT_ANSI__
--char *realpath (const char *, char *);
--int putenv (char *);
--int setenv (const char *, const char *, int);
--#  endif
- # endif
- #endif
- #include <malloc.h>
-@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *, int);
- #include <fcntl.h>
- #include <sys/stat.h>
- 
-+/* declarations of non-ANSI functions */
-+#if defined(__MINGW32__)
-+# ifdef __STRICT_ANSI__
-+int _putenv (const char *);
-+# endif
-+#elif defined(__CYGWIN__)
-+# ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+# endif
-+/* #elif defined (other platforms) ... */
-+#endif
-+
-+/* portability defines, excluding path handling macros */
-+#if defined(_MSC_VER)
-+# define setmode _setmode
-+# define stat    _stat
-+# define chmod   _chmod
-+# define getcwd  _getcwd
-+# define putenv  _putenv
-+# define S_IXUSR _S_IEXEC
-+# ifndef _INTPTR_T_DEFINED
-+#  define _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#elif defined(__MINGW32__)
-+# define setmode _setmode
-+# define stat    _stat
-+# define chmod   _chmod
-+# define getcwd  _getcwd
-+# define putenv  _putenv
-+#elif defined(__CYGWIN__)
-+# define HAVE_SETENV
-+# define FOPEN_WB "wb"
-+/* #elif defined (other platforms) ... */
-+#endif
-+
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
- #elif defined(MAXPATHLEN)
-@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int);
- # define S_IXGRP 0
- #endif
- 
--#ifdef _MSC_VER
--# define S_IXUSR _S_IEXEC
--# define stat _stat
--# ifndef _INTPTR_T_DEFINED
--#  define intptr_t int
--# endif
--#endif
--
-+/* path handling portability macros */
- #ifndef DIR_SEPARATOR
- # define DIR_SEPARATOR '/'
- # define PATH_SEPARATOR ':'
-@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int);
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
- #endif /* PATH_SEPARATOR_2 */
- 
--#ifdef __CYGWIN__
--# define FOPEN_WB "wb"
--#endif
--
- #ifndef FOPEN_WB
- # define FOPEN_WB "w"
- #endif
-@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int);
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
--#undef LTWRAPPER_DEBUGPRINTF
--#if defined DEBUGWRAPPER
--# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
--static void
--ltwrapper_debugprintf (const char *fmt, ...)
--{
--    va_list args;
--    va_start (args, fmt);
--    (void) vfprintf (stderr, fmt, args);
--    va_end (args);
--}
-+#if defined(LT_DEBUGWRAPPER)
-+static int lt_debug = 1;
- #else
--# define LTWRAPPER_DEBUGPRINTF(args)
-+static int lt_debug = 0;
- #endif
- 
--const char *program_name = NULL;
-+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
-@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathspec);
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
--void lt_fatal (const char *message, ...);
-+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-+void lt_fatal (const char *file, int line, const char *message, ...);
-+static const char *nonnull (const char *s);
-+static const char *nonempty (const char *s);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
--void lt_opt_process_env_set (const char *arg);
--void lt_opt_process_env_prepend (const char *arg);
--void lt_opt_process_env_append (const char *arg);
--int lt_split_name_value (const char *arg, char** name, char** value);
- void lt_update_exe_path (const char *name, const char *value);
- void lt_update_lib_path (const char *name, const char *value);
--
--static const char *script_text_part1 =
-+char **prepare_spawn (char **argv);
-+void lt_dump_script (FILE *f);
- EOF
- 
--	    func_emit_wrapper_part1 yes |
--	        $SED -e 's/\([\\"]\)/\\\1/g' \
--	             -e 's/^/  "/' -e 's/$/\\n"/'
--	    echo ";"
- 	    cat <<EOF
--
--static const char *script_text_part2 =
--EOF
--	    func_emit_wrapper_part2 yes |
--	        $SED -e 's/\([\\"]\)/\\\1/g' \
--	             -e 's/^/  "/' -e 's/$/\\n"/'
--	    echo ";"
--
--	    cat <<EOF
--const char * MAGIC_EXE = "$magic_exe";
-+volatile const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
- 
- 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
--              func_to_host_pathlist "$temp_rpath"
-+              func_to_host_path "$temp_rpath"
- 	      cat <<EOF
--const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -3314,10 +4310,10 @@ EOF
- 	    fi
- 
- 	    if test -n "$dllsearchpath"; then
--              func_to_host_pathlist "$dllsearchpath:"
-+              func_to_host_path "$dllsearchpath:"
- 	      cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
--const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -3340,24 +4336,10 @@ EOF
- 	    cat <<"EOF"
- 
- #define LTWRAPPER_OPTION_PREFIX         "--lt-"
--#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
- 
--static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
--
- static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
--
--static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
--static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
--  /* argument is putenv-style "foo=bar", value of foo is set to bar */
--
--static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
--static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
--  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
--
--static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
--static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
--  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
- 
- int
- main (int argc, char *argv[])
-@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-+  newargz = XMALLOC (char *, argc + 1);
- 
--  /* very simple arg parsing; don't want to rely on getopt */
-+  /* very simple arg parsing; don't want to rely on getopt
-+   * also, copy all non cwrapper options to newargz, except
-+   * argz[0], which is handled differently
-+   */
-+  newargc=0;
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4376,57 @@ EOF
- 	      esac
- 
- 	    cat <<"EOF"
--	  printf ("%s", script_text_part1);
--	  printf ("%s", script_text_part2);
-+	  lt_dump_script (stdout);
- 	  return 0;
- 	}
-+      if (strcmp (argv[i], debug_opt) == 0)
-+	{
-+          lt_debug = 1;
-+          continue;
-+	}
-+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal (__FILE__, __LINE__,
-+		    "unrecognized %s option: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-     }
-+  newargz[++newargc] = NULL;
-+
-+EOF
-+	    cat <<EOF
-+  /* The GNU banner must be the first non-error debug message */
-+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-+EOF
-+	    cat <<"EOF"
-+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
--  newargz = XMALLOC (char *, argc + 1);
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
--    lt_fatal ("Couldn't find %s", argv[0]);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
--			  tmp_pathspec));
-+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (before symlink chase) at: %s\n",
-+		  tmp_pathspec);
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
--			  actual_cwrapper_path));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (after symlink chase) at: %s\n",
-+		  actual_cwrapper_path);
-   XFREE (tmp_pathspec);
- 
--  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-@@ -3427,8 +4444,9 @@ EOF
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
--  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
--			  target_name));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(main) libtool target name: %s\n",
-+		  target_name);
- EOF
- 
- 	    cat <<EOF
-@@ -3478,80 +4496,19 @@ EOF
- 
-   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
--  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-+     because on Windows, both *_VARNAMEs are PATH but uninstalled
-+     libraries must come first. */
-   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- 
--  newargc=0;
--  for (i = 1; i < argc; i++)
--    {
--      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
--        {
--          if (argv[i][env_set_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_set_opt_len + 1;
--              lt_opt_process_env_set (p);
--            }
--          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_set (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_set_opt);
--          continue;
--        }
--      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
--        {
--          if (argv[i][env_prepend_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_prepend_opt_len + 1;
--              lt_opt_process_env_prepend (p);
--            }
--          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_prepend_opt);
--          continue;
--        }
--      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
--        {
--          if (argv[i][env_append_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_append_opt_len + 1;
--              lt_opt_process_env_append (p);
--            }
--          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_append (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_append_opt);
--          continue;
--        }
--      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
--        {
--          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
--             namespace, but it is not one of the ones we know about and
--             have already dealt with, above (inluding dump-script), then
--             report an error. Otherwise, targets might begin to believe
--             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
--             namespace. The first time any user complains about this, we'll
--             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
--             or a configure.ac-settable value.
--           */
--          lt_fatal ("Unrecognized option in %s namespace: '%s'",
--                    ltwrapper_option_prefix, argv[i]);
--        }
--      /* otherwise ... */
--      newargz[++newargc] = xstrdup (argv[i]);
--    }
--  newargz[++newargc] = NULL;
--
--  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-+		  nonnull (lt_argv_zero));
-   for (i = 0; i < newargc; i++)
-     {
--      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-+		      i, nonnull (newargz[i]));
-     }
- 
- EOF
-@@ -3560,11 +4517,14 @@ EOF
- 	      mingw*)
- 		cat <<"EOF"
-   /* execv doesn't actually work on mingw as expected on unix */
-+  newargz = prepare_spawn (newargz);
-   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-   if (rval == -1)
-     {
-       /* failed to start process */
--      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      lt_debugprintf (__FILE__, __LINE__,
-+		      "(main) failed to launch target \"%s\": %s\n",
-+		      lt_argv_zero, nonnull (strerror (errno)));
-       return 127;
-     }
-   return rval;
-@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
- {
-   void *p = (void *) malloc (num);
-   if (!p)
--    lt_fatal ("Memory exhausted");
-+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
- 
-   return p;
- }
-@@ -3620,8 +4580,8 @@ check_executable (const char *path)
- {
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
--			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3638,8 +4598,8 @@ make_executable (const char *path)
-   int rval = 0;
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
--			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
-   int tmp_len;
-   char *concat_name;
- 
--  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
--			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-+                  nonempty (wrapper));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
-@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
- 		{
- 		  /* empty path: current directory */
- 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
--		    lt_fatal ("getcwd failed");
-+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+                              nonnull (strerror (errno)));
- 		  tmp_len = strlen (tmp);
- 		  concat_name =
- 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal ("getcwd failed");
-+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+              nonnull (strerror (errno)));
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
--      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
--			      tmp_pathspec));
-+      lt_debugprintf (__FILE__, __LINE__,
-+		      "checking path component for symlinks: %s\n",
-+		      tmp_pathspec);
-       if (lstat (tmp_pathspec, &s) == 0)
- 	{
- 	  if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
- 	}
-       else
- 	{
--	  char *errstr = strerror (errno);
--	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+	  lt_fatal (__FILE__, __LINE__,
-+		    "error accessing file \"%s\": %s",
-+		    tmp_pathspec, nonnull (strerror (errno)));
- 	}
-     }
-   XFREE (tmp_pathspec);
-@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
--      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+      lt_fatal (__FILE__, __LINE__,
-+		"could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
-@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
-   return str;
- }
- 
-+void
-+lt_debugprintf (const char *file, int line, const char *fmt, ...)
-+{
-+  va_list args;
-+  if (lt_debug)
-+    {
-+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-+      va_start (args, fmt);
-+      (void) vfprintf (stderr, fmt, args);
-+      va_end (args);
-+    }
-+}
-+
- static void
--lt_error_core (int exit_status, const char *mode,
-+lt_error_core (int exit_status, const char *file,
-+	       int line, const char *mode,
- 	       const char *message, va_list ap)
- {
--  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode,
- }
- 
- void
--lt_fatal (const char *message, ...)
-+lt_fatal (const char *file, int line, const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-   va_end (ap);
- }
- 
-+static const char *
-+nonnull (const char *s)
-+{
-+  return s ? s : "(null)";
-+}
-+
-+static const char *
-+nonempty (const char *s)
-+{
-+  return (s && !*s) ? "(empty)" : nonnull (s);
-+}
-+
- void
- lt_setenv (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_setenv) setting '%s' to '%s'\n",
-+                  nonnull (name), nonnull (value));
-   {
- #ifdef HAVE_SETENV
-     /* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
-   return new_value;
- }
- 
--int
--lt_split_name_value (const char *arg, char** name, char** value)
--{
--  const char *p;
--  int len;
--  if (!arg || !*arg)
--    return 1;
--
--  p = strchr (arg, (int)'=');
--
--  if (!p)
--    return 1;
--
--  *value = xstrdup (++p);
--
--  len = strlen (arg) - strlen (*value);
--  *name = XMALLOC (char, len);
--  strncpy (*name, arg, len-1);
--  (*name)[len - 1] = '\0';
--
--  return 0;
--}
--
--void
--lt_opt_process_env_set (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
--    }
--
--  lt_setenv (name, value);
--  XFREE (name);
--  XFREE (value);
--}
--
--void
--lt_opt_process_env_prepend (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--  char *new_value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
--    }
--
--  new_value = lt_extend_str (getenv (name), value, 0);
--  lt_setenv (name, new_value);
--  XFREE (new_value);
--  XFREE (name);
--  XFREE (value);
--}
--
--void
--lt_opt_process_env_append (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--  char *new_value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
--    }
--
--  new_value = lt_extend_str (getenv (name), value, 1);
--  lt_setenv (name, new_value);
--  XFREE (new_value);
--  XFREE (name);
--  XFREE (value);
--}
--
- void
- lt_update_exe_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *value)
- void
- lt_update_lib_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value)
-     }
- }
- 
-+EOF
-+	    case $host_os in
-+	      mingw*)
-+		cat <<"EOF"
-+
-+/* Prepares an argument vector before calling spawn().
-+   Note that spawn() does not by itself call the command interpreter
-+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-+         GetVersionEx(&v);
-+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-+      }) ? "cmd.exe" : "command.com").
-+   Instead it simply concatenates the arguments, separated by ' ', and calls
-+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-+   special way:
-+   - Space and tab are interpreted as delimiters. They are not treated as
-+     delimiters if they are surrounded by double quotes: "...".
-+   - Unescaped double quotes are removed from the input. Their only effect is
-+     that within double quotes, space and tab are treated like normal
-+     characters.
-+   - Backslashes not followed by double quotes are not special.
-+   - But 2*n+1 backslashes followed by a double quote become
-+     n backslashes followed by a double quote (n >= 0):
-+       \" -> "
-+       \\\" -> \"
-+       \\\\\" -> \\"
-+ */
-+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-+char **
-+prepare_spawn (char **argv)
-+{
-+  size_t argc;
-+  char **new_argv;
-+  size_t i;
-+
-+  /* Count number of arguments.  */
-+  for (argc = 0; argv[argc] != NULL; argc++)
-+    ;
-+
-+  /* Allocate new argument vector.  */
-+  new_argv = XMALLOC (char *, argc + 1);
-+
-+  /* Put quoted arguments into the new argument vector.  */
-+  for (i = 0; i < argc; i++)
-+    {
-+      const char *string = argv[i];
-+
-+      if (string[0] == '\0')
-+	new_argv[i] = xstrdup ("\"\"");
-+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-+	{
-+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-+	  size_t length;
-+	  unsigned int backslashes;
-+	  const char *s;
-+	  char *quoted_string;
-+	  char *p;
-+
-+	  length = 0;
-+	  backslashes = 0;
-+	  if (quote_around)
-+	    length++;
-+	  for (s = string; *s != '\0'; s++)
-+	    {
-+	      char c = *s;
-+	      if (c == '"')
-+		length += backslashes + 1;
-+	      length++;
-+	      if (c == '\\')
-+		backslashes++;
-+	      else
-+		backslashes = 0;
-+	    }
-+	  if (quote_around)
-+	    length += backslashes + 1;
- 
-+	  quoted_string = XMALLOC (char, length + 1);
-+
-+	  p = quoted_string;
-+	  backslashes = 0;
-+	  if (quote_around)
-+	    *p++ = '"';
-+	  for (s = string; *s != '\0'; s++)
-+	    {
-+	      char c = *s;
-+	      if (c == '"')
-+		{
-+		  unsigned int j;
-+		  for (j = backslashes + 1; j > 0; j--)
-+		    *p++ = '\\';
-+		}
-+	      *p++ = c;
-+	      if (c == '\\')
-+		backslashes++;
-+	      else
-+		backslashes = 0;
-+	    }
-+	  if (quote_around)
-+	    {
-+	      unsigned int j;
-+	      for (j = backslashes; j > 0; j--)
-+		*p++ = '\\';
-+	      *p++ = '"';
-+	    }
-+	  *p = '\0';
-+
-+	  new_argv[i] = quoted_string;
-+	}
-+      else
-+	new_argv[i] = (char *) string;
-+    }
-+  new_argv[argc] = NULL;
-+
-+  return new_argv;
-+}
-+EOF
-+		;;
-+	    esac
-+
-+            cat <<"EOF"
-+void lt_dump_script (FILE* f)
-+{
-+EOF
-+	    func_emit_wrapper yes |
-+              $SED -e 's/\([\\"]\)/\\\1/g' \
-+	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-+
-+            cat <<"EOF"
-+}
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
-+# func_win32_import_lib_p ARG
-+# True if ARG is an import lib, as indicated by $file_magic_cmd
-+func_win32_import_lib_p ()
-+{
-+    $opt_debug
-+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-+    *import*) : ;;
-+    *) false ;;
-+    esac
-+}
-+
- # func_mode_link arg...
- func_mode_link ()
- {
-@@ -4072,6 +5121,7 @@ func_mode_link ()
-     new_inherited_linker_flags=
- 
-     avoid_version=no
-+    bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-@@ -4164,6 +5214,11 @@ func_mode_link ()
- 	esac
- 
- 	case $prev in
-+	bindir)
-+	  bindir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
-@@ -4195,9 +5250,9 @@ func_mode_link ()
- 	    ;;
- 	  *)
- 	    if test "$prev" = dlfiles; then
--	      dlfiles="$dlfiles $arg"
-+	      func_append dlfiles " $arg"
- 	    else
--	      dlprefiles="$dlprefiles $arg"
-+	      func_append dlprefiles " $arg"
- 	    fi
- 	    prev=
- 	    continue
-@@ -4221,7 +5276,7 @@ func_mode_link ()
- 	    *-*-darwin*)
- 	      case "$deplibs " in
- 		*" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
- 		   ;;
- 	      esac
- 	      ;;
-@@ -4240,7 +5295,7 @@ func_mode_link ()
- 	    moreargs=
- 	    for fil in `cat "$save_arg"`
- 	    do
--#	      moreargs="$moreargs $fil"
-+#	      func_append moreargs " $fil"
- 	      arg=$fil
- 	      # A libtool-controlled object.
- 
-@@ -4269,7 +5324,7 @@ func_mode_link ()
- 
- 		  if test "$prev" = dlfiles; then
- 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		      dlfiles="$dlfiles $pic_object"
-+		      func_append dlfiles " $pic_object"
- 		      prev=
- 		      continue
- 		    else
-@@ -4281,7 +5336,7 @@ func_mode_link ()
- 		  # CHECK ME:  I think I busted this.  -Ossama
- 		  if test "$prev" = dlprefiles; then
- 		    # Preload the old-style object.
--		    dlprefiles="$dlprefiles $pic_object"
-+		    func_append dlprefiles " $pic_object"
- 		    prev=
- 		  fi
- 
-@@ -4351,12 +5406,12 @@ func_mode_link ()
- 	  if test "$prev" = rpath; then
- 	    case "$rpath " in
- 	    *" $arg "*) ;;
--	    *) rpath="$rpath $arg" ;;
-+	    *) func_append rpath " $arg" ;;
- 	    esac
- 	  else
- 	    case "$xrpath " in
- 	    *" $arg "*) ;;
--	    *) xrpath="$xrpath $arg" ;;
-+	    *) func_append xrpath " $arg" ;;
- 	    esac
- 	  fi
- 	  prev=
-@@ -4368,28 +5423,28 @@ func_mode_link ()
- 	  continue
- 	  ;;
- 	weak)
--	  weak_libs="$weak_libs $arg"
-+	  func_append weak_libs " $arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	xcclinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $qarg"
-+	  func_append linker_flags " $qarg"
-+	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xcompiler)
--	  compiler_flags="$compiler_flags $qarg"
-+	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xlinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $wl$qarg"
-+	  func_append linker_flags " $qarg"
-+	  func_append compiler_flags " $wl$qarg"
- 	  prev=
- 	  func_append compile_command " $wl$qarg"
- 	  func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5480,11 @@ func_mode_link ()
- 	continue
- 	;;
- 
-+      -bindir)
-+	prev=bindir
-+	continue
-+	;;
-+
-       -dlopen)
- 	prev=dlfiles
- 	continue
-@@ -4475,15 +5535,16 @@ func_mode_link ()
- 	;;
- 
-       -L*)
--	func_stripname '-L' '' "$arg"
--	dir=$func_stripname_result
--	if test -z "$dir"; then
-+	func_stripname "-L" '' "$arg"
-+	if test -z "$func_stripname_result"; then
- 	  if test "$#" -gt 0; then
- 	    func_fatal_error "require no space between \`-L' and \`$1'"
- 	  else
- 	    func_fatal_error "need path for \`-L' option"
- 	  fi
- 	fi
-+	func_resolve_sysroot "$func_stripname_result"
-+	dir=$func_resolve_sysroot_result
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5556,30 @@ func_mode_link ()
- 	  ;;
- 	esac
- 	case "$deplibs " in
--	*" -L$dir "*) ;;
-+	*" -L$dir "* | *" $arg "*)
-+	  # Will only happen for absolute or sysroot arguments
-+	  ;;
- 	*)
--	  deplibs="$deplibs -L$dir"
--	  lib_search_path="$lib_search_path $dir"
-+	  # Preserve sysroot, but never include relative directories
-+	  case $dir in
-+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-+	    *) func_append deplibs " -L$dir" ;;
-+	  esac
-+	  func_append lib_search_path " $dir"
- 	  ;;
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
--	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  ::) dllsearchpath=$dir;;
--	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  *) func_append dllsearchpath ":$dir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -4522,7 +5589,7 @@ func_mode_link ()
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -4536,7 +5603,7 @@ func_mode_link ()
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C and math libraries are in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    func_append deplibs " System.ltframework"
- 	    continue
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5623,7 @@ func_mode_link ()
- 	   ;;
- 	 esac
- 	fi
--	deplibs="$deplibs $arg"
-+	func_append deplibs " $arg"
- 	continue
- 	;;
- 
-@@ -4568,8 +5635,8 @@ func_mode_link ()
-       # Tru64 UNIX uses -model [arg] to determine the layout of C++
-       # classes, name mangling, and exception handling.
-       # Darwin uses the -arch flag to determine output architecture.
--      -model|-arch|-isysroot)
--	compiler_flags="$compiler_flags $arg"
-+      -model|-arch|-isysroot|--sysroot)
-+	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	prev=xcompiler
-@@ -4577,12 +5644,12 @@ func_mode_link ()
- 	;;
- 
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
--	compiler_flags="$compiler_flags $arg"
-+	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	case "$new_inherited_linker_flags " in
- 	    *" $arg "*) ;;
--	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+	    * ) func_append new_inherited_linker_flags " $arg" ;;
- 	esac
- 	continue
- 	;;
-@@ -4649,13 +5716,17 @@ func_mode_link ()
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	=*)
-+	  func_stripname '=' '' "$dir"
-+	  dir=$lt_sysroot$func_stripname_result
-+	  ;;
- 	*)
- 	  func_fatal_error "only absolute run-paths are allowed"
- 	  ;;
- 	esac
- 	case "$xrpath " in
- 	*" $dir "*) ;;
--	*) xrpath="$xrpath $dir" ;;
-+	*) func_append xrpath " $dir" ;;
- 	esac
- 	continue
- 	;;
-@@ -4708,8 +5779,8 @@ func_mode_link ()
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  arg="$arg $wl$func_quote_for_eval_result"
--	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+	  func_append arg " $func_quote_for_eval_result"
-+	  func_append compiler_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -4724,9 +5795,9 @@ func_mode_link ()
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  arg="$arg $wl$func_quote_for_eval_result"
--	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
--	  linker_flags="$linker_flags $func_quote_for_eval_result"
-+	  func_append arg " $wl$func_quote_for_eval_result"
-+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-+	  func_append linker_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -4754,23 +5825,27 @@ func_mode_link ()
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
--      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
--      # -r[0-9][0-9]* specifies the processor on the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
--      # +DA*, +DD* enable 64-bit mode on the HP compiler
--      # -q* pass through compiler args for the IBM compiler
--      # -m*, -t[45]*, -txscale* pass through architecture-specific
--      # compiler args for GCC
--      # -F/path gives path to uninstalled frameworks, gcc on darwin
--      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
--      # @file GCC response files
-+      # Flags to be passed through unchanged, with rationale:
-+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-+      # -r[0-9][0-9]*        specify processor for the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-+      # -q*                  compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-+      # -F/path              path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-+      # @file                GCC response files
-+      # -tp=*                Portland pgcc target processor selection
-+      # --sysroot=*          for sysroot support
-+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
--        compiler_flags="$compiler_flags $arg"
-+        func_append compiler_flags " $arg"
-         continue
-         ;;
- 
-@@ -4782,7 +5857,7 @@ func_mode_link ()
- 
-       *.$objext)
- 	# A standard object.
--	objs="$objs $arg"
-+	func_append objs " $arg"
- 	;;
- 
-       *.lo)
-@@ -4813,7 +5888,7 @@ func_mode_link ()
- 
- 	    if test "$prev" = dlfiles; then
- 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		dlfiles="$dlfiles $pic_object"
-+		func_append dlfiles " $pic_object"
- 		prev=
- 		continue
- 	      else
-@@ -4825,7 +5900,7 @@ func_mode_link ()
- 	    # CHECK ME:  I think I busted this.  -Ossama
- 	    if test "$prev" = dlprefiles; then
- 	      # Preload the old-style object.
--	      dlprefiles="$dlprefiles $pic_object"
-+	      func_append dlprefiles " $pic_object"
- 	      prev=
- 	    fi
- 
-@@ -4870,24 +5945,25 @@ func_mode_link ()
- 
-       *.$libext)
- 	# An archive.
--	deplibs="$deplibs $arg"
--	old_deplibs="$old_deplibs $arg"
-+	func_append deplibs " $arg"
-+	func_append old_deplibs " $arg"
- 	continue
- 	;;
- 
-       *.la)
- 	# A libtool-controlled library.
- 
-+	func_resolve_sysroot "$arg"
- 	if test "$prev" = dlfiles; then
- 	  # This library was specified with -dlopen.
--	  dlfiles="$dlfiles $arg"
-+	  func_append dlfiles " $func_resolve_sysroot_result"
- 	  prev=
- 	elif test "$prev" = dlprefiles; then
- 	  # The library was specified with -dlpreopen.
--	  dlprefiles="$dlprefiles $arg"
-+	  func_append dlprefiles " $func_resolve_sysroot_result"
- 	  prev=
- 	else
--	  deplibs="$deplibs $arg"
-+	  func_append deplibs " $func_resolve_sysroot_result"
- 	fi
- 	continue
- 	;;
-@@ -4925,7 +6001,7 @@ func_mode_link ()
- 
-     if test -n "$shlibpath_var"; then
-       # get the directories listed in $shlibpath_var
--      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-     else
-       shlib_search_path=
-     fi
-@@ -4934,6 +6010,8 @@ func_mode_link ()
- 
-     func_dirname "$output" "/" ""
-     output_objdir="$func_dirname_result$objdir"
-+    func_to_tool_file "$output_objdir/"
-+    tool_output_objdir=$func_to_tool_file_result
-     # Create the object directory.
-     func_mkdir_p "$output_objdir"
- 
-@@ -4954,12 +6032,12 @@ func_mode_link ()
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      if $opt_duplicate_deps ; then
-+      if $opt_preserve_dup_deps ; then
- 	case "$libs " in
--	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	esac
-       fi
--      libs="$libs $deplib"
-+      func_append libs " $deplib"
-     done
- 
-     if test "$linkmode" = lib; then
-@@ -4972,9 +6050,9 @@ func_mode_link ()
-       if $opt_duplicate_compiler_generated_deps; then
- 	for pre_post_dep in $predeps $postdeps; do
- 	  case "$pre_post_deps " in
--	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
- 	  esac
--	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	  func_append pre_post_deps " $pre_post_dep"
- 	done
-       fi
-       pre_post_deps=
-@@ -5044,17 +6122,19 @@ func_mode_link ()
- 	for lib in $dlprefiles; do
- 	  # Ignore non-libtool-libs
- 	  dependency_libs=
-+	  func_resolve_sysroot "$lib"
- 	  case $lib in
--	  *.la)	func_source "$lib" ;;
-+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
- 	  esac
- 
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
--            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+	    func_basename "$deplib"
-+            deplib_base=$func_basename_result
- 	    case " $weak_libs " in
- 	    *" $deplib_base "*) ;;
--	    *) deplibs="$deplibs $deplib" ;;
-+	    *) func_append deplibs " $deplib" ;;
- 	    esac
- 	  done
- 	done
-@@ -5075,11 +6155,11 @@ func_mode_link ()
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    compiler_flags="$compiler_flags $deplib"
-+	    func_append compiler_flags " $deplib"
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -5164,7 +6244,7 @@ func_mode_link ()
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -5177,7 +6257,8 @@ func_mode_link ()
- 	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    func_stripname '-L' '' "$deplib"
--	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  prog)
- 	    if test "$pass" = conv; then
-@@ -5191,7 +6272,8 @@ func_mode_link ()
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    func_stripname '-L' '' "$deplib"
--	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  *)
- 	    func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6284,21 @@ func_mode_link ()
- 	-R*)
- 	  if test "$pass" = link; then
- 	    func_stripname '-R' '' "$deplib"
--	    dir=$func_stripname_result
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    dir=$func_resolve_sysroot_result
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
- 	    *" $dir "*) ;;
--	    *) xrpath="$xrpath $dir" ;;
-+	    *) func_append xrpath " $dir" ;;
- 	    esac
- 	  fi
- 	  deplibs="$deplib $deplibs"
- 	  continue
- 	  ;;
--	*.la) lib="$deplib" ;;
-+	*.la)
-+	  func_resolve_sysroot "$deplib"
-+	  lib=$func_resolve_sysroot_result
-+	  ;;
- 	*.$libext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
-@@ -5230,7 +6316,7 @@ func_mode_link ()
- 		match_pattern*)
- 		  set dummy $deplibs_check_method; shift
- 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
--		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
- 		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=yes
- 		  fi
-@@ -5240,15 +6326,15 @@ func_mode_link ()
- 		;;
- 	      esac
- 	      if test "$valid_a_lib" != yes; then
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
--		$ECHO "*** that it is just a static archive that I should not use here."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because the file extensions .$libext of this argument makes me believe"
-+		echo "*** that it is just a static archive that I should not use here."
- 	      else
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
-@@ -5275,11 +6361,11 @@ func_mode_link ()
- 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- 	      # If there is no dlopen support or we're linking statically,
- 	      # we need to preload.
--	      newdlprefiles="$newdlprefiles $deplib"
-+	      func_append newdlprefiles " $deplib"
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
--	      newdlfiles="$newdlfiles $deplib"
-+	      func_append newdlfiles " $deplib"
- 	    fi
- 	  fi
- 	  continue
-@@ -5321,20 +6407,20 @@ func_mode_link ()
- 
- 	# Convert "-framework foo" to "foo.ltframework"
- 	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
- 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- 	    case " $new_inherited_linker_flags " in
- 	      *" $tmp_inherited_linker_flag "*) ;;
--	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
- 	    esac
- 	  done
- 	fi
--	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
--	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
- 	fi
- 
- 	if test "$pass" = conv; then
-@@ -5345,17 +6431,17 @@ func_mode_link ()
- 	      func_fatal_error "cannot find name of link library for \`$lib'"
- 	    fi
- 	    # It is a libtool convenience library, so add in its objects.
--	    convenience="$convenience $ladir/$objdir/$old_library"
--	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    func_append convenience " $ladir/$objdir/$old_library"
-+	    func_append old_convenience " $ladir/$objdir/$old_library"
- 	    tmp_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
--	      if $opt_duplicate_deps ; then
-+	      if $opt_preserve_dup_deps ; then
- 		case "$tmp_libs " in
--		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 		esac
- 	      fi
--	      tmp_libs="$tmp_libs $deplib"
-+	      func_append tmp_libs " $deplib"
- 	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
-@@ -5366,9 +6452,15 @@ func_mode_link ()
- 
- 	# Get the name of the library we link against.
- 	linklib=
--	for l in $old_library $library_names; do
--	  linklib="$l"
--	done
-+	if test -n "$old_library" &&
-+	   { test "$prefer_static_libs" = yes ||
-+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-+	  linklib=$old_library
-+	else
-+	  for l in $old_library $library_names; do
-+	    linklib="$l"
-+	  done
-+	fi
- 	if test -z "$linklib"; then
- 	  func_fatal_error "cannot find name of link library for \`$lib'"
- 	fi
-@@ -5385,9 +6477,9 @@ func_mode_link ()
- 	    # statically, we need to preload.  We also need to preload any
- 	    # dependent libraries so libltdl's deplib preloader doesn't
- 	    # bomb out in the load deplibs phase.
--	    dlprefiles="$dlprefiles $lib $dependency_libs"
-+	    func_append dlprefiles " $lib $dependency_libs"
- 	  else
--	    newdlfiles="$newdlfiles $lib"
-+	    func_append newdlfiles " $lib"
- 	  fi
- 	  continue
- 	fi # $pass = dlopen
-@@ -5409,14 +6501,14 @@ func_mode_link ()
- 
- 	# Find the relevant object directory and library name.
- 	if test "X$installed" = Xyes; then
--	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    func_warning "library \`$lib' was moved."
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+	    dir="$lt_sysroot$libdir"
-+	    absdir="$lt_sysroot$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
-@@ -5424,12 +6516,12 @@ func_mode_link ()
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    # Remove this search path later
--	    notinst_path="$notinst_path $abs_ladir"
-+	    func_append notinst_path " $abs_ladir"
- 	  else
- 	    dir="$ladir/$objdir"
- 	    absdir="$abs_ladir/$objdir"
- 	    # Remove this search path later
--	    notinst_path="$notinst_path $abs_ladir"
-+	    func_append notinst_path " $abs_ladir"
- 	  fi
- 	fi # $installed = yes
- 	func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6532,46 @@ func_mode_link ()
- 	  if test -z "$libdir" && test "$linkmode" = prog; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
- 	  fi
--	  # Prefer using a static library (so that no silly _DYNAMIC symbols
--	  # are required to link).
--	  if test -n "$old_library"; then
--	    newdlprefiles="$newdlprefiles $dir/$old_library"
--	    # Keep a list of preopened convenience libraries to check
--	    # that they are being used correctly in the link pass.
--	    test -z "$libdir" && \
--		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
--	  # Otherwise, use the dlname, so that lt_dlopen finds it.
--	  elif test -n "$dlname"; then
--	    newdlprefiles="$newdlprefiles $dir/$dlname"
--	  else
--	    newdlprefiles="$newdlprefiles $dir/$linklib"
--	  fi
-+	  case "$host" in
-+	    # special handling for platforms with PE-DLLs.
-+	    *cygwin* | *mingw* | *cegcc* )
-+	      # Linker will automatically link against shared library if both
-+	      # static and shared are present.  Therefore, ensure we extract
-+	      # symbols from the import library if a shared library is present
-+	      # (otherwise, the dlopen module name will be incorrect).  We do
-+	      # this by putting the import library name into $newdlprefiles.
-+	      # We recover the dlopen module name by 'saving' the la file
-+	      # name in a special purpose variable, and (later) extracting the
-+	      # dlname from the la file.
-+	      if test -n "$dlname"; then
-+	        func_tr_sh "$dir/$linklib"
-+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-+	        func_append newdlprefiles " $dir/$linklib"
-+	      else
-+	        func_append newdlprefiles " $dir/$old_library"
-+	        # Keep a list of preopened convenience libraries to check
-+	        # that they are being used correctly in the link pass.
-+	        test -z "$libdir" && \
-+	          func_append dlpreconveniencelibs " $dir/$old_library"
-+	      fi
-+	    ;;
-+	    * )
-+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	      # are required to link).
-+	      if test -n "$old_library"; then
-+	        func_append newdlprefiles " $dir/$old_library"
-+	        # Keep a list of preopened convenience libraries to check
-+	        # that they are being used correctly in the link pass.
-+	        test -z "$libdir" && \
-+	          func_append dlpreconveniencelibs " $dir/$old_library"
-+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	      elif test -n "$dlname"; then
-+	        func_append newdlprefiles " $dir/$dlname"
-+	      else
-+	        func_append newdlprefiles " $dir/$linklib"
-+	      fi
-+	    ;;
-+	  esac
- 	fi # $pass = dlpreopen
- 
- 	if test -z "$libdir"; then
-@@ -5471,7 +6589,7 @@ func_mode_link ()
- 
- 
- 	if test "$linkmode" = prog && test "$pass" != link; then
--	  newlib_search_path="$newlib_search_path $ladir"
-+	  func_append newlib_search_path " $ladir"
- 	  deplibs="$lib $deplibs"
- 
- 	  linkalldeplibs=no
-@@ -5484,7 +6602,8 @@ func_mode_link ()
- 	  for deplib in $dependency_libs; do
- 	    case $deplib in
- 	    -L*) func_stripname '-L' '' "$deplib"
--	         newlib_search_path="$newlib_search_path $func_stripname_result"
-+	         func_resolve_sysroot "$func_stripname_result"
-+	         func_append newlib_search_path " $func_resolve_sysroot_result"
- 		 ;;
- 	    esac
- 	    # Need to link against all dependency_libs?
-@@ -5495,12 +6614,12 @@ func_mode_link ()
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
--	    if $opt_duplicate_deps ; then
-+	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	      esac
- 	    fi
--	    tmp_libs="$tmp_libs $deplib"
-+	    func_append tmp_libs " $deplib"
- 	  done # for deplib
- 	  continue
- 	fi # $linkmode = prog...
-@@ -5515,7 +6634,7 @@ func_mode_link ()
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath:" in
- 	      *"$absdir:"*) ;;
--	      *) temp_rpath="$temp_rpath$absdir:" ;;
-+	      *) func_append temp_rpath "$absdir:" ;;
- 	      esac
- 	    fi
- 
-@@ -5527,7 +6646,7 @@ func_mode_link ()
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
-+	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5536,7 +6655,7 @@ func_mode_link ()
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5561,12 +6680,12 @@ func_mode_link ()
- 	  case $host in
- 	  *cygwin* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
--	      notinst_deplibs="$notinst_deplibs $lib"
-+	      func_append notinst_deplibs " $lib"
- 	      need_relink=no
- 	    ;;
- 	  *)
- 	    if test "$installed" = no; then
--	      notinst_deplibs="$notinst_deplibs $lib"
-+	      func_append notinst_deplibs " $lib"
- 	      need_relink=yes
- 	    fi
- 	    ;;
-@@ -5583,7 +6702,7 @@ func_mode_link ()
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
--	    $ECHO
-+	    echo
- 	    if test "$linkmode" = prog; then
- 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
- 	    else
-@@ -5601,7 +6720,7 @@ func_mode_link ()
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
-+	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5610,7 +6729,7 @@ func_mode_link ()
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5664,7 +6783,7 @@ func_mode_link ()
- 	    linklib=$newlib
- 	  fi # test -n "$old_archive_from_expsyms_cmds"
- 
--	  if test "$linkmode" = prog || test "$mode" != relink; then
-+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -5686,9 +6805,9 @@ func_mode_link ()
- 		      if test "X$dlopenmodule" != "X$lib"; then
- 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library" ; then
--			  $ECHO
--			  $ECHO "*** And there doesn't seem to be a static archive available"
--			  $ECHO "*** The link will probably fail, sorry"
-+			  echo
-+			  echo "*** And there doesn't seem to be a static archive available"
-+			  echo "*** The link will probably fail, sorry"
- 			else
- 			  add="$dir/$old_library"
- 			fi
-@@ -5720,7 +6839,7 @@ func_mode_link ()
- 		if test -n "$inst_prefix_dir"; then
- 		  case $libdir in
- 		    [\\/]*)
--		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      func_append add_dir " -L$inst_prefix_dir$libdir"
- 		      ;;
- 		  esac
- 		fi
-@@ -5742,7 +6861,7 @@ func_mode_link ()
- 	    if test -n "$add_shlibpath"; then
- 	      case :$compile_shlibpath: in
- 	      *":$add_shlibpath:"*) ;;
--	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
- 	      esac
- 	    fi
- 	    if test "$linkmode" = prog; then
-@@ -5756,13 +6875,13 @@ func_mode_link ()
- 		 test "$hardcode_shlibpath_var" = yes; then
- 		case :$finalize_shlibpath: in
- 		*":$libdir:"*) ;;
--		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		*) func_append finalize_shlibpath "$libdir:" ;;
- 		esac
- 	      fi
- 	    fi
- 	  fi
- 
--	  if test "$linkmode" = prog || test "$mode" = relink; then
-+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -5776,7 +6895,7 @@ func_mode_link ()
- 	    elif test "$hardcode_shlibpath_var" = yes; then
- 	      case :$finalize_shlibpath: in
- 	      *":$libdir:"*) ;;
--	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      *) func_append finalize_shlibpath "$libdir:" ;;
- 	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6912,7 @@ func_mode_link ()
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
- 		  [\\/]*)
--		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    func_append add_dir " -L$inst_prefix_dir$libdir"
- 		    ;;
- 		esac
- 	      fi
-@@ -5828,21 +6947,21 @@ func_mode_link ()
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
--	    $ECHO
-+	    echo
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
--	    $ECHO "*** I have the capability to make that library automatically link in when"
--	    $ECHO "*** you link to this library.  But I can only do this if you have a"
--	    $ECHO "*** shared version of the library, which you do not appear to have."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
--	      $ECHO "*** But as you try to build a module library, libtool will still create "
--	      $ECHO "*** a static module, that should work as long as the dlopening application"
--	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      echo "*** But as you try to build a module library, libtool will still create "
-+	      echo "*** a static module, that should work as long as the dlopening application"
-+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
--		$ECHO
--		$ECHO "*** However, this would only work if libtool was able to extract symbol"
--		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
--		$ECHO "*** not find such a program.  So, this module is probably useless."
--		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+		echo
-+		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
-@@ -5870,27 +6989,33 @@ func_mode_link ()
- 	           temp_xrpath=$func_stripname_result
- 		   case " $xrpath " in
- 		   *" $temp_xrpath "*) ;;
--		   *) xrpath="$xrpath $temp_xrpath";;
-+		   *) func_append xrpath " $temp_xrpath";;
- 		   esac;;
--	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      *) func_append temp_deplibs " $libdir";;
- 	      esac
- 	    done
- 	    dependency_libs="$temp_deplibs"
- 	  fi
- 
--	  newlib_search_path="$newlib_search_path $absdir"
-+	  func_append newlib_search_path " $absdir"
- 	  # Link against this library
- 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- 	  # ... and its dependency_libs
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
--	    if $opt_duplicate_deps ; then
-+	    case $deplib in
-+              -L*) func_stripname '-L' '' "$deplib"
-+                   func_resolve_sysroot "$func_stripname_result";;
-+              *) func_resolve_sysroot "$deplib" ;;
-+            esac
-+	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      *" $func_resolve_sysroot_result "*)
-+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
- 	      esac
- 	    fi
--	    tmp_libs="$tmp_libs $deplib"
-+	    func_append tmp_libs " $func_resolve_sysroot_result"
- 	  done
- 
- 	  if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7025,10 @@ func_mode_link ()
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-+	        func_resolve_sysroot "$deplib"
-+	        deplib=$func_resolve_sysroot_result
- 	        func_dirname "$deplib" "" "."
--		dir="$func_dirname_result"
-+		dir=$func_dirname_result
- 		# We need an absolute path.
- 		case $dir in
- 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7055,8 @@ func_mode_link ()
-                       if test -z "$darwin_install_name"; then
-                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                       fi
--		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
--		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
- 		      path=
- 		    fi
- 		  fi
-@@ -5962,7 +7089,7 @@ func_mode_link ()
- 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- 	else
--	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	fi
-       fi
-       dependency_libs="$newdependency_libs"
-@@ -5979,7 +7106,7 @@ func_mode_link ()
- 	  for dir in $newlib_search_path; do
- 	    case "$lib_search_path " in
- 	    *" $dir "*) ;;
--	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    *) func_append lib_search_path " $dir" ;;
- 	    esac
- 	  done
- 	  newlib_search_path=
-@@ -6037,10 +7164,10 @@ func_mode_link ()
- 	    -L*)
- 	      case " $tmp_libs " in
- 	      *" $deplib "*) ;;
--	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      *) func_append tmp_libs " $deplib" ;;
- 	      esac
- 	      ;;
--	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    *) func_append tmp_libs " $deplib" ;;
- 	    esac
- 	  done
- 	  eval $var=\"$tmp_libs\"
-@@ -6056,7 +7183,7 @@ func_mode_link ()
- 	  ;;
- 	esac
- 	if test -n "$i" ; then
--	  tmp_libs="$tmp_libs $i"
-+	  func_append tmp_libs " $i"
- 	fi
-       done
-       dependency_libs=$tmp_libs
-@@ -6097,7 +7224,7 @@ func_mode_link ()
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
--      objs="$objs$old_deplibs"
-+      func_append objs "$old_deplibs"
-       ;;
- 
-     lib)
-@@ -6130,10 +7257,10 @@ func_mode_link ()
- 	if test "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
- 	else
--	  $ECHO
-+	  echo
- 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- 	  $ECHO "*** objects $objs is not portable!"
--	  libobjs="$libobjs $objs"
-+	  func_append libobjs " $objs"
- 	fi
-       fi
- 
-@@ -6198,7 +7325,7 @@ func_mode_link ()
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|sunos)
-+	  freebsd-aout|freebsd-elf|qnx|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -6334,7 +7461,7 @@ func_mode_link ()
- 	  done
- 
- 	  # Make executables depend on our current version.
--	  verstring="$verstring:${current}.0"
-+	  func_append verstring ":${current}.0"
- 	  ;;
- 
- 	qnx)
-@@ -6402,10 +7529,10 @@ func_mode_link ()
-       fi
- 
-       func_generate_dlsyms "$libname" "$libname" "yes"
--      libobjs="$libobjs $symfileobj"
-+      func_append libobjs " $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
- 
--      if test "$mode" != relink; then
-+      if test "$opt_mode" != relink; then
- 	# Remove our outputs, but don't remove object files since they
- 	# may have been created when compiling PIC objects.
- 	removelist=
-@@ -6421,7 +7548,7 @@ func_mode_link ()
- 		   continue
- 		 fi
- 	       fi
--	       removelist="$removelist $p"
-+	       func_append removelist " $p"
- 	       ;;
- 	    *) ;;
- 	  esac
-@@ -6432,27 +7559,28 @@ func_mode_link ()
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	func_append oldlibs " $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
--	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-       fi
- 
-       # Eliminate all temporary directories.
-       #for path in $notinst_path; do
--      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
--      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
--      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-       #done
- 
-       if test -n "$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	temp_xrpath=
- 	for libdir in $xrpath; do
--	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  func_replace_sysroot "$libdir"
-+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
- 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7594,7 @@ func_mode_link ()
-       for lib in $old_dlfiles; do
- 	case " $dlprefiles $dlfiles " in
- 	*" $lib "*) ;;
--	*) dlfiles="$dlfiles $lib" ;;
-+	*) func_append dlfiles " $lib" ;;
- 	esac
-       done
- 
-@@ -6476,19 +7604,19 @@ func_mode_link ()
-       for lib in $old_dlprefiles; do
- 	case "$dlprefiles " in
- 	*" $lib "*) ;;
--	*) dlprefiles="$dlprefiles $lib" ;;
-+	*) func_append dlprefiles " $lib" ;;
- 	esac
-       done
- 
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    func_append deplibs " System.ltframework"
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7633,7 @@ func_mode_link ()
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
--	      deplibs="$deplibs -lc"
-+	      func_append deplibs " -lc"
- 	    fi
- 	    ;;
- 	  esac
-@@ -6554,7 +7682,7 @@ EOF
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		  case " $predeps $postdeps " in
- 		  *" $i "*)
--		    newdeplibs="$newdeplibs $i"
-+		    func_append newdeplibs " $i"
- 		    i=""
- 		    ;;
- 		  esac
-@@ -6565,21 +7693,21 @@ EOF
- 		  set dummy $deplib_matches; shift
- 		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		    newdeplibs="$newdeplibs $i"
-+		    func_append newdeplibs " $i"
- 		  else
- 		    droppeddeps=yes
--		    $ECHO
-+		    echo
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		    $ECHO "*** I have the capability to make that library automatically link in when"
--		    $ECHO "*** you link to this library.  But I can only do this if you have a"
--		    $ECHO "*** shared version of the library, which I believe you do not have"
--		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
--		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-+		    echo "*** I have the capability to make that library automatically link in when"
-+		    echo "*** you link to this library.  But I can only do this if you have a"
-+		    echo "*** shared version of the library, which I believe you do not have"
-+		    echo "*** because a test_compile did reveal that the linker did not use it for"
-+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
- 		;;
- 	      *)
--		newdeplibs="$newdeplibs $i"
-+		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
-@@ -6597,7 +7725,7 @@ EOF
- 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		    case " $predeps $postdeps " in
- 		    *" $i "*)
--		      newdeplibs="$newdeplibs $i"
-+		      func_append newdeplibs " $i"
- 		      i=""
- 		      ;;
- 		    esac
-@@ -6608,29 +7736,29 @@ EOF
- 		    set dummy $deplib_matches; shift
- 		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		      newdeplibs="$newdeplibs $i"
-+		      func_append newdeplibs " $i"
- 		    else
- 		      droppeddeps=yes
--		      $ECHO
-+		      echo
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		      $ECHO "*** I have the capability to make that library automatically link in when"
--		      $ECHO "*** you link to this library.  But I can only do this if you have a"
--		      $ECHO "*** shared version of the library, which you do not appear to have"
--		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
--		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		      echo "*** I have the capability to make that library automatically link in when"
-+		      echo "*** you link to this library.  But I can only do this if you have a"
-+		      echo "*** shared version of the library, which you do not appear to have"
-+		      echo "*** because a test_compile did reveal that the linker did not use this one"
-+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  $ECHO
-+		  echo
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $ECHO "*** make it link in!  You will probably need to install it or some"
--		  $ECHO "*** library that it depends on before this library will be fully"
--		  $ECHO "*** functional.  Installing it before continuing would be even better."
-+		  echo "*** make it link in!  You will probably need to install it or some"
-+		  echo "*** library that it depends on before this library will be fully"
-+		  echo "*** functional.  Installing it before continuing would be even better."
- 		fi
- 		;;
- 	      *)
--		newdeplibs="$newdeplibs $i"
-+		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
-@@ -6647,15 +7775,27 @@ EOF
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  newdeplibs="$newdeplibs $a_deplib"
-+		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		libname=`eval "\\$ECHO \"$libname_spec\""`
-+		if test -n "$file_magic_glob"; then
-+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-+		else
-+		  libnameglob=$libname
-+		fi
-+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
- 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  if test "$want_nocaseglob" = yes; then
-+		    shopt -s nocaseglob
-+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+		    $nocaseglob
-+		  else
-+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+		  fi
- 		  for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7812,13 @@ EOF
- 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
--			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
- 			 $SED -e 10q |
- 			 $EGREP "$file_magic_regex" > /dev/null; then
--			newdeplibs="$newdeplibs $a_deplib"
-+			func_append newdeplibs " $a_deplib"
- 			a_deplib=""
- 			break 2
- 		      fi
-@@ -6687,12 +7827,12 @@ EOF
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because I did check the linker path looking for a file starting"
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
- 		else
-@@ -6703,7 +7843,7 @@ EOF
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
-@@ -6719,7 +7859,7 @@ EOF
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  newdeplibs="$newdeplibs $a_deplib"
-+		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
-@@ -6730,9 +7870,9 @@ EOF
- 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		    potlib="$potent_lib" # see symlink-check above in file_magic test
--		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
- 		       $EGREP "$match_pattern_regex" > /dev/null; then
--		      newdeplibs="$newdeplibs $a_deplib"
-+		      func_append newdeplibs " $a_deplib"
- 		      a_deplib=""
- 		      break 2
- 		    fi
-@@ -6741,12 +7881,12 @@ EOF
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because I did check the linker path looking for a file starting"
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
- 		else
-@@ -6757,32 +7897,32 @@ EOF
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
--	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
--	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
- 	      # can't use Xsed below, because $i might contain '/'
--	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
- 	    done
- 	  fi
--	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
--	     $GREP . >/dev/null; then
--	    $ECHO
-+	  case $tmp_deplibs in
-+	  *[!\	\ ]*)
-+	    echo
- 	    if test "X$deplibs_check_method" = "Xnone"; then
--	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
--	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-+	      echo "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
--	    $ECHO "*** All declared inter-library dependencies are being dropped."
-+	    echo "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
--	  fi
-+	    ;;
-+	  esac
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
-@@ -6794,23 +7934,23 @@ EOF
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library with the System framework
--	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
- 	  ;;
- 	esac
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
--	    $ECHO
--	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-+	    echo
-+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
- 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
--	    $ECHO "*** a static module, that should work as long as the dlopening"
--	    $ECHO "*** application is linked with the -dlopen flag."
-+	    echo "*** a static module, that should work as long as the dlopening"
-+	    echo "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
--	      $ECHO
--	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
--	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
--	      $ECHO "*** not find such a program.  So, this module is probably useless."
--	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      echo
-+	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7960,16 @@ EOF
- 	      build_libtool_libs=no
- 	    fi
- 	  else
--	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
--	    $ECHO "*** automatically added whenever a program is linked with this library"
--	    $ECHO "*** or is declared to -dlopen it."
-+	    echo "*** The inter-library dependencies that have been dropped here will be"
-+	    echo "*** automatically added whenever a program is linked with this library"
-+	    echo "*** or is declared to -dlopen it."
- 
- 	    if test "$allow_undefined" = no; then
--	      $ECHO
--	      $ECHO "*** Since this library must not contain undefined symbols,"
--	      $ECHO "*** because either the platform does not support them or"
--	      $ECHO "*** it was explicitly requested with -no-undefined,"
--	      $ECHO "*** libtool will only create a static version of it."
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
-@@ -6846,9 +7986,9 @@ EOF
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       case $host in
- 	*-*-darwin*)
--	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  ;;
-       esac
- 
-@@ -6861,7 +8001,7 @@ EOF
- 	*)
- 	  case " $deplibs " in
- 	  *" -L$path/$objdir "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
-+	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -6871,10 +8011,10 @@ EOF
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
-+	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
--	*) new_libs="$new_libs $deplib" ;;
-+	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       deplibs="$new_libs"
-@@ -6891,10 +8031,12 @@ EOF
- 	  hardcode_libdirs=
- 	  dep_rpath=
- 	  rpath="$finalize_rpath"
--	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
-+		func_replace_sysroot "$libdir"
-+		libdir=$func_replace_sysroot_result
- 		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs="$libdir"
- 		else
-@@ -6903,18 +8045,18 @@ EOF
- 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		    ;;
- 		  *)
--		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		    ;;
- 		  esac
- 		fi
- 	      else
- 		eval flag=\"$hardcode_libdir_flag_spec\"
--		dep_rpath="$dep_rpath $flag"
-+		func_append dep_rpath " $flag"
- 	      fi
- 	    elif test -n "$runpath_var"; then
- 	      case "$perm_rpath " in
- 	      *" $libdir "*) ;;
--	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      *) func_apped perm_rpath " $libdir" ;;
- 	      esac
- 	    fi
- 	  done
-@@ -6932,7 +8074,7 @@ EOF
- 	    # We should set the runpath_var.
- 	    rpath=
- 	    for dir in $perm_rpath; do
--	      rpath="$rpath$dir:"
-+	      func_append rpath "$dir:"
- 	    done
- 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- 	  fi
-@@ -6940,7 +8082,7 @@ EOF
- 	fi
- 
- 	shlibpath="$finalize_shlibpath"
--	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- 	if test -n "$shlibpath"; then
- 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- 	fi
-@@ -6966,18 +8108,18 @@ EOF
- 	linknames=
- 	for link
- 	do
--	  linknames="$linknames $link"
-+	  func_append linknames " $link"
- 	done
- 
- 	# Use standard objects if they are pic
--	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	test "X$libobjs" = "X " && libobjs=
- 
- 	delfiles=
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- 	  export_symbols="$output_objdir/$libname.uexp"
--	  delfiles="$delfiles $export_symbols"
-+	  func_append delfiles " $export_symbols"
- 	fi
- 
- 	orig_export_symbols=
-@@ -7008,13 +8150,45 @@ EOF
- 	    $opt_dry_run || $RM $export_symbols
- 	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
--	    for cmd in $cmds; do
-+	    for cmd1 in $cmds; do
- 	      IFS="$save_ifs"
--	      eval cmd=\"$cmd\"
--	      func_len " $cmd"
--	      len=$func_len_result
--	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	      # Take the normal branch if the nm_file_list_spec branch
-+	      # doesn't work or if tool conversion is not needed.
-+	      case $nm_file_list_spec~$to_tool_file_cmd in
-+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-+		  try_normal_branch=yes
-+		  eval cmd=\"$cmd1\"
-+		  func_len " $cmd"
-+		  len=$func_len_result
-+		  ;;
-+		*)
-+		  try_normal_branch=no
-+		  ;;
-+	      esac
-+	      if test "$try_normal_branch" = yes \
-+		 && { test "$len" -lt "$max_cmd_len" \
-+		      || test "$max_cmd_len" -le -1; }
-+	      then
-+		func_show_eval "$cmd" 'exit $?'
-+		skipped_export=false
-+	      elif test -n "$nm_file_list_spec"; then
-+		func_basename "$output"
-+		output_la=$func_basename_result
-+		save_libobjs=$libobjs
-+		save_output=$output
-+		output=${output_objdir}/${output_la}.nm
-+		func_to_tool_file "$output"
-+		libobjs=$nm_file_list_spec$func_to_tool_file_result
-+		func_append delfiles " $output"
-+		func_verbose "creating $NM input file list: $output"
-+		for obj in $save_libobjs; do
-+		  func_to_tool_file "$obj"
-+		  $ECHO "$func_to_tool_file_result"
-+		done > "$output"
-+		eval cmd=\"$cmd1\"
- 		func_show_eval "$cmd" 'exit $?'
-+		output=$save_output
-+		libobjs=$save_libobjs
- 		skipped_export=false
- 	      else
- 		# The command line is too long to execute in one step.
-@@ -7036,7 +8210,7 @@ EOF
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols="$export_symbols"
- 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	fi
- 
- 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8222,7 @@ EOF
- 	  # global variables. join(1) would be nice here, but unfortunately
- 	  # isn't a blessed tool.
- 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	  export_symbols=$output_objdir/$libname.def
- 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	fi
-@@ -7058,7 +8232,7 @@ EOF
- 	  case " $convenience " in
- 	  *" $test_deplib "*) ;;
- 	  *)
--	    tmp_deplibs="$tmp_deplibs $test_deplib"
-+	    func_append tmp_deplibs " $test_deplib"
- 	    ;;
- 	  esac
- 	done
-@@ -7078,21 +8252,21 @@ EOF
- 	    test "X$libobjs" = "X " && libobjs=
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    generated="$generated $gentop"
-+	    func_append generated " $gentop"
- 
- 	    func_extract_archives $gentop $convenience
--	    libobjs="$libobjs $func_extract_archives_result"
-+	    func_append libobjs " $func_extract_archives_result"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  fi
- 	fi
- 
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
--	  linker_flags="$linker_flags $flag"
-+	  func_append linker_flags " $flag"
- 	fi
- 
- 	# Make a backup of the uninstalled library when relinking
--	if test "$mode" = relink; then
-+	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
- 	fi
- 
-@@ -7137,7 +8311,8 @@ EOF
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
--	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-+	  func_basename "$output"
-+	  output_la=$func_basename_result
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -7150,13 +8325,16 @@ EOF
- 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
- 	    func_verbose "creating GNU ld script: $output"
--	    $ECHO 'INPUT (' > $output
-+	    echo 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
--	      $ECHO "$obj" >> $output
-+	      func_to_tool_file "$obj"
-+	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
--	    $ECHO ')' >> $output
--	    delfiles="$delfiles $output"
-+	    echo ')' >> $output
-+	    func_append delfiles " $output"
-+	    func_to_tool_file "$output"
-+	    output=$func_to_tool_file_result
- 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
- 	    func_verbose "creating linker input file list: $output"
-@@ -7170,10 +8348,12 @@ EOF
- 	    fi
- 	    for obj
- 	    do
--	      $ECHO "$obj" >> $output
-+	      func_to_tool_file "$obj"
-+	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
--	    delfiles="$delfiles $output"
--	    output=$firstobj\"$file_list_spec$output\"
-+	    func_append delfiles " $output"
-+	    func_to_tool_file "$output"
-+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
- 	  else
- 	    if test -n "$save_libobjs"; then
- 	      func_verbose "creating reloadable object files..."
-@@ -7197,17 +8377,19 @@ EOF
- 		  # command to the queue.
- 		  if test "$k" -eq 1 ; then
- 		    # The first file doesn't have a previous command to add.
--		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+		    reload_objs=$objlist
-+		    eval concat_cmds=\"$reload_cmds\"
- 		  else
- 		    # All subsequent reloadable object files will link in
- 		    # the last one created.
--		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-+		    reload_objs="$objlist $last_robj"
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
- 		  fi
- 		  last_robj=$output_objdir/$output_la-${k}.$objext
- 		  func_arith $k + 1
- 		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-${k}.$objext
--		  objlist=$obj
-+		  objlist=" $obj"
- 		  func_len " $last_robj"
- 		  func_arith $len0 + $func_len_result
- 		  len=$func_arith_result
-@@ -7217,11 +8399,12 @@ EOF
- 	      # reloadable object file.  All subsequent reloadable object
- 	      # files will link in the last one created.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+	      reload_objs="$objlist $last_robj"
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
- 	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- 	      fi
--	      delfiles="$delfiles $output"
-+	      func_append delfiles " $output"
- 
- 	    else
- 	      output=
-@@ -7255,7 +8438,7 @@ EOF
- 		lt_exit=$?
- 
- 		# Restore the uninstalled library and exit
--		if test "$mode" = relink; then
-+		if test "$opt_mode" = relink; then
- 		  ( cd "$output_objdir" && \
- 		    $RM "${realname}T" && \
- 		    $MV "${realname}U" "$realname" )
-@@ -7276,7 +8459,7 @@ EOF
- 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols="$export_symbols"
- 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	    fi
- 
- 	    if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8471,7 @@ EOF
- 	      # global variables. join(1) would be nice here, but unfortunately
- 	      # isn't a blessed tool.
- 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	      export_symbols=$output_objdir/$libname.def
- 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	    fi
-@@ -7329,10 +8512,10 @@ EOF
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  libobjs="$libobjs $func_extract_archives_result"
-+	  func_append libobjs " $func_extract_archives_result"
- 	  test "X$libobjs" = "X " && libobjs=
- 	fi
- 
-@@ -7348,7 +8531,7 @@ EOF
- 	    lt_exit=$?
- 
- 	    # Restore the uninstalled library and exit
--	    if test "$mode" = relink; then
-+	    if test "$opt_mode" = relink; then
- 	      ( cd "$output_objdir" && \
- 	        $RM "${realname}T" && \
- 		$MV "${realname}U" "$realname" )
-@@ -7360,7 +8543,7 @@ EOF
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
--	if test "$mode" = relink; then
-+	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
- 	  if test -n "$convenience"; then
-@@ -7441,18 +8624,21 @@ EOF
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
- 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
--	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $convenience
- 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-+      # If we're not building shared, we need to use non_pic_objs
-+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-+
-       # Create the old-style object.
--      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8698,8 @@ EOF
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
- 	;;
-       esac
- 
-@@ -7524,14 +8710,14 @@ EOF
- 	if test "$tagname" = CXX ; then
- 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 	    10.[0123])
--	      compile_command="$compile_command ${wl}-bind_at_load"
--	      finalize_command="$finalize_command ${wl}-bind_at_load"
-+	      func_append compile_command " ${wl}-bind_at_load"
-+	      func_append finalize_command " ${wl}-bind_at_load"
- 	    ;;
- 	  esac
- 	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	;;
-       esac
- 
-@@ -7545,7 +8731,7 @@ EOF
- 	*)
- 	  case " $compile_deplibs " in
- 	  *" -L$path/$objdir "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
-+	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -7555,17 +8741,17 @@ EOF
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
-+	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
--	*) new_libs="$new_libs $deplib" ;;
-+	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       compile_deplibs="$new_libs"
- 
- 
--      compile_command="$compile_command $compile_deplibs"
--      finalize_command="$finalize_command $finalize_deplibs"
-+      func_append compile_command " $compile_deplibs"
-+      func_append finalize_command " $finalize_deplibs"
- 
-       if test -n "$rpath$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8759,7 @@ EOF
- 	  # This is the magic to use -rpath.
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
-       fi
-@@ -7592,18 +8778,18 @@ EOF
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    rpath="$rpath $flag"
-+	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  *) func_append perm_rpath " $libdir" ;;
- 	  esac
- 	fi
- 	case $host in
-@@ -7612,12 +8798,12 @@ EOF
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
- 	  ::) dllsearchpath=$libdir;;
--	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  *) func_append dllsearchpath ":$libdir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -7643,18 +8829,18 @@ EOF
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    rpath="$rpath $flag"
-+	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$finalize_perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  *) func_append finalize_perm_rpath " $libdir" ;;
- 	  esac
- 	fi
-       done
-@@ -7668,8 +8854,8 @@ EOF
- 
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
--	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
--	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-       fi
- 
-       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8867,15 @@ EOF
- 
-       wrappers_required=yes
-       case $host in
-+      *cegcc* | *mingw32ce*)
-+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-       *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
--      *cegcc)
--        # Disable wrappers for cegcc, we are cross compiling anyway.
--        wrappers_required=no
--        ;;
-       *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-@@ -7698,13 +8884,19 @@ EOF
-       esac
-       if test "$wrappers_required" = no; then
- 	# Replace the output file specification.
--	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
- 
- 	# We have no uninstalled library dependencies, so finalize right now.
- 	exit_status=0
- 	func_show_eval "$link_command" 'exit_status=$?'
- 
-+	if test -n "$postlink_cmds"; then
-+	  func_to_tool_file "$output"
-+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	  func_execute_cmds "$postlink_cmds" 'exit $?'
-+	fi
-+
- 	# Delete the generated files.
- 	if test -f "$output_objdir/${outputname}S.${objext}"; then
- 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8919,7 @@ EOF
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $perm_rpath; do
--	    rpath="$rpath$dir:"
-+	    func_append rpath "$dir:"
- 	  done
- 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -7735,7 +8927,7 @@ EOF
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $finalize_perm_rpath; do
--	    rpath="$rpath$dir:"
-+	    func_append rpath "$dir:"
- 	  done
- 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -7745,11 +8937,18 @@ EOF
- 	# We don't need to create a wrapper script.
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	# Replace the output file specification.
--	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	# Delete the old output file.
- 	$opt_dry_run || $RM $output
- 	# Link the executable and exit
- 	func_show_eval "$link_command" 'exit $?'
-+
-+	if test -n "$postlink_cmds"; then
-+	  func_to_tool_file "$output"
-+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	  func_execute_cmds "$postlink_cmds" 'exit $?'
-+	fi
-+
- 	exit $EXIT_SUCCESS
-       fi
- 
-@@ -7764,7 +8963,7 @@ EOF
- 	if test "$fast_install" != no; then
- 	  link_command="$finalize_var$compile_command$finalize_rpath"
- 	  if test "$fast_install" = yes; then
--	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- 	  else
- 	    # fast_install is set to needless
- 	    relink_command=
-@@ -7776,13 +8975,19 @@ EOF
-       fi
- 
-       # Replace the output file specification.
--      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
-       # Delete the old output files.
-       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
-       func_show_eval "$link_command" 'exit $?'
- 
-+      if test -n "$postlink_cmds"; then
-+	func_to_tool_file "$output_objdir/$outputname"
-+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	func_execute_cmds "$postlink_cmds" 'exit $?'
-+      fi
-+
-       # Now create the wrapper script.
-       func_verbose "creating $output"
- 
-@@ -7800,18 +9005,7 @@ EOF
- 	  fi
- 	done
- 	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
--      fi
--
--      # Quote $ECHO for shipping.
--      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
--	case $progpath in
--	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
--	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
--	esac
--	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
--      else
--	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -7891,7 +9085,7 @@ EOF
- 	else
- 	  oldobjs="$old_deplibs $non_pic_objects"
- 	  if test "$preload" = yes && test -f "$symfileobj"; then
--	    oldobjs="$oldobjs $symfileobj"
-+	    func_append oldobjs " $symfileobj"
- 	  fi
- 	fi
- 	addlibs="$old_convenience"
-@@ -7899,10 +9093,10 @@ EOF
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	generated="$generated $gentop"
-+	func_append generated " $gentop"
- 
- 	func_extract_archives $gentop $addlibs
--	oldobjs="$oldobjs $func_extract_archives_result"
-+	func_append oldobjs " $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-@@ -7913,10 +9107,10 @@ EOF
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  oldobjs="$oldobjs $func_extract_archives_result"
-+	  func_append oldobjs " $func_extract_archives_result"
- 	fi
- 
- 	# POSIX demands no paths to be encoded in archives.  We have
-@@ -7932,9 +9126,9 @@ EOF
- 	    done | sort | sort -uc >/dev/null 2>&1); then
- 	  :
- 	else
--	  $ECHO "copying selected object files to avoid basename conflicts..."
-+	  echo "copying selected object files to avoid basename conflicts..."
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 	  func_mkdir_p "$gentop"
- 	  save_oldobjs=$oldobjs
- 	  oldobjs=
-@@ -7958,9 +9152,9 @@ EOF
- 		esac
- 	      done
- 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
--	      oldobjs="$oldobjs $gentop/$newobj"
-+	      func_append oldobjs " $gentop/$newobj"
- 	      ;;
--	    *) oldobjs="$oldobjs $obj" ;;
-+	    *) func_append oldobjs " $obj" ;;
- 	    esac
- 	  done
- 	fi
-@@ -7970,6 +9164,16 @@ EOF
- 	len=$func_len_result
- 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  cmds=$old_archive_cmds
-+	elif test -n "$archiver_list_spec"; then
-+	  func_verbose "using command file archive linking..."
-+	  for obj in $oldobjs
-+	  do
-+	    func_to_tool_file "$obj"
-+	    $ECHO "$func_to_tool_file_result"
-+	  done > $output_objdir/$libname.libcmd
-+	  func_to_tool_file "$output_objdir/$libname.libcmd"
-+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-+	  cmds=$old_archive_cmds
- 	else
- 	  # the command line is too long to link in one step, link in parts
- 	  func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9247,7 @@ EOF
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
- 	relink_command=
-       fi
-@@ -8066,9 +9270,19 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
--		newdependency_libs="$newdependency_libs $libdir/$name"
-+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-+		;;
-+	      -L*)
-+		func_stripname -L '' "$deplib"
-+		func_replace_sysroot "$func_stripname_result"
-+		func_append newdependency_libs " -L$func_replace_sysroot_result"
-+		;;
-+	      -R*)
-+		func_stripname -R '' "$deplib"
-+		func_replace_sysroot "$func_stripname_result"
-+		func_append newdependency_libs " -R$func_replace_sysroot_result"
- 		;;
--	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      *) func_append newdependency_libs " $deplib" ;;
- 	      esac
- 	    done
- 	    dependency_libs="$newdependency_libs"
-@@ -8082,9 +9296,9 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		newdlfiles="$newdlfiles $libdir/$name"
-+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
--	      *) newdlfiles="$newdlfiles $lib" ;;
-+	      *) func_append newdlfiles " $lib" ;;
- 	      esac
- 	    done
- 	    dlfiles="$newdlfiles"
-@@ -8101,7 +9315,7 @@ EOF
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		newdlprefiles="$newdlprefiles $libdir/$name"
-+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
- 	      esac
- 	    done
-@@ -8113,7 +9327,7 @@ EOF
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      newdlfiles="$newdlfiles $abs"
-+	      func_append newdlfiles " $abs"
- 	    done
- 	    dlfiles="$newdlfiles"
- 	    newdlprefiles=
-@@ -8122,15 +9336,33 @@ EOF
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      newdlprefiles="$newdlprefiles $abs"
-+	      func_append newdlprefiles " $abs"
- 	    done
- 	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $RM $output
- 	  # place dlname in correct position for cygwin
-+	  # In fact, it would be nice if we could use this code for all target
-+	  # systems that can't hard-code library paths into their executables
-+	  # and that have no shared library path variable independent of PATH,
-+	  # but it turns out we can't easily determine that from inspecting
-+	  # libtool variables, so we have to hard-code the OSs to which it
-+	  # applies here; at the moment, that means platforms that use the PE
-+	  # object format with DLL files.  See the long comment at the top of
-+	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-+	      # If a -bindir argument was supplied, place the dll there.
-+	      if test "x$bindir" != x ;
-+	      then
-+		func_relative_path "$install_libdir" "$bindir"
-+		tdlname=$func_relative_path_result$dlname
-+	      else
-+		# Otherwise fall back on heuristic.
-+		tdlname=../bin/$dlname
-+	      fi
-+	      ;;
- 	  esac
- 	  $ECHO > $output "\
- # $outputname - a libtool library file
-@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\""
-     exit $EXIT_SUCCESS
- }
- 
--{ test "$mode" = link || test "$mode" = relink; } &&
-+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-     func_mode_link ${1+"$@"}
- 
- 
-@@ -8209,9 +9441,9 @@ func_mode_uninstall ()
-     for arg
-     do
-       case $arg in
--      -f) RM="$RM $arg"; rmforce=yes ;;
--      -*) RM="$RM $arg" ;;
--      *) files="$files $arg" ;;
-+      -f) func_append RM " $arg"; rmforce=yes ;;
-+      -*) func_append RM " $arg" ;;
-+      *) func_append files " $arg" ;;
-       esac
-     done
- 
-@@ -8220,24 +9452,23 @@ func_mode_uninstall ()
- 
-     rmdirs=
- 
--    origobjdir="$objdir"
-     for file in $files; do
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       if test "X$dir" = X.; then
--	objdir="$origobjdir"
-+	odir="$objdir"
-       else
--	objdir="$dir/$origobjdir"
-+	odir="$dir/$objdir"
-       fi
-       func_basename "$file"
-       name="$func_basename_result"
--      test "$mode" = uninstall && objdir="$dir"
-+      test "$opt_mode" = uninstall && odir="$dir"
- 
--      # Remember objdir for removal later, being careful to avoid duplicates
--      if test "$mode" = clean; then
-+      # Remember odir for removal later, being careful to avoid duplicates
-+      if test "$opt_mode" = clean; then
- 	case " $rmdirs " in
--	  *" $objdir "*) ;;
--	  *) rmdirs="$rmdirs $objdir" ;;
-+	  *" $odir "*) ;;
-+	  *) func_append rmdirs " $odir" ;;
- 	esac
-       fi
- 
-@@ -8263,18 +9494,17 @@ func_mode_uninstall ()
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
--	    rmfiles="$rmfiles $objdir/$n"
-+	    func_append rmfiles " $odir/$n"
- 	  done
--	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- 
--	  case "$mode" in
-+	  case "$opt_mode" in
- 	  clean)
--	    case "  $library_names " in
--	    # "  " in the beginning catches empty $dlname
-+	    case " $library_names " in
- 	    *" $dlname "*) ;;
--	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
- 	    esac
--	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
- 	    ;;
- 	  uninstall)
- 	    if test -n "$library_names"; then
-@@ -8302,19 +9532,19 @@ func_mode_uninstall ()
- 	  # Add PIC object to the list of files to remove.
- 	  if test -n "$pic_object" &&
- 	     test "$pic_object" != none; then
--	    rmfiles="$rmfiles $dir/$pic_object"
-+	    func_append rmfiles " $dir/$pic_object"
- 	  fi
- 
- 	  # Add non-PIC object to the list of files to remove.
- 	  if test -n "$non_pic_object" &&
- 	     test "$non_pic_object" != none; then
--	    rmfiles="$rmfiles $dir/$non_pic_object"
-+	    func_append rmfiles " $dir/$non_pic_object"
- 	  fi
- 	fi
- 	;;
- 
-       *)
--	if test "$mode" = clean ; then
-+	if test "$opt_mode" = clean ; then
- 	  noexename=$name
- 	  case $file in
- 	  *.exe)
-@@ -8324,7 +9554,7 @@ func_mode_uninstall ()
- 	    noexename=$func_stripname_result
- 	    # $file with .exe has already been added to rmfiles,
- 	    # add $file without .exe
--	    rmfiles="$rmfiles $file"
-+	    func_append rmfiles " $file"
- 	    ;;
- 	  esac
- 	  # Do a test to see if this is a libtool program.
-@@ -8333,7 +9563,7 @@ func_mode_uninstall ()
- 	      func_ltwrapper_scriptname "$file"
- 	      relink_command=
- 	      func_source $func_ltwrapper_scriptname_result
--	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
- 	    else
- 	      relink_command=
- 	      func_source $dir/$noexename
-@@ -8341,12 +9571,12 @@ func_mode_uninstall ()
- 
- 	    # note $name still contains .exe if it was in $file originally
- 	    # as does the version of $file that was added into $rmfiles
--	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- 	    if test "$fast_install" = yes && test -n "$relink_command"; then
--	      rmfiles="$rmfiles $objdir/lt-$name"
-+	      func_append rmfiles " $odir/lt-$name"
- 	    fi
- 	    if test "X$noexename" != "X$name" ; then
--	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+	      func_append rmfiles " $odir/lt-${noexename}.c"
- 	    fi
- 	  fi
- 	fi
-@@ -8354,7 +9584,6 @@ func_mode_uninstall ()
-       esac
-       func_show_eval "$RM $rmfiles" 'exit_status=1'
-     done
--    objdir="$origobjdir"
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-@@ -8366,16 +9595,16 @@ func_mode_uninstall ()
-     exit $exit_status
- }
- 
--{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
- 
--test -z "$mode" && {
-+test -z "$opt_mode" && {
-   help="$generic_help"
-   func_fatal_help "you must specify a MODE"
- }
- 
- test -z "$exec_cmd" && \
--  func_fatal_help "invalid operation mode \`$mode'"
-+  func_fatal_help "invalid operation mode \`$opt_mode'"
- 
- if test -n "$exec_cmd"; then
-   eval exec "$exec_cmd"
---
-cgit 
diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
deleted file mode 100644
index d2b5a2926..000000000
--- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c xfce4-sensors-plugin-1.0.0/lib/hddtemp.c
---- xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c	2010-03-27 16:11:48.000000000 +0100
-+++ xfce4-sensors-plugin-1.0.0/lib/hddtemp.c	2010-11-06 20:50:11.717022222 +0100
-@@ -102,7 +102,7 @@
-     if (!notify_is_initted())
-         notify_init(PACKAGE); /* NOTIFY_APPNAME */
- 
--    nn = notify_notification_new (summary, body, icon, NULL);
-+    nn = notify_notification_new (summary, body, icon);
-     /* FIXME: Use channels or propagate private object or use static global variable */
-     //notify_notification_add_action (nn,
-                             //"confirmed",
-diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c
---- xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c	2010-03-27 16:11:48.000000000 +0100
-+++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c	2010-11-06 20:50:24.360007993 +0100
-@@ -105,7 +105,7 @@
-                 if (!notify_is_initted())
-                     notify_init(PACKAGE); /* NOTIFY_APPNAME */
- 
--                nn = notify_notification_new(summary, body, icon, NULL);
-+                nn = notify_notification_new(summary, body, icon);
-                 notify_notification_show(nn, &error);
-                 #else
-                 DBG("%s\n%s", summary, body);
-
diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch
deleted file mode 100644
index 2a19d1d8b..000000000
--- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am	2011-01-14 15:40:24.065537723 +0000
-+++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am.new	2011-01-14 15:41:48.248960397 +0000
-@@ -20,6 +20,7 @@
- 
- xfce4_sensors_plugin_CFLAGS = \
- 	@LIBXFCE4PANEL_CFLAGS@										   \
-+	@LIBXFCEGUI4_CFLAGS@										\
- 	@PLATFORM_CFLAGS@												\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
- 	@LIBSENSORS_CFLAGS@
-@@ -30,6 +31,7 @@
- xfce4_sensors_plugin_LDFLAGS = 								\
- 	$(top_builddir)/lib/libxfce4sensors.la								\
- 	@LIBXFCE4PANEL_LIBS@											 \
-+	@LIBXFCEGUI4_LIBS@											\
- 	@SOLLIBS@														\
- 	@LIBSENSORS_LDFLAGS@											 \
- 	@LIBM@
---- xfce4-sensors-plugin-1.0.0/src/Makefile.am	2009-11-06 11:02:11.000000000 +0000
-+++ xfce4-sensors-plugin-1.0.0/src/Makefile.am.new	2011-01-14 16:19:09.777636193 +0000
-@@ -27,6 +27,7 @@
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- 	@LIBSENSORS_CFLAGS@	\
- 	@LIBXFCE4UTIL_CFLAGS@ \
-+	@LIBXFCE4PANEL_CFLAGS@ \
- 	@LIBXFCEGUI4_CFLAGS@
- 
- # @GTK_CFLAGS@ 	\
-@@ -41,6 +42,7 @@
- 	$(top_builddir)/lib/libxfce4sensors.la \
- 	@LIBSENSORS_LDFLAGS@ \
- 	@LIBXFCE4UTIL_LIBS@	\
-+	@LIBXFCE4PANEL_LIBS@ \
- 	@LIBXFCEGUI4_LIBS@ 
- 
- # @GTK_LIBS@ \
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 905d8ef2f..3ab60ac0a 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119480 2011-04-11 18:13:13Z andyrtr $
+# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -22,13 +22,17 @@ options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
 	org.freedesktop.consolekit.pkla
-	org.freedesktop.upower.pkla)
+	org.freedesktop.upower.pkla
+	gdm.patch)
 md5sums=('478080ff666fdd36786a243829663efd'
          '2e2519950d8c591dc9440ed8957a49ed'
-         '5fa270637b5e685f033863d8664795a2')
+         '5fa270637b5e685f033863d8664795a2'
+         '61423d0e235cad7ffcbbdacc96c9151b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327
+  patch -Np1 -i ${srcdir}/gdm.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch
new file mode 100644
index 000000000..e89e6a0b6
--- /dev/null
+++ b/extra/xfce4-session/gdm.patch
@@ -0,0 +1,21 @@
+From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@laiskiainen.org>
+Date: Wed, 23 Mar 2011 21:13:40 +0000
+Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400).
+
+---
+diff --git a/xfce4-session/main.c b/xfce4-session/main.c
+index ff6e324..fcf69f8 100644
+--- a/xfce4-session/main.c
++++ b/xfce4-session/main.c
+@@ -103,7 +103,7 @@ setup_environment (void)
+ 
+   /* this is for compatibility with the GNOME Display Manager */
+   lang = g_getenv ("GDM_LANG");
+-  if (lang != NULL)
++  if (lang != NULL && strlen (lang) > 0)
+     {
+       xfce_setenv ("LANG", lang, TRUE);
+       xfce_unsetenv ("GDM_LANG");
+--
+cgit 
diff --git a/extra/xpdf/xpdf-3.00-xfont.patch b/extra/xpdf/xpdf-3.00-xfont.patch
deleted file mode 100644
index 50dcec2bb..000000000
--- a/extra/xpdf/xpdf-3.00-xfont.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpdf-3.00/xpdf/XPDFViewer.cc.orig	2004-10-12 12:24:57.055068037 +0200
-+++ xpdf-3.00/xpdf/XPDFViewer.cc	2004-10-12 12:24:47.707449614 +0200
-@@ -1742,7 +1742,7 @@
-   aboutBigFont =
-     createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
-   aboutVersionFont =
--    createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
-+    createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
-   aboutFixedFont =
-     createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
- 
diff --git a/extra/xpdf/xpdf.desktop b/extra/xpdf/xpdf.desktop
deleted file mode 100644
index 06830ecda..000000000
--- a/extra/xpdf/xpdf.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
diff --git a/extra/xpdf/xpdf.install b/extra/xpdf/xpdf.install
deleted file mode 100644
index e111ef946..000000000
--- a/extra/xpdf/xpdf.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index f1aa98ef9..fc40b6011 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $
+# $Id: PKGBUILD 136643 2011-08-31 10:33:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=6.0
-_ffoxver=6.0
+pkgver=6.0.1
+_ffoxver=6.0.1
 pkgrel=1
 pkgver=2.0
 pkgrel=2 # hold ver
@@ -16,20 +16,24 @@ url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         mozconfig
         mozilla-pkgconfig.patch
-        mips.patch)
+        mips.patch
+        moz-639554.patch)
 options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
+
 build() {
   cd "${srcdir}/icecat-${_ffoxver}/"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
-   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
   [[ "$CARCH" == "mips64el" ]] && {
     echo "ac_add_options --disable-ipc" >> .mozconfig
     patch -Np0 -i "${srcdir}/mips.patch"
   }
+  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
+  #upstream fixes
+  patch -Np1 -i "${srcdir}/moz-639554.patch"
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
 
@@ -48,7 +52,8 @@ package() {
   # add xulrunner library path to ld.so.conf
   install -d ${pkgdir}/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+
+  #wtf mozilla!
+  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
 }
-md5sums=('1840185865a1a8975df4a3db59080ddc'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186')
diff --git a/extra/xulrunner/moz-639554.patch b/extra/xulrunner/moz-639554.patch
new file mode 100644
index 000000000..30fe15c6e
--- /dev/null
+++ b/extra/xulrunner/moz-639554.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson <chrisccoulson@ubuntu.com>
+# Date 1306390403 -7200
+# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
+# Parent  831f8e040f381ed58441d8bf413f9845f26ce08e
+Bug 639554 - Install sdk/bin with make install. r=bsmedberg
+
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard 
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
+ 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+ 
+ make-sdk:
+
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 013eb774c..adb4e3367 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 136459 2011-08-29 19:26:01Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.25
+pkgver=2.26
 pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,26 +12,26 @@ url='http://www.linux-nis.org/nis/ypserv/'
 license=('GPL2')
 depends=('gdbm' 'openslp')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \
+source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \
         'yppasswd'
         'ypserv')
-sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736'
+sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
           '96192b628afe36709496e4801d016c4bff343f0e'
           'b625381bfa6cf62345377a7df30b8f45935206c5')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-	install -D -m644 etc/netgroup "$pkgdir"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "$pkgdir"/etc/ypserv.conf
-	install -D -m644 etc/securenets "$pkgdir"/var/yp/securenets
-	install -D -m755 ../ypserv "$pkgdir"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "$pkgdir"/etc/rc.d/yppasswd
+	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
+	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
+	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
+	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
+	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 }