Merge branch 'master' of http://projects.parabolagnulinux.org/abslibre-mips64el

Conflicts: extra/python/PKGBUILD
author: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-18 10:36:32 -0500
committer: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-18 10:36:32 -0500
commit: 02c6fa41964c6bb1e7f285ff530e8082b9326399 (patch)
tree: 2c13819f471dca50955bddeadbf940ff3631c1e2 /extra
parent: 8c0e0492541a5ef68bf2814712502103d8f475b5 (diff)
parent: a4f85b5a8c5460995c83445460351846cde419f8 (diff)
205 files changed, 16779 insertions, 3870 deletions
diff --git a/extra/a2ps/ChangeLog b/extra/a2ps/ChangeLog
deleted file mode 100644
index fda664602..000000000
--- a/extra/a2ps/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2009-03-22  Eric Belanger  <eric@archlinux.org>
-
-	* a2ps 4.14-1
-	* Upstream update
-	* Added/Removed patches
-	* Updated license
-	* Added backup array
-	* Added gperf makedepends
-	* Added install scriptlet to handle info pages
-	* Added ChangeLog
diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index dfa520d23..b1fa5191c 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,46 +1,50 @@
-# $Id: PKGBUILD 31025 2009-03-24 03:24:37Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=1
-pkgdesc="a2ps is an Any to PostScript filter"
+pkgrel=2
+pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
 depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
 makedepends=('gperf')
-replaces=('a2ps-lprng')
-provides=('a2ps-lprng')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
 source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \
         a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \
         a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' '93011b58e9f20a7fafa31287a51884a4'\
-         '2e493d0bc00d71eb3e8a9b6febc52b69' '09cc5ed4d3d8ff1b2103e519191e8286'\
-         '42aa39b74f6da8cf6e94185c4fc3e601' '066f9327fee6b6eca3a57d657d1097d1')
-sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'\
-          '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'\
-          '6aed29c1399e79f3914b408059610f9e7c0fc38e' '58fa90134f1027e3f05aeb08212cbcc10f420738')
+md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
+         '93011b58e9f20a7fafa31287a51884a4'
+         '2e493d0bc00d71eb3e8a9b6febc52b69'
+         '09cc5ed4d3d8ff1b2103e519191e8286'
+         '42aa39b74f6da8cf6e94185c4fc3e601'
+         '066f9327fee6b6eca3a57d657d1097d1')
+sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
+          '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
+          '94e35a6ad9268161bec22a56d4cfb696d635994a'
+          '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
+          '6aed29c1399e79f3914b408059610f9e7c0fc38e'
+          '58fa90134f1027e3f05aeb08212cbcc10f420738')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch || return 1
-  patch -p1 < ../a2ps-4.13c-emacs.patch || return 1
-  patch -p1 < ../a2ps-4.13-manpage-chmod.patch || return 1
-  patch -p1 < ../a2ps-4.14-check-mempcpy.patch || return 1
-  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch || return 1
-  libtoolize --force --copy || return 1
-  autoreconf -I m4 || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
+  patch -p1 < ../a2ps-4.13c-emacs.patch
+  patch -p1 < ../a2ps-4.13-manpage-chmod.patch
+  patch -p1 < ../a2ps-4.14-check-mempcpy.patch
+  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  libtoolize --force --copy
+  autoreconf -I m4
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
-              --includedir=/usr/include --enable-nls || return 1
-  export LANG=C
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  sed -i "s:^countdictstack: \0:" ${pkgdir}/usr/bin/psset || return 1
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+    --includedir=/usr/include --enable-nls
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
 }
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index eff8df43e..7b5d011c9 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118244 2011-04-06 08:21:21Z andrea $
+# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,10 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1c69a74474389e35709171a329c77bed')
+md5sums=('ad342acca61c2af27be4cce61b2d925a')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD
index 93bdedc54..e70e9a75a 100644
--- a/extra/alpine/PKGBUILD
+++ b/extra/alpine/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 104455 2011-01-03 05:46:57Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alpine
 pkgver=2.00
-pkgrel=12
+pkgrel=13
 _patchlevel=79
 pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.washington.edu/alpine/"
 license=('APACHE')
-depends=('libldap' 'heimdal' 'gettext')
+depends=('libldap' 'krb5' 'gettext')
 optdepends=('aspell: for spell-checking support')
 provides=('pine')
 conflicts=('pine')
@@ -18,10 +18,14 @@ options=('!makeflags')
 source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
         http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
         2.00-lpam.patch CVE-2008-5514.patch)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52' 'd7dffd121c9a1cac4c458c0ff71df1ce'\
-         'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'\
-         '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
+md5sums=('84e44cbf71ed674800a5d57eed9c1c52'
+         'd7dffd121c9a1cac4c458c0ff71df1ce'
+         'cd3911c16fc6a072e853c0ccfc35857c'
+         '1b52a54a656979116c09fb1d948a4325')
+sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4'
+          'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'
+          '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3'
+          'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index b4ecccb7d..fe6d67a7f 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 115423 2011-03-17 21:56:46Z andrea $
+# $Id: PKGBUILD 122696 2011-05-06 06:26:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.0
-pkgrel=4
-pkgdesc="A media player for KDE"
+pkgver=2.4.1
+pkgrel=1
+pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2' 'FDL')
+license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             'libmygpo-qt')
 optdepends=("libgpod: support for Apple iPod audio devices"
-	"libmtp: support for portable media devices"
-	"loudmouth: backend needed by mp3tunes for syncing"
-    "ifuse: support for Apple iPod Touch and iPhone")
+	        "libmtp: support for portable media devices"
+        	"loudmouth: backend needed by mp3tunes for syncing"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdb6ddc8e38d0982a0786ff8ac96d923')
+md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
 
 build() {
   cd ${srcdir}
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 9113e9a96..ea8f93893 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120058 2011-04-18 22:46:19Z giovanni $
+# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z 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=10525
+pkgver=10552
 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=('d1b925a2ceac1c63b5fb1e42702c1a2a')
+md5sums=('b3685a792e92c2900dbb3eaeba7cc65d')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 3e09aad25..e8f8112bc 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $
+# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
 pkgver=3.0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 8769c266b..95e752b63 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96448 2010-10-21 09:16:04Z jgc $
+# $Id: PKGBUILD 123392 2011-05-10 21:15:00Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
 pkgver=2.2.17
-pkgrel=1
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
@@ -18,7 +18,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
         etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
-_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02
+_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         ${_itkurl}/02-rename-prefork-to-itk.patch
         ${_itkurl}/03-add-mpm-to-build-system.patch
@@ -29,21 +29,23 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         ${_itkurl}/08-max-clients-per-vhost.patch
         ${_itkurl}/09-capabilities.patch
         ${_itkurl}/10-nice.patch
+        ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
         apachectl-confd.patch
         apache.conf.d
         httpd.logrotate
         httpd
         arch.layout)
 md5sums=('16eadc59ea6b38af33874d300973202e'
-         'db42cfcc18ae1c32aaaff2347e35b79d'
-         '131408ad4dc7b18547b4e062e7e495ab'
-         'ee488f391054d528547c3a372faa2aa7'
-         'b202944761b2f0516196488b12504236'
-         '78fa15f8ca3a284b7d71f942e24e47fb'
-         'd33e39350e987721d50e6fb8e164ab6b'
-         '9f7a8935f9cabc7b46d0052906634cef'
-         '1b28e3363e1b0d05b738a21e7ddd264f'
-         'd9667fcd2ffecc63e446edd4d6666731'
+         'f1d9d41360908ceb2374da55ae99197a'
+         'cdfa04985a0efa850976aef01c2a0c40'
+         '0930d2d0612eb0a53a0d00aea7e8687f'
+         '3a0c29bb91442c33ea73ebbe072af922'
+         '0ef4729a6f1ffc848ad0e9b440a66f66'
+         '940944caa948340b11ddae56adaef89b'
+         'ce09a987523884de8838f73dc8ec0d19'
+         'e75b7dd8d8afcd299ba4ab2ab81c11e4'
+         'ce1ccc21f3ad8625169c8f62913450ac'
+         '1e5b222edcfbf99a3edc56fcb2074fbe'
          '4ac64df6e019edbe137017cba1ff2f51'
          '08b3c875f6260644f2f52b4056d656b0'
          '6382331e9700ed9e8cc78ea51887b537'
@@ -77,6 +79,7 @@ build() {
 			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
 			patch -Np1 -i "${srcdir}/09-capabilities.patch"
 			patch -Np1 -i "${srcdir}/10-nice.patch"
+                        patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
 
 			autoconf
 		fi
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index d63b882ee..e3745a0bf 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96364 2010-10-20 01:39:57Z allan $
+# $Id: PKGBUILD 123397 2011-05-10 22:24:40Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
-pkgver=1.3.10
-pkgrel=2
+pkgver=1.3.11
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
-depends=('apr>=1.4.2' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
+depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('6a6f501a1b2a45166b8ffd6df29204bb')
+md5sums=('2aeddb384b03f3f73107770724d5c97b')
 
 build() {
 	cd "${srcdir}/apr-util-${pkgver}"
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index 378648237..997cba462 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72235 2010-03-13 20:22:25Z jgc $
+# $Id: PKGBUILD 123387 2011-05-10 21:11:03Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('util-linux-ng>=2.16')
 options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('4b00e8f70c067893d075577962656b35')
+md5sums=('daf5487c82dd7bec9c005c96f8cb01b1')
 
 build() {
   cd "${srcdir}/apr-${pkgver}"
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 24049772c..8878c6f26 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 112958 2011-03-08 00:19:22Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 122962 2011-05-07 14:45:29Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0
-_pkgver=9.8.0
+pkgver=9.8.0.P1
+_pkgver=9.8.0-P1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
@@ -30,7 +31,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('33019694ef3119d9daa1e8ff5117a6688e188528'
+sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29'
           'ee52947062c1582858187716b776afa3613608fb'
           '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
           '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 0b7823db0..1276fdf56 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.bitlbee.org/'
 license=('GPL')
-depends=('openssl' 'glib2' 'libotr')
+depends=('gnutls' 'glib2' 'libotr')
 optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
@@ -33,7 +33,7 @@ build() {
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
 		--strip=0 \
 		--otr=1 \
-		--ssl=openssl
+		--ssl=gnutls
 	make
 }
 
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index 7030952e3..2f81cc228 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id $
+# $Id: PKGBUILD 123124 2011-05-08 20:39:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=cagibi
-pkgver=0.1.1
+pkgver=0.2.0
 pkgrel=1
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('qt')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2db2424dc436bc436011185de09be9da')
+md5sums=('af66d89337ef80e8a868d3bb9dd92328')
 
 build() {
   cd ${srcdir}
diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD
index fdb40695b..c19387e97 100644
--- a/extra/cd-discid/PKGBUILD
+++ b/extra/cd-discid/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 32259 2009-03-29 22:10:04Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 123749 2011-05-12 20:54:41Z andrea $
+# Maintainer:
+# Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=cd-discid
 pkgver=0.9
-pkgrel=2
-pkgdesc="cd-discid is a backend utility to get CDDB discid information from a CD-ROM disc."
-arch=(i686 x86_64 'mips64el')
+pkgrel=3
+pkgdesc="A backend utility to get CDDB discid information from a CD-ROM disc"
+arch=('i686' 'x86_64')
 url="http://lly.org/~rcw/cd-discid/"
 license=('GPL')
 depends=('glibc')
-source=(http://lly.org/~rcw/$pkgname/$pkgname\_$pkgver.orig.tar.gz)
+source=("http://lly.org/~rcw/$pkgname/${pkgname}_${pkgver}.orig.tar.gz")
 md5sums=('64677b8b63d1db0db015043f5455171a')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  make || return 1
-  make DESTDIR=$pkgdir INSTALL=/bin/install install || return 1
+  cd "${srcdir}"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" INSTALL=/bin/install install
 }
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index e7f037a30..1c85829c0 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 117241 2011-03-30 13:34:45Z tpowa $
+# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
 pkgver=4.9
-pkgrel=2
+pkgrel=3
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
-depends=('libcap' 'keyutils' 'heimdal')
+depends=('libcap' 'keyutils' 'krb5' 'talloc')
 source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+md5sums=('908d904e6b9e58f09f530de151a88ef8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,4 +24,3 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
-md5sums=('908d904e6b9e58f09f530de151a88ef8')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index ebf40b2a5..64ab5d109 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 105161 2011-01-07 06:36:34Z andyrtr $
+# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.6
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
              'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
@@ -20,6 +20,8 @@ md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
 
+# move client.conf man page for next update to the client pkg.
+
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
@@ -40,7 +42,7 @@ build() {
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
+depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs || return 1
diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD
index 95dbe3295..62db9ea0e 100644
--- a/extra/cvs/PKGBUILD
+++ b/extra/cvs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 101751 2010-12-01 14:33:51Z stephane $
+# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cvs
 pkgver=1.11.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64 'mips64el')
 url="http://cvs.nongnu.org"
 license=('GPL')
-depends=('heimdal>=1.3.1')
+depends=('krb5')
 optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
 install=cvs.install
 source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2
@@ -34,6 +34,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install
+  rm "${pkgdir}"/usr/share/info/dir
 }
diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD
index 2fbef6eb0..71ff8378b 100644
--- a/extra/cyrus-sasl-plugins/PKGBUILD
+++ b/extra/cyrus-sasl-plugins/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 115177 2011-03-17 10:51:19Z andrea $
+# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cyrus-sasl-plugins
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
-depends=('postgresql-libs>=9.0.3' 'heimdal>=1.3.3' 'libldap>2.4'
+depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
         'libmysqlclient>=5.5.10')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-gcc44.patch
@@ -24,6 +24,9 @@ build() {
   # from http://bugs.gentoo.org/show_bug.cgi?id=319935
   patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch
   ./configure --prefix=/usr \
+    --host=$CHOST \
+    --build=$CHOST \
+    --target=$CHOST \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-login \
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 1589e351e..2aa9a2351 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,33 +1,52 @@
-# $Id: PKGBUILD 75335 2010-04-01 10:43:20Z allan $
+# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/"
-depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz
-	saslauthd
-	saslauthd.conf.d) 
+        saslauthd
+        saslauthd.conf.d
+        cyrus-sasl-2.1.23-gcc4.patch
+        cyrus-sasl-2.1.23+db-5.0.patch)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
          '697dfb51206c398bc976ce9f4cffe72d'
-         '96d8a2f6189501f8044838e04d5cae7f')
+         '96d8a2f6189501f8044838e04d5cae7f'
+         '3a71688df7d5724cd55a8de17d74f34e'
+         '35c189c8e93ad37e3ae3c49386fdeb2c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix building with db v5.x
+  patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch
+
+  # Fix error: #elif with no expression
+  patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
+    --host=$CHOST \
+    --build=$CHOST \
+    --target=$CHOST \
     --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
+    --disable-krb4 --with-gss_impl=mit --disable-otp
   cd saslauthd
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  make testsaslauthd || return 1
-  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  make testsaslauthd
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin"
 
   install -dm766 "${pkgdir}/var/run/saslauthd"
   install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
new file mode 100644
index 000000000..62df3e67e
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c	2009-04-28 08:09:18.000000000 -0700
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2011-05-02 07:16:42.748675977 -0700
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c	2003-02-13 11:56:17.000000000 -0800
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2011-05-02 07:16:42.748675977 -0700
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
new file mode 100644
index 000000000..0d8627b1f
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
@@ -0,0 +1,21 @@
+diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
+--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c	2009-04-28 08:09:17.000000000 -0700
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c	2011-05-02 07:56:55.375403814 -0700
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 53fd3d51f..c67140463 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 103703 2010-12-22 15:11:09Z jgc $
+# $Id: PKGBUILD 123271 2011-05-09 14:50:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.1
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
-makedepends=('libsm' 'libice')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('99cb057700c0455fb68f8d57902f77ac'
+md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index f9bd14a1b..601ccbe31 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $
+# $Id: PKGBUILD 123352 2011-05-10 15:42:26Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=dconf
-pkgver=0.7.3
-pkgrel=2
+pkgver=0.7.5
+pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
@@ -11,16 +11,13 @@ depends=('glib2')
 makedepends=('vala' 'gobject-introspection' 'gtk3')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
-       load-enum.patch)
-sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9'
-            '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/load-enum.patch"
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dconf
   make
 }
diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install
index 5a87df82f..39bce8f45 100644
--- a/extra/dconf/dconf.install
+++ b/extra/dconf/dconf.install
@@ -1,5 +1,6 @@
 post_install() {
     usr/bin/gio-querymodules usr/lib/gio/modules
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 post_upgrade(){
diff --git a/extra/dconf/load-enum.patch b/extra/dconf/load-enum.patch
deleted file mode 100644
index 949de1e00..000000000
--- a/extra/dconf/load-enum.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@canonical.com>
-Date: Tue, 29 Mar 2011 05:50:12 +0000
-Subject: editor: Load *.enums.xml as well as *.gschema.xml.  This was stopping some enums from being loaded.
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636880
----
-diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala
-index 2b34e28..c2654b5 100644
---- a/editor/dconf-schema.vala
-+++ b/editor/dconf-schema.vala
-@@ -371,7 +371,7 @@ public class SchemaList
-         while ((info = i.next_file (null)) != null) {
-             string name = info.get_name();
- 
--            if (!name.has_suffix(".gschema.xml"))
-+            if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml"))
-                 continue;
- 
-             string path = Path.build_filename(dir, name, null);
---
-cgit v0.9
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 323165f45..b7b23fc58 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -12,7 +12,7 @@ pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
-source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
         dhcp4 dhcp6 dhcp
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 6fc98a8d0..179624811 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 119695 2011-04-13 19:29:24Z andyrtr $
+# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dovecot
-pkgver=2.0.12
+pkgver=2.0.13
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('heimdal>=1.3.3' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
+depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
         'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
 makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22')
 optdepends=('libldap: ldap plugin')
@@ -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=('689e1a8863d4fb2fd252e1a6121dd181'
+md5sums=('fd8a0702275a61332db7353dadff0f92'
          'd020d43eab4ded6fb379dadc570a9490')
 
 build() {
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index e94a2bde2..2ccc6a4e9 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121987 2011-05-01 07:40:14Z ibiru $
+# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,19 +15,25 @@ optdepends=('texlive-bin: DVI support')
 groups=('gnome-extra')
 install=evince.install
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        introspection-fix.patch)
+sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b'
+            '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/introspection-fix.patch"
+  autoreconf -fi
+
   ./configure --prefix=/usr   --sysconfdir=/etc \
       --localstatedir=/var    --libexecdir=/usr/lib/evince \
       --disable-static        --enable-nautilus \
       --enable-pdf            --enable-tiff \
       --enable-djvu           --enable-dvi \
       --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile
+      --disable-scrollkeeper  --disable-schemas-compile \
+      --enable-introspection
   make
 }
 
diff --git a/extra/evince/introspection-fix.patch b/extra/evince/introspection-fix.patch
new file mode 100644
index 000000000..6a64517bd
--- /dev/null
+++ b/extra/evince/introspection-fix.patch
@@ -0,0 +1,11 @@
+diff a/libview/Makefile.am b/libview/Makefile.am
+--- a/libview/Makefile.am
++++ b/libview/Makefile.am
+@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte
+ 	--output $@ \
+ 	--pkg evince-document-$(EV_API_VERSION) \
+ 	--pkg evince-view-$(EV_API_VERSION) \
++	-L$(top_builddir)/libdocument/ \
+ 	-I$(top_srcdir) \
+ 	-I$(top_builddir) \
+ 	-DEVINCE_COMPILATION \
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 756a4e379..195be21c6 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 120574 2011-04-25 17:24:21Z ibiru $
+# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libsoup' 'nss' 'libgnome-keyring' 'heimdal' 'libgweather' 'libical' 'db' 'libgdata')
+arch=('i686' 'x86_64')
+depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
 makedepends=('intltool' 'gperf' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 7d90c1ee1..3dcb196d7 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120624 2011-04-25 18:31:36Z ibiru $
+# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index ffcc5a2c3..86f45ff21 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106429 2011-01-16 21:30:41Z ibiru $
+# $Id: PKGBUILD 123595 2011-05-11 17:34:16Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL')
@@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ac9deafdf9de426d8a03855ac549f424')
+md5sums=('2ae3d9a9dedc3adebb748fa8724e02ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fastjar/PKGBUILD b/extra/fastjar/PKGBUILD
index 7907f2113..f0bb8176c 100644
--- a/extra/fastjar/PKGBUILD
+++ b/extra/fastjar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97252 2010-10-28 03:59:06Z allan $
+# $Id: PKGBUILD 123670 2011-05-12 09:09:06Z guillaume $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=fastjar
-pkgver=0.97
-pkgrel=2
+pkgver=0.98
+pkgrel=1
 pkgdesc="Sun java jar compatible archiver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/fastjar"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('zlib' 'texinfo')
 install=fastjar.install
 source=(http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2659f09c2e43ef8b7d4406321753f1b2')
+md5sums=('d2d264d343d4d0e1575832cc1023c3bf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 8d3b8000f..3485bdb20 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120449 2011-04-23 22:47:50Z bisson $
+# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.13
+pkgver=1.14
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8b2c8250137edbda630b920e5eb7ca7ba5818a5e')
+sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD
index bda750337..c1275119b 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -10,8 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.haible.de/bruno/packages-ffcall.html"
 license=('GPL2')
 options=('!libtool' '!makeflags')
-source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4')
+source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz
+        mipsn32.patch)
+md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4'
+         '64045515f2664b5544943c6754bf2737')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -20,6 +22,9 @@ build() {
   else
     ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   fi
+
+  patch -Np0 -i $srcdir/mipsn32.patch
+
   make || return 1
   install -d ${startdir}/pkg/usr/share/man || return 1
   make DESTDIR=${startdir}/pkg/ install || return 1
diff --git a/extra/ffcall/mipsn32.patch b/extra/ffcall/mipsn32.patch
new file mode 100644
index 000000000..2a667c37c
--- /dev/null
+++ b/extra/ffcall/mipsn32.patch
@@ -0,0 +1,11 @@
+--- autoconf/config.guess.orig	2011-05-08 14:09:55.621461438 -0300
++++ autoconf/config.guess	2011-05-08 14:10:12.225759443 -0300
+@@ -882,7 +882,7 @@
+ 	#undef mips64
+ 	#undef mips64el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=mipsn32
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips64
diff --git a/extra/fluxter/ChangeLog b/extra/fluxter/ChangeLog
deleted file mode 100644
index 48b1aa12a..000000000
--- a/extra/fluxter/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-03-13  Eric Belanger  <eric@archlinux.org>
-
-	* fluxter 0.1.0-4
-	* Added license
-	* Replaced gcc depends by gcc-libs
-	* Added ChangeLog
diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD
index 209f88b25..705b34f5d 100644
--- a/extra/fluxter/PKGBUILD
+++ b/extra/fluxter/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 30062 2009-03-16 01:14:26Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <ben@benmazer.ner>
+# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxter
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A workspace pager for fluxbox"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html"
 license=('GPL')
-depends=('gcc-libs' 'libx11' 'libsm')
-source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6d18553220e8fc33c54762d2e7d31528')
-sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc')
+depends=('gcc-libs' 'libx11')
+source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \
+        fluxter-0.1.0-asneeded.patch)
+md5sums=('6d18553220e8fc33c54762d2e7d31528'
+         '3deb4e816d12a262455bc8281fa82577')
+sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc'
+          '2fc912d40233577b34cb6c641e066863e487fab0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../fluxter-0.1.0-asneeded.patch
+  autoreconf
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fluxter/fluxter-0.1.0-asneeded.patch b/extra/fluxter/fluxter-0.1.0-asneeded.patch
new file mode 100644
index 000000000..8b6826074
--- /dev/null
+++ b/extra/fluxter/fluxter-0.1.0-asneeded.patch
@@ -0,0 +1,43 @@
+--- Makefile.am
++++ Makefile.am
+@@ -17,4 +17,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-fluxter_LDADD = @X_LIBS@
++fluxter_LDADD = @LIBS@
+--- configure.in
++++ configure.in
+@@ -18,14 +18,12 @@
+ [
+  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CFLAGS" = "" && CFLAGS="-Wall"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -71,12 +69,12 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/extra/fyre/ChangeLog b/extra/fyre/ChangeLog
deleted file mode 100644
index edb09672c..000000000
--- a/extra/fyre/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-11-03  Eric Belanger  <eric@archlinux.org>
-
-	* fyre 1.0.1-3
-	* Fixed mime file conflict
-	* Fixed install scriptlet
-	* Added shared-mime-info depends
-	* Added ChangeLog	
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 70308372b..7817eb002 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 18876 2008-11-09 22:41:09Z andyrtr $
+# $Id: PKGBUILD 123615 2011-05-11 19:36:33Z jgc $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 pkgname=gc
 pkgver=7.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A garbage collector for C and C++"
 arch=(i686 x86_64 'mips64el')
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
@@ -15,7 +15,16 @@ md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-cplusplus || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --enable-cplusplus
+  make
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share/gc"
+  install -m755 -d "${pkgdir}/usr/share/doc/gc"
+  install -m644 doc/README{,.{changes,contributors,environment,linux}} \
+    "${pkgdir}/usr/share/doc/gc/"
+
+  sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
+  install -m755 -d "${pkgdir}/usr/share/man/man3"
+  install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
 }
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index 09a677d38..61ad4ea4c 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40077 2009-05-27 06:02:01Z juergen $
+# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ depends=('zlib')
 backup=(etc/geoip/GeoIP.conf)
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('cb14b1beeb40631a12676b11ca0c309a')
+md5sums=('a802175d5b7e2b57b540a7dd308d9205')
 
 build() {
   cd ${startdir}/src/GeoIP-${pkgver}
diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
index d04a5cbae..5c173cc62 100644
--- a/extra/ggz-client-libs/PKGBUILD
+++ b/extra/ggz-client-libs/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 123871 2011-05-14 00:20:19Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ggz-client-libs
 pkgver=0.0.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libggz>=0.0.14.1' 'expat>=2.0.1')
 options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('299eaa93721b1d867b5bf7dc6ac764b0')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index 50eb6cad7..dbcf18034 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 118216 2011-04-05 22:43:03Z heftig $
+# $Id: PKGBUILD 123377 2011-05-10 16:36:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.28.0
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=2.28.1
+pkgrel=1
+arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-sha256sums=('b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3')
+sha256sums=('ca74638b91296df127caab30f2d0664746bfefa942ce5a5ecc982e0f16edc145')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glsof/ChangeLog b/extra/glsof/ChangeLog
deleted file mode 100644
index e941c8b45..000000000
--- a/extra/glsof/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-03-14  Eric Belanger  <eric@archlinux.org>
-
-	* glsof 0.9.16-5
-	* Added license
-	* Added .desktop file
-	* Added ChangeLog
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index ac9eacdd4..cc82175f7 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,25 +1,38 @@
-# $Id: PKGBUILD 30064 2009-03-16 01:17:32Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# $Id: PKGBUILD 123056 2011-05-07 20:58:12Z eric $
+#  Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=0.9.16
-pkgrel=5
-pkgdesc="A gtk-GUI for lsof (aka GTK-lsof)"
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glsof.sourceforge.net/"
-license=('GPL')
-depends=('libxml2' 'gtk2' 'lsof')
-source=(http://download.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz glsof.desktop)
-md5sums=('5ad5f2a6908be713753d9826c38e3e2c' '1a6ab5bf5ef44ae31b8b7461b76f62db')
-sha1sums=('80f4596ad09c5ddb463bad299a76ce275c0ecd4d' '647be33bea11fec6ba0bfd59c02034dc64925e52')
+license=('GPL3')
+depends=('java-runtime' 'lsof')
+if [ "$CARCH" = "i686" ]; then
+  source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux32.tar.gz \
+          http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux32.tar.gz \
+          glsof-filemonitor glsof-queries)
+  md5sums=('7a541ee8c432b78f9bfd36dd1707fb8d'
+         '895bcec79edea97ebde36d7f5eaa3ee9'
+         '7e43c1120e15e65bd1a12d6f188be4a0'
+         '980da4b39e1e3f4fbed08018dfd3be7b')
+elif [ "$CARCH" = "x86_64" ]; then
+  source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux64.tar.gz \
+          http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux64.tar.gz \
+          glsof-filemonitor glsof-queries)
+  md5sums=('9a6043b0b90fbc6de4db36967647dab0'
+         'ed96ee2105428aa8b038f5fe13b8cd1d'
+         '7e43c1120e15e65bd1a12d6f188be4a0'
+         '980da4b39e1e3f4fbed08018dfd3be7b')
+fi
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ../glsof.desktop ${pkgdir}/usr/share/applications/glsof.desktop || return 1
-  install -d ${pkgdir}/usr/share/pixmaps
-  ln -s /usr/share/glsof/pixmaps/logo.png ${pkgdir}/usr/share/pixmaps/glsof.png
+package() {
+ cd "${srcdir}"
+ install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor"
+ install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries"
+ install -D -m644 filemonitor_linux??/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar"
+ install -D -m644 filemonitor_linux??/filemonitor.pdf "${pkgdir}/usr/share/doc/glsof/filemonitor.pdf"
+ install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
+ install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
 }
diff --git a/extra/glsof/glsof-filemonitor b/extra/glsof/glsof-filemonitor
new file mode 100644
index 000000000..616e23ac7
--- /dev/null
+++ b/extra/glsof/glsof-filemonitor
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/glsof/filemonitor.jar
diff --git a/extra/glsof/glsof-queries b/extra/glsof/glsof-queries
new file mode 100644
index 000000000..1e9c4fc9d
--- /dev/null
+++ b/extra/glsof/glsof-queries
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/glsof/queries.jar
diff --git a/extra/glsof/glsof.desktop b/extra/glsof/glsof.desktop
deleted file mode 100644
index fb13ffd6d..000000000
--- a/extra/glsof/glsof.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=glsof
-Comment=A GUI for lsof
-Comment[pl]=GUI do lsof
-Exec=glsof
-Icon=glsof.png
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=GTK;System;Monitor;
-Encoding=UTF-8
-# vi: encoding=utf-8
diff --git a/extra/gnet/ChangeLog b/extra/gnet/ChangeLog
deleted file mode 100644
index b8975af31..000000000
--- a/extra/gnet/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-05-04  Eric Belanger  <eric@archlinux.org>
-
-	* gnet 2.0.8-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index fe9bc25e6..d7f6db5a1 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113478 2011-03-08 21:10:38Z ibiru $
+# $Id: PKGBUILD 123041 2011-05-07 17:45:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-applets
-pkgver=2.91.4
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,9 +13,8 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 groups=(gnome)
 install=gnome-applets.install
-#source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
-source=(${pkgname}-${pkgver}.tar.xz)
-sha256sums=('950ab962c39fca9375a9df0827ccb8f2178f7e84950c8fdbea5e3d2f9889a49c')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110506.tar.xz)
+sha256sums=('eb19a412e804975d614255520f4c7c6477d927e8d5cb6abe217008ab62ab857b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 1a694aff9..1b7fd44d0 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $
+# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts')
+arch=('i686' 'x86_64')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
+optdepends=('apg: adds password generation for user accounts')
 makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
 url="http://www.gnome.org"
 groups=('gnome')
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index de382038d..3ba0e1161 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120873 2011-04-26 21:57:00Z ibiru $
+# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -12,11 +12,16 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        randr-fix.patch)
+sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3'
+            '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/randr-fix.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --with-gnome-distributor="Arch Linux" \
diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch
new file mode 100644
index 000000000..c5d83ef2c
--- /dev/null
+++ b/extra/gnome-desktop/randr-fix.patch
@@ -0,0 +1,26 @@
+From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sun, 01 May 2011 00:48:03 +0000
+Subject: Don't fall over if RANDR is missing
+
+When RANDR is not present, the screen object never gets an info,
+and since screen_info_free asserts, we must not call it unconditionally
+in finalize.
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
+---
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 4a9d98e..eb3d735 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
+ 
+     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
+ 
+-    screen_info_free (screen->priv->info);
++    if (screen->priv->info)
++      screen_info_free (screen->priv->info);
+ 
+     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
+ }
+--
+cgit v0.9
diff --git a/extra/gnome-mag/PKGBUILD b/extra/gnome-mag/PKGBUILD
index 00f8ed968..8b08b9ee5 100644
--- a/extra/gnome-mag/PKGBUILD
+++ b/extra/gnome-mag/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 74622 2010-03-31 19:18:45Z jgc $
+# $Id: PKGBUILD 123655 2011-05-12 07:09:30Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mag
-pkgver=0.16.1
+pkgver=0.16.3
 pkgrel=1
 pkgdesc="Gnome magnifier"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
-depends=('at-spi>=1.30.0')
+depends=('at-spi>=1.32.0')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/gnome-mag/0.16/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('92541c30a70a6cf59ec3fb3f46d27a598173984f786f7c6bc1bd3e4be65ad3fa')
+sha256sums=('1ea1b1218ce621226b0397c4c548db29636ab663da7943440327e04345916d99')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --localstatedir=/var
+  make
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index adb317a8e..0f5c6cffe 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $
+# $Id: PKGBUILD 123201 2011-05-09 08:52:42Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint')
+pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint')
 pkgver=2.32.0
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
@@ -22,7 +22,7 @@ build() {
 }
 
 package_gnome-python-desktop() {
-  depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python')
+  depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -107,16 +107,6 @@ package_python-wnck() {
   make -C wnck install DESTDIR="${pkgdir}"
 }
 
-package_python-gtksourceview() {
-  depends=('pygtk' 'gtksourceview' 'python-gnomeprint')
-  pkgdesc="Python bindings for gtksourceview"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  for dir in gtksourceview docs/gtksourceview; do
-    make -C ${dir} install DESTDIR="${pkgdir}"
-  done
-}
-
 package_python-gnomeprint() {
   depends=('pygtk' 'libgnomeprintui')
   pkgdesc="Python bindings for libgnomeprintui"
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 9658f40a3..c3270d70e 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120747 2011-04-26 10:46:20Z heftig $
+# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
-         'libcanberra' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf'
-         'pulseaudio' 'pulseaudio-alsa')
+         'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
+         'dconf' 'pulseaudio' 'pulseaudio-alsa')
 makedepends=('intltool' 'gtk-doc')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
new file mode 100644
index 000000000..c07627338
--- /dev/null
+++ b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
@@ -0,0 +1,31 @@
+From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Mon, 9 May 2011 13:03:17 -0700
+Subject: [PATCH] Don't crash when removing nameless user
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ src/gdmuser/gdm-user-manager.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
+index eba9da1..543fcc3 100644
+--- a/src/gdmuser/gdm-user-manager.c
++++ b/src/gdmuser/gdm-user-manager.c
+@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager,
+         if (gdm_user_get_object_path (user) != NULL) {
+                 g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user));
+         }
+-        g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
++
++        if (gdm_user_get_user_name (user) != NULL) {
++            g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
++        }
+ 
+         if (manager->priv->is_loaded) {
+                 g_signal_emit (manager, signals[USER_REMOVED], 0, user);
+-- 
+1.7.5.1
+
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 55bf202d5..34974115f 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122711 2011-05-06 07:06:52Z ibiru $
+# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.0.1
-pkgrel=3
+pkgrel=5
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -21,12 +21,16 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
         arch.patch
         network_fixes_up_to_5090a4ccce.patch
         shell-xfixes-cursor_missing_free.patch
-        st-private_fix_memory_leak.patch)
+        st-private_fix_memory_leak.patch
+        st-private_correct_fix_memory_leak.patch
+        0001-Don-t-crash-when-removing-nameless-user.patch)
 sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
             'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
             '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
             'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
-            '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718')
+            '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718'
+            'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074'
+            '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,6 +39,8 @@ build() {
   patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch"
   patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch"
   patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch"
+  patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch"
+  patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
new file mode 100644
index 000000000..d3f887c29
--- /dev/null
+++ b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
@@ -0,0 +1,52 @@
+From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 May 2011 15:21:18 +0000
+Subject: st-private: Correct fix for memory leak
+
+The previous fix in 72f9f482d was wrong; we need to keep around
+the buffer until cairo is done with the pattern.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649497
+---
+diff --git a/src/st/st-private.c b/src/st/st-private.c
+index 51798a1..21ca09a 100644
+--- a/src/st/st-private.c
++++ b/src/st/st-private.c
+@@ -667,6 +667,7 @@ cairo_pattern_t *
+ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                                  cairo_pattern_t *src_pattern)
+ {
++  static cairo_user_data_key_t shadow_pattern_user_data;
+   cairo_t *cr;
+   cairo_surface_t *src_surface;
+   cairo_surface_t *surface_in;
+@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                                                      width_out,
+                                                      height_out,
+                                                      rowstride_out);
++  cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data,
++                               pixels_out, (cairo_destroy_func_t) g_free);
+ 
+   dst_pattern = cairo_pattern_create_for_surface (surface_out);
+   cairo_surface_destroy (surface_out);
+@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                               (width_out - width_in) / 2.0,
+                               (height_out - height_in) / 2.0);
+       cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+-
+-      goto out;
++      return dst_pattern;
+     }
+ 
+   /* Read all the code from the cairo_pattern_set_matrix call
+@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+ 
+   cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+ 
+- out:
+-  g_free (pixels_out);
+   return dst_pattern;
+ }
+ 
+--
+cgit v0.9
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 9bffe9dec..469b6725b 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,18 +1,15 @@
-# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $
+# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=(gnome-vfs-samba)
-provides=(gnome-vfs-samba)
-replaces=(gnome-vfs-samba gnome-vfs-extras)
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
@@ -36,6 +33,10 @@ build() {
       --enable-avahi --disable-howl \
       --disable-openssl --enable-gnutls
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index 0f6b057dd..8d0c654ea 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 27575 2009-02-23 03:41:08Z eric $
-# Maintainer: Jason Chu <jason@archlinux.org>
+# $Id: PKGBUILD 123739 2011-05-12 20:48:23Z andrea $
+# Maintainer:
+# Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Commiter: damir <damir@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=gnugo
 pkgver=3.8
-pkgrel=1
-pkgdesc="This sofware is a program that plays the game of Go"
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+pkgdesc="A program that plays the game of Go"
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnugo/"
 license=('GPL3' 'custom')
 depends=('ncurses' 'glibc' 'texinfo')
 install=gnugo.install
-source=(http://ftp.gnu.org/gnu/gnugo/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('6db0a528df58876d2b0ef1659c374a9a' '4df5819356804397c553c95ea8164f11')
+source=("http://ftp.gnu.org/gnu/gnugo/$pkgname-$pkgver.tar.gz"
+        'LICENSE')
+md5sums=('6db0a528df58876d2b0ef1659c374a9a'
+         '4df5819356804397c553c95ea8164f11')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  rm -r ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+  rm -r "${pkgdir}"/usr/share/info/dir
+  gzip "${pkgdir}"/usr/share/info/*
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 357733d16..146b627a4 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120489 2011-04-24 13:19:44Z andyrtr $
+# $Id: PKGBUILD 123031 2011-05-07 16:07:34Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.12.3
+pkgver=2.12.4
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('04b72b022b42b10df12cbbae051e2d55')
+md5sums=('3e17fc8cb1cf8272067f6b66baf02810')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,7 +20,7 @@ build() {
   # we stay with libgcrypt for now. nettle would need to be moved from AUR to extra.
   ./configure --prefix=/usr \
 	--with-zlib \
-	 --with-libgcrypt \
+	--with-libgcrypt \
 	--disable-static \
 	--disable-guile
   make
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index d6211f40a..ea7f76aaa 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -1,22 +1,27 @@
-#$Id: PKGBUILD 37369 2009-05-01 06:35:08Z eric $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 123759 2011-05-12 21:02:36Z andrea $
+# Maintainer:
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=1
-pkgdesc="Perfect hash function generator."
-arch=('x86_64' 'i686' 'mips64el')
+pkgrel=2
+pkgdesc="Perfect hash function generator"
+arch=('x86_64' 'i686')
 url="http://www.gnu.org/software/gperf/"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
 install=gperf.install
-source=(ftp://ftp.gnu.org/gnu/gperf/${pkgname}-${pkgver}.tar.gz)
+source=("ftp://ftp.gnu.org/gnu/gperf/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c1f1db32fb6598d6a93e6e88796a8632')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  gzip ${pkgdir}/usr/share/info/gperf.info
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  gzip "${pkgdir}"/usr/share/info/gperf.info
 }
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index d6831a4b0..f6f50cb57 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 110525 2011-02-19 18:19:40Z bisson $
+# $Id: PKGBUILD 123442 2011-05-11 13:08:33Z bisson $
 # Maintainer: kevin <kevin@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.26.3
-pkgrel=3
+pkgver=2.28.0
+pkgrel=1
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -23,7 +24,7 @@ optdepends=('mono: sharp bindings'
             'tcl: tcl bindings')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
-sha1sums=('04503ac5a9eaa579859f0d017811fa245717edec'
+sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
           'e78277e502c29abb74b9587a5dc951ec392554ea')
 
 options=('!libtool')
diff --git a/extra/gstreamer0.10-good/PKGBUILD.orig b/extra/gstreamer0.10-good/PKGBUILD.orig
deleted file mode 100644
index 577779e7d..000000000
--- a/extra/gstreamer0.10-good/PKGBUILD.orig
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-good
-pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
-<<<<<<< HEAD
-pkgver=0.10.27
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-=======
-pkgver=0.10.28
-pkgrel=1
-arch=('i686' 'x86_64')
->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
-license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
-md5sums=('6ef1588921f59d85c44ee2e49a3c97a0')
-
-build() {
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --disable-schemas-install \
-    --disable-hal \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-
-  make
-  sed -e 's/gst sys ext/gst/' -i Makefile
-}
-
-package_gstreamer0.10-good() {
-  depends=('gstreamer0.10-base>=0.10.32' 'bzip2')
-  pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
-  conflicts=('gstreamer0.10-bad<=0.10.17')
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/etc/gconf"
-}
-
-package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse')
-  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  install=gstreamer0.10-good-plugins.install
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make -C sys DESTDIR="${pkgdir}" install
-  make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas"
-}
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 5fcc6a520..e67d63520 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 117444 2011-04-02 06:12:32Z ibiru $
+# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.4
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls'
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls'
              'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
 options=('!libtool' '!docs')
 license=('LGPL')
@@ -29,7 +29,7 @@ build() {
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
     backup=(etc/gtk-2.0/gtkrc)
 
     cd "${srcdir}/gtk+-${pkgver}"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 7c3a55dba..5550647fc 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119847 2011-04-15 22:42:57Z ibiru $
+# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'heimdal' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
 makedepends=('gobject-introspection')
 options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 0238faccb..d38b58afc 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118358 2011-04-06 12:31:04Z ibiru $
+# $Id: PKGBUILD 123382 2011-05-10 16:48:34Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.0/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('567582948d4c47c29aa751162adc714644f50958d3d3e427c7a8c3818cd643f9')
+sha256sums=('fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/gtksourceview-sharp-2.0/PKGBUILD b/extra/gtksourceview-sharp-2.0/PKGBUILD
deleted file mode 100644
index c62d29dc0..000000000
--- a/extra/gtksourceview-sharp-2.0/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 22404 2008-12-26 18:25:17Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=gtksourceview-sharp-2.0
-pkgver=0.12
-pkgrel=1
-pkgdesc="a C# binding to gtksourceview"
-url="http://www.mono-project.com/"
-depends=('gtksourceview' 'gtk-sharp-2>=2.12.7' 'gnome-sharp>=2.24.0')
-makedepends=('monodoc')
-conflicts=('gtksourceview-sharp')
-provides=('gtksourceview-sharp')
-source=(http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/${pkgname}-${pkgver}.tar.bz2
-	gtksourceview-sharp2-gnome-print.patch)
-license=('LGPL2')
-arch=('i686' 'x86_64' 'mips64el')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/gtksourceview-sharp2-gnome-print.patch" || return 1
-  autoreconf || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-    DESTDIR="${pkgdir}" install || return 1
-  rm -rf "${pkgdir}/usr/share/gtksourceview-1.0"
-}
diff --git a/extra/gtksourceview-sharp-2.0/gtksourceview-sharp-2.0.install b/extra/gtksourceview-sharp-2.0/gtksourceview-sharp-2.0.install
deleted file mode 100644
index 4d9d891f6..000000000
--- a/extra/gtksourceview-sharp-2.0/gtksourceview-sharp-2.0.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  echo "recreating monodoc index ... this could take a while..."
-  monodoc --make-index > /dev/null 2>&1 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  echo "recreating monodoc index ... this could take a while..."
-  monodoc --make-index > /dev/null 2>&1 
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/gtksourceview-sharp-2.0/gtksourceview-sharp2-gnome-print.patch b/extra/gtksourceview-sharp-2.0/gtksourceview-sharp2-gnome-print.patch
deleted file mode 100644
index 618f3f94e..000000000
--- a/extra/gtksourceview-sharp-2.0/gtksourceview-sharp2-gnome-print.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in	2008-02-26 16:30:05.000000000 -0700
-+++ configure.in	2008-09-05 13:36:30.000000000 -0600
-@@ -69,6 +69,16 @@
- gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
- AC_SUBST(gtksharp_prefix)
- 
-+PKG_CHECK_MODULES(GNOMEPRINT_SHARP, gnome-print-sharp-2.18, use_gnomeprint=yes, use_gnomeprint=no)
-+if test "x$use_gnomeprint" = "xyes" ; then
-+GNOMEPRINT_SHARP_REQUIRES=gnome-print-sharp-2.18
-+else
-+GNOMEPRINT_SHARP_REQUIRES=
-+fi
-+AC_SUBST(GNOMEPRINT_SHARP_CFLAGS)
-+AC_SUBST(GNOMEPRINT_SHARP_LIBS)
-+AC_SUBST(GNOMEPRINT_SHARP_REQUIRES)
-+
- PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-1.0 >= 1.0.0)
- AC_SUBST(GTKSOURCEVIEW_LIBS)
- gtksourceview_prefix=`pkg-config --variable=prefix gtksourceview-1.0`
---- gtksourceview/Makefile.am	2008-02-26 16:30:05.000000000 -0700
-+++ gtksourceview/Makefile.am	2008-09-05 13:14:53.000000000 -0600
-@@ -2,7 +2,7 @@
- LIBRARY=	$(LIBRARY_NAME).dll
- APIS=		gtksourceview-api.xml
- 
--ASSEMBLIES=	/pkg:gnome-sharp-2.0
-+ASSEMBLIES=	$(GTK_SHARP_LIBS) $(GNOMEPRINT_SHARP_LIBS)
- 
- EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
- 
-@@ -21,7 +21,7 @@
- 	$(GAPI_FIXUP) --api=gtksourceview-api.xml --metadata=$(srcdir)/Gtk.metadata
- 
- generated-stamp: $(APIS) $(customs) $(sources) Gtk.metadata
--	$(GAPI_CODEGEN) $(GTK_SHARP_CFLAGS) --generate $(APIS) \
-+	$(GAPI_CODEGEN) $(GTK_SHARP_CFLAGS) $(GNOMEPRINT_SHARP_CFLAGS) --generate $(APIS) \
- 	--outdir=generated --customdir=. --assembly-name=gtksourceview-sharp && touch generated-stamp
- 
- sources = \
---- gtksourceview-sharp-2.0.pc.in	2008-02-26 16:30:05.000000000 -0700
-+++ gtksourceview-sharp-2.0.pc.in	2008-09-05 13:22:33.000000000 -0600
-@@ -6,5 +6,5 @@
- Name: GtkSourceView#
- Description: GtkSourceView# - gtksourceview .NET Binding
- Version: @VERSION@
--Requires: gnome-sharp-2.0
-+Requires: gnome-sharp-2.0 @GNOMEPRINT_SHARP_REQUIRES@
- Libs: -r:${prefix}/lib/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll
---- sample/Makefile.am	2008-02-26 16:30:05.000000000 -0700
-+++ sample/Makefile.am	2008-09-05 13:35:34.000000000 -0600
-@@ -10,5 +10,5 @@
- 	$(CSC) -out:$@ $(srcdir)/SourceViewTest.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0
- 
- $(PRINT): $(srcdir)/PrintSample.cs
--	$(CSC) -out:$@ $(srcdir)/PrintSample.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0
-+	$(CSC) -out:$@ $(srcdir)/PrintSample.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 $(GNOMEPRINT_SHARP_LIBS)
- 
diff --git a/extra/gtksourceview/PKGBUILD b/extra/gtksourceview/PKGBUILD
deleted file mode 100644
index a6c85575a..000000000
--- a/extra/gtksourceview/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 57064 2009-10-31 11:55:39Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtksourceview
-pkgver=1.8.5
-pkgrel=3
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libgnomeprint' 'gtk2')
-makedepends=('perlxml' 'libgnomeprintui' 'pkgconfig')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('de67df2944c1cccbc2d0b4a738e11050')
-
-build() {
-  export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index d1fcb285c..219ea49e7 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122412 2011-05-04 06:25:40Z andyrtr $
+# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
 pkgver=5.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 4ad239d4c..b020e631d 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 114724 2011-03-15 19:35:12Z andyrtr $
+# $Id: PKGBUILD 123623 2011-05-11 21:09:44Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
 pkgver=4.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.icu-project.org/"
@@ -12,11 +12,15 @@ license=('custom:"icu"')
 depends=('gcc-libs' 'sh')
 source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
+	icu.8198.revert.icu5431.patch
 )
-md5sums=('da64675d85f0c2191cef93a8cb5eea88')
+md5sums=('da64675d85f0c2191cef93a8cb5eea88'
+         'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
   cd ${srcdir}/icu/source
+  # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
+  patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man
diff --git a/extra/icu/icu.8198.revert.icu5431.patch b/extra/icu/icu.8198.revert.icu5431.patch
new file mode 100644
index 000000000..4c3e78b8e
--- /dev/null
+++ b/extra/icu/icu.8198.revert.icu5431.patch
@@ -0,0 +1,129 @@
+Index: icu/trunk/source/layout/IndicReordering.cpp
+===================================================================
+--- icu/trunk/source/layout/IndicReordering.cpp	(revision 25772)
++++ icu/trunk/source/layout/IndicReordering.cpp	(revision 26090)
+@@ -126,4 +126,8 @@
+     FeatureMask fSMFeatures;
+ 
++    LEUnicode   fPreBaseConsonant;
++    LEUnicode   fPreBaseVirama;
++    le_int32    fPBCIndex;
++    FeatureMask fPBCFeatures;
+ 
+     void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
+@@ -172,5 +176,6 @@
+           fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
+           fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+-          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
++          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
++          fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
+     {
+         // nothing else to do...
+@@ -191,4 +196,6 @@
+         fVMabove = fVMpost  = 0;
+         fSMabove = fSMbelow = 0;
++
++        fPreBaseConsonant = fPreBaseVirama = 0;
+     }
+ 
+@@ -386,4 +393,12 @@
+     }
+ 
++    void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
++    {
++        fPBCIndex = index;
++        fPreBaseConsonant = PBConsonant;
++        fPreBaseVirama = PBVirama;
++        fPBCFeatures = features;
++    }
++
+     void noteBaseConsonant()
+     {
+@@ -465,4 +480,20 @@
+     }
+     
++    void writePreBaseConsonant()
++    {
++        // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam.  However,
++        // it seems that almost none of the fonts for Malayalam are set up to handle this.
++        // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
++
++        if (fPreBaseConsonant == 0x0d31) { // RRA
++            fPreBaseConsonant = 0x0d30; // RA
++        }
++        
++        if (fPreBaseConsonant != 0) {
++            writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
++            writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
++        }
++    }
++
+     le_int32 getOutputIndex()
+     {
+@@ -723,4 +754,5 @@
+             }
+ 
++            
+             IndicClassTable::CharClass charClass = CC_RESERVED;
+             IndicClassTable::CharClass nextClass = CC_RESERVED;
+@@ -730,7 +762,9 @@
+             le_bool  seenVattu = FALSE;
+             le_bool  seenBelowBaseForm = FALSE;
++            le_bool  seenPreBaseForm = FALSE;
+             le_bool  hasNukta = FALSE;
+             le_bool  hasBelowBaseForm = FALSE;
+             le_bool  hasPostBaseForm = FALSE;
++            le_bool  hasPreBaseForm = FALSE;
+ 
+             if (postBase < markStart && classTable->isNukta(chars[postBase])) {
+@@ -746,12 +780,20 @@
+                 hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
+                 hasPostBaseForm  = IndicClassTable::hasPostBaseForm(charClass)  && !hasNukta;
++                hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
+ 
+                 if (IndicClassTable::isConsonant(charClass)) {
+                     if (postBaseLimit == 0 || seenVattu ||
+                         (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+-                        !(hasBelowBaseForm || hasPostBaseForm)) {
++                        !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
+                         break;
+                     }
+ 
++                    // Note any pre-base consonants
++                    if ( baseConsonant == lastConsonant && lastConsonant > 0 && 
++                         hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
++                        output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
++                        seenPreBaseForm = TRUE;
++   
++                    }
+                     // consonants with nuktas are never vattus
+                     seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
+@@ -786,10 +828,12 @@
+ 
+             // write any pre-base consonants
++            output.writePreBaseConsonant();
++
+             le_bool supressVattu = TRUE;
+ 
+             for (i = baseLimit; i < baseConsonant; i += 1) {
+                 LEUnicode ch = chars[i];
+-                // Don't put 'blwf' on first consonant.
+-                FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
++                // Don't put 'pstf' or 'blwf' on anything before the base consonant.
++                FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
+ 
+                 charClass = classTable->getCharClass(ch);
+@@ -842,5 +886,5 @@
+ 
+             // write below-base consonants
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 for (i = bcSpan + 1; i < postBase; i += 1) {
+                     output.writeChar(chars[i], i, tagArray1);
+@@ -872,5 +916,5 @@
+             // write post-base consonants
+             // FIXME: does this put the right tags on post-base consonants?
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 if (postBase <= lastConsonant) {
+                     for (i = postBase; i <= lastConsonant; i += 1) {
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 58e145256..332f24875 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 2130 2008-05-26 00:08:23Z eric $
+# $Id: PKGBUILD 123876 2011-05-14 00:23:46Z andrea $
 # Maintainer: 
 # Contributor: Jochem Kossen <j.kossen@home.nl>
+
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=10
+pkgrel=11
 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	patch_id3lib_3.8.3_UTF16_writing_bug.diff
-	id3lib-3.8.3-CVE-2007-4460.patch
-	id3lib-3.8.3-gcc-4.3.patch)
-md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '196c65adee1ba511ddacef2de0dfd102'\
-         '78e90e15ddd1122b66da352b6c3b00ff' 'fdbffd2d9d289ed0d730950c78d4ebc4')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'patch_id3lib_3.8.3_UTF16_writing_bug.diff'
+        'id3lib-3.8.3-CVE-2007-4460.patch'
+        'id3lib-3.8.3-gcc-4.3.patch')
+md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
+         '196c65adee1ba511ddacef2de0dfd102'
+         '78e90e15ddd1122b66da352b6c3b00ff'
+         'fdbffd2d9d289ed0d730950c78d4ebc4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/patch_id3lib_3.8.3_UTF16_writing_bug.diff || return 1
-  patch -Np0 -i ${startdir}/src/id3lib-3.8.3-CVE-2007-4460.patch || return 1
-  patch -Np1 -i ${startdir}/src/id3lib-3.8.3-gcc-4.3.patch || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+  patch -p0 -i "${srcdir}"/id3lib-3.8.3-CVE-2007-4460.patch
+  patch -p1 -i "${srcdir}"/id3lib-3.8.3-gcc-4.3.patch
   ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index 6204e1a2e..d4935a934 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102540 2010-12-07 23:38:21Z andrea $
+# $Id: PKGBUILD 123729 2011-05-12 20:42:42Z andrea $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=jade
 pkgver=1.2.1
-pkgrel=5
+pkgrel=6
 _debpatch=47
 pkgdesc="James Clark's DSSSL Engine"
 url='http://www.jclark.com/jade/'
@@ -14,24 +14,28 @@ license=('custom')
 depends=('gcc-libs')
 replaces=('openjade')
 options=('!libtool' '!makeflags')
-source=(ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz)
+source=("ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz")
 md5sums=('4239670ca6b578bff68b8c2e7cd1225f'
          'feb3889e2a5fa86ac6bdb742a25d0001')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/jade_${pkgver}-${_debpatch}.diff
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+
+  patch -p1 -i "${srcdir}"/jade_${pkgver}-${_debpatch}.diff
+
   chmod 755 configure
   ./configure --prefix=/usr --enable-default-catalog=/usr/share/sgml/catalog
+
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/lib
-  make prefix=${pkgdir}/usr install
-  mv ${pkgdir}/usr/bin/sx ${pkgdir}/usr/bin/sgml2xml
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  install -d -m755 "${pkgdir}"/usr/lib
+  make prefix="${pkgdir}"/usr install
+  mv "${pkgdir}"/usr/bin/sx "${pkgdir}"/usr/bin/sgml2xml
+  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
new file mode 100644
index 000000000..91d32fd90
--- /dev/null
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+pkgname=('java-commons-daemon' 'java-jsvc')
+pkgbase=java-commons-daemon
+pkgver=1.0.5
+pkgrel=1
+arch=('i686' 'x86_64')
+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=('2fe0a35d4a9c0338ecd45dad20f33662')
+makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
+
+
+build() {
+  # commons-daemon.jar
+  cd "${srcdir}/${_libname}-${pkgver}-src"
+  ant
+
+  # jsvc
+  cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
+  ./configure
+  make
+  docbook2man man/jsvc.1.xml
+}
+
+package_java-commons-daemon() {
+  pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily"
+  depends=('java-runtime')
+
+  cd "${srcdir}/${_libname}-${pkgver}-src"
+
+  install -Dm755 dist/${_libname}-${pkgver}.jar \
+                 ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
+  ln -s ${_libname}-${pkgver}.jar \
+        ${pkgdir}/usr/share/java/${_libname}.jar
+}
+
+package_java-jsvc() {
+  pkgdesc="Apache application for making Java applications run on UNIX more easily"
+  depends=("java-${_libname}" 'libcap')
+
+  # jsvc
+  cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
+
+  install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
+  install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
+}
+
diff --git a/extra/kdebase-workspace/sensors-fix.patch b/extra/kdebase-workspace/sensors-fix.patch
deleted file mode 100644
index 2d9b70c52..000000000
--- a/extra/kdebase-workspace/sensors-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 23863a99399cbb274f6756146b3c08de2efa0c7f
-Author: John Tapsell <johnflux@gmail.com>
-Date:   Thu Apr 7 10:59:20 2011 +0100
-
-    Fix accidental removal of a #include, when adding freebsd support.  This broke the lmsensors at minimum
-    
-    BUG: 270246
-    BUG: 270246
-    CCMAIL: naylor.b.david@gmail.com
-
-diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
-index e780be6..9aae890 100644
---- a/ksysguard/ksysguardd/modules.h
-+++ b/ksysguard/ksysguardd/modules.h
-@@ -23,6 +23,7 @@
- #ifndef KSG_MODULES_H
- #define KSG_MODULES_H
- 
-+#include "config-ksysguardd.h"
- #include "Command.h"
- #include "conf.h"
- #include "ksysguardd.h"
diff --git a/extra/kdebase-workspace/shutdown-fix.patch b/extra/kdebase-workspace/shutdown-fix.patch
deleted file mode 100644
index b01ab7fba..000000000
--- a/extra/kdebase-workspace/shutdown-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase-workspace-4.6.2/kdm/config.def~	2011-04-08 00:29:48.291941154 -0700
-+++ kdebase-workspace-4.6.2/kdm/config.def	2011-04-08 00:32:04.738607619 -0700
-@@ -38,7 +38,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD) || defined(__linux__)
--# define HALT_CMD	"/sbin/shutdown -p now"
-+# define HALT_CMD	"/sbin/shutdown -h now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 98641f782..4f120b7c0 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121100 2011-04-29 00:27:55Z andrea $
+# $Id: PKGBUILD 123676 2011-05-12 11:12:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -44,13 +44,13 @@ pkgname=('kdegames-bomber'
          'kdegames-lskat'
          'kdegames-palapeli')
 pkgver=4.6.3
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs'
-	'twisted' 'kdebindings-python')
+             'twisted' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
 sha1sums=('472cb9541f389a8869a496f715d48587db568dda')
 
@@ -101,7 +101,7 @@ package_kdegames-granatier() {
 
 package_kdegames-kajongg() {
 	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdebindings-python' 'twisted')
+	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
 	install='kdegames.install'
 	cd $srcdir/build/kajongg
 	make DESTDIR=$pkgdir install
@@ -206,7 +206,7 @@ package_kdegames-kfourinline() {
 	pkgdesc='Four-in-a-row Board Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames.install'
+	install='kdegames-kfourinline.install'
 	cd $srcdir/build/kfourinline
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kfourinline
@@ -228,7 +228,7 @@ package_kdegames-kigo() {
 	pkgdesc='Go Board Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
 	url="http://kde.org/applications/games/kigo/"
-	install='kdegames.install'
+	install='kdegames-kigo.install'
 	cd $srcdir/build/kigo
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kigo
@@ -329,7 +329,7 @@ package_kdegames-kolf() {
 	pkgdesc='Miniature Golf'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/kolf/"
-	install='kdegames.install'
+	install='kdegames-kolf.install'
 	cd $srcdir/build/kolf
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kolf
@@ -409,7 +409,7 @@ package_kdegames-kspaceduel() {
 	pkgdesc='Space Arcade Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames.install'
+	install='kdegames-kspaceduel.install'
 	cd $srcdir/build/kspaceduel
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kspaceduel
@@ -455,7 +455,7 @@ package_kdegames-ktuberling() {
 	pkgdesc='Picture Game for Children'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames.install'
+	install='kdegames-ktuberling.install'
 	cd $srcdir/build/ktuberling
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/ktuberling
@@ -496,7 +496,7 @@ package_kdegames-lskat() {
 	pkgdesc='Card Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/lskat/"
-	install='kdegames.install'
+	install='kdegames-lskat.install'
 	cd $srcdir/build/lskat
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/lskat
diff --git a/extra/kdegames/kdegames-kbattleship.install b/extra/kdegames/kdegames-kbattleship.install
index ae4e089cb..ac4516ed0 100644
--- a/extra/kdegames/kdegames-kbattleship.install
+++ b/extra/kdegames/kdegames-kbattleship.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
 }
 
@@ -19,4 +20,5 @@ post_upgrade() {
 
 post_remove() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 }
diff --git a/extra/kdegames/kdegames-kfourinline.install b/extra/kdegames/kdegames-kfourinline.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-kfourinline.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-kigo.install b/extra/kdegames/kdegames-kigo.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-kigo.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-kolf.install b/extra/kdegames/kdegames-kolf.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-kolf.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-kspaceduel.install b/extra/kdegames/kdegames-kspaceduel.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-kspaceduel.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-ktuberling.install b/extra/kdegames/kdegames-ktuberling.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-ktuberling.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-lskat.install b/extra/kdegames/kdegames-lskat.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-lskat.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegames/kdegames-palapeli.install b/extra/kdegames/kdegames-palapeli.install
index ce5c32e1b..c77e68041 100644
--- a/extra/kdegames/kdegames-palapeli.install
+++ b/extra/kdegames/kdegames-palapeli.install
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
@@ -9,4 +10,4 @@ post_upgrade() {
 
 post_remove() {
 	post_install
-}
-\ No newline at end of file
+}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 26101a6f1..572d2bdb3 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 122716 2011-05-06 07:29:37Z andrea $
+# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'heimdal'
+depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
         'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index ce0d2f7f9..e9494adac 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,10 +1,11 @@
-# $ Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 123704 2011-05-12 16:07:27Z andrea $
+# Maintainer:
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=10
+pkgrel=11
 pkgdesc='KDE3 Core Libraries'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,23 +20,26 @@ source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz
         'acinclude.patch'
         'kde3.profile'
         'kde4-compatibility.patch'
-        'kconf_updaterc')
+        'kconf_updaterc'
+        'openssl.patch')
 md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
          'ca50d4515468cfda80946690c53073f3'
          'a5aedcc9550809ce6672a7dddf9f5ad4'
          'ab14ce2c40698e24e162284d50c6f466'
          'f4e0735475b5de59d738d68a9f467b77'
-         '11e49bc6aca497f55610146afe217751')
+         '11e49bc6aca497f55610146afe217751'
+         '242f0e4750c019e62e285c0aad0c03b8')
 
 build() {
-	cd $srcdir/kdelibs-${pkgver}
+	cd "$srcdir"/kdelibs-${pkgver}
 
 	. /etc/profile.d/qt3.sh
-	. $srcdir/kde3.profile
+	. "$srcdir"/kde3.profile
 
-	patch -p0 -i $srcdir/kde-3.5-1074156.patch || return 1
-	patch -p1 -i $srcdir/acinclude.patch || return 1
-	patch -p1 -i $srcdir/kde4-compatibility.patch || return 1
+	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
+	patch -p1 -i "$srcdir"/acinclude.patch
+	patch -p1 -i "$srcdir"/kde4-compatibility.patch
+    patch -p1 -i "${srcdir}"/openssl.patch
 
 	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 	make -f admin/Makefile.common cvs
@@ -54,32 +58,33 @@ build() {
 		--enable-final \
 		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
 		--without-arts \
-		--disable-libfam || return 1
-	make || return 1
+		--disable-libfam
+	make
 }
 
 package() {
-	cd $srcdir/kdelibs-${pkgver}
+	cd "$srcdir"/kdelibs-${pkgver}
 
-	make DESTDIR=$pkgdir install || return 1
+	make DESTDIR="$pkgdir" install
 
 	# disable broken kconf_update by default
-	install -D -m644 $srcdir/kconf_updaterc $pkgdir/opt/kde/share/config/kconf_updaterc
+	install -D -m644 "$srcdir"/kconf_updaterc \
+      "$pkgdir"/opt/kde/share/config/kconf_updaterc
 
 	# install KDE3 profile
-	install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
+	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
 	# make KDE3 styles available to Qt3
-	install -d -m755 $pkgdir/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles $pkgdir/opt/qt/plugins/styles
+	install -d -m755 "$pkgdir"/opt/qt/plugins
+	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
 
 	# cert bundle seems to be hardcoded
 	# link it to the one from ca-certificates
-	rm -f $pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
+	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
+	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
 
 	# we don't have khelpcenter anyway
-	rm -rf $pkgdir/opt/kde/share/doc
+	rm -rf "$pkgdir"/opt/kde/share/doc
 
-	install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
+	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
+	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
 }
diff --git a/extra/kdelibs3/openssl.patch b/extra/kdelibs3/openssl.patch
new file mode 100644
index 000000000..a948b884a
--- /dev/null
+++ b/extra/kdelibs3/openssl.patch
@@ -0,0 +1,180 @@
+diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
+@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
+ static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
+                                    const EVP_CIPHER *,unsigned char *,int ,
+                                             pem_password_cb *, void *) = 0L;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
++#else
+ static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
+ static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
+ static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
++#endif
+ static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
+ static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
+ static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
+@@ -430,9 +435,14 @@ KConfig *cfg;
+       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
+       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
+       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
++      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
++#else
+       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
+       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
+       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
++#endif
+       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
+       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
+       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
+@@ -594,7 +604,7 @@ KConfig *cfg;
+       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
+       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
+       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
+-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
++      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ #endif
+ 
+ 
+@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+    else return -1;
+ }
+ 
+-
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
++   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
++        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
++   else return -1;
++}
++#else
+ ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
+    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
+    else return 0L;
+@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
+         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
+    else return -1;
+ }
+-
++#endif
+ 
+ int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
+    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
+diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
+--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
+@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
+ #include <openssl/stack.h>
+ #include <openssl/bn.h>
+ #undef crypt
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define STACK _STACK
++#endif
+ #endif
+ 
+ #include <kstaticdeleter.h>
+@@ -446,12 +449,12 @@ public:
+     */
+    int PEM_write_bio_X509(BIO *bp, X509 *x);
+ 
+-
++#if OPENSSL_VERSION_NUMBER < 0x10000000L
+    /*
+     *   X509_asn1_meth - used for netscape output
+     */
+    ASN1_METHOD *X509_asn1_meth();
+-
++#endif
+ 
+    /*
+     *   ASN1_i2d_fp - used for netscape output
+@@ -531,6 +534,9 @@ public:
+     */
+    void sk_free(STACK *s);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
++#endif
+ 
+    /* 
+     *  Number of elements in the stack
+@@ -543,6 +549,9 @@ public:
+     */
+    char *sk_value(STACK *s, int n);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
++#endif
+ 
+    /* 
+     *  Create a new stack
+@@ -555,6 +564,9 @@ public:
+     */
+    int sk_push(STACK *s, char *d);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
++#endif
+ 
+    /* 
+     *  Duplicate the stack
+diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
+--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
+@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
+ 
+ 
+ STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
+-    STACK_OF(X509) *x509 = sk_new(NULL);
++    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
+     KSSLCertificate *cert = certs.first();
+     while(cert) {
+ 	sk_X509_push(x509, cert->getCert());
+diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
+--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
+@@ -1003,17 +1003,31 @@ return qba;
+ QByteArray KSSLCertificate::toNetscape() {
+ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
+-ASN1_HEADER ah;
+-ASN1_OCTET_STRING os;
+-KTempFile ktf;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	NETSCAPE_X509 nx;
++	ASN1_OCTET_STRING hdr;
++#else
++   ASN1_HEADER ah;
++   ASN1_OCTET_STRING os;
++#endif
++	KTempFile ktf;
+ 
+-	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+-	os.length = strlen(NETSCAPE_CERT_HDR);
+-	ah.header = &os;
+-	ah.data = (char *)getCert();
+-	ah.meth = d->kossl->X509_asn1_meth();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
++	hdr.length = strlen(NETSCAPE_CERT_HDR);
++	nx.header = &hdr;
++	nx.cert = getCert();
++
++	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
++#else
++   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
++   os.length = strlen(NETSCAPE_CERT_HDR);
++   ah.header = &os;
++   ah.data = (char *)getCert();
++   ah.meth = d->kossl->X509_asn1_meth();
+ 
+-	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++#endif
+ 
+ 	ktf.close();
+ 
diff --git a/extra/kdemultimedia/kmix-locale-pulseaudio.patch b/extra/kdemultimedia/kmix-locale-pulseaudio.patch
deleted file mode 100644
index 88be8dbde..000000000
--- a/extra/kdemultimedia/kmix-locale-pulseaudio.patch
+++ /dev/null
@@ -1,1117 +0,0 @@
-Index: kmix/apps/kmix.cpp
-===================================================================
---- kmix/apps/kmix.cpp	(revision 1226955)
-+++ kmix/apps/kmix.cpp	(revision 1226956)
-@@ -78,8 +78,6 @@
-   m_dockWidget(),
-   m_dontSetDefaultCardOnStart (false)
- {
--    _cornerLabelNew = 0;
--
-     setObjectName( QLatin1String("KMixWindow" ));
-     // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in
-     setAttribute(Qt::WA_DeleteOnClose, false);
-@@ -184,16 +182,29 @@
- 
- void KMixWindow::initActionsAfterInitMixer()
- {
-+    bool isPulseAudio = false;
-     // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use
-     foreach( Mixer* mixer, Mixer::mixers() )
-     {
--        if ( mixer->getDriverName() == "PulseAudio") {
-+        if ( mixer->getDriverName() == "PulseAudio")
-+        {
-+            isPulseAudio = true;
-             KAction* action = actionCollection()->addAction( "launch_pavucontrol" );
-             action->setText( i18n( "Audio setup (&Pulseaudio)" ) );
-             connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() ));
-             break;
-         }
-     }
-+
-+    if (! isPulseAudio )
-+    {
-+       QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
-+       QPushButton* _cornerLabelNew = new QPushButton();
-+       _cornerLabelNew->setIcon(cornerNewPM);
-+       //cornerLabelNew->setSizePolicy(QSizePolicy());
-+       m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner);
-+       connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) );
-+    }
- }
- 
- void KMixWindow::initPrefDlg()
-@@ -210,15 +221,10 @@
-     m_wsMixers = new KTabWidget();
-     m_wsMixers->setDocumentMode(true);
-     setCentralWidget(m_wsMixers);
--    m_wsMixers->setTabsClosable(true);
-+    m_wsMixers->setTabsClosable(false);
-     connect (m_wsMixers, SIGNAL(tabCloseRequested(int)), SLOT(saveAndCloseView(int)) );
- 
-     QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
--    _cornerLabelNew = new QPushButton();
--    _cornerLabelNew->setIcon(cornerNewPM);
--    //cornerLabelNew->setSizePolicy(QSizePolicy());
--    m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner);
--    connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) );
- 
-     connect( m_wsMixers, SIGNAL( currentChanged ( int ) ), SLOT( newMixerShown(int)) );
- 
-@@ -516,6 +522,7 @@
-             addMixerWidget(mixer->id(), guiprof, -1);
-         }
-         else {
-+            // did exist => remove and insert new guiprof at old position
-             int indexOfTab =  m_wsMixers->indexOf(kmw);
-             if ( indexOfTab != -1 ) m_wsMixers->removeTab(indexOfTab);
-             delete kmw;
-@@ -676,9 +683,9 @@
-         m_wsMixers->removeTab(idx);
-         delete kmw;
- 
--        if ( m_wsMixers->count() < 2 ) {
--            m_wsMixers->setTabsClosable(false);
--        }
-+        bool isPulseAudio =  kmw->mixer()->getDriverName() == "PulseAudio";
-+        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+
-         saveViewConfig();
-     }
-     kDebug() << "Exit";
-@@ -874,9 +881,9 @@
-         if ( kmw->getGuiprof()->getId() == m_defaultCardOnStart ) {
-             m_wsMixers->setCurrentWidget(kmw);
-         }
--        if ( m_wsMixers->count() > 1 ) {
--            m_wsMixers->setTabsClosable(true);
--        }
-+
-+        bool isPulseAudio =  mixer->getDriverName() == "PulseAudio";
-+        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-         m_dontSetDefaultCardOnStart = false;
- 
- 
-Index: kmix/apps/kmix.h
-===================================================================
---- kmix/apps/kmix.h	(revision 1226955)
-+++ kmix/apps/kmix.h	(revision 1226956)
-@@ -116,7 +116,6 @@
-    Qt::Orientation m_toplevelOrientation;
- 
-    KTabWidget *m_wsMixers;
--   QPushButton* _cornerLabelNew;
- 
-    KMixPrefDlg *m_prefDlg;
-    KMixDockWidget *m_dockWidget;
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1226956)
-+++ kmix/gui/viewbase.cpp	(revision 1226957)
-@@ -226,34 +226,35 @@
- 
-         // Check the guiprofile... if it is not the fallback GUIProfile, then
-         // make sure that we add a specific entry for any devices not present.
--        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) {
-+        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense.
-+        {
-             kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present";
- 
-             QList<QString> new_mix_devices;
-             MixSet ms = _mixer->getMixSet();
-             for (int i=0; i < ms.count(); ++i)
-+            {
-                 new_mix_devices.append("^" + ms[i]->id() + "$");
-+                kDebug(67100) << "new_mix_devices.append => " << ms[i]->id();
-+            }
- 
-+            GUIProfile::ControlSet& ctlSet = _guiprof->getControls();
-+
- //            std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end();
- //            for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it)
- //                new_mix_devices.removeAll((*it)->id);
-               // TODO Please check this change, Colin
--              foreach ( ProfControl* pctl, _guiprof->getControls() ) {
-+              foreach ( ProfControl* pctl, ctlSet ) {
-                   new_mix_devices.removeAll(pctl->id);
-               }
- 
- 
-             if ( new_mix_devices.count() > 0 ) {
-                 kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile";
-+                QString sctlMatchAll("*");
-                 while ( new_mix_devices.count() > 0 ) {
--                    QString sctlMatchAll("*");
-                     QString new_mix_devices0 = new_mix_devices.takeAt(0);
--                    ProfControl* ctl = new ProfControl(new_mix_devices0, sctlMatchAll);
--//                    ctl->id = new_mix_devices.takeAt(0);
--//                    ctl->setSubcontrols(QString("*"));
--//                    ctl->tab  = (_guiprof->tabs())[0]->name(); // Use the first tab... not ideal but should work most of the time;
--//                    ctl->show = "simple";
--                    _guiprof->getControls().push_back(ctl);
-+                    ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll));
-                 }
-                 _guiprof->setDirty();
-             }
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1226957)
-+++ kmix/gui/viewbase.cpp	(revision 1226958)
-@@ -33,6 +33,7 @@
- #include <kactioncollection.h>
- #include <ktoggleaction.h>
- #include <kstandardaction.h>
-+#include <kmessagebox.h>
- // KMix
- #include "dialogviewconfiguration.h"
- #include "gui/guiprofile.h"
-@@ -43,7 +44,7 @@
- 
- 
- ViewBase::ViewBase(QWidget* parent, const char* id, Mixer* mixer, Qt::WFlags f, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actionColletion)
--    : QWidget(parent, f), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof)
-+    : QWidget(parent, f), _popMenu(NULL), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof)
- {
-    setObjectName(id);
-    m_viewId = id;
-@@ -73,9 +74,11 @@
-          }
-       }
-    }
--   QAction *action = _localActionColletion->addAction("toggle_channels");
--   action->setText(i18n("&Channels"));
--   connect(action, SIGNAL(triggered(bool) ), SLOT(configureView()));
-+   if ( !_mixer->isDynamic() ) {
-+      QAction *action = _localActionColletion->addAction("toggle_channels");
-+      action->setText(i18n("&Channels"));
-+      connect(action, SIGNAL(triggered(bool) ), SLOT(configureView()));
-+   }
-    connect ( _mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
-    connect ( _mixer, SIGNAL(controlsReconfigured(const QString&)), this, SLOT(controlsReconfigured(const QString&)) );
- }
-@@ -95,7 +98,7 @@
- 
- bool ViewBase::isValid() const
- {
--   return ( _mixSet->count() > 0 || _mixer->dynamic() );
-+   return ( _mixSet->count() > 0 || _mixer->isDynamic() );
- }
- 
- void ViewBase::setIcons (bool on) { KMixToolBox::setIcons (_mdws, on ); }
-@@ -170,6 +173,8 @@
- {
-     QAction *a;
- 
-+    if ( _popMenu )
-+        delete _popMenu;
-     _popMenu = new KMenu( this );
-     _popMenu->addTitle( KIcon( QLatin1String(  "kmix" ) ), i18n("Device Settings" ));
- 
-@@ -222,44 +227,8 @@
- 
- void ViewBase::setMixSet()
- {
--    if ( _mixer->dynamic()) {
-+    if ( _mixer->isDynamic() ) {
- 
--        // Check the guiprofile... if it is not the fallback GUIProfile, then
--        // make sure that we add a specific entry for any devices not present.
--        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense.
--        {
--            kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present";
--
--            QList<QString> new_mix_devices;
--            MixSet ms = _mixer->getMixSet();
--            for (int i=0; i < ms.count(); ++i)
--            {
--                new_mix_devices.append("^" + ms[i]->id() + "$");
--                kDebug(67100) << "new_mix_devices.append => " << ms[i]->id();
--            }
--
--            GUIProfile::ControlSet& ctlSet = _guiprof->getControls();
--
--//            std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end();
--//            for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it)
--//                new_mix_devices.removeAll((*it)->id);
--              // TODO Please check this change, Colin
--              foreach ( ProfControl* pctl, ctlSet ) {
--                  new_mix_devices.removeAll(pctl->id);
--              }
--
--
--            if ( new_mix_devices.count() > 0 ) {
--                kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile";
--                QString sctlMatchAll("*");
--                while ( new_mix_devices.count() > 0 ) {
--                    QString new_mix_devices0 = new_mix_devices.takeAt(0);
--                    ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll));
--                }
--                _guiprof->setDirty();
--            }
--        }
--
-         // We need to delete the current MixDeviceWidgets so we can redraw them
-         while (!_mdws.isEmpty()) {
-             QWidget* mdw = _mdws.last();
-@@ -280,6 +249,8 @@
-  */
- void ViewBase::configureView() {
- 
-+    Q_ASSERT( !_mixer->isDynamic() );
-+    
-     DialogViewConfiguration* dvc = new DialogViewConfiguration(0, *this);
-     dvc->show();
-     // !! The dialog is modal. Does it delete itself?
-@@ -302,6 +273,10 @@
-    kDebug(67100) << "KMixToolBox::loadView() grp=" << grp.toAscii();
- 
-    static char guiComplexity[3][20] = { "simple", "extended", "all" };
-+
-+   // Certain bits are not saved for dynamic mixers (e.g. PulseAudio)
-+   bool dynamic = _mixer->isDynamic();
-+
-    for ( int tries = 0; tries < 3; tries++ )
-    {
-    bool atLeastOneControlIsShown = false;
-@@ -315,12 +290,12 @@
-            Workaround: If found, write back correct group name.
-         */
-          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
--         QString devgrp;
--         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         MixDevice* md = mdw->mixDevice();
-+
-+         QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());
-          KConfigGroup devcg  = config->group( devgrp );
- 
--         QString buggyDevgrp;
--         buggyDevgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), view->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         QString buggyDevgrp = QString("%1.%2.%3").arg(grp).arg(view->id()).arg(md->id());
-          KConfigGroup buggyDevgrpCG = config->group( buggyDevgrp );
-          if ( buggyDevgrpCG.exists() ) {
-             buggyDevgrpCG.copyTo(&devcg);
-@@ -335,7 +310,7 @@
-          }
- 
-          bool mdwEnabled = false;
--         if ( devcg.hasKey("Show") )
-+         if ( !dynamic && devcg.hasKey("Show") )
-          {
-             mdwEnabled = ( true == devcg.readEntry("Show", true) );
-         //kDebug() << "Load devgrp" << devgrp << "show=" << mdwEnabled;
-@@ -382,20 +357,23 @@
-    QString grp = "View.";
-    grp += view->id();
- //   KConfigGroup cg = config->group( grp );
--   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp.toAscii();
-+   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp;
- 
-+   // Certain bits are not saved for dynamic mixers (e.g. PulseAudio)
-+   bool dynamic = _mixer->isDynamic();
-+
-    for (int i=0; i < view->_mdws.count(); ++i ){
-       QWidget *qmdw = view->_mdws[i];
-       if ( qmdw->inherits("MixDeviceWidget") )
-       {
-          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
-+         MixDevice* md = mdw->mixDevice();
- 
-          //kDebug(67100) << "  grp=" << grp.toAscii();
-          //kDebug(67100) << "  mixer=" << view->id().toAscii();
-          //kDebug(67100) << "  mdwPK=" << mdw->mixDevice()->id().toAscii();
- 
--         QString devgrp;
--         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());
-          KConfigGroup devcg = config->group( devgrp );
- 
-          if ( mdw->inherits("MDWSlider") )
-@@ -403,15 +381,19 @@
-             // only sliders have the ability to split apart in mutliple channels
-             devcg.writeEntry( "Split", ! mdw->isStereoLinked() );
-          }
--         devcg.writeEntry( "Show" , mdw->isVisibleTo(view) );
--kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view);
-+         if ( !dynamic ) {
-+            devcg.writeEntry( "Show" , mdw->isVisibleTo(view) );
-+            kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view);
-+         }
- 
-       } // inherits MixDeviceWidget
-    } // for all MDW's
- 
--   kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty();
--   if ( guiProfile()->isDirty() ) {
--       guiProfile()->writeProfile();
-+   if ( !dynamic ) {
-+        // We do not save GUIProfiles (as they cannot be customised) for dynamic mixers (e.g. PulseAudio)
-+        kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty();
-+        if ( guiProfile()->isDirty() )
-+            guiProfile()->writeProfile();
-    }
- }
- 
-Index: kmix/gui/mdwslider.cpp
-===================================================================
---- kmix/gui/mdwslider.cpp	(revision 1226957)
-+++ kmix/gui/mdwslider.cpp	(revision 1226958)
-@@ -86,10 +86,14 @@
-     KToggleAction *taction = _mdwActions->add<KToggleAction>( "stereo" );
-     taction->setText( i18n("&Split Channels") );
-     connect( taction, SIGNAL( triggered(bool) ), SLOT( toggleStereoLinked() ) );
--    KAction *action = _mdwActions->add<KToggleAction>( "hide" );
--    action->setText( i18n("&Hide") );
--    connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) );
- 
-+    KAction *action;
-+    if ( ! m_mixdevice->mixer()->isDynamic() ) {
-+        action = _mdwActions->add<KToggleAction>( "hide" );
-+        action->setText( i18n("&Hide") );
-+        connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) );
-+    }
-+
-     if( m_mixdevice->playbackVolume().hasSwitch() ) {
-         taction = _mdwActions->add<KToggleAction>( "mute" );
-         taction->setText( i18n("&Muted") );
-@@ -129,8 +133,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( increaseVolume() ) );
-@@ -143,8 +147,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( decreaseVolume() ) );
-@@ -157,8 +161,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( toggleMuted() ) );
-Index: kmix/gui/viewdockareapopup.h
-===================================================================
---- kmix/gui/viewdockareapopup.h	(revision 1226957)
-+++ kmix/gui/viewdockareapopup.h	(revision 1226958)
-@@ -24,7 +24,6 @@
- #include "viewbase.h"
- 
- class QGridLayout;
--class QPushButton;
- class QWidget;
- 
- class Mixer;
-@@ -48,8 +47,6 @@
- 
- protected:
-     KMixWindow  *_dock;
--    //MixDevice       *_dockDevice;
--    QPushButton     *_showPanelBox;
- 
-     void wheelEvent ( QWheelEvent * e );
-     virtual void _setMixSet();
-Index: kmix/gui/viewsliders.cpp
-===================================================================
---- kmix/gui/viewsliders.cpp	(revision 1226957)
-+++ kmix/gui/viewsliders.cpp	(revision 1226958)
-@@ -148,7 +148,7 @@
- {
-     const MixSet& mixset = _mixer->getMixSet();
- 
--    if ( _mixer->dynamic() ) {
-+    if ( _mixer->isDynamic() ) {
-         // We will be recreating our sliders, so make sure we trash all the separators too.
-         qDeleteAll(_separators);
-         _separators.clear();
-Index: kmix/gui/guiprofile.cpp
-===================================================================
---- kmix/gui/guiprofile.cpp	(revision 1226957)
-+++ kmix/gui/guiprofile.cpp	(revision 1226958)
-@@ -158,8 +158,12 @@
- {
-     GUIProfile* guiprof = 0;
- 
--    if ( mixer == 0 || profileName.isEmpty() ) {
-+    if ( mixer == 0 || profileName.isEmpty() )
-         return 0;
-+
-+    if ( mixer->isDynamic() ) {
-+        kDebug(67100) << "GUIProfile::find() Not loading GUIProfile for Dynamic Mixer (e.g. PulseAudio)";
-+        return 0;
-     }
- 
-     QString requestedProfileName;
-Index: kmix/gui/viewbase.h
-===================================================================
---- kmix/gui/viewbase.h	(revision 1226957)
-+++ kmix/gui/viewbase.h	(revision 1226958)
-@@ -133,7 +133,7 @@
- 
-     ViewFlags _vflags;
-     GUIProfile* _guiprof;
--   KActionCollection *_localActionColletion;
-+    KActionCollection *_localActionColletion;
- 
-     virtual void _setMixSet() = 0;
- 
-Index: kmix/gui/viewdockareapopup.cpp
-===================================================================
---- kmix/gui/viewdockareapopup.cpp	(revision 1226957)
-+++ kmix/gui/viewdockareapopup.cpp	(revision 1226958)
-@@ -88,8 +88,8 @@
- {
-    // kDebug(67100) << "ViewDockAreaPopup::setMixSet()\n";
- 
--   if ( _mixer->dynamic() ) {
--      // Our _layoutMDW now should only contain spacer widgets from the QSpacerItems's in add() below.
-+   if ( _mixer->isDynamic() ) {
-+      // Our _layoutMDW now should only contain spacer widgets from the QSpacerItem's in add() below.
-       // We need to trash those too otherwise all sliders gradually migrate away from the edge :p
-       QLayoutItem *li;
-       while ( ( li = _layoutMDW->takeAt(0) ) )
-@@ -114,9 +114,9 @@
-     QString matchAllPlaybackAndTheCswitch("pvolume,pswitch,cswitch");
-     ProfControl *pctl = new ProfControl( dummyMatchAll, matchAllPlaybackAndTheCswitch);
-     MixDeviceWidget *mdw = new MDWSlider(
--      md,		  // only 1 device. This is actually _dockDevice
-+      md,           // only 1 device.
-       true,         // Show Mute LED
--      false,         // Show Record LED
-+      false,        // Show Record LED
-       false,        // Small
-       Qt::Vertical, // Direction: only 1 device, so doesn't matter
-       this,         // parent
-@@ -128,10 +128,10 @@
-    _layoutMDW->addWidget( mdw, 0, 1 );
- 
-    // Add button to show main panel
--   _showPanelBox = new QPushButton( i18n("Mixer"), this );
--   _showPanelBox->setObjectName( QLatin1String("MixerPanel" ));
--   connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
--   _layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 );
-+   QPushButton *pb = new QPushButton( i18n("Mixer"), this );
-+   pb->setObjectName( QLatin1String("MixerPanel" ));
-+   connect ( pb, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
-+   _layoutMDW->addWidget( pb, 1, 0, 1, 3 );
- 
-    return mdw;
- }
-Index: kmix/core/mixdevice.h
-===================================================================
---- kmix/core/mixdevice.h	(revision 1226957)
-+++ kmix/core/mixdevice.h	(revision 1226958)
-@@ -157,15 +157,6 @@
-        _artificial = artificial;
-    }
- 
--   bool isEthereal() const
--   {
--       return _ethereal;
--   }
--   void setEthereal(bool _ethereal)
--   {
--       this->_ethereal = _ethereal;
--   }
--
-    void setControlProfile(ProfControl* control);
-    ProfControl* controlProfile();
-    
-@@ -191,14 +182,12 @@
-    int _enumCurrentId;
-    QList<QString> _enumValues; // A MixDevice, that is an ENUM, has these _enumValues
- 
--   //bool _doNotRestore;
-    // A virtual control. It will not be saved/restored and/or doesn't get shortcuts
--   // Actually we discriminate those "virtual" controls in artificial controls and ethereal controls:
-+   // Actually we discriminate those "virtual" controls in artificial controls and dynamic controls:
-    // Type        Shortcut  Restore
-    // Artificial:    yes       no    Virtual::GlobalMaster or Virtual::CaptureGroup_3   (controls that are constructed artificially from other controls)
--   // Ethereal  :     no       no    Controls that come and go, like Pulse Stream controls
-+   // Dynamic   :     no       no    Controls that come and go, like Pulse Stream controls
-    bool _artificial;
--   bool _ethereal;
-    MixSet *_moveDestinationMixSet;
-    QString _iconName;
- 
-Index: kmix/core/mixer.cpp
-===================================================================
---- kmix/core/mixer.cpp	(revision 1226957)
-+++ kmix/core/mixer.cpp	(revision 1226958)
-@@ -748,7 +748,7 @@
-     m_dynamic = dynamic;
- }
- 
--bool Mixer::dynamic()
-+bool Mixer::isDynamic()
- {
-     return m_dynamic;
- }
-Index: kmix/core/mixer.h
-===================================================================
---- kmix/core/mixer.h	(revision 1226957)
-+++ kmix/core/mixer.h	(revision 1226958)
-@@ -164,7 +164,7 @@
- 
-     /// Says if we are dynamic (e.g. widgets can come and go)
-     virtual void setDynamic( bool dynamic = true );
--    virtual bool dynamic();
-+    virtual bool isDynamic();
- 
-     virtual bool moveStream( const QString id, const QString& destId );
- 
-Index: kmix/core/mixdevice.cpp
-===================================================================
---- kmix/core/mixdevice.cpp	(revision 1226957)
-+++ kmix/core/mixdevice.cpp	(revision 1226958)
-@@ -23,6 +23,7 @@
- #include <klocale.h>
- 
- #include "core/mixdevice.h"
-+#include "core/mixer.h"
- #include "gui/guiprofile.h"
- #include "core/volume.h"
- 
-@@ -96,14 +97,12 @@
- 
- MixDevice::MixDevice(  Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet )
- {
--    // doNotRestore is superseded by the more generic concepts isEthereal(), isArtificial()
-     init(mixer, id, name, iconName, moveDestinationMixSet);
- }
- 
- void MixDevice::init(  Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet )
- {
-     _artificial = false;
--    _ethereal   = false;
-     _mixer = mixer;
-     _id = id;
-     if( name.isEmpty() )
-@@ -117,9 +116,10 @@
-     _moveDestinationMixSet = moveDestinationMixSet;
-     if ( _id.contains(' ') ) {
-         // The key is used in the config file. It MUST NOT contain spaces
--        kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it might not contain spaces" << endl;
-+        kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it must not contain spaces" << endl;
-         _id.replace(' ', '_');
-     }
-+    kDebug(67100) << "MixDevice::init() _id=" << _id;
- }
- 
- void MixDevice::addPlaybackVolume(Volume &playbackVol)
-@@ -216,11 +216,10 @@
-  */
- void MixDevice::read( KConfig *config, const QString& grp )
- {
--    if ( isEthereal() || isArtificial() ) {
-+    if ( _mixer->isDynamic() || isArtificial() ) {
-         kDebug(67100) << "MixDevice::read(): This MixDevice does not permit volume restoration (i.e. because it is handled lower down in the audio stack). Ignoring.";
-     } else {
--        QString devgrp;
--        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
-+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
-         KConfigGroup cg = config->group( devgrp );
-         //kDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp;
- 
-@@ -264,11 +263,10 @@
-  */
- void MixDevice::write( KConfig *config, const QString& grp )
- {
--    if (isEthereal() || isArtificial()) {
-+    if (_mixer->isDynamic() || isArtificial()) {
-         kDebug(67100) << "MixDevice::write(): This MixDevice does not permit volume saving (i.e. because it is handled lower down in the audio stack). Ignoring.";
-     } else {
--        QString devgrp;
--        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
-+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
-         KConfigGroup cg = config->group(devgrp);
-         // kDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp;
- 
-Index: kmix/apps/kmix.cpp
-===================================================================
---- kmix/apps/kmix.cpp	(revision 1226957)
-+++ kmix/apps/kmix.cpp	(revision 1226958)
-@@ -182,21 +182,20 @@
- 
- void KMixWindow::initActionsAfterInitMixer()
- {
--    bool isPulseAudio = false;
--    // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use
-+    // Only show the new tab widget if some of the mixers are not Dynamic.
-+    // The GUI that then pops up could then make a new mixer from a dynamic one,
-+    // if mixed dynamic and non-dynamic mixers were allowed, but this is generally not the case.
-+    bool allDynamic = true;
-     foreach( Mixer* mixer, Mixer::mixers() )
-     {
--        if ( mixer->getDriverName() == "PulseAudio")
-+        if ( !mixer->isDynamic() )
-         {
--            isPulseAudio = true;
--            KAction* action = actionCollection()->addAction( "launch_pavucontrol" );
--            action->setText( i18n( "Audio setup (&Pulseaudio)" ) );
--            connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() ));
-+            allDynamic = false;
-             break;
-         }
-     }
- 
--    if (! isPulseAudio )
-+    if (! allDynamic )
-     {
-        QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
-        QPushButton* _cornerLabelNew = new QPushButton();
-@@ -339,8 +338,11 @@
-     
-     // The following loop is necessary for the case that the user has hidden all views for a Mixer instance.
-     // Otherwise we would not save the Meta information (step -2- below for that mixer.
--    foreach ( Mixer* mixer, Mixer::mixers() )
--        mixerViews[mixer->id()]; // just insert a map entry
-+    // We also do not save dynamic mixers (e.g. PulseAudio)
-+    foreach ( Mixer* mixer, Mixer::mixers() ) {
-+        if ( !mixer->isDynamic() )
-+            mixerViews[mixer->id()]; // just insert a map entry
-+    }
- 
-     // -1- Save the views themselves
-     for ( int i=0; i<m_wsMixers->count() ; ++i ) {
-@@ -351,8 +353,10 @@
-             // Otherwise the user will be confused afer re-plugging the card (as the config was not saved).
-             mw->saveConfig( KGlobal::config().data() );
-             // add the view to the corresponding mixer list, so we can save a views-per-mixer list below
--            QStringList& qsl = mixerViews[mw->mixer()->id()];
--            qsl.append(mw->getGuiprof()->getId());
-+            if ( !mw->mixer()->isDynamic() ) {
-+                QStringList& qsl = mixerViews[mw->mixer()->id()];
-+                qsl.append(mw->getGuiprof()->getId());
-+            }
-         }
-     }
- 
-@@ -539,22 +543,29 @@
-             continue;  // OK, this mixer already has a profile => skip it
-         }
-         // No TAB YET => This should mean KMix is just started, or the user has just plugged in a card
--        bool profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line
--        QStringList profileList = pconfig.readEntry( mixer->id(), QStringList() );
-+        bool profileListHasKey = false;
-+        QStringList profileList;
-+        bool aProfileWasAddedSucesufully = false;
- 
--        bool aProfileWasAddedSucesufully = false;
--        foreach ( QString profileId, profileList)
--        {
--            // This handles the profileList form the kmixrc
--            kDebug() << "Now searching for profile: " << profileId  ;
--            GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ###
--            if ( guiprof != 0 ) {
--                addMixerWidget(mixer->id(), guiprof, -1);
--                aProfileWasAddedSucesufully = true;
-+        if ( !mixer->isDynamic() ) {
-+            // We do not support save profiles for dynamic mixers (i.e. PulseAudio)
-+
-+            profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line
-+            profileList = pconfig.readEntry( mixer->id(), QStringList() );
-+
-+            foreach ( QString profileId, profileList)
-+            {
-+                // This handles the profileList form the kmixrc
-+                kDebug() << "Now searching for profile: " << profileId  ;
-+                GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ###
-+                if ( guiprof != 0 ) {
-+                    addMixerWidget(mixer->id(), guiprof, -1);
-+                    aProfileWasAddedSucesufully = true;
-+                }
-+                else {
-+                    kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective.";
-+                }
-             }
--            else {
--                kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective.";
--            }
-         }
- 
-         // The we_need_a_fallback case is a bit tricky. Please ask the author (cesken) before even considering to change the code.
-@@ -568,11 +579,17 @@
- 
-             // Lets try a bunch of fallback strategies:
-             GUIProfile* guiprof = 0;
-+            if ( !mixer->isDynamic() ) {
-+                // We know that GUIProfile::find() will return 0 if the mixer is dynamic, so don't bother checking.
-+                kDebug() << "Attempting to find a card-specific GUI Profile for the mixer " << mixer->id();
-                 guiprof = GUIProfile::find(mixer, QString("default"), false, false);  // ### Card specific profile ###
--            if ( guiprof == 0 ) {
--                guiprof = GUIProfile::find(mixer, QString("default"), false, true);  // ### Card unspecific profile ###
-+                if ( guiprof == 0 ) {
-+                    kDebug() << "Not found. Attempting to find a generic GUI Profile for the mixer " << mixer->id();
-+                    guiprof = GUIProfile::find(mixer, QString("default"), false, true);  // ### Card unspecific profile ###
-+                }
-             }
-             if ( guiprof == 0) {
-+                kDebug() << "Using fallback GUI Profile for the mixer " << mixer->id();
-                 // This means there is neither card specific nor card unspecific profile
-                 // This is the case for some backends (as they don't ship profiles).
-                 guiprof = GUIProfile::fallbackProfile(mixer);
-@@ -683,8 +700,7 @@
-         m_wsMixers->removeTab(idx);
-         delete kmw;
- 
--        bool isPulseAudio =  kmw->mixer()->getDriverName() == "PulseAudio";
--        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+        m_wsMixers->setTabsClosable(!kmw->mixer()->isDynamic() && m_wsMixers->count() > 1);
- 
-         saveViewConfig();
-     }
-@@ -882,8 +898,7 @@
-             m_wsMixers->setCurrentWidget(kmw);
-         }
- 
--        bool isPulseAudio =  mixer->getDriverName() == "PulseAudio";
--        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+        m_wsMixers->setTabsClosable(!mixer->isDynamic() && m_wsMixers->count() > 1);
-         m_dontSetDefaultCardOnStart = false;
- 
- 
-@@ -1071,12 +1086,6 @@
-     KMessageBox::information( 0, m_hwInfoString, i18n("Mixer Hardware Information") );
- }
- 
--void KMixWindow::slotPavucontrolExec()
--{
--    QStringList args("pavucontrol");
--    forkExec(args);
--}
--
- void KMixWindow::slotKdeAudioSetupExec()
- {
-     QStringList args;
-@@ -1133,6 +1142,12 @@
-             m_defaultCardOnStart = kmw->getGuiprof()->getId();
-         // As switching the tab does NOT mean switching the master card, we do not need to update dock icon here.
-         // It would lead to unnecesary flickering of the (complete) dock area.
-+
-+        // We only show the "Configure Channels..." menu item if the mixer is not dynamic
-+        ViewBase* view = kmw->currentView();
-+        QAction* action = actionCollection()->action( "toggle_channels_currentview" );
-+        if (view && action)
-+            action->setVisible( !view->getMixer()->isDynamic() );
-     }
- }
- 
-Index: kmix/apps/kmix.h
-===================================================================
---- kmix/apps/kmix.h	(revision 1226957)
-+++ kmix/apps/kmix.h	(revision 1226958)
-@@ -136,7 +136,6 @@
-   private slots:
-    void saveConfig();
-    void slotHWInfo();
--   void slotPavucontrolExec();
-    void slotKdeAudioSetupExec();
-    void slotConfigureCurrentView();
-    void slotSelectMaster();
-Index: kmix/kmixui.rc
-===================================================================
---- kmix/kmixui.rc	(revision 1226957)
-+++ kmix/kmixui.rc	(revision 1226958)
-@@ -17,7 +17,6 @@
-      <Action name="toggle_channels_currentview" append="save_merge"/>
-      <Action name="select_master" append="save_merge"/>
-      <Action name="launch_kdesoundsetup" append="save_merge"/>     
--     <Action name="launch_pavucontrol" append="save_merge"/>
-  </Menu>
-  <Menu name="help" append="about_merge"><text>&amp;Help</text>
-   <Action name="hwinfo"/>
-Index: kmix/backends/mixer_backend.cpp
-===================================================================
---- kmix/backends/mixer_backend.cpp	(revision 1226957)
-+++ kmix/backends/mixer_backend.cpp	(revision 1226958)
-@@ -48,7 +48,7 @@
- bool Mixer_Backend::openIfValid() {
-     bool valid = false;
-     int ret = open();
--    if ( ret == 0  && (m_mixDevices.count() > 0 || _mixer->dynamic())) {
-+    if ( ret == 0  && (m_mixDevices.count() > 0 || _mixer->isDynamic())) {
-         valid = true;
-         // A better ID is now calculated in mixertoolbox.cpp, and set via setID(),
-         // but we want a somehow usable fallback just in case.
-@@ -139,7 +139,7 @@
-       return m_mixDevices.at(0);  // Backend has NOT set a recommended master. Evil backend => lets help out.
-    } //first device (if exists)
-    else {
--      if ( !_mixer->dynamic()) {
-+      if ( !_mixer->isDynamic()) {
-          // This should never ever happen, as KMix doe NOT accept soundcards without controls
-          kError(67100) << "Mixer_Backend::recommendedMaster(): returning invalid master. This is a bug in KMix. Please file a bug report stating how you produced this." << endl;
-       }
-Index: kmix/backends/mixer_pulse.cpp
-===================================================================
---- kmix/backends/mixer_pulse.cpp	(revision 1226957)
-+++ kmix/backends/mixer_pulse.cpp	(revision 1226958)
-@@ -36,6 +36,8 @@
- #define KMIXPA_APP_CAPTURE  3
- #define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE
- 
-+#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event"
-+
- static unsigned int refcount = 0;
- static pa_glib_mainloop *s_mainloop = NULL;
- static pa_context *s_context = NULL;
-@@ -189,7 +191,7 @@
- 
-     devinfo s;
-     s.index = s.device_index = i->index;
--    s.name = QString(i->name).replace(' ', '_');
-+    s.name = QString::fromUtf8(i->name).replace(' ', '_');
-     s.description = QString::fromUtf8(i->description);
-     s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-     s.volume = i->volume;
-@@ -242,7 +244,7 @@
- 
-     devinfo s;
-     s.index = s.device_index = i->index;
--    s.name = QString(i->name).replace(' ', '_');
-+    s.name = QString::fromUtf8(i->name).replace(' ', '_');
-     s.description = QString::fromUtf8(i->description);
-     s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-     s.volume = i->volume;
-@@ -307,26 +309,28 @@
- 
-     const char *t;
-     if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) {
--        if (strcmp(t, "sink-input-by-media-role:event") == 0) {
-+        if (strcmp(t, KMIXPA_EVENT_KEY) == 0) {
-             kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider";
-             return;
-         }
-     }
- 
--    QString prefix = QString("%1: ").arg(i18n("Unknown Application"));
-+    QString appname = i18n("Unknown Application");
-     if (clients.contains(i->client))
--        prefix = QString("%1: ").arg(clients[i->client]);
-+        appname = clients[i->client];
- 
-+    QString prefix = QString("%1: ").arg(appname);
-+
-     devinfo s;
-     s.index = i->index;
-     s.device_index = i->sink;
-     s.description = prefix + QString::fromUtf8(i->name);
--    s.name = QString("stream:") + i->index;
-+    s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower();
-     s.icon_name = getIconNameFromProplist(i->proplist);
-     s.volume = i->volume;
-     s.channel_map = i->channel_map;
-     s.mute = !!i->mute;
--    s.stream_restore_rule = t;
-+    s.stream_restore_rule = QString::fromUtf8(t);
- 
-     translateMasksAndMaps(s);
- 
-@@ -370,22 +374,24 @@
-         return;
-     }
- 
--    QString prefix = QString("%1: ").arg(i18n("Unknown Application"));
-+    QString appname = i18n("Unknown Application");
-     if (clients.contains(i->client))
--        prefix = QString("%1: ").arg(clients[i->client]);
-+        appname = clients[i->client];
- 
-+    QString prefix = QString("%1: ").arg(appname);
-+
-     devinfo s;
-     s.index = i->index;
-     s.device_index = i->source;
-     s.description = prefix + QString::fromUtf8(i->name);
--    s.name = QString("stream:") + i->index;
-+    s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower();
-     s.icon_name = getIconNameFromProplist(i->proplist);
-     //s.volume = i->volume;
-     s.volume = captureDevices[i->source].volume;
-     s.channel_map = i->channel_map;
-     //s.mute = !!i->mute;
-     s.mute = captureDevices[i->source].mute;
--    s.stream_restore_rule = pa_proplist_gets(i->proplist, "module-stream-restore.id");
-+    s.stream_restore_rule = QString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id"));
- 
-     translateMasksAndMaps(s);
- 
-@@ -407,7 +413,7 @@
- }
- 
- 
--static devinfo create_role_devinfo(const char* name) {
-+static devinfo create_role_devinfo(QString name) {
- 
-     Q_ASSERT(s_RestoreRules.contains(name));
- 
-@@ -436,9 +442,10 @@
- 
-     if (eol > 0) {
-         dec_outstanding(c);
-+
-         // Special case: ensure that our media events exists.
-         // On first login by a new users, this wont be in our database so we should create it.
--        if (!outputRoles.contains(PA_INVALID_INDEX)) {
-+        if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) {
-             // Create a fake rule
-             restoreRule rule;
-             rule.channel_map.channels = 1;
-@@ -447,37 +454,56 @@
-             rule.volume.values[0] = PA_VOLUME_NORM;
-             rule.mute = false;
-             rule.device = "";
--            s_RestoreRules["sink-input-by-media-role:event"] = rule;
-+            s_RestoreRules[KMIXPA_EVENT_KEY] = rule;
-+            kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds");
-+        }
- 
--            devinfo s = create_role_devinfo("sink-input-by-media-role:event");
--            outputRoles[s.index] = s;
--            kDebug(67100) << "Initialising restore rule for new user: " << s.description;
-+        if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+            // If we have rules, it will be created below... but if no rules
-+            // then we add it here.
-+            if (!outputRoles.contains(PA_INVALID_INDEX)) {
-+                devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY);
-+                outputRoles[s.index] = s;
- 
--            if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
-                 s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+            }
-+
-+            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-         }
- 
--        if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
--            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-         return;
-     }
- 
--    kDebug(67100) << "Got some info about restore rule: " << i->name << i->device;
-+
-+    QString name = QString::fromUtf8(i->name);
-+    kDebug(67100) << QString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None");
-     restoreRule rule;
-     rule.channel_map = i->channel_map;
-     rule.volume = i->volume;
-     rule.mute = !!i->mute;
-     rule.device = i->device;
--    s_RestoreRules[i->name] = rule;
- 
--    // We only want to know about Sound Events for now...
--    if (strcmp(i->name, "sink-input-by-media-role:event") == 0) {
--        devinfo s = create_role_devinfo(i->name);
--        bool is_new = !outputRoles.contains(s.index);
--        outputRoles[s.index] = s;
-+    if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) {
-+        // Stream restore rules may not have valid volumes/channel maps (as these are optional)
-+        // but we need a valid volume+channelmap for our events sounds so fix it up.
-+        rule.channel_map.channels = 1;
-+        rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-+        rule.volume.channels = 1;
-+        rule.volume.values[0] = PA_VOLUME_NORM;
-+    }
- 
--        if (is_new && s_mixers.contains(KMIXPA_APP_PLAYBACK))
--            s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+    s_RestoreRules[name] = rule;
-+
-+    if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+        // We only want to know about Sound Events for now...
-+        if (name == KMIXPA_EVENT_KEY) {
-+            devinfo s = create_role_devinfo(name);
-+            bool is_new = !outputRoles.contains(s.index);
-+            outputRoles[s.index] = s;
-+
-+            if (is_new)
-+                s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+        }
-     }
- }
- 
-@@ -788,7 +814,6 @@
-         Volume v(dev.chanMask, PA_VOLUME_NORM, PA_VOLUME_MUTED, true, false);
-         setVolumeFromPulse(v, dev);
-         MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms);
--        md->setEthereal(true);
-         md->addPlaybackVolume(v);
-         md->setMuted(dev.mute);
-         m_mixDevices.append(md);
-@@ -1095,10 +1120,10 @@
-                 {
-                     restoreRule &rule = s_RestoreRules[iter->stream_restore_rule];
-                     pa_ext_stream_restore_info info;
--                    info.name = iter->stream_restore_rule.toAscii().constData();
-+                    info.name = iter->stream_restore_rule.toUtf8().constData();
-                     info.channel_map = rule.channel_map;
-                     info.volume = genVolumeForPulse(*iter, md->playbackVolume());
--                    info.device = rule.device.isEmpty() ? NULL : rule.device.toAscii().constData();
-+                    info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData();
-                     info.mute = (md->isMuted() ? 1 : 0);
- 
-                     pa_operation* o;
-@@ -1153,13 +1178,13 @@
- 
-     // Lookup the stream index.
-     uint32_t stream_index = PA_INVALID_INDEX;
--    const char* stream_restore_rule = NULL;
-+    QString stream_restore_rule = "";
-     devmap::iterator iter;
-     devmap *map = get_widget_map(m_devnum);
-     for (iter = map->begin(); iter != map->end(); ++iter) {
-         if (iter->name == id) {
-             stream_index = iter->index;
--            stream_restore_rule = iter->stream_restore_rule.isEmpty() ? NULL : iter->stream_restore_rule.toAscii().constData();
-+            stream_restore_rule = iter->stream_restore_rule;
-             break;
-         }
-     }
-@@ -1171,12 +1196,12 @@
- 
-     if (destId.isEmpty()) {
-         // We want to remove any specific device in the stream restore rule.
--        if (!stream_restore_rule || !s_RestoreRules.contains(stream_restore_rule)) {
-+        if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) {
-             kWarning(67100) <<  "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule";
-         } else {
-             restoreRule &rule = s_RestoreRules[stream_restore_rule];
-             pa_ext_stream_restore_info info;
--            info.name = stream_restore_rule;
-+            info.name = stream_restore_rule.toUtf8().constData();
-             info.channel_map = rule.channel_map;
-             info.volume = rule.volume;
-             info.device = NULL;
-@@ -1192,12 +1217,12 @@
-     } else {
-         pa_operation* o;
-         if (KMIXPA_APP_PLAYBACK == m_devnum) {
--            if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) {
-+            if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-                 kWarning(67100) <<  "pa_context_move_sink_input_by_name() failed";
-                 return false;
-             }
-         } else {
--            if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) {
-+            if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-                 kWarning(67100) <<  "pa_context_move_source_output_by_name() failed";
-                 return false;
-             }
diff --git a/extra/keytouch-editor/ChangeLog b/extra/keytouch-editor/ChangeLog
deleted file mode 100644
index 0503eb1f7..000000000
--- a/extra/keytouch-editor/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2008-06-22  Eric Belanger  <eric@archlinux.org>
-
-	* keytouch-editor 3.1.3-1
-	* Patched for glibc 2.8
-        * Added to [extra] repo
-        * Added ChangeLog
-
-
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 4c8f9ee0d..015044fe8 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -1,38 +1,59 @@
-# $Id: PKGBUILD 119587 2011-04-12 15:18:27Z angvp $
-# Contributer: Jason Chu <jason@archlinux.org>
-# Maintainer: Juergen Hoetzel <jason@archlinux.org>
+# $Id: PKGBUILD 123234 2011-05-09 12:19:16Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Jason Chu <jason@archlinux.org>
+# Contributor: Juergen Hoetzel <jason@archlinux.org>
 
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=1
-pkgdesc="802.11b sniffing software"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7')
-optdepends=(perl-libwww)
+pkgrel=2
+pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+arch=('i686' 'x86_64')
 url="http://www.kismetwireless.net/"
+license=('GPL')
+depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
+makedepends=() # already in core: ('grep' 'gcc-libs')
+optdepends=('gpsd: log coordinates of detected networks'
+            'wireshark: provide OUI files used to determine device manufacturer'
+            'wireshark: mergecap, to merge multiple capture files'
+            'sox: provide the default kismet sound playback binary'
+            'festival: text-to-speech support'
+            'flite:  alternative/lightweight text-to-speech support'
+            'mac80211-driver: full rfmon support'
+            'ruby: ruby interface')
 backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
-options=('!makeflags')
-source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz)
+options=()
+install=kismet.install
+changelog=kismet.changelog
+source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz")
 md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
 
 build() {
-   cd "$srcdir/kismet-$_realver"
+    cd "${srcdir}/${pkgname}-${_realver}"
+
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var
+    make dep
+    make
 
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc \
-               --localstatedir=/var 
+    # Include plugins bundled with kismet
+    make plugins
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${_realver}"
 
-   make dep
-   make 
-   sed -i 's/prism2/wlanng/g' conf/kismet.conf
-   make DESTDIR="$pkgdir" install
+    # Install kismet
+    make DESTDIR="$pkgdir" install
 
-   chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
+    # Install plugins
+    make plugins-install DESTDIR="$pkgdir"
 
-   install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README"
+    # the README is very comprehensive, a good idea to include it
+    install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README"
 
-   # Fix the *.conf unexpanded ${prefix} problems
-   sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf 
+    # Our own suid-install, first half (see kismet.install)
+    install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/"
 }
+
diff --git a/extra/kismet/kismet.changelog b/extra/kismet/kismet.changelog
new file mode 100644
index 000000000..e66dcfda0
--- /dev/null
+++ b/extra/kismet/kismet.changelog
@@ -0,0 +1,26 @@
+2010-05-07 Angel Velasquez <angvp@archlinux.org>
+    * ChangeLog added
+
+    * Removed old patches from SVN
+
+    * Applied changes from FS#15746 thanks to people who worked on it. 
+
+    * Files that are no longer shipped and so should not be backed up:
+      backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf')
+
+    *  No longer needed; gpsmap is deprecated and being replaced with a tile-based
+      mapper, as of yet incomplete
+      optdepends=('perl-libwww: fetch maps for gpsmap')
+
+    * Configuration has completely changed, no longer containing
+      references to either prism2 or wlanng 
+      sed -i 's/prism2/wlanng/g' conf/kismet.conf
+
+    * Ownership of man pages now defaults to "root" if the group "man" does not exist
+      chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
+
+    * Dependencies no longer needed
+      depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7')
+
+    * Options no longer needed
+      options=('!makeflags')
diff --git a/extra/kismet/kismet.install b/extra/kismet/kismet.install
new file mode 100644
index 000000000..0bc806034
--- /dev/null
+++ b/extra/kismet/kismet.install
@@ -0,0 +1,34 @@
+## arg 1:  the new package version
+post_install() {
+  post_upgrade
+
+  cat << EOP
+  If you have not done so already, read the README file and the FAQ file.
+	You MUST edit /etc/kismet.conf and configure Kismet for your system, or
+  it will NOT run properly!"
+
+  Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by 
+  users in the group ' kismet '.  This WILL ALLOW USERS IN THIS GROUP 
+  TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running 
+  all of Kismet as root.  ONLY users in this group will be able to 
+  run Kismet and capture from physical network devices.
+EOP
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  # Add the group needed to use the limited-functionality binary "kismet_capture"
+  # Change group ownership of "kismet_capture" to this new group
+  # Preserve the file mode bits of "kismet_capture"
+  getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null
+  chown root:kismet "/usr/bin/kismet_capture"
+  chmod 4550 "/usr/bin/kismet_capture"
+}
+
+## arg 1:  the old package version
+post_remove() {
+  getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/kobodeluxe/ChangeLog b/extra/kobodeluxe/ChangeLog
deleted file mode 100644
index 08b4c2dec..000000000
--- a/extra/kobodeluxe/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2009-01-06  Eric Belanger  <eric@archlinux.org>
-
-	* kobodeluxe 0.5.1-2
-	* Fixed build issue
-	* Added game group support
-	* Added .desktop file and icons
-	* Improved package description
-	* Added ChangeLog
diff --git a/extra/kobodeluxe/PKGBUILD b/extra/kobodeluxe/PKGBUILD
index be6f139a3..8a52ce946 100644
--- a/extra/kobodeluxe/PKGBUILD
+++ b/extra/kobodeluxe/PKGBUILD
@@ -1,44 +1,50 @@
-# $Id: PKGBUILD 23389 2009-01-09 00:47:54Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# $Id: PKGBUILD 122903 2011-05-07 08:05:30Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kobodeluxe
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.olofson.net/kobodl/"
 license=('GPL' 'LGPL')
-depends=('gcc-libs' 'libjpeg' 'libpng' 'sdl' 'sdl_image' 'sdl_mixer')
+depends=('libjpeg' 'libpng' 'sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache')
 install=kobodeluxe.install
-source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz kobodeluxe-gcc-4.3.patch)
-md5sums=('cf765559461213d651c7be042507b767' '2b76306ec997fdc64986b4425e5b7814')
-sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75' '274dc8e7909bc6f9fab31306c85d992af8b62674')
+source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz \
+        kobodeluxe-gcc-4.3.patch kobodeluxe-0.5.1-glibc2.10.patch)
+md5sums=('cf765559461213d651c7be042507b767'
+         '2b76306ec997fdc64986b4425e5b7814'
+         '56115c9a1e3db1b95b731fdcb11f3f4f')
+sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75'
+          '274dc8e7909bc6f9fab31306c85d992af8b62674'
+          '9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0')
 
 build() {
-  cd ${srcdir}/KoboDeluxe-${pkgver}
+  cd "${srcdir}/KoboDeluxe-${pkgver}"
   patch -p0 < ../kobodeluxe-gcc-4.3.patch
-  ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  patch -p0 < ../kobodeluxe-0.5.1-glibc2.10.patch
+  ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games
+  make
+}
+
+package() {
+  cd "${srcdir}/KoboDeluxe-${pkgver}"
+  make DESTDIR="${pkgdir}" install
  
   tar -xzf icons.tar.gz
-  install -D -m644 icons/KDE/kobo-deluxe.desktop ${pkgdir}/usr/share/applications/kobo-deluxe.desktop
-  install -D -m644 icons/KDE/icons/128x128/kobodl.png ${pkgdir}/usr/share/icons/hicolor/128x128/kobodl.png
-  install -D -m644 icons/KDE/icons/16x16/kobodl.png ${pkgdir}/usr/share/icons/hicolor/16x16/kobodl.png
-  install -D -m644 icons/KDE/icons/22x22/kobodl.png ${pkgdir}/usr/share/icons/hicolor/22x22/kobodl.png
-  install -D -m644 icons/KDE/icons/32x32/kobodl.png ${pkgdir}/usr/share/icons/hicolor/32x32/kobodl.png
-  install -D -m644 icons/KDE/icons/48x48/kobodl.png ${pkgdir}/usr/share/icons/hicolor/48x48/kobodl.png
-  install -D -m644 icons/KDE/icons/64x64/kobodl.png ${pkgdir}/usr/share/icons/hicolor/64x64/kobodl.png
-  install -D -m644 icons/Ubuntu/kobo-icon.xpm ${pkgdir}/usr/share/pixmaps/kobo-icon.xpm
-  ln -s /usr/share/icons/hicolor/48x48/kobodl.png ${pkgdir}/usr/share/icons/kobodl.png
+  install -D -m644 icons/KDE/kobo-deluxe.desktop "${pkgdir}/usr/share/applications/kobo-deluxe.desktop"
+  for i in 16 22 32 48 64 128 ; do
+    install -D -m644 icons/KDE/icons/${i}x${i}/kobodl.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/kobodl.png"
+  done
+  install -D -m644 icons/Ubuntu/kobo-icon.xpm "${pkgdir}/usr/share/pixmaps/kobo-icon.xpm"
+  ln -s /usr/share/icons/hicolor/48x48/kobodl.png "${pkgdir}/usr/share/icons/kobodl.png"
 
-  chown root:games ${pkgdir}/usr/bin/kobodl
-  chmod 2755 ${pkgdir}/usr/bin/kobodl
-  chown root:games ${pkgdir}/var/games
-  chmod 775 ${pkgdir}/var/games
-  chown root:games ${pkgdir}/var/games/kobo-deluxe
-  chmod 775 ${pkgdir}/var/games/kobo-deluxe
-  chown root:games ${pkgdir}/var/games/kobo-deluxe/scores
-  chmod 775 ${pkgdir}/var/games/kobo-deluxe/scores
+  chown root:games "${pkgdir}/usr/bin/kobodl"
+  chmod 2755 "${pkgdir}/usr/bin/kobodl"
+  chown root:games "${pkgdir}/var/games"
+  chmod 775 "${pkgdir}/var/games"
+  chown root:games "${pkgdir}/var/games/kobo-deluxe"
+  chmod 775 "${pkgdir}/var/games/kobo-deluxe"
+  chown root:games "${pkgdir}/var/games/kobo-deluxe/scores"
+  chmod 775 "${pkgdir}/var/games/kobo-deluxe/scores"
 }
diff --git a/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch b/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch
new file mode 100644
index 000000000..1095cc1c7
--- /dev/null
+++ b/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- graphics/window.cpp
++++ graphics/window.cpp
+@@ -398,7 +398,7 @@
+ 		 */
+ 		if(token)
+ 		{
+-			char *tok = strchr(txt, token);
++			const char *tok = strchr(txt, token);
+ 			if(tok)
+ 				tokpos = tok-txt;
+ 			else
diff --git a/extra/kobodeluxe/kobodeluxe.install b/extra/kobodeluxe/kobodeluxe.install
index 7136b4880..54b9f81f6 100644
--- a/extra/kobodeluxe/kobodeluxe.install
+++ b/extra/kobodeluxe/kobodeluxe.install
@@ -4,18 +4,17 @@ post_install() {
 
 post_upgrade() {
   if [ -d usr/share/kobo-deluxe/kobo-deluxe/scores ] ; then
+    mkdir -p var/games/kobo-deluxe/scores/
     for i in usr/share/kobo-deluxe/kobo-deluxe/scores/* ; do
       mv $i var/games/kobo-deluxe/scores/
     done
     rmdir usr/share/kobo-deluxe/kobo-deluxe/scores
     rmdir usr/share/kobo-deluxe/kobo-deluxe
-    chgrp -R games /var/games/kobo-deluxe/scores/
+    chgrp -R games var/games/kobo-deluxe/scores/
   fi
-  # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that.
-  [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {
-  # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that.
-  [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index a0f1ebe79..af2e9d96d 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122112 2011-05-02 07:25:24Z andrea $
+# $Id: PKGBUILD 123660 2011-05-12 07:33:28Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ktorrent.org"
@@ -31,7 +31,7 @@ build() {
 	cmake ../${pkgname}-${pkgver} \
 	  -DCMAKE_BUILD_TYPE=Release \
 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DENABLE_MEDIAPLAYER_PLUGIN=false
+	  -DENABLE_MEDIAPLAYER_PLUGIN=true
 	make
 }
 
diff --git a/extra/ktorrent/ktorrent.install b/extra/ktorrent/ktorrent.install
index 3884b350d..c3f65a3dc 100644
--- a/extra/ktorrent/ktorrent.install
+++ b/extra/ktorrent/ktorrent.install
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
         update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index a82c71423..437416148 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 106688 2011-01-17 20:58:22Z tpowa $
+# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
-depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview' 'gtksourceview2')
+url="http://lablgtk.forge.ocamlcore.org/"
+depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
 makedepends=('ocaml')
-source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-$pkgver.tar.gz)
+source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
 options=(!makeflags)
+md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
 
 build() {
-  cd $startdir/src/lablgtk-$pkgver
-  ./configure
+  cd "${srcdir}/lablgtk-${pkgver}"
+  ./configure --prefix=/usr
   make world
   make opt
-  make  PREFIX=$startdir/pkg/usr LIBDIR=$startdir/pkg/usr/lib/ocaml BINDIR=$startdir/pkg/usr/bin INSTALLDIR=$startdir/pkg/usr/lib/ocaml/lablgtk2 DLLDIR=$startdir/pkg/usr/lib/ocaml/stublibs install
-rm -r $startdir/pkg/usr/bin
+  make DESTDIR="${pkgdir}" install
+  install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/"
+  rm -r "${pkgdir}/usr/bin"
 }
-md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
diff --git a/extra/lablgtk2/ocaml-3.12.patch b/extra/lablgtk2/ocaml-3.12.patch
deleted file mode 100644
index 1b960138f..000000000
--- a/extra/lablgtk2/ocaml-3.12.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-Index: src/gWindow.mli
-===================================================================
---- src/gWindow.mli	(revision 1514)
-+++ src/gWindow.mli	(revision 1515)
-@@ -191,9 +191,10 @@
- 
- (** Create popup windows
-    @gtkdoc gtk GtkDialog *)
--class ['a] dialog_ext : [> Gtk.dialog] obj ->
-+class ['a] dialog_ext : ([> Gtk.dialog] as 'b) obj ->
-   object
-     inherit ['a] dialog_skel
-+    val obj : 'b obj
-     method add_button : string -> 'a -> unit
-     method add_button_stock : GtkStock.id -> 'a -> unit
-   end
-@@ -203,6 +204,7 @@
- class ['a] dialog : [> Gtk.dialog] obj ->
-   object
-     inherit ['a] dialog_ext
-+    val obj : Gtk.dialog obj
-     method connect : 'a dialog_signals
-   end
- 
-Index: src/gButton.mli
-===================================================================
---- src/gButton.mli	(revision 1514)
-+++ src/gButton.mli	(revision 1515)
-@@ -357,9 +357,10 @@
- (** @gtkdoc gtk GtkToolItem 
-     @since GTK 2.4 *)
- class tool_item : 
--  [> Gtk.tool_item] obj ->
-+  ([> Gtk.tool_item] as 'a) obj ->
-   object
-     inherit tool_item_skel
-+    val obj : 'a obj
-     method connect : GContainer.container_signals
-   end
- 
-@@ -423,9 +424,10 @@
- (** @gtkdoc gtk GtkToolButton
-     @since GTK 2.4 *)
- class tool_button : 
--  [> Gtk.tool_button] obj ->
-+  ([> Gtk.tool_button] as 'a) obj ->
-   object
-     inherit tool_button_skel
-+    val obj : 'a obj
-     method connect : tool_button_signals
-   end
- 
-Index: src/gAction.mli
-===================================================================
---- src/gAction.mli	(revision 1514)
-+++ src/gAction.mli	(revision 1515)
-@@ -20,6 +20,10 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+(* $Id: lablgtk-2.14.1-ocaml312.patch,v 1.1 2010/08/03 20:38:29 aballier Exp $ *)
-+
-+open Gobject
-+
- (** Action-based menus and toolbars *)
- 
- (** {3 GtkAction} *)
-@@ -27,9 +31,9 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkAction *)
- class action_signals :
--  ([> Gtk.action ] as 'b) Gobject.obj ->
-+  ([> Gtk.action ] as 'b) obj ->
-   object ('a)
--    val obj : 'b Gobject.obj
-+    val obj : 'b obj
-     val after : bool
-     method after : < after : 'a; .. > as 'a
-     method activate : callback:(unit -> unit) -> GtkSignal.id
-@@ -38,10 +42,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkAction *)
- class action_skel :
--  ([> Gtk.action ] as 'a) Gobject.obj ->
-+  ([> Gtk.action ] as 'a) obj ->
-   object
--    val obj : 'a Gobject.obj
--    method as_action : Gtk.action Gobject.obj
-+    val obj : 'a obj
-+    method as_action : Gtk.action obj
- 
-     (** Properties *)
- 
-@@ -88,10 +92,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkAction *)
- class action :
--  ([> Gtk.action ] as 'a) Gobject.obj ->
-+  ([> Gtk.action ] as 'a) obj ->
-   object
-     inherit action_skel
--    val obj : 'a Gobject.obj
-+    val obj : 'a obj
-     method connect : action_signals
-   end
- 
-@@ -103,20 +107,20 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkToggleAction *)
- class toggle_action_signals :
--  ([> Gtk.toggle_action ] as 'b) Gobject.obj ->
-+  ([> Gtk.toggle_action ] as 'b) obj ->
-   object
-     inherit action_signals
--    val obj : 'b Gobject.obj
-+    val obj : 'b obj
-     method toggled : callback:(unit -> unit) -> GtkSignal.id
-   end
- 
- (** @since GTK 2.4
-     @gtkdoc gtk GtkToggleAction *)
- class toggle_action_skel :
--  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
-+  ([> Gtk.toggle_action ] as 'a) obj ->
-   object
-     inherit action_skel
--    val obj : 'a Gobject.obj
-+    val obj : 'a obj
-     method draw_as_radio : bool
-     method get_active : bool
-     method set_active : bool -> unit
-@@ -127,9 +131,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkToggleAction *)
- class toggle_action :
--  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
-+  ([> Gtk.toggle_action ] as 'a) obj ->
-   object
-     inherit toggle_action_skel
-+    val obj : 'a obj
-     method connect : toggle_action_signals
-   end
- 
-@@ -140,10 +145,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkRadioAction *)
- class radio_action_signals :
--  ([> Gtk.radio_action] as 'b) Gobject.obj ->
-+  ([> Gtk.radio_action] as 'b) obj ->
-   object
-     inherit toggle_action_signals
--    val obj : 'b Gobject.obj
-+    val obj : 'b obj
-     method changed :
-       callback:(int -> unit) -> GtkSignal.id
-   end
-@@ -151,12 +156,12 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkRadioAction *)
- class radio_action :
--  ([> Gtk.radio_action] as 'a) Gobject.obj ->
-+  ([> Gtk.radio_action] as 'a) obj ->
-   object
-     inherit toggle_action_skel
--    val obj : 'a Gobject.obj
-+    val obj : 'a obj
-     method connect : radio_action_signals
--    method as_radio_action : Gtk.radio_action Gobject.obj
-+    method as_radio_action : Gtk.radio_action obj
-     method get_current_value : int
-     method set_group : Gtk.radio_action Gtk.group -> unit
-     method set_value : int -> unit
-@@ -172,10 +177,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkActionGroup *)
- class action_group_signals :
--  ([> Gtk.action_group ] as 'b) Gobject.obj ->
-+  ([> Gtk.action_group ] as 'b) obj ->
-   object ('a)
-     val after : bool
--    val obj : 'b Gobject.obj
-+    val obj : 'b obj
-     method after : 'a
-     method connect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
-     method disconnect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
-@@ -186,10 +191,10 @@
- (** @since GTK 2.4
-     @gtkdoc gtk GtkActionGroup *)
- class action_group :
--  ([> Gtk.action_group ] as 'a) Gobject.obj ->
-+  ([> Gtk.action_group ] as 'a) obj ->
-   object
--    val obj : 'a Gobject.obj
--    method as_group : Gtk.action_group Gobject.obj
-+    val obj : 'a obj
-+    method as_group : Gtk.action_group obj
-     method connect : action_group_signals
-     method sensitive : bool
-     method set_sensitive : bool -> unit
-Index: src/gnoCanvas.mli
-===================================================================
---- src/gnoCanvas.mli	(revision 1514)
-+++ src/gnoCanvas.mli	(revision 1515)
-@@ -180,9 +180,10 @@
-   end
- 
- (** @gtkdoc libgnomecanvas GnomeCanvasItem *)
--class ['p] item : [> GnomeCanvas.item] Gtk.obj -> 
-+class ['p] item : ([> GnomeCanvas.item] as 'a) Gtk.obj -> 
-   object
-     inherit base_item
-+    val obj : 'a Gtk.obj
-     constraint 'p = [< items_properties]
-     method set : 'p list -> unit
-   end
-Index: src/gWindow.ml
-===================================================================
---- src/gWindow.ml	(revision 1514)
-+++ src/gWindow.ml	(revision 1515)
-@@ -171,7 +171,7 @@
- end
- 
- class ['a] dialog obj = object (self)
--  inherit ['a] dialog_ext obj
-+  inherit ['a] dialog_ext (obj :> Gtk.dialog obj)
-   method connect : 'a dialog_signals = new dialog_signals obj (self#decode)
- end
- 
-@@ -193,7 +193,7 @@
- type any_response = [GtkEnums.response | `OTHER of int]
- 
- class dialog_any obj = object (self)
--  inherit [any_response] dialog_base obj
-+  inherit [any_response] dialog_base (obj :> Gtk.dialog obj)
-   method private encode = function
-       `OTHER n -> n
-     | #GtkEnums.response as v -> Dialog.std_response v
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index c24e4d6fb..41b3a0f71 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120419 2011-04-23 21:33:28Z ibiru $
+# $Id: PKGBUILD 123051 2011-05-07 19:17:52Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=4.2.6
+pkgver=4.2.7
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('141259e19ba163500963bd5bd512cfa4eb542b24c99f2fa14a2ef27643308cd3')
+sha256sums=('0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
index 3f2165793..22b350783 100644
--- a/extra/libggz/PKGBUILD
+++ b/extra/libggz/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 123866 2011-05-14 00:16:35Z andrea $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libggz
 pkgver=0.0.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libgcrypt')
 options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('603739504648833779aa13b0327a1c3d')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD
index 69e035678..2e874487d 100644
--- a/extra/libgme/PKGBUILD
+++ b/extra/libgme/PKGBUILD
@@ -2,24 +2,23 @@
 # Contributer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
 pkgname=libgme
-pkgver=0.5.5
-pkgrel=3
+pkgver=0.6.0
+pkgrel=1
 pkgdesc="Video game music file emulation/playback library"
 url="http://game-music-emu.googlecode.com/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=(http://game-music-emu.googlecode.com/files/game-music-emu-${pkgver}.tbz2)
-md5sums=("94459001a763fb76209a550a03b7949e")
+source=(ftp://ftp.archlinux.org/other/game-music-emu/game-music-emu-${pkgver}.tar.xz)
+md5sums=('b72bc337ea4bd6dab7f0288ed4cd598e')
 
 build() {
-	cd "${srcdir}/game-music-emu-${pkgver}"
-	mkdir build
-	cd build
+  cd "${srcdir}/game-music-emu-${pkgver}"
+  mkdir build
+  cd build
 
-	msg "Starting build process."
-	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-	make
-	make DESTDIR="${pkgdir}" install
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD
index ec81f0eb5..a654b2790 100644
--- a/extra/libgnome/PKGBUILD
+++ b/extra/libgnome/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 99674 2010-11-16 00:21:13Z ibiru $ 
+# $Id: PKGBUILD 123229 2011-05-09 11:06:37Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libgnome
 pkgname=('libgnome' 'libgnome-data')
-pkgver=2.32.0
-pkgrel=3
+pkgver=2.32.1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('intltool' 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25')
+makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02')
+sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -23,7 +23,7 @@ build() {
 
 package_libgnome() {
     pkgdesc="Common libraries for GNOME"
-    depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25')
+    depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28')
 
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
@@ -44,6 +44,6 @@ package_libgnome-data() {
    done
 
    install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
    rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/libgnomecups/PKGBUILD b/extra/libgnomecups/PKGBUILD
index a867d0634..8a8739700 100644
--- a/extra/libgnomecups/PKGBUILD
+++ b/extra/libgnomecups/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 75341 2010-04-01 10:56:43Z allan $
+# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=libgnomecups
 pkgver=0.2.3
-pkgrel=7
+pkgrel=8
 pkgdesc="GNOME cups library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'GPL')
 url="http://www.gnome.org"
-depends=('libcups>=1.3.8-2' 'glib2>=2.16.4' 'heimdal>=1.3.1' 'gnutls>=2.4.1')
+depends=('libcups' 'glib2' 'krb5' 'gnutls')
 makedepends=('perlxml')
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
@@ -20,8 +20,12 @@ md5sums=('dc4920c15c9f886f73ea74fbff0ae48b'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # This avoids generating huge 'IPP request failed with status 1030' lines
-  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgnomeprint/PKGBUILD b/extra/libgnomeprint/PKGBUILD
index 7fcc3250e..4779db9b4 100644
--- a/extra/libgnomeprint/PKGBUILD
+++ b/extra/libgnomeprint/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 91999 2010-09-28 16:38:45Z ibiru $
+# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeprint
 pkgver=2.18.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Printing routines for GNOME"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'GPL')
-depends=('pango>=1.28.1' 'libart-lgpl>=2.3.21' 'libxml2>=2.7.7' 'libgnomecups>=0.2.3-4' 'heimdal>=1.3.3' 'gnutls>=2.8.6')
+depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls')
 makedepends=('intltool' 'pkgconfig')
 replaces=('libgnomeprint-cups')
 conflicts=('libgnomeprint-cups')
@@ -20,5 +20,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 6852860be..cdb51f1cb 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119045 2011-04-10 17:31:05Z andyrtr $
+# $Id: PKGBUILD 123808 2011-05-13 10:30:31Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@gmail.com>
 # Contributor: Bjorn Martensen
 
 pkgname=libisofs
-pkgver=1.0.6
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('acl' 'zlib')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('85b8d2c9e378dc01c4b6039bcc1c6b43')
+md5sums=('b404e1deeee000d90efbf8ed60360412')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libmcs/PKGBUILD.orig b/extra/libmcs/PKGBUILD.orig
deleted file mode 100644
index a00c9c10e..000000000
--- a/extra/libmcs/PKGBUILD.orig
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Brad Gordon <brad@rpgcyco.net>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=libmcs
-pkgver=0.7.2
-<<<<<<< HEAD
-pkgrel=1
-pkgdesc="Library which abstracts the storage of configuration settings"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.atheme.org/project/mcs"
-=======
-pkgrel=2
-pkgdesc='Library which abstracts the storage of configuration settings'
-arch=('i686' 'x86_64')
-url='http://www.atheme.org/project/mcs'
->>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa
-license=('BSD')
-depends=('libmowgli')
-source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2")
-sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c')
-
-build() {
-	cd "${srcdir}/libmcs-${pkgver}"
-	./configure --prefix=/usr --disable-gconf --disable-kconfig
-	make
-}
-
-package() {
-	cd "${srcdir}/libmcs-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
-}
diff --git a/extra/libmowgli/PKGBUILD.orig b/extra/libmowgli/PKGBUILD.orig
deleted file mode 100644
index 49586147d..000000000
--- a/extra/libmowgli/PKGBUILD.orig
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Brad Gordon <brad@rpgcyco.net>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=libmowgli
-pkgver=0.9.50
-pkgrel=1
-<<<<<<< HEAD
-pkgdesc="Class library containing performance and usability oriented extensions to C"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.atheme.org/project/mowgli"
-=======
-pkgdesc='Performance and usability-oriented extensions to C'
-arch=('i686' 'x86_64')
-url='http://www.atheme.org/project/mowgli'
->>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa
-license=('custom')
-depends=('glibc')
-source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2")
-sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88')
-
-build() {
-	cd "${srcdir}/libmowgli-${pkgver}"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/libmowgli-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING"
-}
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index cb6287b77..3b2fb76ce 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,32 +1,29 @@
-# $Id: PKGBUILD 101397 2010-11-29 04:35:05Z allan $
+# $Id: PKGBUILD 123216 2011-05-09 10:21:51Z jgc $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" 'mips64el')
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
 depends=('libusb-compat')
 makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cdc1cc6afa6be287ff6bc331e71bdc47')
 options=('!libtool')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('7d3c624d768adba8537f8bc9c0a82cbf')
 
 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 -m0644 libmtp.rules \
-         $pkgdir/lib/udev/rules.d/52-libmtp.rules
-  install -D -m0644 libmtp.fdi \
-         $pkgdir/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
+  install -D -m0644 libmtp.rules "${pkgdir}/lib/udev/rules.d/52-libmtp.rules"
 }
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index e67352204..34d03a7c6 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 115920 2011-03-22 14:03:02Z ibiru $
+# $Id: PKGBUILD 123347 2011-05-10 13:55:24Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="Desktop notification library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ 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=('9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6')
+sha256sums=('322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index 9f36b38ff..b5435f7c0 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100370 2010-11-23 01:14:32Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 123061 2011-05-07 21:22:40Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsamplerate
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/SRC/index.html"
diff --git a/extra/libstroke/ChangeLog b/extra/libstroke/ChangeLog
deleted file mode 100644
index cf5bc097b..000000000
--- a/extra/libstroke/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2009-03-14  Eric Belanger  <eric@archlinux.org>
-
-	* libstroke 0.5.1-3
-	* Fixed build issue
-	* Updated url
-	* Added license
-	* Added libx11 and gtk makedepends
-	* Added ChangeLog
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index a09b4aee1..ad67c9fe8 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 30070 2009-03-16 01:26:56Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 123180 2011-05-09 03:18:04Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=3
-pkgdesc="LibStroke is a stroke (mouse gesture) translation library"
+pkgrel=4
+pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
 makedepends=('libx11' 'gtk')
 options=('!libtool')
-source=(http://etla.net/libstroke/$pkgname-$pkgver.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch)
-md5sums=('51b9a4e309ac15cfcab96191eed03cb2' '60bbaf355355c3c66c8015b0f7feca85'\
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch)
+md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
+         '60bbaf355355c3c66c8015b0f7feca85'
          '96413a77e1d39d1a3223e8eb6be8ef01')
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
           'ee5a3635c31dba00b070a942c512cc0d53056188')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../libgstroke-Makefile.am.patch || return 1
-  patch -p1 < ../libstroke-Makefile.am.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../libgstroke-Makefile.am.patch
+  patch -p1 < ../libstroke-Makefile.am.patch
 
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake --add-missing --force --copy || return 1
+  libtoolize --force --copy
+  aclocal
+  autoconf
+  automake --add-missing --force --copy
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libtextcat/PKGBUILD b/extra/libtextcat/PKGBUILD
new file mode 100644
index 000000000..dfccfb8db
--- /dev/null
+++ b/extra/libtextcat/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 122957 2011-05-07 14:06:48Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=libtextcat
+pkgver=2.2
+pkgrel=8
+pkgdesc="Library that implements N-gram-based text categorization"
+arch=('i686' 'x86_64')
+url="http://software.wise-guys.nl/libtextcat/"
+license=('BSD')
+depends=('glibc')
+options=(!libtool)
+source=(http://software.wise-guys.nl/download/${pkgname}-${pkgver}.tar.gz
+	# from http://hg.services.openoffice.org/hg/DEV300/raw-file/tip/libtextcat/data/new_fingerprints/fpdb.conf
+	fpdb.conf
+	libtextcat-2.2-exportapi.patch
+	libtextcat-2.2-OOo.patch)
+md5sums=('128cfc86ed5953e57fe0f5ae98b62c2e'
+         'f4fafe97d3aa184f5476e4918dba045d'
+         '4c46fcb825ec13e9f7ae3728f5f4c834'
+         '1d5f1026392365c58f7a7406e923f886')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/libtextcat-2.2-exportapi.patch
+  patch -Np1 -i ${srcdir}/libtextcat-2.2-OOo.patch
+  autoreconf -fi
+  ./configure --prefix=/usr \
+    --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+#  install -D -m644 src/textcat.h ${pkgdir}/usr/include/textcat.h
+  
+  install -dm755 ${pkgdir}/usr/share/libtextcat/{LM,ShortTexts}
+  install -m644 ${srcdir}/fpdb.conf ${pkgdir}/usr/share/libtextcat
+  install -m644 langclass/conf.txt ${pkgdir}/usr/share/libtextcat
+  install -m644 langclass/LM/*.lm ${pkgdir}/usr/share/libtextcat/LM
+  install -m644 langclass/ShortTexts/*.txt ${pkgdir}/usr/share/libtextcat/ShortTexts
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  sed -i 's|LM|/usr/share/libtextcat/LM|' ${pkgdir}/usr/share/libtextcat/conf.txt
+}
+
diff --git a/extra/libtextcat/fpdb.conf b/extra/libtextcat/fpdb.conf
new file mode 100644
index 000000000..329184d51
--- /dev/null
+++ b/extra/libtextcat/fpdb.conf
@@ -0,0 +1,86 @@
+#
+# A sample config file for the language models
+# provided with Gertjan van Noords language guesser
+# (http://odur.let.rug.nl/~vannoord/TextCat/)
+#
+# Notes:
+# - You may consider eliminating a couple of small languages from this
+# list because they cause false positives with big languages and are
+# bad for performance. (Do you really want to recognize Drents?)
+# - Putting the most probable languages at the top of the list
+# improves performance, because this will raise the threshold for
+# likely candidates more quickly.
+#
+
+# this file have been modified (to OOo by Jocelyn MERAND joc.mer@gmail.com) to include country and encoding
+# guess strings are made as following : language-country-encoding
+
+afrikaans.lm                         af--utf8
+albanian.lm                          sq--utf8
+amharic_utf.lm                       am--utf8
+arabic.lm                            ar--utf8
+basque.lm                            eu--utf8
+belarus.lm                           be--utf8
+bosnian.lm                           bs--utf8
+breton.lm                            br--utf8
+catalan.lm                           ca--utf8
+chinese_simplified.lm                zh-CN-utf8
+chinese_traditional.lm               zh-TW-utf8
+croatian.lm                          hr--utf8
+czech.lm                             cs--utf8
+danish.lm                            da--utf8
+dutch.lm                             nl--utf8
+english.lm                           en--utf8
+esperanto.lm                         eo--utf8
+estonian.lm                          et--utf8
+finnish.lm                           fi--utf8
+french.lm                            fr--utf8
+frisian.lm                           fy--utf8
+georgian.lm                          ka--utf8
+german.lm                            de--utf8
+greek.lm                             el--utf8
+hebrew.lm                            he--utf8
+hindi.lm                             hi--utf8
+hungarian.lm                         hu--utf8
+icelandic.lm                         is--utf8
+indonesian.lm                        id--utf8
+irish_gaelic.lm                      ga--utf8
+italian.lm                           it--utf8
+japanese.lm                          ja--utf8
+korean.lm                            ko--utf8
+latin.lm                             la--utf8
+latvian.lm                           lv--utf8
+lithuanian.lm                        lt--utf8
+luxembourgish.lm                     lb--utf8
+malay.lm                             ms--utf8
+manx_gaelic.lm                       gv--utf8
+marathi.lm                           mr--utf8
+mongolian_cyrillic.lm                mn--utf8
+nepali.lm                            ne--utf8
+norwegian.lm                         nb--utf8       # Norwegian (Bokmal)
+persian.lm                           fa--utf8       # Farsi
+polish.lm                            pl--utf8
+portuguese.lm                        pt-PT-utf8
+quechua.lm                           qu--utf8
+romanian.lm                          ro--utf8
+romansh.lm                           rm--utf8
+russian.lm                           ru--utf8
+sanskrit.lm                          sa--utf8
+scots.lm                             sco--utf8
+scots_gaelic.lm                      gd--utf8
+serbian.lm                           sr--utf-8
+serbian-latin.lm                     sh--utf-8
+slovak_ascii.lm                      sk-SK-utf8
+slovenian.lm                         sl--utf8
+spanish.lm                           es--utf8
+swahili.lm                           sw--utf8
+swedish.lm                           sv--utf8
+tagalog.lm                           tl--utf8
+tamil.lm                             ta--utf8
+thai.lm                              th--utf8
+turkish.lm                           tr--utf8
+ukrainian.lm                         uk--utf8
+vietnamese.lm                        vi--utf8
+welsh.lm                             cy--utf8
+yiddish_utf.lm                       yi--utf8
+zulu.lm                              zu--utf8
diff --git a/extra/libtextcat/libtextcat-2.2-OOo.patch b/extra/libtextcat/libtextcat-2.2-OOo.patch
new file mode 100644
index 000000000..70f9d8d23
--- /dev/null
+++ b/extra/libtextcat/libtextcat-2.2-OOo.patch
@@ -0,0 +1,634 @@
+diff -ruN libtextcat-2.2.part1/src/constants.h libtextcat-2.2/src/constants.h
+--- libtextcat-2.2.part1/src/constants.h	2007-07-25 10:46:49.000000000 +0100
++++ libtextcat-2.2/src/constants.h	2007-07-25 10:47:25.000000000 +0100
+@@ -39,6 +39,8 @@
+  */
+ #include <limits.h>
+ 
++#define _UTF8_
++
+ #define DESCRIPTION "out of place"
+ 
+ /* Reported matches are those fingerprints with a score less than best
+@@ -59,14 +61,21 @@
+ /* Maximum number of n-grams in a fingerprint */
+ #define MAXNGRAMS  400
+ 
+-/* Maximum size of an n-gram? */
+-#define MAXNGRAMSIZE 5
++/* Maximum number of character of an n-gram? */
++#define MAXNGRAMSYMBOL 5
++
++/* Maximum size of the string representing an n-gram (must be greater than number of symbol) */
++#ifdef _UTF8_
++#define MAXNGRAMSIZE 20
++#else
++#define MAXNGRAMSIZE MAXNGRAMSYMBOL
++#endif
+ 
+ /* Which characters are not acceptable in n-grams? */
+ #define INVALID(c) (isspace((int)c) || isdigit((int)c)) 
+ 
+ /* Minimum size (in characters) for accepting a document */
+-#define MINDOCSIZE  25
++#define MINDOCSIZE  6
+ 
+ /* Maximum penalty for missing an n-gram in fingerprint */
+ #define MAXOUTOFPLACE 400
+@@ -76,4 +85,7 @@
+ 
+ #define MAXSCORE  INT_MAX
+ 
++/* where the fingerprints files are stored */
++#define DEFAULT_FINGERPRINTS_PATH ""
++
+ #endif
+diff -ruN libtextcat-2.2.part1/src/fingerprint.c libtextcat-2.2/src/fingerprint.c
+--- libtextcat-2.2.part1/src/fingerprint.c	2007-07-25 10:46:49.000000000 +0100
++++ libtextcat-2.2/src/fingerprint.c	2007-07-25 10:47:25.000000000 +0100
+@@ -63,6 +63,10 @@
+  * - put table/heap datastructure in a separate file.
+  */
+ 
++#ifndef _UTF8_
++#define _UTF8_
++#endif
++
+ #include "config.h"
+ #include <stdio.h>
+ #ifdef HAVE_STDLIB_H
+@@ -80,10 +84,12 @@
+ #include "wg_mempool.h"
+ #include "constants.h"
+ 
++#include "utf8misc.h"
+ 
+ #define TABLESIZE  (1<<TABLEPOW)
+ #define TABLEMASK  ((TABLESIZE)-1)
+ 
++
+ typedef struct {
+ 
+ 	sint2 rank;
+@@ -134,29 +140,14 @@
+ }
+ 
+ 
+-/* checks if n-gram lex is a prefix of key and of length len */
+-inline int issame( char *lex, char *key, int len )
+-{
+-	int i;
+-	for (i=0; i<len; i++) {
+-		if ( key[i] != lex[i] ) {
+-			return 0;
+-		}
+-	}
+-	if ( lex[i] != 0 ) {
+-		return 0;
+-	}
+-	return 1;
+-}
+-
+ 
+ /* increases frequency of ngram(p,len) */
+-static inline int increasefreq( table_t *t, char *p, int len ) 
+-{	
+-	uint4 hash = simplehash( p, len ) & TABLEMASK;				
++static int increasefreq( table_t *t, char *p, int len )
++{
++	uint4 hash = simplehash( p, len ) & TABLEMASK;
+ 	entry_t *entry = t->table[ hash ];
+-	
+-	while ( entry ) {				
++
++	while ( entry ) {
+ 		if ( issame( entry->str, p, len ) ) {
+ 			/*** Found it! ***/
+ 			entry->cnt++;
+@@ -168,7 +159,7 @@
+ 	}
+ 
+ 	/*** Not found, so create ***/
+-	entry = wgmempool_alloc( t->pool, sizeof(entry_t) );
++        entry = (entry_t*)(wgmempool_alloc( t->pool, sizeof(entry_t) ));
+ 	strcpy( entry->str, p );
+ 	entry->cnt = 1;
+ 
+@@ -181,12 +172,12 @@
+ #if 0
+ 
+ /* looks up ngram(p,len) */
+-static entry_t *findfreq( table_t *t, char *p, int len ) 
+-{	
+-	uint4 hash = simplehash( p, len ) & TABLEMASK;				
++static entry_t *findfreq( table_t *t, char *p, int len )
++{
++	uint4 hash = simplehash( p, len ) & TABLEMASK;
+ 	entry_t *entry = t->table[ hash ];
+-	
+-	while ( entry ) {				
++
++	while ( entry ) {
+ 		if ( issame( entry->str, p, len ) ) {
+ 			return entry;
+ 		}
+@@ -219,7 +210,7 @@
+ #define GREATER(x,y) ((x).cnt > (y).cnt)
+ #define LESS(x,y)    ((x).cnt < (y).cnt)
+ 
+-inline static void siftup( table_t *t, unsigned int child )
++static void siftup( table_t *t, unsigned int child )
+ {
+ 	entry_t *heap = t->heap;
+ 	unsigned int parent = (child-1) >> 1;
+@@ -241,7 +232,7 @@
+ }
+ 
+ 
+-inline static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
++static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
+ {
+ 	entry_t *heap = t->heap;
+ 	unsigned int child = parent*2 + 1;
+@@ -458,21 +449,27 @@
+ 	return dest;
+ }
+ 
+-
++/**
++* this function extract all n-gram from past buffer and put them into the table "t"
++* [modified] by Jocelyn Merand to accept utf-8 multi-character symbols to be used in OpenOffice
++*/
+ static void createngramtable( table_t *t, const char *buf )
+ {
+ 	char n[MAXNGRAMSIZE+1];
+ 	const char *p = buf;
+ 	int i;
++        int pointer = 0;
+ 
+ 	/*** Get all n-grams where 1<=n<=MAXNGRAMSIZE. Allow underscores only at borders. ***/
+-	for (;;p++) {
++	while(1) {
+ 
+-		const char *q = p;
++     const char *q = &p[pointer];   /*[modified] previously p++ above (for(;;p++)) now, it's pointer wich is increased so we have to get the new pointer on the buffer*/
+ 		char *m = n;
+ 
+ 		/*** First char may be an underscore ***/
+-		*m++ = *q++;
++                int decay = charcopy(q, m); /*[modified] previously *q++ = *m++*/
++                q = &(p[pointer+decay]);    /*[modified] the old copying method do not manage multi-character symbols*/
++                m += decay; /*[modified]*/
+ 		*m = '\0';
+ 
+ 		increasefreq( t, n, 1 );
+@@ -482,19 +479,22 @@
+ 		}
+ 
+ 		/*** Let the compiler unroll this ***/
+-		for ( i=2; i<=MAXNGRAMSIZE; i++) {
++		for ( i=2; i<=MAXNGRAMSYMBOL; i++) {
+ 
+-			*m++ = *q;
++                        decay = charcopy(q, m); /*[modified] like above*/
++                        m += decay;
+ 			*m = '\0';
+ 
+ 			increasefreq( t, n, i );
+ 
+ 			if ( *q == '_' ) break;
+-			q++;
++                        q += decay;
+ 			if ( *q == '\0' ) {
+ 				return;
+ 			}
+ 		}
++
++  pointer = nextcharstart(p,pointer);   /*[modified] p[pointer] must point on the next start of symbol, but whith utf next start is not surely next char*/
+ 	}
+ 	return;
+ }
+diff -ruN libtextcat-2.2.part1/src/fingerprint.h.orig libtextcat-2.2/src/fingerprint.h.orig
+--- libtextcat-2.2.part1/src/fingerprint.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ libtextcat-2.2/src/fingerprint.h.orig	2007-07-25 10:47:22.000000000 +0100
+@@ -0,0 +1,55 @@
++#ifndef _FINGERPRINT_H_
++#define _FINGERPRINT_H_
++/*
++ * Copyright (C) 2003 WiseGuys Internet B.V.
++ *
++ * THE BSD LICENSE
++ * 
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 
++ * - Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 
++ * - 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.
++ * 
++ * - Neither the name of the WiseGuys Internet B.V. 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 COPYRIGHT
++ * OWNER 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.
++ */
++#include "common.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++extern void *fp_Init(const char *name);
++extern void fp_Done( void *handle );
++extern int fp_Create( void *handle, const char *buffer, uint4 bufsize, uint4 maxngrams );
++extern int fp_Read( void *handle, const char *fname, int maxngrams );
++extern sint4 fp_Compare( void *cat, void *unknown, int cutoff );
++extern void fp_Show( void *handle );
++extern const char *fp_Name( void *handle );
++extern void fp_Print( void *handle, FILE *fp );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff -ruN libtextcat-2.2.part1/src/textcat.c libtextcat-2.2/src/textcat.c
+--- libtextcat-2.2.part1/src/textcat.c	2007-07-25 10:46:49.000000000 +0100
++++ libtextcat-2.2/src/textcat.c	2007-07-25 10:47:25.000000000 +0100
+@@ -74,6 +74,7 @@
+ typedef struct {
+ 
+ 	void **fprint;
++        char *fprint_disable;
+ 	uint4 size;
+ 	uint4 maxsize;
+ 
+@@ -112,11 +113,21 @@
+ 		fp_Done( h->fprint[i] );
+ 	}
+ 	wg_free( h->fprint );
++        wg_free( h->fprint_disable );
+ 	wg_free( h );
+ 
+ }
+ 
+-extern void *textcat_Init( const char *conffile )
++/** Replaces older function */
++extern void *textcat_Init( const char *conffile ){
++    return special_textcat_Init( conffile, DEFAULT_FINGERPRINTS_PATH );
++}
++
++/**
++ * Originaly this function had only one parameter (conffile) it has been modified since OOo use
++ * Basicaly prefix is the directory path where fingerprints are stored
++ */
++extern void *special_textcat_Init( const char *conffile, const char *prefix )
+ {
+ 	textcat_t *h;
+ 	char line[1024];
+@@ -134,11 +145,13 @@
+ 	h->size = 0;
+ 	h->maxsize = 16;
+ 	h->fprint = (void **)wg_malloc( sizeof(void*) * h->maxsize );
++ h->fprint_disable = (char *)wg_malloc( sizeof(char*) * h->maxsize );   /*added to store the state of languages*/
+ 
+ 	while ( wg_getline( line, 1024, fp ) ) {
+ 		char *p;
+ 		char *segment[4];
+-		int res;
++                char finger_print_file_name[512];
++                int res;
+ 
+ 		/*** Skip comments ***/
+ #ifdef HAVE_STRCHR
+@@ -156,17 +169,23 @@
+ 		/*** Ensure enough space ***/
+ 		if ( h->size == h->maxsize ) {
+ 			h->maxsize *= 2;
+-			h->fprint = (void *)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
++			h->fprint = (void **)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
++                        h->fprint_disable = (char *)wg_realloc( h->fprint_disable, sizeof(char*) * h->maxsize );
+ 		}
+ 
+ 		/*** Load data ***/
+ 		if ((h->fprint[ h->size ] = fp_Init( segment[1] ))==NULL) {
+ 			goto ERROR;
+ 		}
+-		if ( fp_Read( h->fprint[h->size], segment[0], 400 ) == 0 ) {
++                finger_print_file_name[0] = '\0';
++                strcat(finger_print_file_name, prefix);
++                strcat(finger_print_file_name, segment[0]);
++
++                if ( fp_Read( h->fprint[h->size], finger_print_file_name, 400 ) == 0 ) {
+ 			textcat_Done(h);
+ 			goto ERROR;
+-		}		
++		}
++                h->fprint_disable[h->size] = 0xF0;  /*0xF0 is the code for enabled languages, 0x0F is for disabled*/
+ 		h->size++;
+ 	}
+ 
+@@ -203,11 +222,18 @@
+ 		result = _TEXTCAT_RESULT_SHORT;
+ 		goto READY;
+ 	}
+-	
++
+ 	/*** Calculate the score for each category. ***/
+ 	for (i=0; i<h->size; i++) {
+-		int score = fp_Compare( h->fprint[i], unknown, threshold );
+-		candidates[i].score = score;
++                int score;
++                if(h->fprint_disable[i] & 0x0F){    /*if this language is disabled*/
++                    score = MAXSCORE;
++                }
++                else{
++                    score = fp_Compare( h->fprint[i], unknown, threshold );
++                    /*printf("Score for %s : %i\n", fp_Name(h->fprint[i]), score);*/
++                }
++                candidates[i].score = score;
+ 		candidates[i].name = fp_Name( h->fprint[i] );
+ 		if ( score < minscore ) {
+ 			minscore = score;
+diff -ruN libtextcat-2.2.part1/src/textcat.h libtextcat-2.2/src/textcat.h
+--- libtextcat-2.2.part1/src/textcat.h	2007-07-25 10:46:49.000000000 +0100
++++ libtextcat-2.2/src/textcat.h	2007-07-25 10:48:18.000000000 +0100
+@@ -55,10 +54,19 @@
+  * Returns: handle on success, NULL on error. (At the moment, the
+  * only way errors can occur, is when the library cannot read the
+  * conffile, or one of the fingerprint files listed in it.)
++ *
++ * Replace older function (and has exacly the same behaviour)
++ * see below
+  */
+ extern void *textcat_Init( const char *conffile );
+ 
+ /**
++ * Originaly this function had only one parameter (conffile) it has been modified since OOo must be able to load alternativ DB
++ * Basicaly prefix is the directory path where fingerprints are stored
++ */
++extern void *special_textcat_Init( const char *conffile, const char *prefix );
++
++/**
+  * textcat_Done() - Free up resources for handle
+  */
+ extern void textcat_Done( void *handle );
+diff -ruN libtextcat-2.2.part1/src/utf8misc.c libtextcat-2.2/src/utf8misc.c
+--- libtextcat-2.2.part1/src/utf8misc.c	1970-01-01 01:00:00.000000000 +0100
++++ libtextcat-2.2/src/utf8misc.c	2007-07-25 10:48:57.000000000 +0100
+@@ -0,0 +1,132 @@
++/***************************************************************************
++ *   Copyright (C) 2006 by Jocelyn Merand                                  *
++ *   joc.mer@gmail.com                                                     *
++ *                                                                         *
++ * THE BSD LICENSE
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * - Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * - 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.
++ *
++ * - Neither the name of the WiseGuys Internet B.V. 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 COPYRIGHT
++ * OWNER 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.
++ ***************************************************************************/
++
++#ifndef _UTF8_MISC_H_
++#include "utf8misc.h"
++#endif
++
++
++int nextcharstart(const char *str, int position){
++    int pointer = position;
++
++    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
++
++        /*then str[pointer] is an escape character*/
++
++    char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count (by bit translation) following characters (only the weightest part)*/
++
++    while(escape_char & ESCAPE_MASK && str[pointer]){/*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
++        escape_char = escape_char <<1;
++        ++pointer;
++    }
++    }
++    if(str[pointer]){   /*finaly, if we are not on the \0 character, we jump to the next character*/
++        ++pointer;
++    }
++    return pointer;
++}
++
++
++int charcopy(const char *str, char *dest){
++
++    int pointer = 0;
++    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
++
++        /*then str[pointer] is an escape character*/
++
++        char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count following characters (only the weightest part)*/
++
++        while(escape_char & ESCAPE_MASK && str[pointer]){   /*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
++            dest[pointer] = str[pointer];
++            escape_char = escape_char <<1;
++            ++pointer;
++        }
++    }
++    if(str[pointer]){
++        dest[pointer] = str[pointer];
++        ++pointer;
++    }
++
++    return pointer;
++}
++
++
++int issame( char *lex, char *key, int len )
++{
++    /*printf("[%s] prefix of [%s] with length %i", lex, key, len);*/
++    int char_counter = 0;
++    int pointer = 0;
++    while(char_counter < len) {
++
++        if(key[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
++
++            /*then key[pointer] is an escap character*/
++
++            char escape_char = ((key[pointer] & WEIGHT_MASK) << 1);     /*and we use it to count (only the weightest part)*/
++
++            while(escape_char & ESCAPE_MASK && key[pointer] == lex[pointer] ){
++                escape_char = escape_char <<1;
++                ++pointer;
++            }
++        }
++        ++char_counter; /*and we are on a new utf8 character*/
++        if ( key[pointer] != lex[pointer] ) {
++            return 0;
++            /*printf(" NO\n", lex, key, len);*/
++        }
++        ++pointer;
++    }
++    if ( lex[pointer] != '\0' ) {
++        return 0;
++        /*printf(" NO\n");*/
++    }
++
++    /*printf(" YES\n");*/
++
++    return 1;
++}
++
++
++extern int utfstrlen(const char* str){
++    int char_counter = 0;
++    int pointer = 0;
++    while(str[pointer]) {
++        pointer = nextcharstart(str, pointer);
++
++        ++char_counter; /*and we are on a new utf8 character*/
++    }
++    return char_counter;
++}
++
+diff -ruN libtextcat-2.2.part1/src/utf8misc.h libtextcat-2.2/src/utf8misc.h
+--- libtextcat-2.2.part1/src/utf8misc.h	1970-01-01 01:00:00.000000000 +0100
++++ libtextcat-2.2/src/utf8misc.h	2007-07-25 10:48:57.000000000 +0100
+@@ -0,0 +1,88 @@
++/***************************************************************************
++ *   Copyright (C) 2006 by Jocelyn Merand                                  *
++ *   joc.mer@gmail.com                                                     *
++ *                                                                         *
++ * THE BSD LICENSE
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * - Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * - 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.
++ *
++ * - Neither the name of the WiseGuys Internet B.V. 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 COPYRIGHT
++ * OWNER 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.
++ ***************************************************************************/
++
++#ifndef _UTF8_MISC_H_
++#define _UTF8_MISC_H_
++
++/**
++ * These variables are used in character processing functions
++ * These have been added to manage utf-8 symbols, particularly escape chars
++ */
++#ifdef _UTF8_
++#define ESCAPE_MASK 0x80
++#define WEIGHT_MASK 0xF0
++#else
++#define ESCAPE_MASK 0xFF
++#define WEIGHT_MASK 0x00
++#endif
++
++
++/*
++ * Is used to jump to the next start of char
++ * of course it's only usefull when encoding is utf-8
++ * This function have been added by Jocelyn Merand to use libtextcat in OOo
++ */
++int nextcharstart(const char *str, int position);
++
++
++/*Copy the char in str to dest
++ * of course it's only usefull when encoding is utf8 and the symbol is encoded with more than 1 char
++ * return the number of char jumped
++ * This function have been added by Jocelyn Merand to use libtextcat in OOo
++ */
++int charcopy(const char *str, char *dest);
++
++
++/* checks if n-gram lex is a prefix of key and of length len
++* if _UTF8_ is defined, it uses escap characters and len is not realy the length of lex
++* in this case, len is the number of utf-8 char strlen("€") == 3 but len == 1
++*/
++int issame( char *lex, char *key, int len );
++
++
++/* Counts the number of characters
++* if _UTF8_ is defined, it uses escap characters and the result is not realy the length of str
++* in this case, the result is the number of utf-8 char strlen("€") == 3 but utfstrlen("€") == 1
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++extern int utfstrlen(const char* str);
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++
+--- libtextcat-2.2.part2/src/Makefile.am	2007-07-25 10:55:02.000000000 +0100
++++ libtextcat-2.2/src/Makefile.am	2007-07-25 10:55:52.000000000 +0100
+@@ -12,11 +12,11 @@
+ 
+ libtextcat_includedir = $(includedir)/libtextcat
+ libtextcat_include_HEADERS = \
+-	common.h constants.h fingerprint.h textcat.h
++	common.h constants.h fingerprint.h textcat.h utf8misc.h
+ 
+ lib_LTLIBRARIES =	libtextcat.la
+ libtextcat_la_SOURCES = \
+-	common.c fingerprint.c textcat.c wg_mempool.c
++	common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c
+ 
+ bin_PROGRAMS =		createfp
+ createfp_SOURCES =	createfp.c
diff --git a/extra/libtextcat/libtextcat-2.2-exportapi.patch b/extra/libtextcat/libtextcat-2.2-exportapi.patch
new file mode 100644
index 000000000..acf84e099
--- /dev/null
+++ b/extra/libtextcat/libtextcat-2.2-exportapi.patch
@@ -0,0 +1,305 @@
+diff -ruN libtextcat-2.2.orig/src/common.c libtextcat-2.2/src/common.c
+--- libtextcat-2.2.orig/src/common.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/common.c	2007-06-27 17:45:16.000000000 +0100
+@@ -45,7 +45,7 @@
+ #endif
+ #include <stdarg.h>
+ #include <ctype.h>
+-#include "common.h"
++#include "common_impl.h"
+ 
+ extern void wgmem_error( const char *fmt, ... )
+ {
+@@ -55,8 +55,6 @@
+         va_start(ap, fmt);
+         vfprintf(stderr, fmt, ap);
+         va_end(ap);
+-
+-	exit(-1);
+ }
+ 
+ 
+diff -ruN libtextcat-2.2.orig/src/common_impl.h libtextcat-2.2/src/common_impl.h
+--- libtextcat-2.2.orig/src/common_impl.h	1970-01-01 01:00:00.000000000 +0100
++++ libtextcat-2.2/src/common_impl.h	2007-06-27 17:45:16.000000000 +0100
+@@ -0,0 +1,66 @@
++#ifndef _COMMON_IMPL_H_
++#define _COMMON_IMPL_H_
++/**
++ * common_impl.h -- a mixed bag of helper functions 
++ *
++ * Copyright (C) 2003 WiseGuys Internet B.V.
++ *
++ * THE BSD LICENSE
++ * 
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 
++ * - Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 
++ * - 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.
++ * 
++ * - Neither the name of the WiseGuys Internet B.V. 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 COPYRIGHT
++ * OWNER 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.
++ */
++
++#include "config.h"
++#ifndef HAVE_MALLOC
++#error "This library needs a GNU like malloc to compile. 'configure' says there isn't one."
++#endif
++#ifndef HAVE_REALLOC
++#error "This library needs a GNU like realloc to compile. 'configure' says there isn't one."
++#endif
++#ifndef HAVE_STRDUP
++#error "This library needs a GNU like strdup to compile. 'configure' says there isn't one."
++#endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#endif
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++#include "common.h"
++
++#define WGMIN(x,y)         ((x)<=(y)?(x):(y))
++#define WGMAX(x,y)         ((x)<=(y)?(y):(x))
++#define __STR__(x)         #x
++#define WGSTR(x)           __STR__(x)
++
++#endif
+diff -ruN libtextcat-2.2.orig/src/createfp.c libtextcat-2.2/src/createfp.c
+--- libtextcat-2.2.orig/src/createfp.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/createfp.c	2007-06-27 17:45:16.000000000 +0100
+@@ -44,7 +44,7 @@
+ #endif
+ 
+ #include "fingerprint.h"
+-#include "common.h"
++#include "common_impl.h"
+ 
+ #define BLOCKSIZE 4096
+ 
+diff -ruN libtextcat-2.2.orig/src/fingerprint.c libtextcat-2.2/src/fingerprint.c
+--- libtextcat-2.2.orig/src/fingerprint.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/fingerprint.c	2007-06-27 17:45:16.000000000 +0100
+@@ -76,7 +76,7 @@
+ #endif
+ #include <ctype.h>
+ 
+-#include "common.h"
++#include "common_impl.h"
+ #include "wg_mempool.h"
+ #include "constants.h"
+ 
+diff -ruN libtextcat-2.2.orig/src/Makefile.am libtextcat-2.2/src/Makefile.am
+--- libtextcat-2.2.orig/src/Makefile.am	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/Makefile.am	2007-06-27 17:47:40.000000000 +0100
+@@ -8,7 +8,11 @@
+ AM_LDFLAGS =	-g
+ 
+ noinst_HEADERS = \
+-	common.h constants.h fingerprint.h textcat.h wg_mempool.h
++	common_impl.h wg_mempool.h
++
++libtextcat_includedir = $(includedir)/libtextcat
++libtextcat_include_HEADERS = \
++	common.h constants.h fingerprint.h textcat.h
+ 
+ lib_LTLIBRARIES =	libtextcat.la
+ libtextcat_la_SOURCES = \
+diff -ruN libtextcat-2.2.orig/src/testtextcat.c libtextcat-2.2/src/testtextcat.c
+--- libtextcat-2.2.orig/src/testtextcat.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/testtextcat.c	2007-06-27 17:45:16.000000000 +0100
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ #include "textcat.h"
+-#include "common.h"
++#include "common_impl.h"
+ 
+ #define BLOCKSIZE 4096
+ 
+diff -ruN libtextcat-2.2.orig/src/textcat.c libtextcat-2.2/src/textcat.c
+--- libtextcat-2.2.orig/src/textcat.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/textcat.c	2007-06-27 17:45:16.000000000 +0100
+@@ -65,7 +65,7 @@
+ #include <alloca.h>
+ #endif
+ 
+-#include "common.h"
++#include "common_impl.h"
+ #include "fingerprint.h"
+ #include "textcat.h"
+ #include "constants.h"
+diff -ruN libtextcat-2.2.orig/src/wg_mempool.c libtextcat-2.2/src/wg_mempool.c
+--- libtextcat-2.2.orig/src/wg_mempool.c	2007-06-27 17:02:34.000000000 +0100
++++ libtextcat-2.2/src/wg_mempool.c	2007-06-27 17:45:16.000000000 +0100
+@@ -41,7 +41,7 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+-#include "common.h"
++#include "common_impl.h"
+ 
+ typedef struct memblock_s {
+ 	char *pool;             
+diff -ru libtextcat-2.2.orig/src/common.h libtextcat-2.2/src/common.h
+--- libtextcat-2.2.orig/src/common.h	2003-05-22 14:02:29.000000000 +0100
++++ libtextcat-2.2/src/common.h	2007-06-28 09:10:42.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef _COMMON_H_
+ #define _COMMON_H_
+ /**
+- * common.h -- a mixed bag of helper functions 
++ * common.h
+  *
+  * Copyright (C) 2003 WiseGuys Internet B.V.
+  *
+@@ -36,56 +36,25 @@
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#include "config.h"
+-#ifndef HAVE_MALLOC
+-#error "This library needs a GNU like malloc to compile. 'configure' says there isn't one."
+-#endif
+-#ifndef HAVE_REALLOC
+-#error "This library needs a GNU like realloc to compile. 'configure' says there isn't one."
+-#endif
+-#ifndef HAVE_STRDUP
+-#error "This library needs a GNU like strdup to compile. 'configure' says there isn't one."
+-#endif
+ #include <stdio.h>
+-#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#else
+-#ifdef HAVE_STDINT_H
+-#include <stdint.h>
+-#endif
+-#endif
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/time.h>
+-#endif
+ #include <time.h>
+ 
+-#define WGMIN(x,y)         ((x)<=(y)?(x):(y))
+-#define WGMAX(x,y)         ((x)<=(y)?(y):(x))
+-#define __STR__(x)         #x
+-#define WGSTR(x)           __STR__(x)
+-
+-#ifdef HAVE_INTTYPES_H
+-typedef uint32_t	uint4;
+-typedef uint16_t	uint2;
+-typedef uint8_t		uchar;
+-
+-typedef int32_t		sint4;
+-typedef int16_t		sint2;
+-typedef int8_t		schar;
+-
+-typedef int8_t		boole;
+-#else
+-typedef unsigned long	uint4;
+-typedef unsigned int	uint2;
+-typedef unsigned char	uchar;
+-
+-typedef long		sint4;
+-typedef int		sint2;
+-typedef char		schar;
+-
+-typedef char		boole;
++#include <sys/time.h>
++#ifdef __cplusplus
++extern "C" {
+ #endif
+ 
++typedef uint32_t        uint4;
++typedef uint16_t        uint2;
++typedef uint8_t         uchar;
++
++typedef int32_t         sint4;
++typedef int16_t         sint2;
++typedef int8_t          schar;
++
++typedef int8_t          boole;
++
+ typedef struct wgtimer_s {
+         struct timeval start;
+         struct timeval stop;
+@@ -108,6 +76,8 @@
+ extern char *wg_strgmov( char *dest, const char *src, const char *destlimit );
+ extern char *wg_trim( char *dest, const char *src );
+ 
++#ifdef __cplusplus
++}
++#endif
+       
+ #endif
+-
+diff -ru libtextcat-2.2.orig/src/fingerprint.h libtextcat-2.2/src/fingerprint.h
+--- libtextcat-2.2.orig/src/fingerprint.h	2003-05-19 13:16:31.000000000 +0100
++++ libtextcat-2.2/src/fingerprint.h	2007-06-28 09:11:17.000000000 +0100
+@@ -35,6 +35,10 @@
+  */
+ #include "common.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern void *fp_Init(const char *name);
+ extern void fp_Done( void *handle );
+ extern int fp_Create( void *handle, const char *buffer, uint4 bufsize, uint4 maxngrams );
+@@ -44,4 +48,8 @@
+ extern const char *fp_Name( void *handle );
+ extern void fp_Print( void *handle, FILE *fp );
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- libtextcat-2.2.orig/src/textcat.h	2007-06-28 09:19:26.000000000 +0100
++++ libtextcat-2.2/src/textcat.h	2007-06-28 09:20:19.000000000 +0100
+@@ -37,6 +37,10 @@
+  */
+ #include <stdio.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #define _TEXTCAT_RESULT_UNKOWN        "UNKNOWN"
+ #define _TEXTCAT_RESULT_SHORT         "SHORT"
+ 
+@@ -77,4 +81,9 @@
+  * textcat_Version() - Returns a string describing the version of this classifier.
+  */
+ extern char *textcat_Version();
++
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index f1cfa64e7..30b22c16e 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 110381 2011-02-19 06:05:32Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 122922 2011-05-07 10:20:23Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
-depends=('libgsf>=1.14.3-2')
+depends=('gcc-libs')
+makedepends=('libgsf>=1.14.20')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6edd1b7eb8992888c6c82fc95859ac1b')
-sha1sums=('af4bc109ad270e873652d0af80e96b42d82dddbc')
+md5sums=('da43f18da732f6156cef145d06613960')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --without-docs
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
new file mode 100644
index 000000000..650e94400
--- /dev/null
+++ b/extra/libwps/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 122933 2011-05-07 10:59:22Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Robert McCathie <archaur at rmcc dot com dot au>
+
+pkgname=libwps
+pkgver=0.2.2
+pkgrel=1
+pkgdesc="a Microsoft Works file word processor format import filter library"
+arch=('i686' 'x86_64')
+url="http://libwps.sourceforge.net/"
+license=('LGPL')
+depends=('libwpd>=0.9.2')
+options=(!libtool)
+source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
+#md5sums=('83d4029aebf290c0a9a8fee9c99638d3')
+#md5sums=('9e436bff44c60dc8b97cba0c7fc11a5c')
+md5sums=('29721a16f25967d59969d5f0ae485b4a')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	sed -i -e 's: -Wall -Werror -pedantic::' configure.in
+	touch NEWS AUTHORS ChangeLog
+	autoreconf -fi
+	./configure  --prefix=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+
diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD
index 7dd7cb16e..5d7bdd2f0 100644
--- a/extra/libxext/PKGBUILD
+++ b/extra/libxext/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97797 2010-11-01 22:17:28Z jgc $
+# $Id: PKGBUILD 123247 2011-05-09 13:35:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxext
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="X11 miscellaneous extensions library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('libx11' 'xextproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
-sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e')
+sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d')
 
 build() {
   cd "${srcdir}/libXext-${pkgver}"
diff --git a/extra/lirc/PKGBUILD.orig b/extra/lirc/PKGBUILD.orig
deleted file mode 100644
index fb7621875..000000000
--- a/extra/lirc/PKGBUILD.orig
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=2
-epoch=1
-<<<<<<< HEAD
-_kernver=2.6.37-ARCH
-arch=('i686' 'x86_64' 'mips64el')
-=======
-_kernver=2.6.38-ARCH
-arch=('i686' 'x86_64')
->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
-url="http://www.lirc.org/"
-license=('GPL')
-makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  cd "${srcdir}/lirc-${pkgver}"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-      -e 's/@X_LIBS@//g' \
-      -e 's/@X_PRE_LIBS@//g' \
-      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-      --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
-  make
-}
-
-package_lirc() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
-  replaces=('lirc+pctv')
-  install=lirc.install
-
-  cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" install
-
-  # set the kernel we've built for inside the install script
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
-  pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
-  optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-
-  cd "${srcdir}/lirc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
-  # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-    
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
-  install -d "${pkgdir}/etc/lirc"
-  
-  # remove built modules
-  rm -r "${pkgdir}/lib/"
-}
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 3587a7775..234b009b6 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121057 2011-04-28 21:09:26Z heftig $
+# $Id: PKGBUILD 123080 2011-05-08 02:35:16Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -12,7 +12,7 @@
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=2.9
 _gcc_ver=4.6.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -24,7 +24,8 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz
         cindexer-clang-path.patch
         clang-toolchains-gcc-versions.patch
         clang-pure64.patch
-        enable-lto.patch)
+        enable-lto.patch
+        bug-9869-operator-h-c++0x.patch)
 md5sums=('793138412d2af2c7c7f54615f8943771'
          '634de18d04b7a4ded19ec4c17d23cfca'
          '70e23a3dc2b38ecb2bb4d2c48f47295d'
@@ -32,7 +33,8 @@ md5sums=('793138412d2af2c7c7f54615f8943771'
          '87a7162dbe99e9ffce6c40bd09f5f4f0'
          '8da236120a9a287a977b575b8b905c93'
          '225ee6b531f8327f34f344a18cb4ec81'
-         '8f7582d7440e4a8342c3aea9ec714fb4')
+         '8f7582d7440e4a8342c3aea9ec714fb4'
+         '047cac563a557463d7ec6bd87d953f5e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -73,6 +75,10 @@ build() {
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
 
+  # Fix upstream bug #9869:
+  #   Operator.h incompatibility with GCC 4.6 in C++0x mode
+  patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch"
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
diff --git a/extra/llvm/bug-9869-operator-h-c++0x.patch b/extra/llvm/bug-9869-operator-h-c++0x.patch
new file mode 100644
index 000000000..b95d7d772
--- /dev/null
+++ b/extra/llvm/bug-9869-operator-h-c++0x.patch
@@ -0,0 +1,57 @@
+--- llvm/trunk/include/llvm/Operator.h	2011/02/07 16:40:21	125006
++++ llvm/trunk/include/llvm/Operator.h	2011/05/08 01:59:22	131062
+@@ -186,28 +186,46 @@
+ };
+ 
+ class AddOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
++  ~AddOperator(); // DO NOT IMPLEMENT
++};
+ class SubOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
++  ~SubOperator(); // DO NOT IMPLEMENT
++};
+ class MulOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
++  ~MulOperator(); // DO NOT IMPLEMENT
++};
+ class ShlOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
++  ~ShlOperator(); // DO NOT IMPLEMENT
++};
+ 
+   
+ class SDivOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
++  ~SDivOperator(); // DO NOT IMPLEMENT
++};
+ class UDivOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
++  ~UDivOperator(); // DO NOT IMPLEMENT
++};
+ class AShrOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
++  ~AShrOperator(); // DO NOT IMPLEMENT
++};
+ class LShrOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
++  ~LShrOperator(); // DO NOT IMPLEMENT
++};
+   
+   
+   
+ class GEPOperator
+   : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
++  ~GEPOperator(); // DO NOT IMPLEMENT
++
+   enum {
+     IsInBounds = (1 << 0)
+   };
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 13b47314a..63dbc0ff2 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122622 2011-05-05 07:25:15Z eric $
+# $Id: PKGBUILD 123402 2011-05-11 03:51:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
@@ -15,7 +15,8 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
-        sensord.conf sensord.rc daemonarg.patch)
+        sensord.conf sensord.rc daemonarg.patch \
+        changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff)
 md5sums=('5eb18d7531ead4f54f28a1133a606535'
          'c370f5e620bfe41113354a1e22c0c18c'
          '232bedf043dd5dedde82df1a399c682c'
@@ -25,7 +26,8 @@ md5sums=('5eb18d7531ead4f54f28a1133a606535'
          '970408d2e509dc4138927020efefe323'
          '96a8dd468e81d455ec9b165bdf33e0b7'
          '41a5c20854bbff00ea7174bd2276b736'
-         '40c8eb16af8249a0f1d851fc1057ea15')
+         '40c8eb16af8249a0f1d851fc1057ea15'
+         '2f1c004bd525bdc9b2495503a77d375a')
 sha1sums=('16c13a186557164fa51459a02209b120c0335f96'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
@@ -35,12 +37,14 @@ sha1sums=('16c13a186557164fa51459a02209b120c0335f96'
           'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
           'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
           '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6')
+          '34241388c4001bfb6e49b7e10da1217e29a258d6'
+          '0de66445805adaf65935764da9974df1db125865')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../sensors-detect.patch
   patch -p1 < ../daemonarg.patch
+  patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
   make PREFIX=/usr
 }
 
diff --git a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
new file mode 100644
index 000000000..eb3c591b9
--- /dev/null
+++ b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
@@ -0,0 +1,44 @@
+Index: lm-sensors/trunk/prog/detect/sensors-detect
+===================================================================
+--- lm-sensors/trunk/prog/detect/sensors-detect	(revision 5963)
++++ lm-sensors/trunk/prog/detect/sensors-detect	(revision 5964)
+@@ -2416,5 +2416,5 @@
+ 		# Try some known default udev db locations, just in case
+ 		if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
+-		 || -e '/dev/.udevdb') {
++		 || -e '/dev/.udevdb' || -e '/run/udev') {
+ 			$use_udev = 1;
+ 			$dev_i2c = '/dev/i2c-';
+@@ -6460,4 +6460,20 @@
+ 		close(SYSCONFIG);
+ 
++		if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
++		    ! -f "/lib/systemd/system/lm_sensors.service") {
++			print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
++			      "and run 'systemctl enable lm_sensors.service'\n".
++			      "for initialization at boot time.\n";
++			return;
++		}
++
++		if (-x "/bin/systemctl" &&
++		    -f "/lib/systemd/system/lm_sensors.service") {
++			system("/bin/systemctl", "enable", "lm_sensors.service");
++			system("/bin/systemctl", "start", "lm_sensors.service");
++			# All done, don't check for /etc/init.d/lm_sensors
++			return;
++		}
++
+ 		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
+ 		      "for initialization at boot time.\n"
+@@ -6513,7 +6497,9 @@
+ 		exit -1;
+ 	}
+ 
+-	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
+-	    -f "/var/lock/subsys/lm_sensors") {
++       if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
++               system("/bin/systemctl", "stop", "lm_sensors.service");
++       } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
++                -f "/var/lock/subsys/lm_sensors") {
+ 		system("/sbin/service", "lm_sensors", "stop");
+ 	}
diff --git a/extra/lzo/PKGBUILD b/extra/lzo/PKGBUILD
index eef9fa8f2..f93973dba 100644
--- a/extra/lzo/PKGBUILD
+++ b/extra/lzo/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 37199 2009-05-01 03:25:47Z eric $
+# $Id: PKGBUILD 123754 2011-05-12 20:58:30Z andrea $
+# Maintainer:
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=lzo
 pkgver=1.08
-pkgrel=5
-pkgdesc="LZO is a portable lossless data compression library written in ANSI C"
-arch=(i686 x86_64 'mips64el')
+pkgrel=6
+pkgdesc='A portable lossless data compression library written in ANSI C'
+arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.oberhumer.com/opensource/lzo"
+url='http://www.oberhumer.com/opensource/lzo'
 depends=('glibc')
 makedepends=('nasm')
 options=('!libtool')
-source=(http://www.oberhumer.com/opensource/${pkgname}/download/${pkgname}-${pkgver}.tar.gz
-	nasm-gcc3.patch)
-md5sums=('ab94d3da364c7cbd5b78d76f1875b0f6' '43fb13762383b572d22152f8815ea4a5')
+source=("http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${pkgname}-${pkgver}.tar.gz"
+        'nasm-gcc3.patch')
+md5sums=('ab94d3da364c7cbd5b78d76f1875b0f6'
+         '43fb13762383b572d22152f8815ea4a5')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i  ${srcdir}/nasm-gcc3.patch || return 1
-  autoconf || return 1
-  ./configure --prefix=/usr --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	patch -p0 -i "${srcdir}"/nasm-gcc3.patch
+	autoconf
+	./configure --prefix=/usr --enable-shared
+	make
+}
+
+package() {
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index fcd327069..1ab450da4 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 122501 2011-05-04 10:25:04Z ronald $
+# $Id: PKGBUILD 123432 2011-05-11 11:09:27Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.47' 'texinfo' 'sh')
+depends=('sbcl=1.0.48' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/mc/PKGBUILD.orig b/extra/mc/PKGBUILD.orig
deleted file mode 100644
index de4f212dd..000000000
--- a/extra/mc/PKGBUILD.orig
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 119545 2011-04-12 03:04:01Z eric $
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=mc
-<<<<<<< HEAD
-pkgver=4.7.5.1
-pkgrel=2
-pkgdesc="A filemanager/shell that emulates Norton Commander"
-arch=('i686' 'x86_64' 'mips64el')
-=======
-pkgver=4.7.5.2
-pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
-arch=('i686' 'x86_64')
->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
-url="http://www.ibiblio.org/mc/"
-license=('GPL')
-depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
-makedepends=('libxt' 'libx11')
-optdepends=('p7zip: support for 7zip archives')
-provides=('mcedit-pkgbuild-syntax')
-conflicts=('mc-utf8')
-replaces=('mc-utf8')
-options=('!emptydirs' '!makeflags')
-source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdae966244496cd4f6d282d80c9cf3c6')
-sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-	    --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-	    --enable-background --enable-charset --enable-largefile \
-	    --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
-	    --with-screen=slang --with-subshell --with-vfs --with-x \
-	    --without-debug --without-gnome --without-included-gettext \
-	    --libexecdir=/usr/lib
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	# Fix FS#15177
-	sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-		-i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
-
-	# Fix FS#18312
-	rm "${pkgdir}/usr/lib/mc/extfs.d/u7z"
-
-	sed 's#/usr/bin/env python#/usr/bin/python2#' \
-		-i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
-}
diff --git a/extra/mesa/PKGBUILD.orig b/extra/mesa/PKGBUILD.orig
deleted file mode 100644
index c5fc9f4a6..000000000
--- a/extra/mesa/PKGBUILD.orig
+++ /dev/null
@@ -1,349 +0,0 @@
-# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
-
-#_git=true
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=7.10.0.git20110215
-  else
-    pkgver=7.10.2
-fi
-<<<<<<< HEAD
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-=======
-pkgrel=2
-arch=('i686' 'x86_64')
->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' 
-             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '3ec78f340f9387abd7a37b195e764cbf'
-         '67c87b77cc2236b52a3b47dad3fbb5d4'
-         'f5de82852f1243f42cc004039e10b771')
-
-build() {
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-    autoreconf -vfi
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-fi
-
-#backport from master to fix gnome-shell shader
-#https://bugs.freedesktop.org/show_bug.cgi?id=35714
-patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
-patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
-
-if [ "${_git}" = "true" ]; then
-    ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-radeon \
-    --enable-gallium-r600 \
-    --enable-gallium-nouveau \
-    --enable-gallium-swrast \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --with-state-trackers=dri,glx \
-    --disable-glut \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --disable-gallium-egl
-  else
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-radeon \
-    --enable-gallium-r600 \
-    --enable-gallium-nouveau \
-    --enable-gallium-swrast \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --with-state-trackers=dri,glx \
-    --disable-glut \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --disable-gallium-egl
-fi
-
-  make
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-fi
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-
-  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
-
-  cd src/mesa/drivers/dri
-  #make -C swrast DESTDIR="${pkgdir}" install
-if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-fi
-  ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_libgles() {
-  depends=('libgl')
-  pkgdesc="Mesa GLES libraries and headers"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-fi
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/GLES"
-  install -m755 -d "${pkgdir}/usr/include/GLES2"
-  bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  depends=('libgl')
-  pkgdesc="Mesa libEGL libraries and headers"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-fi
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/"
-  install -m755 -d "${pkgdir}/usr/include/EGL"
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  install -m755 -d "${pkgdir}/usr/share"
-  install -m755 -d "${pkgdir}/usr/share/doc"
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
-  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
-  bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-}
-package_mesa() {
-  depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-fi
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib/libGL.so"*
-  rm -f "${pkgdir}/usr/lib/libGLESv"*
-  rm -f "${pkgdir}/usr/lib/libEGL"*
-  rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -f "${pkgdir}/usr/include/GL/glew.h"
-  rm -f "${pkgdir}/usr/include/GL/glxew.h"
-  rm -f "${pkgdir}/usr/include/GL/wglew.h"
-  rm -f "${pkgdir}/usr/include/GL/glut.h"
-  rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C radeon DESTDIR="${pkgdir}" install
-  make -C r200 DESTDIR="${pkgdir}" install
-  # classic mesa driver for R300 r300_dri.so
-  #make -C r300 DESTDIR="${pkgdir}" install  <------- deprecated
-  # gallium3D driver for R300 r300_dri.so
-if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-fi
-  #make -C r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C i810 DESTDIR="${pkgdir}" install
-  make -C i915 DESTDIR="${pkgdir}" install
-  make -C i965 DESTDIR="${pkgdir}" install
-}
-
-package_unichrome-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C unichrome DESTDIR="${pkgdir}" install
-}
-
-package_mach64-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Mach64"
-  conflicts=('xf86-video-mach64<6.8.2')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C mach64 DESTDIR="${pkgdir}" install
-}
-
-package_mga-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Matrox"
-  conflicts=('xf86-video-mga<1.4.11')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C mga DESTDIR="${pkgdir}" install
-}
-
-package_r128-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Rage128"
-  conflicts=('xf86-video-r128<6.8.1')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C r128 DESTDIR="${pkgdir}" install
-}
-
-package_savage-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
-  conflicts=('xf86-video-savage<2.3.1')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C savage DESTDIR="${pkgdir}" install
-}
-
-package_sis-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for SiS"
-  conflicts=('xf86-video-sis<0.10.2')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C sis DESTDIR="${pkgdir}" install
-}
-
-package_tdfx-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for 3dfx"
-  conflicts=('xf86-video-tdfx<1.4.3')
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-  make -C tdfx DESTDIR="${pkgdir}" install
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C nouveau DESTDIR="${pkgdir}" install
-
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-fi
-}
-
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 14f66eb60..d96117ea1 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -37,7 +37,7 @@ build() {
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
+  ./configure --prefix=/usr \
 	--enable-addons \
 	--disable-hildon \
 	--enable-unique \
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 33dcf24cf..9a940857c 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 116680 2011-03-24 21:41:03Z bisson $
+# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $
 # Contributor: tobias [tobias [at] archlinux.org]
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt
 pkgver=1.5.21
-pkgrel=4
+pkgrel=5
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
 backup=('etc/Muttrc')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'heimdal')
+arch=('i686' 'x86_64')
+depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
 
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 4add473fa..0f40309d1 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $
+# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME3"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,11 +15,14 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        squash_some_leaks.patch)
+sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708'
+            'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/squash_some_leaks.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static
diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch
new file mode 100644
index 000000000..0e6b506bc
--- /dev/null
+++ b/extra/mutter/squash_some_leaks.patch
@@ -0,0 +1,70 @@
+From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 05 May 2011 20:11:02 +0000
+Subject: region-utils.c: Squash a memory leak
+
+"chunk" was an allocated but unused variable.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649504
+---
+diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c
+index b4071ca..cf3c64e 100644
+--- a/src/compositor/region-utils.c
++++ b/src/compositor/region-utils.c
+@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region,
+   MetaRegionBuilder builder;
+   MetaRegionIterator iter;
+   cairo_rectangle_int_t extents;
+-  cairo_region_t *chunk;
+ 
+   int last_x;
+ 
+@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region,
+                      extents.x, extents.y + extents.height, extents.width, 1,
+                      x_amount, y_amount, flip);
+ 
+-  chunk = NULL;
+-
+   last_x = extents.x;
+   for (meta_region_iterator_init (&iter, region);
+        !meta_region_iterator_at_end (&iter);
+        meta_region_iterator_next (&iter))
+     {
+-      if (chunk == NULL)
+-        chunk = cairo_region_create ();
+-
+       if (iter.rectangle.x > last_x)
+         add_expanded_rect (&builder,
+                            last_x, iter.rectangle.y,
+--
+cgit v0.9
+From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 05 May 2011 20:46:00 +0000
+Subject: theme.c: Squash memory leak
+
+When converting a token to a different type, we need to free its
+string.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649500
+---
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index 0077388..9305645 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme   *theme,
+         {
+           if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival))
+             {
++              g_free (t->d.v.name);
+               t->type = POS_TOKEN_INT;
+               t->d.i.val = ival;
+             }
+           else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval))
+             {
++              g_free (t->d.v.name);
+               t->type = POS_TOKEN_DOUBLE;
+               t->d.d.val = dval;
+             }
+--
+cgit v0.9
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 326472290..6f4d6c974 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 118056 2011-04-05 09:37:46Z andrea $
+# $Id: PKGBUILD 122912 2011-05-07 10:07:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.11
+pkgver=5.5.12
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('befa4e0d0aa95be6c8f6f143ae3b0641'
+md5sums=('53d31a0b24f3eb3176185090eff129b9'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index 746929a95..b43b0526d 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $
+# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 # KEEP LIBTOOL FILES!
 pkgname=neon
 pkgver=0.29.3
-pkgrel=2
+pkgrel=3
 pkgdesc="HTTP and WebDAV client library with a C interface"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
-depends=('heimdal' 'expat' 'ca-certificates')
+depends=('krb5' 'expat' 'ca-certificates')
 url="http://www.webdav.org/neon/"
 source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ba1015b59c112d44d7797b62fe7bee51')
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
     --with-expat --enable-shared --disable-static \
     --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make || return 1
+  make
 }
 
 package() {
diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD
index cc259782b..44e8df8d2 100644
--- a/extra/nss_ldap/PKGBUILD
+++ b/extra/nss_ldap/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 109106 2011-02-06 10:18:06Z andyrtr $
+# $Id: PKGBUILD 121171 2011-04-29 06:45:19Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Comete <la_comete@tiscali.fr>
 
 pkgname=nss_ldap
 pkgver=265
-pkgrel=1
+pkgrel=2
 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
 arch=(i686 x86_64 'mips64el')
 url="http://www.padl.com/OSS/nss_ldap.html"
 license=('LGPL')
-depends=('libldap>=2.4.18' 'heimdal>=1.2.1')
+depends=('libldap>=2.4.18' 'krb5')
 backup=("etc/nss_ldap.conf")
 source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
diff --git a/extra/obconf/PKGBUILD b/extra/obconf/PKGBUILD
index 1d64dd0f4..0fa8c420e 100644
--- a/extra/obconf/PKGBUILD
+++ b/extra/obconf/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 38529 2009-05-08 21:31:17Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# $Id: PKGBUILD 123764 2011-05-12 21:09:06Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=obconf
 pkgver=2.0.3
-pkgrel=3
-pkgdesc="A gtk2 based configuration tool for the Openbox windowmanager"
-arch=(i686 x86_64 'mips64el')
+pkgrel=4
+pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
+arch=('i686' 'x86_64')
+url="http://icculus.org/openbox/index.php/ObConf:About"
 license=('GPL')
-url="http://tr.openmonkey.com/pages/obconf/"
-depends=('openbox>=3.4.5' 'gtk2>=2.16.1' 'libglade' 'desktop-file-utils')
+depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
-source=(http://icculus.org/openbox/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        http://icculus.org/openbox/mw/images/8/80/Obconf-72.png)
-md5sums=('b22e273721851dedad72acbc77eefb68' '340ae4732e76731d2838473541eb8d4e')
+source=("http://icculus.org/openbox/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'http://icculus.org/openbox/mw/images/8/80/Obconf-72.png')
+md5sums=('b22e273721851dedad72acbc77eefb68'
+         '340ae4732e76731d2838473541eb8d4e')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  sed -i 's/=openbox/=obconf/' obconf.desktop || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -Dm644 ../Obconf-72.png ${startdir}/pkg/usr/share/pixmaps/obconf.png || return 1
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	./configure --prefix=/usr
+	make
+	sed -i 's/=openbox/=obconf/' obconf.desktop
+}
+
+package() {
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 ../Obconf-72.png \
+	    "${pkgdir}"/usr/share/pixmaps/obconf.png
 }
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 7c47f3050..2e994e28d 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88099 2010-08-19 13:05:24Z tpowa $
+# $Id: PKGBUILD 123206 2011-05-09 09:44:39Z jgc $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ocaml	
 pkgver=3.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -11,19 +11,23 @@ url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-3.12/$pkgname-$pkgver.tar.gz)
+source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz
+        fix-ocaml-binutils-2.21.patch)
 options=('!makeflags' '!emptydirs')
+md5sums=('3ba7cc65123c3579f14e7c726d3ee782'
+         '8c664a0a346424ea2ec6fc6f713170c6')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch"
   ./configure -prefix /usr 
-  make world.opt || return 1
-  make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install || return 1
+  make world.opt
+  make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
-# Save >10MB with this one, makepkg only strips debug symbols.
- find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
+  # Save >10MB with this one, makepkg only strips debug symbols.
+  #find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
 
-# install license
-install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE
+  # install license
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('3ba7cc65123c3579f14e7c726d3ee782')
diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch
new file mode 100644
index 000000000..fa7664cec
--- /dev/null
+++ b/extra/ocaml/fix-ocaml-binutils-2.21.patch
@@ -0,0 +1,66 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Tue, 8 Mar 2011 21:17:40 +0100
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5237
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
+Authors: Eric Cooper, spiralvoice
+Reviewed-by: Stéphane Glondu <steph@glondu.net>
+---
+ asmcomp/amd64/emit.mlp |   13 +++++++------
+ asmcomp/i386/emit.mlp  |    6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
+index 4a3f844..525c6e6 100644
+--- a/asmcomp/amd64/emit.mlp
++++ b/asmcomp/amd64/emit.mlp
+@@ -679,17 +679,18 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
++  begin match Config.system with
++    "linux" | "gnu" ->
++      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
++      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
++    | _ -> ()
++  end;
+   if !float_constants <> [] then begin
+     if macosx
+     then `	.literal8\n`
+     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
+     List.iter emit_float_constant !float_constants
+-  end;
+-  match Config.system with
+-    "linux" | "gnu" ->
+-      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
+-      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+-  | _ -> ()
++  end
+ 
+ (* Emission of data *)
+ 
+diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
+index 2992f29..0b1252c 100644
+--- a/asmcomp/i386/emit.mlp
++++ b/asmcomp/i386/emit.mlp
+@@ -905,12 +905,12 @@ let fundecl fundecl =
+   emit_all true fundecl.fun_body;
+   List.iter emit_call_gc !call_gc_sites;
+   emit_call_bound_errors ();
+-  List.iter emit_float_constant !float_constants;
+-  match Config.system with
++  begin match Config.system with
+     "linux_elf" | "bsd_elf" | "gnu" ->
+       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
+       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+-  | _ -> ()
++  | _ -> () end;
++  List.iter emit_float_constant !float_constants
+ 
+ 
+ (* Emission of data *)
+-- 
diff --git a/extra/opensp/PKGBUILD b/extra/opensp/PKGBUILD
index 322d75c4b..0559cfe6e 100644
--- a/extra/opensp/PKGBUILD
+++ b/extra/opensp/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 27683 2009-02-24 20:03:03Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 123744 2011-05-12 20:50:20Z andrea $
+# Maintainer:
+# Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=opensp
 pkgver=1.5.2
-pkgrel=1
-pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents."
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents"
+arch=('i686' 'x86_64')
 url="http://openjade.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!libtool')
-source=(http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz)
+source=("http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz")
 md5sums=('670b223c5d12cee40c9137be86b6c39b')
 
 build() {
-  cd $srcdir/OpenSP-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-     --disable-nls \
-     --enable-http \
-     --enable-default-catalog=/etc/sgml/catalog:/etc/xml/catalog \
-     --enable-default-search-path=/usr/share/sgml:/usr/share/xml \
-     --enable-xml-messages || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  cd "${srcdir}"/OpenSP-$pkgver
+  ./configure --prefix=/usr \
+    --mandir=/usr/share/man \
+    --disable-nls \
+    --enable-http \
+    --enable-default-catalog=/etc/sgml/catalog:/etc/xml/catalog \
+    --enable-default-search-path=/usr/share/sgml:/usr/share/xml \
+    --enable-xml-messages
+  make
+}
+
+package() {
+  cd "${srcdir}"/OpenSP-$pkgver
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/orca/PKGBUILD b/extra/orca/PKGBUILD
deleted file mode 100644
index c2049503f..000000000
--- a/extra/orca/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 99644 2010-11-15 23:32:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=orca
-pkgver=2.32.1
-pkgrel=1
-pkgdesc="A scriptable screen reader and magnifier"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-url="http://www.gnome.org/projects/orca"
-install=orca.install
-options=('!libtool')
-depends=('pygtk>=2.22.0' 'python2-gconf' 'python2-bonobo' 'python2-libgnome' 'python-wnck' 'dbus-python>=0.83.0' 'at-spi>=1.32.0' 'gnome-speech>=0.4.25' 'gnome-mag>=0.16.0' 'brltty' 'hicolor-icon-theme' 'pyxdg')
-makedepends=('intltool')
-replaces=('gnopernicus')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44da9da70c1b47bc87fda8f3b9da4cc1df9993d92388434f5707d39b5a832629')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/orca/orca.install b/extra/orca/orca.install
deleted file mode 100644
index 17ca8f78a..000000000
--- a/extra/orca/orca.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  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/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index 20bce5af7..a27d7abfd 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119675 2011-04-13 12:39:30Z andrea $
+# $Id: PKGBUILD 123677 2011-05-12 11:19:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('gtk2')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0aed63523f8abe79860e6b934a9d6210')
+md5sums=('4a30da4b5442d896c054cfcae783248e')
 
 build() {
   cd ${srcdir}
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 4b87c9924..18c3813c5 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119060 2011-04-10 18:47:30Z andrea $
+# $Id: PKGBUILD 122917 2011-05-07 10:12:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-gstreamer
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://phonon.kde.org"
@@ -12,10 +12,10 @@ depends=('gstreamer0.10-base-plugins')
 makedepends=('cmake' 'automoc4' 'phonon' 'mesa')
 provides=('phonon-backend')
 source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.bz2")
-md5sums=('2875139f2b7b649396125f4acc66de67')
+md5sums=('021cf7740208e7212b7ce91adb6a349b')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../phonon-backend-gstreamer-${pkgver} \
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 868e0937c..814b4a97f 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,90 +1,102 @@
-# $Id: PKGBUILD 114320 2011-03-12 12:41:32Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
-pkgbase=('pidgin')
-pkgname=('libpurple' 'pidgin' 'finch')
+pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.7.11
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
-             'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager')
+makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
+             'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
+             'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
+             'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('07c2a2535b4d7436b5ec7685fe063fec')
 
 build() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    sed -i "s#env python#env python2#" */plugins/*.py
-    sed -i "s#env python#env python2#" libpurple/purple-{remote,notifications-example,url-handler}
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --disable-schemas-install \
-                --disable-meanwhile \
-                --disable-gnutls \
-                --enable-cyrus-sasl \
-                --disable-doxygen \
-                --enable-nm \
-		--with-python=/usr/bin/python2 \
-                --with-system-ssl-certs=/etc/ssl/certs
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use Python 2
+  sed -i 's/env python$/\02/' */plugins/*.py \
+    libpurple/purple-{remote,notifications-example,url-handler}
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-schemas-install \
+    --disable-meanwhile \
+    --disable-gnutls \
+    --enable-cyrus-sasl \
+    --disable-doxygen \
+    --enable-nm \
+    --with-python=/usr/bin/python2 \
+    --with-system-ssl-certs=/etc/ssl/certs
     make
 }
-package_libpurple(){
-    pkgdesc="IM library extracted from Pidgin"
-    depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plugins')
-    optdepends=('dbus-python: for purple-remote and purple-url-handler')
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-
-    for dir in libpurple share/sounds share/ca-certs m4macros po
-    do
-        make -C "${dir}" DESTDIR="${pkgdir}" install
-    done
-#    rm -rf "$pkgdir/etc" || return 1
-}
 
 package_pidgin(){
-    pkgdesc="Multi-protocol instant messaging client"
-    depends=("libpurple=$pkgver" 'startup-notification' 'gtkspell' 'libxss' 'hicolor-icon-theme' 'gstreamer0.10')
-    optdepends=('aspell: for spelling correction'
-                'avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'gstreamer0.10-good-plugins: video and voice support'
-                'tk: Tcl/Tk scripting support')
+  pkgdesc="Multi-protocol instant messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'startup-notification' 'gtkspell'
+           'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction'
+              'ca-certificates: SSL CA certificates'
+              'gstreamer0.10-good-plugins: video and voice support'
+              'tk: Tcl/Tk scripting support')
+  install=pidgin.install
 
-    install=pidgin.install
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd "$srcdir/pidgin-$pkgver"
+  
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
 
-    make -C pidgin DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
+  make -C pidgin DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
 
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+  rm "$pkgdir/usr/share/man/man1/finch.1"
+}
 
-    install -D -m 0644 pidgin.desktop "${pkgdir}"/usr/share/applications/pidgin.desktop
+package_libpurple(){
+  pkgdesc="IM library extracted from Pidgin"
+  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss'
+           'cyrus-sasl-plugins')
+  optdepends=('avahi: Bonjour protocol support'
+              'dbus-python: for purple-remote and purple-url-handler')
+  
+  cd "$srcdir/pidgin-$pkgver"
 
-    rm -f "${pkgdir}"/usr/share/man/man1/finch.1
+  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+    make -C "$_dir" DESTDIR="$pkgdir" install
+  done
 }
+
 package_finch(){
-    pkgdesc="A ncurses-based messaging client"
-    depends=("libpurple=$pkgver" 'python2' 'gstreamer0.10')
-    optdepends=('avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'tk: Tcl/Tk scripting support')
-
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-    make -C finch DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
-
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
-    rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1
+  pkgdesc="A ncurses-based messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
+  optdepends=('avahi: Bonjour protocol support'
+              'ca-certificates: SSL CA certificates'
+              'tk: Tcl/Tk scripting support')
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C finch DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir"/usr/share/man/man1/pidgin.1
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index d28dc5481..f11499723 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgname=('poppler' 'poppler-glib') # 'poppler-qt')
 pkgver=0.16.4
 pkgrel=1
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
@@ -22,7 +22,7 @@ build() {
       --enable-cairo-output \
       --enable-xpdf-headers \
       --enable-libjpeg --enable-zlib \
-      --enable-poppler-qt4 \
+      --disable-poppler-qt4 \
       --enable-poppler-glib
   make
   sed -e 's/^glib_subdir =.*/glib_subdir =/' \
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 23f6cdb1a..05554e4e5 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117190 2011-03-29 13:39:06Z bisson $
+# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.2
-pkgrel=3
+pkgver=2.8.3
+pkgrel=1
 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=('224e0b6dd161f4648114de8902124c9dec64aa8c'
+sha1sums=('2604066f158f5327449960afd6334b996dc01799'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '050e6afc5886049682c945ce147b3c47fe113939')
 
diff --git a/extra/python-qt/PKGBUILD b/extra/python-qt/PKGBUILD
deleted file mode 100644
index cdf111a7f..000000000
--- a/extra/python-qt/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 110673 2011-02-21 12:42:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=python-qt
-pkgver=4.8.3
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-pkgdesc="A set of Python 3 bindings for the Qt toolkit"
-depends=('python2-qt' 'python-sip')
-optdepends=('phonon: enable audio and video in PyQt applications'
-	'qscintilla: QScintilla API'
-	'qt-assistant-compat: add PyQt online help in Qt Assistant')
-makedepends=('phonon' 'qt-assistant-compat')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('d54fd1c37a74864faf42709c8102f254')
-
-build() {
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package(){
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by python2-qt package
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/extra/python-sip/PKGBUILD b/extra/python-sip/PKGBUILD
deleted file mode 100644
index ba45af8a9..000000000
--- a/extra/python-sip/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 110667 2011-02-21 12:01:59Z stephane $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=python-sip
-pkgver=4.12.1
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-pkgdesc="A tool that makes it easy to create Python 3 bindings for C and C++ libraries"
-depends=('python2-sip' 'python')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${pkgver}.tar.gz")
-md5sums=('0f8e8305b14c1812191de2e0ee22fea9')
-
-build() {
-  cd "${srcdir}/sip-${pkgver}"
-
-  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package() {
-  cd "${srcdir}/sip-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  
-  # Provided by python2-sip package
-  rm "${pkgdir}/usr/bin/sip"
-}
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 8cea60985..478a2dfcb 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -39,7 +39,7 @@ build() {
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
-              --disable-valgrind\
+              --without-valgrind \
               --with-wide-unicode \
               --with-system-expat \
               --with-system-ffi
diff --git a/extra/python2-qt/PKGBUILD b/extra/python2-qt/PKGBUILD
deleted file mode 100644
index de24795ff..000000000
--- a/extra/python2-qt/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 107404 2011-01-24 17:30:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=python2-qt
-pkgver=4.8.3
-pkgrel=1
-pkgdesc="A set of Python 2 bindings for the Qt toolkit"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-depends=('qt' 'python2-sip' 'dbus-python')
-makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
-optdepends=('phonon: enable audio and video in PyQt applications'
-	'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-	'qscintilla: QScintilla API'
-	'qt-assistant-compat: add PyQt online help in Qt Assistant')
-replaces=('pyqt')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('d54fd1c37a74864faf42709c8102f254')
-
-build() {
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package(){
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/extra/python2-sip/PKGBUILD b/extra/python2-sip/PKGBUILD
deleted file mode 100644
index 477f7595d..000000000
--- a/extra/python2-sip/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 107403 2011-01-24 17:30:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgname=python2-sip
-pkgver=4.12.1
-pkgrel=1
-pkgdesc="A tool that makes it easy to create Python 2 bindings for C and C++ libraries"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-depends=('python2')
-replaces=('sip')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${pkgver}.tar.gz")
-md5sums=('0f8e8305b14c1812191de2e0ee22fea9')
-
-build() {
-  cd "${srcdir}/sip-${pkgver}"
-
-  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package() {
-  cd "${srcdir}/sip-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index 92058b649..cbe885624 100644
--- a/extra/qca-gnupg/PKGBUILD
+++ b/extra/qca-gnupg/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 123769 2011-05-12 21:14:25Z andrea $
+# Maintainer:
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca-gnupg
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
@@ -15,10 +16,14 @@ source=("http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${_pkgver}
 md5sums=('9b4d020efd835a52d98b2ced9ae79c4b')
 
 build() {
-	cd $srcdir/${pkgname}-${_pkgver}
+	cd "${srcdir}"/${pkgname}-${_pkgver}
 	./configure \
 		--release \
 		--no-separate-debug-info
-	make || return 1
-	make INSTALL_ROOT=$pkgdir install
+	make
+}
+
+package() {
+	cd "${srcdir}"/${pkgname}-${_pkgver}
+	make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index fa2b2aaa8..d8c966d4d 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 119950 2011-04-17 11:43:04Z andrea $
+# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python-qt')
+makedepends=('python2-pyqt')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
 md5sums=('dd7edef5ff674d307057a3c12dbd8fce'
@@ -52,7 +52,7 @@ package_qscintilla() {
 
 package_python-qscintilla() {
     pkgdesc="Python 3 bindings for QScintilla2"
-    depends=('python-qt' 'python2-qscintilla')
+    depends=('pyqt' 'qscintilla')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
@@ -61,7 +61,7 @@ package_python-qscintilla() {
 
 package_python2-qscintilla() {
     pkgdesc="Python 2 bindings for QScintilla2"
-    depends=('qscintilla' 'python2-qt')
+    depends=('python-qscintilla' 'python2-pyqt')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index e5823fc36..c0e86f867 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 120507 2011-04-24 15:55:09Z andrea $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 123699 2011-05-12 15:47:03Z andrea $
+# Maintainer:
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=19
-pkgdesc="The QT gui toolkit."
-arch=(i686 x86_64 'mips64el')
+pkgrel=20
+pkgdesc="The QT3 gui toolkit"
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.trolltech.com/products/qt/index.html"
 pkgfqn=qt-x11-free-${pkgver}
 install=qt.install
-depends=('libpng>=1.4.0' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' \
-	 'libxft' 'libxrandr' 'libmng>=1.0.10-3')
-makedepends=('mysql' 'postgresql>=8.2.3' 'unixodbc' 'sqlite3')
+depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
+         'libxrandr' 'libmng')
+makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \
-        qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
+source=("ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2"
+        qt3-png14.patch
+        qt.profile
+        qt-copy-kde-patches.tar.bz2
+        qt-patches.tar.bz2
+        utf8-bug-qt3.diff
 	    qt-font-default-subst.diff
         mysql.patch
         eastern_asian_languagues.diff
@@ -40,11 +45,11 @@ md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
 
 build() {
   unset QMAKESPEC
-  export QTDIR=${srcdir}/$pkgfqn
+  export QTDIR="${srcdir}"/$pkgfqn
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd ${srcdir}/$pkgfqn
+  cd "${srcdir}"/$pkgfqn
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
     patch -Np0 -i $i 
@@ -54,19 +59,19 @@ build() {
     patch -Np1 -i $i 
   done
   # fix utf8 bug
-  patch -Np0 -i ../utf8-bug-qt3.diff 
+  patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff 
   # fix asia fonts
-  patch -Np0 -i ../qt-font-default-subst.diff 
+  patch -p0 -i "${srcdir}"/qt-font-default-subst.diff 
   # fix segfaults on exit when using mysql DB driver
-  patch -Np0 -i ../mysql.patch 
+  patch -p0 -i "${srcdir}"/mysql.patch 
   # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff 
+  patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
   # fix build problem against new unixODBC
-  patch -p1 -i ${srcdir}/qt-odbc.patch 
+  patch -p1 -i "${srcdir}"/qt-odbc.patch 
   # fix build with gcc 4.6.0
-  patch -p1 -i ${srcdir}/gcc-4.6.patch
+  patch -p1 -i "${srcdir}"/gcc-4.6.patch
 
-  patch -p0 -i ${srcdir}/qt3-png14.patch 
+  patch -p0 -i "${srcdir}"/qt3-png14.patch 
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
   rm -rf doc/html examples tutorial
@@ -85,45 +90,54 @@ build() {
     else unset ARCH
   fi
 
-  ./configure -prefix /opt/qt -platform linux-g++$ARCH \
-    -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
+  ./configure -prefix /opt/qt \
+    -platform linux-g++$ARCH \
+    -system-zlib \
+    -qt-gif \
+    -release \
+    -shared \
+    -sm \
+    -nis \
+    -thread \
+    -stl \
     -system-lib{png,jpeg,mng} \
-    -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
+    -no-g++-exceptions \
+    -plugin-sql-{mysql,psql,sqlite,odbc}
 
   # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/uilib/Makefile
 
-  cd ${srcdir}/$pkgfqn
+  cd "${srcdir}"/$pkgfqn
   make -C qmake 
-  cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
-  ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
-  ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+  cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/mysql
+  "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+  cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/psql
+  "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
 
-  cd ${srcdir}/$pkgfqn
+  cd "${srcdir}"/$pkgfqn
   # fix the broken makefiles
   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgfqn
-  make INSTALL_ROOT=${pkgdir} install
-  rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake
-  install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config 
-  rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+  cd "${srcdir}"/$pkgfqn
+  make INSTALL_ROOT="${pkgdir}" install
+  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
+  sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
+  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
+  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
+  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
+  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
 
   # install man pages
-  install -d -m755 ${pkgdir}/opt/qt/man
-  cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
+  install -d -m755 "${pkgdir}"/opt/qt/man
+  cp -r "${srcdir}"/$pkgfqn/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
 
-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
+  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
+  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
 }
diff --git a/extra/quota-tools/ChangeLog b/extra/quota-tools/ChangeLog
deleted file mode 100644
index 56c760b78..000000000
--- a/extra/quota-tools/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2009-01-07  Eric Belanger  <eric@archlinux.org>
-
-	* quota-tools 3.17-1
-	* Upstream update
-
-2008-05-01  Eric Belanger  <eric@archlinux.org>
-
-	* quota-tools 3.16-1
-	* Upstream update
diff --git a/extra/re2c/PKGBUILD b/extra/re2c/PKGBUILD
index ab10f9595..8b0d5be7a 100644
--- a/extra/re2c/PKGBUILD
+++ b/extra/re2c/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 24272 2009-01-15 20:24:40Z giovanni $
+# $Id: PKGBUILD 123734 2011-05-12 20:45:05Z andrea $
+# Maintainer:
 # Contributor: nut543 <kfs1@online.no>
-# Maintainer: Dale Blount <dale@archlinux.org>
+# Contributor: Dale Blount <dale@archlinux.org>
+
 pkgname=re2c
 pkgver=0.13.5
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 depends=('gcc-libs')
-makedepends=('gcc')
-pkgrel=1
-pkgdesc="a tool for generating C-based recognizers from regular expressions."
+pkgdesc="A tool for generating C-based recognizers from regular expressions"
 url="http://re2c.sourceforge.net/"
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/re2c/re2c-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4a97d8f77ed6d2c76c8bd840a43f5633')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
 }
 
-
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/rxvt-unicode/rxvt-unicode.png b/extra/rxvt-unicode/rxvt-unicode.png
deleted file mode 100644
index 0738a7840..000000000
--- a/extra/rxvt-unicode/rxvt-unicode.png
+++ /dev/null
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 5bb9d6260..6bd883503 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 116932 2011-03-26 14:54:05Z tpowa $
+# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,16 +8,16 @@ pkgver=3.5.8
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.5.8
-pkgrel=2
-arch=(i686 x86_64 'mips64el')
+pkgrel=3
+arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-        samba samba.logrotate 
-        swat.xinetd 
-        samba.pam 
+        samba samba.logrotate
+        swat.xinetd
+        samba.pam
         samba.conf.d
         fix-ipv6-mount.patch)
 ### UNINSTALL dmapi package before building!!!
@@ -44,12 +44,12 @@ build() {
               --disable-avahi \
               --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
               --enable-external-libtdb
-  make || return 1
+  make
 }
 
 package_smbclient () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
@@ -72,17 +72,17 @@ depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.1
 
 package_samba () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba 
-        etc/pam.d/samba 
+backup=(etc/logrotate.d/samba
+        etc/pam.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/var/log/samba
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install 
+  make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 149352acd..a53386c7b 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 110715 2011-02-21 19:15:42Z tpowa $
+# $Id: PKGBUILD 123295 2011-05-09 20:29:22Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed by Sarah Hay <sarahhay@mb.sympatico.ca>, Tobias Powalowski <t.powa@gmx.de>, Simo L. <neotuli@yahoo.com>, eric <eric@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor: Simo L. <neotuli@yahoo.com>
+# Contributor: eric <eric@archlinux.org>
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org"
+url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
@@ -14,12 +16,21 @@ makedepends=('texlive-latexextra')
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
 source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
-        sane.xinetd)
+        'sane.xinetd'
+        'libv4l-0.8.3.patch')
 options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi
+
+  patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-docdir=/usr/share/doc/sane \
+    --enable-avahi \
+    --disable-locking
   make
 }
 
@@ -33,16 +44,10 @@ package () {
     "${pkgdir}/lib/udev/rules.d/53-sane.rules"
   # fix udev rules
   sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
-  # fix group on /var/lock
-  mkdir -p "${pkgdir}/var/lock/sane"
-  chgrp 0 "${pkgdir}/var"
-  chmod 755 "${pkgdir}/var"
-  chmod 1777 "${pkgdir}/var/lock"
-  chgrp 0 "${pkgdir}/var/lock"
-  chmod 775 "${pkgdir}/var/lock/sane"
-  chgrp 96 "${pkgdir}/var/lock/sane"
+  
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
 }
 md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2')
+         'da946cc36fb83612162cf9505986d4b2'
+         'e645a8921cff9f18ffbdabb2ed885060')
diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch
new file mode 100644
index 000000000..4e240e0cf
--- /dev/null
+++ b/extra/sane/libv4l-0.8.3.patch
@@ -0,0 +1,64 @@
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 14 Mar 2011 13:35:05 +0100
+Subject: [PATCH] patch: v4l
+
+Squashed commit of the following:
+
+commit 23381932c76846191b42a48e505b37cd74711265
+Author: Julien BLACHE <jb@jblache.org>
+Date:   Wed Feb 16 19:37:43 2011 +0100
+
+    Fix v4l build with libv4l 0.8.3+
+
+    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
+
+    Conflicts:
+
+    	ChangeLog
+
+    Signed-off-by: Nils Philippsen <nils@redhat.com>
+---
+ backend/v4l.c |    3 +--
+ backend/v4l.h |    3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+ 
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
++#include "v4l.h"
+ 
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+ 
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+ 
+@@ -165,7 +166,7 @@ struct video_channel
+ 
+ 
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+ 
+ #include <../include/sane/sane.h>
+ 
+-- 
+1.7.4
+
diff --git a/extra/sane/sane.install b/extra/sane/sane.install
index 850bd3255..cbecf7b2e 100644
--- a/extra/sane/sane.install
+++ b/extra/sane/sane.install
@@ -1,6 +1,5 @@
-# arg 1:  the new package version
 post_install() {
-getent group scanner >/dev/null || usr/sbin/groupadd -g 96 scanner
+    getent group scanner >/dev/null 2>&1 || groupadd -g 96 scanner &>/dev/null
 	/bin/cat <<THEEND
 NOTE
 ----
@@ -8,7 +7,8 @@ Add your user to group 'scanner' to use scanner devices.
 THEEND
 }
 
-# arg 1:  the old package version
-pre_remove() {
-  usr/sbin/groupdel scanner &>/dev/null
+post_remove() {
+    if getent group scanner >/dev/null 2>&1; then
+        groupdel scanner
+    fi
 }
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 1bcfd7fa8..29fea2638 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117231 2011-03-30 10:39:06Z juergen $
+# $Id: PKGBUILD 123411 2011-05-11 09:13:37Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher) 
 
 pkgname=sbcl
-pkgver=1.0.47
+pkgver=1.0.48
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
-md5sums=('2e90fca5ffec9ce19ed232b24f09cd0a'
+md5sums=('f60f27bcc04d1c9241562aafe4ee5d4a'
          '7ac0c1936547f4278198b8bf7725204d')
 url="http://www.sbcl.org/"
 install=sbcl.install
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index e509d70d7..c04443584 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 98391 2010-11-08 19:40:29Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 123635 2011-05-11 23:31:36Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sharutils
-pkgver=4.10
+pkgver=4.11.1
 pkgrel=1
-pkgdesc="GNU shar makes so-called shell archives out of many files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/sharutils/"
+pkgdesc='Makes so-called shell archives out of many files'
+url='http://www.gnu.org/software/sharutils/'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('perl' 'gettext' 'texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f918859228238d69e1ce78ccbec8f9e0')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109')
+
+install=install
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info \
-    --disable-nls
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/sharutils/install b/extra/sharutils/install
new file mode 100644
index 000000000..1de76964c
--- /dev/null
+++ b/extra/sharutils/install
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(sharutils.info.gz)
+
+post_install() {
+	for file in ${filelist[@]}; do
+		install-info $infodir/$file $infodir/dir
+	done
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	for file in ${filelist[@]}; do
+		install-info --delete $infodir/$file $infodir/dir
+	done
+}
diff --git a/extra/squid/fix-for-new-cap-headers.patch b/extra/squid/fix-for-new-cap-headers.patch
deleted file mode 100644
index ce24681e8..000000000
--- a/extra/squid/fix-for-new-cap-headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tools.c.orig	2009-11-02 10:54:49.000000000 -0500
-+++ src/tools.c	2009-11-02 10:55:05.000000000 -0500
-@@ -44,9 +44,9 @@
- #if HAVE_SYS_CAPABILITY_H
- #undef _POSIX_SOURCE
- /* Ugly glue to get around linux header madness colliding with glibc */
--#define _LINUX_TYPES_H
-+/*#define _LINUX_TYPES_H*/
- #define _LINUX_FS_H
--typedef uint32_t __u32;
-+/*typedef uint32_t __u32;*/
- #include <sys/capability.h>
- #endif
- #endif
diff --git a/extra/squid/squid-makefiles.patch b/extra/squid/squid-makefiles.patch
deleted file mode 100644
index 4cefb89a0..000000000
--- a/extra/squid/squid-makefiles.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in
---- squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in	2007-11-11 20:14:01.000000000 -0500
-+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in	2008-06-09 21:32:52.000000000 -0400
-@@ -268,7 +268,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = /usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
- smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
-diff -Naur squid-2.7.STABLE2-orig/src/Makefile.in squid-2.7.STABLE2/src/Makefile.in
---- squid-2.7.STABLE2-orig/src/Makefile.in	2008-01-02 20:16:40.000000000 -0500
-+++ squid-2.7.STABLE2/src/Makefile.in	2008-06-09 21:34:39.000000000 -0400
-@@ -653,13 +653,13 @@
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX = $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
- DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff -Naur squid-2.7.STABLE2-orig/src/cf.data.pre squid-2.7.STABLE2/src/cf.data.pre
---- squid-2.7.STABLE2-orig/src/cf.data.pre	2008-05-31 16:49:45.000000000 -0400
-+++ squid-2.7.STABLE2/src/cf.data.pre	2008-06-09 21:35:43.000000000 -0400
-@@ -3749,7 +3749,7 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: proxy
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
-@@ -3763,7 +3763,7 @@
- 
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: none
-+DEFAULT: proxy
- LOC: Config.effectiveGroup
- DOC_START
- 	If you want Squid to run with a specific GID regardless of
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 8839dd111..7b42cf2a6 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 103462 2010-12-19 17:12:50Z paul $
+# $Id: PKGBUILD 121110 2011-04-29 01:29:30Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Replacement for CVS, another versioning system (SVN)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util')
-makedepends=('heimdal' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
diff --git a/extra/swfdec-mozilla/PKGBUILD b/extra/swfdec-mozilla/PKGBUILD
deleted file mode 100644
index d477c34be..000000000
--- a/extra/swfdec-mozilla/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-#$Id: PKGBUILD 17042 2008-10-24 15:55:09Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=swfdec-mozilla
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="free plugin for Mozilla browsers that uses the Swfdec library for playing SWF files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://swfdec.freedesktop.org"
-license=('LGPL')
-depends=("swfdec>=$pkgver")
-source=(http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool')
-md5sums=('716632e0d35b3c1582c180569ba30346')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure  --prefix=/usr --disable-static --with-plugin-dir=/usr/lib/mozilla/plugins/
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/extra/swfdec/PKGBUILD b/extra/swfdec/PKGBUILD
deleted file mode 100644
index d651e0497..000000000
--- a/extra/swfdec/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-#$Id: PKGBUILD 64546 2010-01-21 03:43:49Z eric $
-#Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=swfdec
-pkgver=0.8.4
-pkgrel=2
-pkgdesc="free library for decoding and rendering Flash animations"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://swfdec.freedesktop.org"
-license=('LGPL')
-depends=('alsa-lib>=1.0.18' 'liboil>=0.3.15' 'gtk2>=2.14.6' 'libsoup>=2.24.2.1-1')
-makedepends=('pkgconfig' 'gstreamer0.10-ffmpeg>=0.10.6-1')
-optdepends=('gstreamer0.10-base:	required for various audio and video formats'
-            'gstreamer0.10-ffmpeg:	most common audio/video format for internet flash')
-source=(http://swfdec.freedesktop.org/download/swfdec/0.8/${pkgname}-${pkgver}.tar.gz)
-md5sums=('aece501d0e73f3e564200a44ec03c385')
-options=('!libtool' '!emptydirs')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static --enable-gtk \
-	--enable-gstreamer --enable-soup --with-audio=alsa
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index caa9dabe8..cdf1d757b 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 117598 2011-04-04 12:33:45Z ibiru $
+# $Id: PKGBUILD 123372 2011-05-10 16:32:52Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
-pkgver=0.2.8
+pkgver=0.2.9
 pkgrel=1
 pkgdesc="Telepathy framework logging daemon"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +11,7 @@ depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('755e6dcaa6a9ccf47f2fe73f3d4d888b')
+md5sums=('6d4a1c916883e4d1f19ed1002be6700c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index 2f910c3ed..6581d8593 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120802 2011-04-26 15:50:07Z ibiru $
+# $Id: PKGBUILD 123605 2011-05-11 18:21:04Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Andreas Zwinkau <beza1e1@web.de>
 pkgname=telepathy-mission-control
-pkgver=5.7.9
+pkgver=5.7.11
 pkgrel=1
 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring')
 makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('df7e63d857676fab9ec2261cffe5eb4a')
+md5sums=('d4b37aa43f391c34d033b1af5ab32e6d')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD
index 4a96ed776..29b1f2aac 100644
--- a/extra/terminal/PKGBUILD
+++ b/extra/terminal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 118239 2011-04-06 07:52:59Z andyrtr $
+# $Id: PKGBUILD 123714 2011-05-12 17:42:28Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=terminal
 pkgver=0.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -16,11 +16,18 @@ depends=('exo>=0.5.4' "vte" 'dbus-glib'
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=terminal.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2)
-md5sums=('34daa0090e1bc9014a5b9849103a129f')
+source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2
+        bug-7595-go-menu-single-tab-sensitivity.patch)
+md5sums=('34daa0090e1bc9014a5b9849103a129f'
+         '043774c11e2f8c1c424510847dc82fae')
 
 build() {
   cd ${srcdir}/Terminal-${pkgver}
+
+  # Add upstream patch for Xfce bug #7595
+  # (Only make go menu action sensitive if tabs)
+  patch -Np1 -i ${srcdir}/bug-7595-go-menu-single-tab-sensitivity.patch
+
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
diff --git a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch
new file mode 100644
index 000000000..9d8eff6bd
--- /dev/null
+++ b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch
@@ -0,0 +1,22 @@
+From be9fca9ea8cedcf879c8e0c8cea96dd256a3591c Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Thu, 12 May 2011 16:08:20 +0000
+Subject: Only make go menu action sensitive if tabs > 1 (bug #7595).
+
+This way the (default) Alt+1 keybinding is usable when
+only a single tab is opened in the terminal window.
+---
+diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
+index f580a39..0d461a4 100644
+--- a/terminal/terminal-window.c
++++ b/terminal/terminal-window.c
+@@ -748,6 +748,7 @@ terminal_window_rebuild_gomenu (TerminalWindow *window)
+ 
+       /* create action */
+       radio_action = gtk_radio_action_new (name, NULL, NULL, NULL, n);
++      gtk_action_set_sensitive (GTK_ACTION (radio_action), npages > 1);
+       exo_binding_new (G_OBJECT (page), "title", G_OBJECT (radio_action), "label");
+       gtk_radio_action_set_group (radio_action, group);
+       group = gtk_radio_action_get_group (radio_action);
+--
+cgit 
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 29ca99100..c4b1b0218 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75596 2010-04-01 22:40:17Z giovanni $
+# $Id: PKGBUILD 123688 2011-05-12 14:06:47Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=testdisk
-pkgver=6.11.3
-pkgrel=3
+pkgver=6.12
+pkgrel=1
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
@@ -13,7 +13,6 @@ license=('GPL')
 depends=('libjpeg>=8' 'openssl' 'progsreiserfs' 'ntfsprogs')
 makedepends=('pkgconfig')
 source=(http://www.cgsecurity.org/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ceee384a8613d8f7ffff5ccfa3fba510')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,3 +23,4 @@ build() {
   make || return 1
   make DESTDIR="${pkgdir}/" install || return 1
 }
+md5sums=('6ef653301f309156f3a802233a3139c1')
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
new file mode 100644
index 000000000..3686445e1
--- /dev/null
+++ b/extra/tomcat-native/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.20
+pkgrel=2
+pkgdesc="The Apache Tomcat Native Library"
+arch=('i686' 'x86_64')
+url="http://tomcat.apache.org/"
+license="Apache"
+depends=('apr' 'openssl')
+makedepends=('java-environment')
+source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('fb2b9d073cb6575c2d0020eda266ca0c')
+
+build() {
+  cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
+
+  ./configure \
+    --prefix=/usr \
+    --with-java-home=${JAVA_HOME} \
+    --with-apr=/usr \
+    --with-ssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native"
+
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/{bin,include}
+}
diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD
index 844d36bb4..fc5a39222 100644
--- a/extra/trayer/PKGBUILD
+++ b/extra/trayer/PKGBUILD
@@ -1,23 +1,31 @@
-# $Id: PKGBUILD 15775 2008-10-18 20:40:50Z eric $
-# Maintainer: Thayer Williams <thayer@archlinux.org>
+# $Id: PKGBUILD 122890 2011-05-07 04:26:20Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=trayer
 pkgver=1.0
-pkgrel=4
-pkgdesc="Swallows GTK 1.2/2.x application docklets, and KDE docklets."
+pkgrel=5
+pkgdesc="A lightweight GTK2-based systray"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://gna.org/projects/fvwm-crystal/"
 license=('GPL' 'MIT')
-depends=('gtk2' 'libxmu')
+depends=('gtk2')
+makedepends=('libxmu')
 options=('!makeflags')
-source=(http://download.gna.org/fvwm-crystal/trayer/$pkgver/$pkgname-$pkgver.tar.gz
+source=(http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz
         trayer.diff)
-md5sums=('e1b0b6464f991f2c296561e377585867' '7f66eee885563871f9f76646bca6b14d')
+md5sums=('e1b0b6464f991f2c296561e377585867'
+         '7f66eee885563871f9f76646bca6b14d')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np0 -i ${startdir}/src/trayer.diff || return 1
-  make || return 1
-  make PREFIX=$startdir/pkg/usr install
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../trayer.diff
+  sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' Makefile
+  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="${pkgdir}/usr" install
+  install -D -m644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/v86d/PKGBUILD.orig b/extra/v86d/PKGBUILD.orig
deleted file mode 100644
index f73fc234b..000000000
--- a/extra/v86d/PKGBUILD.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=v86d
-pkgver=0.1.10
-pkgrel=1
-pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
-arch=('i686' 'x86_64')
-url="http://dev.gentoo.org/~spock/projects/uvesafb/"
-license=('GPL2')
-<<<<<<< HEAD
-arch=("i686" "x86_64" 'mips64el')
-=======
->>>>>>> 6dab5c46b00f624c7900ff6d11b75bcafbe251d0
-depends=('glibc')
-conflicts=('mkinitcpio<0.5.99')
-backup=('etc/modprobe.d/uvesafb.conf')
-options=('!makeflags')
-source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
-        v86d
-        v86d_hook
-        modprobe.uvesafb)
-md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
-         '33f3131e7bf041ed6a67e92bff272f4c'
-         '813958b8f6c75a7063e4858f31509694'
-         '2d7cc8dc6a41916a13869212d0191147')
-
-build() {
-  cd "$srcdir/v86d-$pkgver"
-  ./configure --with-x86emu
-  # we only need /usr/include/video/uvesafb.h
-  make KDIR=/usr
-}
-
-package() {
-  cd "$srcdir/v86d-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d"
-  install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d"
-  install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf"
-}
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 53d41d18f..7d4f5d5fc 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115648 2011-03-18 18:01:46Z heftig $
+# $Id: PKGBUILD 123129 2011-05-08 21:00:10Z heftig $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
 _topver=7.3
-_patchlevel=138
+_patchlevel=177
 pkgver=${_topver}.${_patchlevel}
-__hgrev=ea399ac2c1b9
+__hgrev=60890b26cb17
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD
index bc4b87aaf..aca4645b3 100644
--- a/extra/webkit-sharp/PKGBUILD
+++ b/extra/webkit-sharp/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgname=webkit-sharp
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mono/.NET bindings for the WebKit rendering engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/"
 license=('custom:MIT')
-depends=('gtk-sharp-2' 'libwebkit')
+depends=('gtk-sharp-2' 'libwebkit>=1.4.0')
 makedepends=('pkgconfig>=0.9.0')
-source=(http://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('21482f9d5eafb0ef4acc6e790482f934')
 
 build() {
@@ -20,9 +20,15 @@ build() {
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/\.1/.2/' sources/webkit-sharp.dll.config.in
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0.7.0@:' sources/webkit-sharp.dll.config.in
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+
 }
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index eaed67b0b..a83355164 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120079 2011-04-19 13:10:40Z guillaume $
+# $Id: PKGBUILD 121168 2011-04-29 06:39:53Z stephane $
 # 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.4.6
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
@@ -23,7 +23,7 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('heimdal' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2')
+  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2')
   install=wireshark.install
   conflicts=(wireshark)
 
diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD
index 0b2e56693..7b9503c78 100644
--- a/extra/xbill/PKGBUILD
+++ b/extra/xbill/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 22212 2008-12-23 06:11:22Z eric $
-# Maintainer: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# $Id: PKGBUILD 122895 2011-05-07 05:36:47Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=6
-pkgdesc="Xbill is a game that tests you reflexes as you seek and destroy all forms of Bill"
+pkgrel=7
+pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xbill.org/"
 license=('GPL')
-depends=('xaw3d>=1.5E' 'libxaw')
+depends=('xaw3d')
+makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/$pkgname-$pkgver.tar.gz)
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('585e4866b15255a24203db9959407b2f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
-  --disable-motif  --enable-athena --disable-gtk || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+    --disable-motif  --enable-athena --disable-gtk
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
 # set appropriate permissions and destinations
-  chown root:games $pkgdir/usr/bin/xbill
-  chmod 2755 $pkgdir/usr/bin/xbill
+  chown root:games "${pkgdir}/usr/bin/xbill"
+  chmod 2755 "${pkgdir}/usr/bin/xbill"
 
-  chown root:games $pkgdir/var/games
-  chmod 775 $pkgdir/var/games
-  chown root:games $pkgdir/var/games/xbill
-  chmod 775 $pkgdir/var/games/xbill
+  chown root:games "${pkgdir}/var/games"
+  chmod 775 "${pkgdir}/var/games"
+  chown root:games "${pkgdir}/var/games/xbill"
+  chmod 775 "${pkgdir}/var/games/xbill"
 
 # Handle the scores file creation in the install script
-  rm $pkgdir/var/games/xbill/scores
+  rm "${pkgdir}/var/games/xbill/scores"
 }
diff --git a/extra/xbill/xbill.install b/extra/xbill/xbill.install
index 014c0d54b..b68d88071 100644
--- a/extra/xbill/xbill.install
+++ b/extra/xbill/xbill.install
@@ -1,6 +1,7 @@
 pre_install() {
-  if [ ! -e var/games/xbill/scores ]; then
-    [ -e usr/var/xbill/scores ] && mv usr/var/xbill/scores var/games/xbill/scores
+  if [ ! -e var/games/xbill/scores -a -e usr/var/xbill/scores ]; then
+    mkdir -p var/games/xbill
+    mv usr/var/xbill/scores var/games/xbill/scores
   fi
 }
 
diff --git a/extra/xchat-gnome/PKGBUILD b/extra/xchat-gnome/PKGBUILD
deleted file mode 100644
index 94c6b5c40..000000000
--- a/extra/xchat-gnome/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 112861 2011-03-07 10:29:01Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xchat-gnome
-pkgver=0.26.1
-pkgrel=5
-pkgdesc="GNOME frontend to the popular X-Chat IRC client."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://xchat-gnome.navi.cx/"
-depends=('libgnomeui>=2.18.1-2' 'libsexy>=0.1.11' 'gconf>=2.18.0.1-4'
-         'hicolor-icon-theme' 'desktop-file-utils' 'libcanberra' 'libsm')
-makedepends=('gettext' 'perlxml' 'python2' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3'
-             'intltool' 'pkg-config')
-optdepends=('libnotify: notifications'
-            'python2: plugin'
-            'tcl: plugin')
-options=('!libtool')
-install=xchat-gnome.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.26/${pkgname}-${pkgver}.tar.gz
-        gtk2-2.20.patch xchat-gnome-0.26.1-deprecated-symbol.patch)
-md5sums=('e355d71d76cd97a0764e37bfacf09101' 'dafc2536a0c5ee3f8015af81fce69656'\
-         'f82417277f0b5e83334147c4bf63d531')
-sha1sums=('303bfbf2f1bda83fbc4edab148df4764cb4b8998' 'f1bfc5af50be7c10a9db96be20185325636d8da9'\
-         '9aa0abc4b7999e09cafdeb8da1ad4641552a421b')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  patch -Np1 -i "$srcdir/gtk2-2.20.patch"
-  patch -Np1 -i "$srcdir/xchat-gnome-0.26.1-deprecated-symbol.patch"
-  sed -i 's/notify_notification_new (summary, escaped, NULL, NULL);/notify_notification_new (summary, escaped, NULL);/' plugins/notify-osd/notify-osd.c
-  sed -i -e "s/       /\t/" src/common/dbus/Makefile.in
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --enable-ipv6 --enable-shm \
-	      --disable-gtkfe --disable-scrollkeeper
-  make
-}
-
-package() {  
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  
-  install -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/${pkgname}.schemas" \
-    "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/xchat-gnome/gtk2-2.20.patch b/extra/xchat-gnome/gtk2-2.20.patch
deleted file mode 100644
index 7a5dcedf2..000000000
--- a/extra/xchat-gnome/gtk2-2.20.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c
---- xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c	2008-09-07 09:18:45.000000000 -0400
-+++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c	2010-03-28 16:16:52.181405173 -0400
-@@ -753,7 +753,7 @@ fe_gui_info (session * sess, int info_ty
- {
- 	switch (info_type) {
- 	case 0:
--		if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (gui.main_window))) {
-+		if (!gtk_widget_get_visible (GTK_WIDGET (gui.main_window))) {
- 			return 2;
- 		}
- 		if (gtk_window_is_active (GTK_WINDOW (gui.main_window))) {
-diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c xchat-gnome-0.26.1/src/fe-gnome/find-bar.c
---- xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c	2007-03-09 10:42:57.000000000 -0500
-+++ xchat-gnome-0.26.1/src/fe-gnome/find-bar.c	2010-03-28 16:26:24.300405158 -0400
-@@ -247,7 +247,7 @@ find_bar_close (FindBar *bar)
- {
- 	gint position;
- 
--	if (!GTK_WIDGET_VISIBLE (bar)) {
-+	if (!gtk_widget_get_visible (GTK_WIDGET (bar))) {
- 		return;
- 	}
- 
-diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c xchat-gnome-0.26.1/src/fe-gnome/text-entry.c
---- xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c	2008-09-07 10:02:45.000000000 -0400
-+++ xchat-gnome-0.26.1/src/fe-gnome/text-entry.c	2010-03-28 16:39:48.755153605 -0400
-@@ -667,7 +667,7 @@ text_entry_set_current (TextEntry *entry
- 	char *selection = NULL, *text = NULL;
- 	int start, end;
- 
--	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-+	g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (widget)));
- 
- 	if (sess == priv->current) {
- 		return;
-diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c
---- xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c	2008-10-13 17:02:16.000000000 -0400
-+++ xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c	2010-03-28 16:47:55.703154452 -0400
-@@ -261,12 +261,12 @@ userlist_gui_show (void)
- 
- 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui.userlist_toggle), TRUE);
- 
--	if (!GTK_WIDGET_REALIZED (gui.userlist_window)) {
-+	if (!gtk_widget_get_realized (GTK_WIDGET (gui.userlist_window))) {
- 		gtk_widget_realize (gui.userlist_window);
- 	}
- 	gtk_widget_size_request (gui.userlist, &request);
- 
--	if (GTK_WIDGET_REALIZED (gui.userlist_toggle))
-+	if (gtk_widget_get_realized (GTK_WIDGET (gui.userlist_toggle)))
- 		anchor_widget = gui.userlist_toggle;
- 	else
- 		anchor_widget = gui.main_window;
-diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c xchat-gnome-0.26.1/src/fe-gnome/xtext.c
---- xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c	2009-01-16 08:17:31.000000000 -0500
-+++ xchat-gnome-0.26.1/src/fe-gnome/xtext.c	2010-03-28 16:57:17.441402617 -0400
-@@ -1086,7 +1086,7 @@ gtk_xtext_size_allocate (GtkWidget * wid
- 	xtext->avoid_trans = FALSE;
- 
- 	widget->allocation = *allocation;
--	if (GTK_WIDGET_REALIZED (widget))
-+	if (gtk_widget_get_realized (GTK_WIDGET (widget)))
- 	{
- 		xtext->buffer->window_width = allocation->width;
- 		xtext->buffer->window_height = allocation->height;
-@@ -4113,7 +4113,7 @@ gtk_xtext_set_palette (GtkXText * xtext,
- 		xtext->palette[i] = palette[i].pixel;
- 	}
- 
--	if (GTK_WIDGET_REALIZED (xtext))
-+	if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 	{
- 		xtext_set_fg (xtext, xtext->fgc, XTEXT_FG);
- 		xtext_set_bg (xtext, xtext->fgc, XTEXT_BG);
-@@ -4211,7 +4211,7 @@ gtk_xtext_set_font (GtkXText *xtext, cha
- 
- 	gtk_xtext_fix_indent (xtext->buffer);
- 
--	if (GTK_WIDGET_REALIZED (xtext))
-+	if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 		gtk_xtext_recalc_widths (xtext->buffer, TRUE);
- 
- 	return TRUE;
-@@ -4248,7 +4248,7 @@ gtk_xtext_set_background (GtkXText * xte
- 	if (trans)
- 	{
- 		xtext->shaded = shaded;
--		if (GTK_WIDGET_REALIZED (xtext))
-+		if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 			gtk_xtext_load_trans (xtext);
- 		return;
- 	}
-@@ -4260,14 +4260,14 @@ gtk_xtext_set_background (GtkXText * xte
- 	if (pixmap != 0)
- 	{
- 		g_object_ref (pixmap);
--		if (GTK_WIDGET_REALIZED (xtext))
-+		if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 		{
- 			gdk_gc_set_tile (xtext->bgc, pixmap);
- 			gdk_gc_set_ts_origin (xtext->bgc, 0, 0);
- 			xtext->ts_x = xtext->ts_y = 0;
- 			gdk_gc_set_fill (xtext->bgc, GDK_TILED);
- 		}
--	} else if (GTK_WIDGET_REALIZED (xtext))
-+	} else if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 	{
- 		g_object_unref (xtext->bgc);
- 		val.subwindow_mode = GDK_INCLUDE_INFERIORS;
-@@ -4516,7 +4516,7 @@ gtk_xtext_render_page (GtkXText * xtext)
- 	int subline;
- 	int startline = xtext->adj->value;
- 
--	if(!GTK_WIDGET_REALIZED(xtext))
-+	if(!gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 	  return;
- 
- 	if (xtext->buffer->indent < MARGIN)
-@@ -4636,7 +4636,7 @@ gtk_xtext_render_page (GtkXText * xtext)
- void
- gtk_xtext_refresh (GtkXText * xtext, int do_trans)
- {
--	if (GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
-+	if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 	{
- #if defined(USE_XLIB) || defined(WIN32)
- 		if (xtext->transparent && do_trans)
-@@ -5204,7 +5204,7 @@ gtk_xtext_buffer_show (GtkXText *xtext, 
- 		xtext->io_tag = 0;
- 	}
- 
--	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
-+	if (!gtk_widget_get_realized (GTK_WIDGET (xtext)))
- 		gtk_widget_realize (GTK_WIDGET (xtext));
- 
- 	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h);
diff --git a/extra/xchat-gnome/xchat-gnome-0.26.1-deprecated-symbol.patch b/extra/xchat-gnome/xchat-gnome-0.26.1-deprecated-symbol.patch
deleted file mode 100644
index 5bf1e4ef5..000000000
--- a/extra/xchat-gnome/xchat-gnome-0.26.1-deprecated-symbol.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8d35b36baa8204b68c9520ec92327e34c1d7c580 Mon Sep 17 00:00:00 2001
-From: Ritesh Khadgaray <khadgaray@gmail.com>
-Date: Sun, 04 Jul 2010 09:52:07 +0000
-Subject: remove deprecated GTK+ symbols, GTK_WIDGET_SET_FLAGS.
-
----
-diff --git a/src/fe-gnome/xtext.c b/src/fe-gnome/xtext.c
-index 92562a3..51503f8 100644
---- a/src/fe-gnome/xtext.c
-+++ b/src/fe-gnome/xtext.c
-@@ -963,7 +963,7 @@ gtk_xtext_realize (GtkWidget * widget)
- 	GdkColor col;
- 	GdkColormap *cmap;
- 
--	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-+	gtk_widget_set_realized (widget, TRUE);
- 	xtext = GTK_XTEXT (widget);
- 
- 	attributes.x = widget->allocation.x;
---
-cgit v0.8.3.1
-
diff --git a/extra/xchat-gnome/xchat-gnome.install b/extra/xchat-gnome/xchat-gnome.install
deleted file mode 100644
index b0816ece3..000000000
--- a/extra/xchat-gnome/xchat-gnome.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=xchat-gnome
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index d870cc608..c74241a47 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120950 2011-04-27 19:00:34Z giovanni $
+# $Id: PKGBUILD 122945 2011-05-07 11:59:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
-pkgver=1.19
+pkgver=1.20
 pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ install=xchm.install
 source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz
         xchm.desktop
         xchm.xml)
-md5sums=('c9d65971801e044d51476f57e91909fc'
+md5sums=('85943645d20af536704a20b58ebd5849'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')
 
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index b760d8cc9..f2bfca2e6 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 115526 2011-03-18 10:32:21Z andyrtr $
+# $Id: PKGBUILD 123257 2011-05-09 13:44:31Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
-_gitdate=20110318
-pkgver=1.4.99_git${_gitdate} # see configure.ac
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="X.Org acecad tablet input driver"
 arch=(i686 x86_64 'mips64el')
@@ -14,31 +13,17 @@ makedepends=('xorg-server-devel')
 conflicts=('xorg-server<1.10.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2)
-sha1sums=('f1aa0c13542242316ebd401369959f6c55ae8222')
-
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-acecad
-	cd xf86-input-acecad
-	git archive --prefix=xf86-video-acecad-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
-	popd
-}
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1')
 
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  ./configure --prefix=/usr
-  cd ${srcdir}/xf86-video-acecad-${_gitdate}
-  ./autogen.sh --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/xf86-video-acecad-${_gitdate}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index 95e36f5dc..582cb5f41 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 115529 2011-03-18 10:37:30Z andyrtr $
+# $Id: PKGBUILD 123262 2011-05-09 13:47:41Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
-_gitdate=20110318
-pkgver=1.3.99_git${_gitdate} # see configure.ac
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
 arch=(i686 x86_64 'mips64el')
@@ -14,31 +13,17 @@ makedepends=('pkgconfig' 'xorg-server-devel')
 conflicts=('xorg-server<1.10.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2)
-md5sums=('0dc6fe834142ca7a4bec8fceb0885a15')
-
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-aiptek
-	cd xf86-input-aiptek
-	git archive --prefix=xf86-video-aiptek-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
-	popd
-}
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('19b7d42f35aff866de96d95941dce2b4682ad923')
 
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  ./configure --prefix=/usr
-  cd ${srcdir}/xf86-video-aiptek-${_gitdate}
-  ./autogen.sh --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/xf86-video-aiptek-${_gitdate}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   make DESTDIR="${pkgdir}" install
   
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 1826fbb58..ab7400c55 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 115535 2011-03-18 10:46:45Z andyrtr $
+# $Id: PKGBUILD 123252 2011-05-09 13:38:43Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-void
-_gitdate=20110318
-pkgver=1.3.1.99_git${_gitdate} # see configure.ac
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="X.org void input driver"
 arch=(i686 x86_64 'mips64el')
@@ -14,31 +13,18 @@ makedepends=('xorg-server-devel')
 conflicts=('xorg-server<1.10.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2)
-md5sums=('0ec2820fc178138d393fd248f56b8754')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
 
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-void
-	cd xf86-input-void
-	git archive --prefix=xf86-video-void-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
-	popd
-}
 
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  ./configure --prefix=/usr
-  cd ${srcdir}/xf86-video-void-${_gitdate}
-  ./autogen.sh --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/xf86-video-void-${_gitdate}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   make DESTDIR="${pkgdir}" install
   
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index ee62e6d6e..39b1c6e9c 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 112922 2011-03-07 18:49:40Z andyrtr $
+# $Id: PKGBUILD 123665 2011-05-12 08:18:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
-pkgver=1.0.0
-pkgrel=4
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' 
 makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools')
 optdepends=('gnu-netcat: for hddtemp access')
-options=(!libtool)
+options=(!libtool !makeflags)
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2
-	xfce4-sensors-plugin-1.0.0-underlink.patch
-	xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch)
-md5sums=('74d83628246536d575f954c76724982b'
-         'f0295e3a7c6beb267355f64fc0ed44d5'
-         'b5e9013de01cd8f2b4a72c8f052d2c37')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2
+	git.patch)
+md5sums=('3fd270762d69eb281594bdf16be924b9'
+         '181df53dc5bb647274293f72f73ef39b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # panel 4.8 patch from http://bugzilla.xfce.org/show_bug.cgi?id=7095
-  patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-underlink.patch
+#  patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-underlink.patch
 
-  patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
-
-  xdt-autogen
+#  patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
+  patch -Np1 -i ${srcdir}/git.patch
+  #xdt-autogen
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
diff --git a/extra/xfce4-sensors-plugin/git.patch b/extra/xfce4-sensors-plugin/git.patch
new file mode 100644
index 000000000..0e2140765
--- /dev/null
+++ b/extra/xfce4-sensors-plugin/git.patch
@@ -0,0 +1,13319 @@
+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-xfapplet-plugin/PKGBUILD b/extra/xfce4-xfapplet-plugin/PKGBUILD
deleted file mode 100644
index 517f78b81..000000000
--- a/extra/xfce4-xfapplet-plugin/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 105796 2011-01-11 20:47:13Z andyrtr $
-# Maintainer:
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-xfapplet-plugin
-pkgver=0.1.0
-pkgrel=7
-pkgdesc="plugin that allows to use gnome applets in the Xfce4 panel"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'gnome-panel' 'gnome-panel-bonobo')
-makedepends=('')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6a06c44b18a97626f44a240ad3bc3244')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/ \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/xfprint/PKGBUILD b/extra/xfprint/PKGBUILD
index a5c9317c3..984dec831 100644
--- a/extra/xfprint/PKGBUILD
+++ b/extra/xfprint/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 85560 2010-07-15 21:39:23Z andyrtr $
+# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfprint
 pkgver=4.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A print dialog and a printer manager for Xfce"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'heimdal>=1.3.1'
+depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5'
          'gnutls>=2.6.5' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
-	xfprint-manager-fix.diff)
+source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+        xfprint-manager-fix.diff)
 md5sums=('d92fca97a42816085080baf07a99a62e'
          '69b3619a285e94d602a1d0ac08f4ca06')
 
diff --git a/extra/xmahjongg/PKGBUILD b/extra/xmahjongg/PKGBUILD
index 8b896fc4f..2e954d29d 100644
--- a/extra/xmahjongg/PKGBUILD
+++ b/extra/xmahjongg/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 36409 2009-04-22 04:45:25Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Roberto Carvajal <rcarvajal@users.sf.net>
+# $Id: PKGBUILD 123155 2011-05-09 00:53:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmahjongg
 pkgver=3.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Mahjongg game for X-Window"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/xmahjongg/"
 license=('GPL')
-depends=('gcc-libs' 'libsm' 'libx11')
-source=(http://www.lcdf.org/$pkgname/$pkgname-$pkgver.tar.gz)
+depends=('gcc-libs' 'libx11')
+source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('9db5bf1b329b410220b7976cd9b3d374')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
index ce3f8e8a0..65db6d384 100644
--- a/extra/xscreensaver/PKGBUILD
+++ b/extra/xscreensaver/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113959 2011-03-10 22:37:48Z jgc $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 123881 2011-05-14 00:52:40Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jwz.org/xscreensaver/"
@@ -13,10 +13,14 @@ makedepends=('bc')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
         add-electricsheep.diff xscreensaver.pam LICENSE)
-md5sums=('0345c1acb9280729de05c5ca44b401e3' 'f82524626ed8a6832cd279e0548a9b46'\
-         '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('7252540b1b1853459a56453714c0974de26fa4c5' '65c2933380267475f2c4560bc22f4350393b00ce'\
-         '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134')
+md5sums=('a1a55b763e17c5c83a2b7cb5ddf23560'
+         'f82524626ed8a6832cd279e0548a9b46'
+         '367a3538f54db71f108b34cfa31088ac'
+         '5e7f3f2a63d20a484742f5b4cb5d572c')
+sha1sums=('3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181'
+          '65c2933380267475f2c4560bc22f4350393b00ce'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 3fb4ccab2..1d353f6b3 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -11,21 +11,24 @@ license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify')
 makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
+source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         mozconfig
         mozilla-pkgconfig.patch
         xulrunner-version.patch
         xulrunner-omnijar.patch
-        port_gnomevfs_to_gio.patch)
-options=('!emptydirs')
-md5sums=('9abda7d23151e97913c8555a64c13f34'
+        port_gnomevfs_to_gio.patch
+        mips.patch)
+md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
          '2358a2ddd35bcdd62ff42442dfe548d9'
          '639ea80e823543dd415b90c0ee804186'
          'a0236f6c3e55f60b7888d8cf137ff209'
          '0bf82bc6677e3ce57fd20a147fe8d7b1'
-         '42f83468b296452fb754a81a4317ca64')
+         '42f83468b296452fb754a81a4317ca64'
+         '0e970ff5600246e953f527813883e744')
+options=('!emptydirs')
+
 build() {
-  cd "${srcdir}/mozilla-2.0"
+  cd "${srcdir}/icecat-${_ffoxver}/"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
@@ -40,6 +43,11 @@ build() {
   #https://bugzilla.mozilla.org/show_bug.cgi?id=494163
   patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
 
+ [[ "$CARCH" == "mips64el" ]] && {
+   echo "ac_add_options --disable-ipc" >> .mozconfig
+   patch -Np0 -i "${srcdir}/mips.patch"
+ }
+
   unset CFLAGS
   unset CXXFLAGS
 
@@ -49,7 +57,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/mozilla-2.0"
+  cd "${srcdir}/icecat-${_ffoxver}/"
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
   #Remove included dictionaries, add symlink to system myspell path.
author	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-18 10:36:32 -0500
committer	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-18 10:36:32 -0500
commit	02c6fa41964c6bb1e7f285ff530e8082b9326399 (patch)
tree	2c13819f471dca50955bddeadbf940ff3631c1e2 /extra
parent	8c0e0492541a5ef68bf2814712502103d8f475b5 (diff)
parent	a4f85b5a8c5460995c83445460351846cde419f8 (diff)