Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts: community/csfml/PKGBUILD community/evolution-rss/PKGBUILD community/inn/PKGBUILD community/libssh2/PKGBUILD community/perl-xml-dom/PKGBUILD community/php52/PKGBUILD community/python-pysfml/PKGBUILD community/skype-call-recorder/PKGBUILD extra/ipod-sharp/PKGBUILD extra/madwifi-utils/PKGBUILD extra/madwifi/PKGBUILD
author: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-29 22:59:51 -0500
committer: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-29 22:59:51 -0500
commit: 0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch)
tree: 98b1d03925fafa426c20c3075d69145c8bb2f4d8 /extra
parent: b18caf89fb235f174419d578a7da0237e456ef3d (diff)
parent: c399070d50c89903ec1dea55aa4aa5147a367565 (diff)
118 files changed, 4075 insertions, 3747 deletions
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 1541ff19c..5f0c6e93a 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 121312 2011-04-30 14:57:48Z ibiru $
+# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=accountsservice
-pkgver=0.6.10
+pkgver=0.6.12
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e43d0ea4c0cb9291e60f800d9c2d0ba4')
+md5sums=('2fcf38a65d574dd2fe6ba182ff4de053')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 7b5d011c9..1e5037778 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $
+# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org/akonadi'
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index b644eb196..a37609c5e 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 91255 2010-09-25 13:05:55Z ibiru $
+# $Id: PKGBUILD 125663 2011-05-27 21:50:52Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
-pkgver=4.4.1.1
-pkgrel=2
+pkgver=4.4.2
+pkgrel=1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng')
 makedepends=('cmake')
-options=('!makeflags')
 source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz
         LICENSE)
-md5sums=('0f1cfff8f2cf88e5c91a667d9fd386ec'
+md5sums=('4db71b0460fc99926ae91d223199c2e6'
          'cd97e2992e8e66b9e6a449d832dc9c7a')
 
 build() {
@@ -28,6 +27,11 @@ build() {
 	-DWANT_DOCS=OFF
 
   make
+}
+
+package() {
+  cd "${srcdir}"/build
+
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index e8f8112bc..e161588d0 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $
+# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=3.0.1.0
-pkgrel=2
+pkgver=3.0.2.0
+pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/"
 install=anjuta.install
 source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
-sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261')
+sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0')
 
 build() {
   cd "${srcdir}/anjuta-${pkgver}"
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 0e97d0b5c..93d71053f 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $
+# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
-depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
+depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('92c2702c1980f70fb6d87a1a58147911')
diff --git a/extra/bind/ChangeLog b/extra/bind/ChangeLog
deleted file mode 100644
index fac736994..000000000
--- a/extra/bind/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-
-2010-03-27  kevin  <kevin@archlinux.org>
-
-    * bind 9.7.0.P1-1
-    - Patch addresses excessive query traffic generated when there is a break
-      in the DNSSEC trust chain as a result of a configuration error
-
-2010-01-22  kevin  <kevin@archlinux.org>
-
-    * bind 9.6.1.P3-1
-    - Fix for CVE-2010-0097, VU#360341, BIND 9 DNSSEC validation code could
-      cause bogus NXDOMAIN responses
-    - Updated fix for CVE-2009-4022, VU#418861, BIND 9 Cache Update from
-      Additional Section
-
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 77394d336..7237e301b 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 114691 2011-03-15 13:50:13Z andrea $
+# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,17 +6,17 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.46.0
+pkgver=1.46.1
 _boostver=${pkgver//./_}
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=1
+arch=('i686' 'x86_64')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
         4994-compile-fix-for-Python32-v2.patch
         boost-1.46.0-spirit.patch)
 license=('custom')
-md5sums=('820393d5746553c192db7b81ba0e53fe'
+md5sums=('341e5d993b19d099bf1a548495ea91ec'
          'cb59e8adbf2a45ef9264a2f4ab92b849'
          '9d6e2f13fef23bf27d7bdddc104e182a')
 
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index cd55d811d..7ae96eb77 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 119485 2011-04-11 18:46:01Z eric $
+# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $
 # Maintainer :
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=bzr
-pkgver=2.3.1
+pkgver=2.3.3
 pkgrel=1
 pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.bazaar-vcs.org"
+arch=('i686' 'x86_64')
+url="http://bazaar.canonical.com/en/"
 license=('GPL')
 depends=('python2')
 optdepends=('python-paramiko: for sftp support')
-source=(http://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1a4367ce59a2880f321ecb882e195856')
-sha1sums=('49b9dfb5a01ffd87a120f8a7abf4833a482ba245')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('a8ca30af0431c691ce7e71a74497e31d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +22,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   # bash-completion
   install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 28365ff5e..29c80bbd3 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $
+# $Id: PKGBUILD 125706 2011-05-28 10:53:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst'
+depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst'
          'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
 groups=('gnome-extra')
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 3637d7ef4..e6e328a7b 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121163 2011-04-29 06:26:08Z andyrtr $
+# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.7.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -20,12 +20,17 @@ replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+        claws-notify-crash.patch)
+md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
+         '9a2903449f679344b5f5f51c91825b45')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -Np0 -i $srcdir/claws-notify-crash.patch
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
   ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch
new file mode 100644
index 000000000..e1d4eb686
--- /dev/null
+++ b/extra/claws-mail/claws-notify-crash.patch
@@ -0,0 +1,18 @@
+Index: src/main.c
+===================================================================
+RCS file: //claws/src/main.c,v
+retrieving revision 1.115.2.237
+retrieving revision 1.115.2.238
+diff -u -r1.115.2.237 -r1.115.2.238
+--- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
++++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
+@@ -331,7 +331,7 @@
+ 		gtk_widget_show(hack);
+ 	}
+ 
+-	xdisplay = gdk_display_get_default();
++	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	sn_display = sn_display_new(xdisplay,
+ 				sn_error_trap_push,
+ 				sn_error_trap_pop);
+
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index 355449166..9034823d7 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 120673 2011-04-25 22:55:12Z eric $
+# $Id: PKGBUILD 125618 2011-05-27 08:07:05Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
-makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 
+             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
 optdepends=('alsa-lib: for ALSA output plugin support'
             'libao: for AO output plugin support'
             'libpulse: for PulseAudio output plugin support'
@@ -21,10 +22,11 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'libmpcdec: for musepack input plugin support'
             'wavpack: for wavpack input plugin support'
             'libvorbis: for vorbis input plugin support'
-            'flac: for flac input plugin support')
+            'flac: for flac input plugin support'
+            'libmp4v2: for mp4 input plugin support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('0c5a9f4032e632e5f6b6a49f53df1e7e')
-sha1sums=('cbd80d1ff12be5dbf9a3b8b6494381f8b3073761')
+md5sums=('7932bbada04bc9a273c332a323fc5704')
+sha1sums=('918c637becdcbca3652b836b38b164eb852fa896')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 5ca48711c..baeddbc94 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109077 2011-02-05 18:14:46Z eric $
+# $Id: PKGBUILD 125668 2011-05-27 23:18:08Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.06
+pkgver=9.08
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,10 @@ license=('custom')
 depends=('lcms')
 source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
-md5sums=('22921c24c697bbe43c1010f463176921' '110b4604a6dacd5537339c4082e9e12a')
-sha1sums=('7bd7b2283cf1ad1cb1591d0f69fd6831689b20b0' '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
+md5sums=('eb1d365c27495a513c0768b2f696ba66'
+         '110b4604a6dacd5537339c4082e9e12a')
+sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e'
+          '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
   cd "${srcdir}/${pkgname}"
@@ -26,26 +28,21 @@ package() {
   install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
   
   for langchar in \
-    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 sv.latin1 \
+    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \
     ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \
     zh_TW.big5 zh_CN.gb2312
   do
     lang=$(echo $langchar | cut -d. -f1)
     char=$(echo $langchar | cut -d. -f2-)
-    mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
-    iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
-    mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
-    cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
+    if [ -f dcraw_${lang}.1 ]; then
+      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
+      iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
+      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
+      cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
+    fi
     mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
     msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
   done
 
-# dcraw_nl.1 is missing
-  langchar=nl.latin1
-  lang=$(echo $langchar | cut -d. -f1)
-  char=$(echo $langchar | cut -d. -f2-)
-  mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
-  msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
-
   install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 731a5e78a..a8a00c533 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $
+# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index a42ae2bd2..ed67782cb 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $
+# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=empathy
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809')
+sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 44b11b962..4d6f58f5c 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $
+# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
-         'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme')
+         'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
 makedepends=('gtk-doc' 'intltool')
 install=eog.install
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2')
+sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 494341f87..a03a3630e 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $
+# $Id: PKGBUILD 125696 2011-05-28 10:41:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss'
          'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme')
+         'hicolor-icon-theme' 'seed')
 makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
@@ -23,7 +23,8 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
-      --enable-network-manager
+      --enable-network-manager \
+      --enable-seed
   make
 }
 
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 2ccc6a4e9..1532bce40 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $
+# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.0.0
-pkgrel=4
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         introspection-fix.patch)
-sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b'
+sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97'
             '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1')
 
 build() {
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 195be21c6..040385490 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $
+# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2.1
+pkgrel=1
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
 arch=('i686' 'x86_64')
 depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
@@ -12,7 +12,7 @@ options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0')
+sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 3dcb196d7..db3854d78 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $
+# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02')
+sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 42e98b3ca..557c4b855 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $
+# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b')
+sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD
index 0e4f9d9a6..a27c424d2 100644
--- a/extra/file-roller/PKGBUILD
+++ b/extra/file-roller/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $
+# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=file-roller
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
-optdepends=('nautilus: nautilus shell extension'
-            'unrar: the RAR uncompression program'
+optdepends=('unrar: the RAR uncompression program'
             'zip: creates PKZIP-compatible .zip files'
             'unzip: unpacks .zip archives'
             'p7zip: 7zip compression utility'
@@ -22,7 +21,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce')
+sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index 608c11bd0..1c05d49c0 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $
+# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09')
+sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index bbb3b7622..323edc3c4 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $
+# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
-pkgver=3.0.0
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -10,7 +10,7 @@ url="http://www.gnome.org"
 backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit')
+depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb')
 makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
 conflicts=('fast-user-switch-applet')
 replaces=('fast-user-switch-applet')
@@ -20,24 +20,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname
         gdm-vt-allocation-hack.patch
         gdm.pam
         gdm-autologin.pam
-        gdm
-        fix_crasher_with_gtk307.patch)
-sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff'
+        gdm)
+sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05'
             '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9')
+            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
 
-  #https://bugzilla.gnome.org/show_bug.cgi?id=646498
-  patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
       --with-at-spi-registryd-directory=/usr/lib/at-spi \
diff --git a/extra/gdm/fix_crasher_with_gtk307.patch b/extra/gdm/fix_crasher_with_gtk307.patch
deleted file mode 100644
index 3b8379ea3..000000000
--- a/extra/gdm/fix_crasher_with_gtk307.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 2 Apr 2011 04:10:09 +0200
-Subject: [PATCH] simple-greeter: Don't request an invalid size
-
-GTK widgets must at all times report a size they can handle. So it is
-not allowed to return 0 when not realized, because then size allocations
-break when GTK uses this size for its widget.
-In this case, GTK uses the pre-realize size to determine the size it
-should request when creating the greeter window - chicken and egg so to
-say.
-
-This patch just uses the default monitor (I guess the root window's
-monitor is the default monitor?) for determining the login window size.
-
-One thing this patch doesn't do is add a call to gtk_widget_queue_resize()
-from the realize callback or from monitor-changing signals, though
-that's probably technically necessary.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646498
----
- gui/simple-greeter/gdm-greeter-login-window.c |   28 +++++++++----------------
- 1 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index abd6707..3ec9a09 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         GtkAllocation   widget_allocation;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make width be at least 33% screen width */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MAX (min_size, .33 * area.width);
-         nat_size = MAX (nat_size, .33 * area.width);
-@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
-         min_size = MAX (min_size, widget_allocation.width);
-         nat_size = MAX (nat_size, widget_allocation.width);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
-@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make height be at most 80% of screen height */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MIN (min_size, .8 * area.height);
-         nat_size = MIN (nat_size, .8 * area.height);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
--- 
-1.7.4
-\ No newline at end of file
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 42b189676..40699597b 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $
+# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.0.2
-pkgrel=1
+pkgver=3.0.3
+pkgrel=2
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant'
-         'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject')
+depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db')
+sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index f7c87770a..c789f208b 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $
+# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
-pkgver=2.28.6.1
-pkgrel=2
+pkgver=2.28.7
+pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -11,8 +11,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schema
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index eaf8911b5..6b5ef16b8 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117688 2011-04-04 16:21:47Z ibiru $
+# $Id: PKGBUILD 125640 2011-05-27 17:23:17Z ibiru $
 # Maintainer:
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('bdfa7986b8b7f622b48a70b29a48016482190d240de499da5d7fddb48ed4c211'
+sha256sums=('bce843f7cf690c595678fd554b546bd35175f6e7afa70a1463037a0367b3fd38'
             'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
 
 build() {
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 1b7fd44d0..945af2f09 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $
+# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.0.1.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
 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')
@@ -14,8 +14,8 @@ groups=('gnome')
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
+source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 3ba0e1161..ce09ddf4c 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $
+# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -12,16 +12,12 @@ 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
-        randr-fix.patch)
-sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3'
-            '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3')
 
 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
deleted file mode 100644
index c5d83ef2c..000000000
--- a/extra/gnome-desktop/randr-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index ff10f5bea..cac447e29 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $
+# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.0.1.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed')
+depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 provides=('glchess')
 conflicts=('glchess')
@@ -15,8 +15,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,4 +38,6 @@ package() {
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
 }
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 7bf4f4cc3..cfa1dc390 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 124399 2011-05-20 14:09:17Z heftig $
+#$Id: PKGBUILD 125542 2011-05-26 16:38:57Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
@@ -10,11 +10,11 @@ license=('GPL' 'LGPL')
 depends=('gtk3' 'dconf')
 makedepends=('intltool' 'pkgconfig' 'python2')
 groups=('gnome')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ed834e5a6d87fe8a90c7c79153af3d8979740d5f8eacad6a8991ef147c924af7')
+sha256sums=('a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index c2c7931bd..2ecec8404 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $
+# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.0.0.1
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=3.0.2
+pkgrel=1
+arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="The GNOME Panel"
 url="http://www.gnome.org"
@@ -15,14 +15,11 @@ groups=('gnome')
 replaces=('gnome-panel-bonobo')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-crasher-launchers.patch)
-sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
-            '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-panel \
diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch
deleted file mode 100644
index b15fdf29c..000000000
--- a/extra/gnome-panel/fix-crasher-launchers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@malsain.org>
-Date: Mon, 11 Apr 2011 13:05:32 +0000
-Subject: panel: Fix crash when starting launcher
-
-Do not destroy a widget in its draw signal. This is bad. Really.
-
-This was happening in the animation that is being drawn after clicking a
-launcher.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=641325
----
-diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
-index 8465341..5acbf66 100644
---- a/gnome-panel/xstuff.c
-+++ b/gnome-panel/xstuff.c
-@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
- }
- 
- static gboolean
-+idle_destroy (gpointer data)
-+{
-+	gtk_widget_destroy (GTK_WIDGET (data));
-+
-+	return FALSE;
-+}
-+
-+static gboolean
- zoom_draw (GtkWidget *widget,
- 	   cairo_t   *cr,
-            gpointer    user_data)
-@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
- 
- 		g_slice_free (CompositedZoomData, zoom);
- 
--		gtk_widget_destroy (widget);
-+		g_idle_add (idle_destroy, widget);
- 	} else {
- 		GdkPixbuf *scaled;
- 		int width, height;
---
-cgit v0.9
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index c9161e142..61fa2a7a7 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $
+# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
 arch=(i686 x86_64 'mips64el')
@@ -13,9 +13,9 @@ depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower'
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
 options=(!emptydirs)
 install=gnome-power-manager.install
-groups=(gnome-extra)
+groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1')
+sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 14916a6dd..3d62ff5bb 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $
+# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-session
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25')
+sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index c3270d70e..38617dc2e 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $
+# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -18,7 +18,7 @@ groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117')
+sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
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
deleted file mode 100644
index c07627338..000000000
--- a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 34974115f..0c005f56e 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $
+# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.0.1
-pkgrel=5
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -19,28 +19,19 @@ install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         arch.patch
-        network_fixes_up_to_5090a4ccce.patch
-        shell-xfixes-cursor_missing_free.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'
+        bluetoothstatus-always-update-devices.patch
+        shell-recorder-missing-XFree.patch)
+sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95'
             'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
-            '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
-            'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
-            '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718'
-            'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074'
-            '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d')
+            'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae'
+            '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/arch.patch"
-  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"
+  patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch"
+  patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
new file mode 100644
index 000000000..0272169f5
--- /dev/null
+++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
@@ -0,0 +1,132 @@
+From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Wed, 13 Apr 2011 17:08:45 +0000
+Subject: BluetoothStatus: always update devices
+
+Previously, we skipped rebuilding device items in case the device
+had already been seen, but this caused the connected switch not to
+be updated. Now it has been refactored to update in case the device
+changes, and to create only when the device is completely new.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647565
+---
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index 070016a..cee2f90 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -127,13 +127,6 @@ Indicator.prototype = {
+         }
+     },
+ 
+-    _deviceCompare: function(d1, d2) {
+-        return d1.device_path == d2.device_path &&
+-            d1.bdaddr == d2.bdaddr &&
+-            d1.can_connect == d2.can_connect &&
+-            d1.capabilities == d2.capabilities;
+-    },
+-
+     _updateDevices: function() {
+         let devices = this._applet.get_devices();
+ 
+@@ -142,12 +135,8 @@ Indicator.prototype = {
+             let item = this._deviceItems[i];
+             let destroy = true;
+             for (let j = 0; j < devices.length; j++) {
+-                // we need to deep compare because BluetoothSimpleDevice is a boxed type
+-                // (but we take advantage of that, because _skip will disappear the next
+-                // time get_devices() is called)
+-                if (this._deviceCompare(item._device, devices[j])) {
+-                    item.label.text = devices[j].alias;
+-                    devices[j]._skip = true;
++                if (item._device.device_path == devices[j].device_path) {
++                    this._updateDeviceItem(item, devices[j]);
+                     destroy = false;
+                     break;
+                 }
+@@ -162,7 +151,7 @@ Indicator.prototype = {
+         this._hasDevices = newlist.length > 0;
+         for (let i = 0; i < devices.length; i++) {
+             let d = devices[i];
+-            if (d._skip)
++            if (d._item)
+                 continue;
+             let item = this._createDeviceItem(d);
+             if (item) {
+@@ -177,17 +166,55 @@ Indicator.prototype = {
+             this._deviceSep.actor.hide();
+     },
+ 
++    _updateDeviceItem: function(item, device) {
++        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
++            item.destroy();
++            return;
++        }
++
++        let prevDevice = item._device;
++        let prevCapabilities = prevDevice.capabilities;
++        let prevCanConnect = prevDevice.can_connect;
++
++        // adopt the new device object
++        item._device = device;
++        device._item = item;
++
++        // update properties
++        item.label.text = device.alias;
++
++        if (prevCapabilities != device.capabilities ||
++            prevCanConnect != device.can_connect) {
++            // need to rebuild the submenu
++            item.menu.removeAll();
++            this._buildDeviceSubMenu(item, device);
++        }
++
++        // update connected property
++        if (device.can_connect)
++            item._connectedMenuitem.setToggleState(device.connected);
++    },
++
+     _createDeviceItem: function(device) {
+         if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+             return null;
+         let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
++
++        // adopt the device object, and add a back link
+         item._device = device;
++        device._item = item;
+ 
++        this._buildDeviceSubMenu(item, device);
++
++        return item;
++    },
++
++    _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
+             item._connected = device.connected;
+-            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+ 
+-            menuitem.connect('toggled', Lang.bind(this, function() {
++            item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+                     menuitem.setToggleState(menuitem.state);
+@@ -217,7 +244,7 @@ Indicator.prototype = {
+                 }
+             }));
+ 
+-            item.menu.addMenuItem(menuitem);
++            item.menu.addMenuItem(item._connectedMenuitem);
+         }
+ 
+         if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+@@ -263,8 +290,6 @@ Indicator.prototype = {
+         default:
+             break;
+         }
+-
+-        return item;
+     },
+ 
+     _updateFullMenu: function() {
+--
+cgit v0.9
diff --git a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch b/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
deleted file mode 100644
index 16453b0b9..000000000
--- a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-From d0780d16224d7bb2ad183542337c48324fdd2185 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Wed, 06 Apr 2011 16:11:23 +0000
-Subject: NetworkMenu: keep wirelesss networks in predictable order
-
-Adds a function that compares wireless networks and keeps them sorted
-at all times. Order is: first already configured connections, then
-first secure networks, then alphabtic. Also, the appearance of a new access
-point no longer causes the whole menu to be rebuilt (but it still linear
-searches for the position, I guess that could be skipped), which caused
-the addition of more code for tracking the active access point.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646580
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6fa5642..49cb3f0 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode'];
- const NM80211ApFlags = NetworkManager['80211ApFlags'];
- const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
- 
-+// number of wireless networks that should be visible
-+// (the remaining are placed into More...)
-+const NUM_VISIBLE_NETWORKS = 5;
-+
- function macToArray(string) {
-     return string.split(':').map(function(el) {
-         return parseInt(el, 16);
-@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = {
-                         item: null,
-                         accessPoints: [ ap ]
-                       };
-+                obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid);
-                 this._networks.push(obj);
-             }
- 
-@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = {
-                 }
-             }
-         }
-+        if (this.device.active_access_point) {
-+            this._activeNetwork = this._networks[this._findNetwork(this.device.active_access_point)];
-+        } else {
-+            this._activeNetwork = null;
-+        }
-+        this._networks.sort(this._networkSortFunction);
-+
-+        this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
-         this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
-         this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));
- 
-@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = {
-     },
- 
-     destroy: function() {
--        if (this._apAddedId) {
-+        if (this._apChangedId) {
-             // see above for this HACK
-+            GObject.Object.prototype.disconnect.call(this.device, this._apChangedId);
-+            this._apChangedId = 0;
-+        }
-+
-+        if (this._apAddedId) {
-             GObject.Object.prototype.disconnect.call(this.device, this._apAddedId);
-             this._apAddedId = 0;
-         }
-@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = {
-         }
-     },
- 
-+    _activeApChanged: function() {
-+        this._activeNetwork = null;
-+
-+        let activeAp = this.device.active_access_point;
-+
-+        if (activeAp) {
-+            let pos = this._findNetwork(activeAp);
-+            this._activeNetwork = this._networks[pos];
-+        }
-+
-+        // we don't refresh the view here, setActiveConnection will
-+    },
-+
-     _getApSecurityType: function(accessPoint) {
-         if (accessPoint._secType)
-             return accessPoint._secType;
-@@ -1151,6 +1182,32 @@ NMDeviceWireless.prototype = {
-         return type;
-     },
- 
-+    _networkSortFunction: function(one, two) {
-+        let oneHasConnection = one.connections.length != 0;
-+        let twoHasConnection = two.connections.length != 0;
-+
-+        // place known connections first
-+        // (-1 = good order, 1 = wrong order)
-+        if (oneHasConnection && !twoHasConnection)
-+            return -1;
-+        else if (!oneHasConnection && twoHasConnection)
-+            return 1;
-+
-+        let oneHasSecurity = one.security != NMAccessPointSecurity.NONE;
-+        let twoHasSecurity = two.security != NMAccessPointSecurity.NONE;
-+
-+        // place secure connections first
-+        // (we treat WEP/WPA/WPA2 the same as there is no way to
-+        // take them apart from the UI)
-+        if (oneHasSecurity && !twoHasSecurity)
-+            return -1;
-+        else if (!oneHasSecurity && twoHasSecurity)
-+            return 1;
-+
-+        // sort alphabetically
-+        return GLib.utf8_collate(one.ssidText, two.ssidText);
-+    },
-+
-     _networkCompare: function(network, accessPoint) {
-         if (!ssidCompare(network.ssid, accessPoint.get_ssid()))
-             return false;
-@@ -1173,6 +1230,8 @@ NMDeviceWireless.prototype = {
-     _accessPointAdded: function(device, accessPoint) {
-         let pos = this._findNetwork(accessPoint);
-         let apObj;
-+        let needsupdate = false;
-+
-         if (pos != -1) {
-             apObj = this._networks[pos];
-             if (apObj.accessPoints.indexOf(accessPoint) != -1) {
-@@ -1181,6 +1240,8 @@ NMDeviceWireless.prototype = {
-             }
- 
-             apObj.accessPoints.push(accessPoint);
-+            if (apObj.item)
-+                apObj.item.updateAccessPoints(apObj.accessPoints);
-         } else {
-             apObj = { ssid: accessPoint.get_ssid(),
-                       mode: accessPoint.mode,
-@@ -1189,7 +1250,8 @@ NMDeviceWireless.prototype = {
-                       item: null,
-                       accessPoints: [ accessPoint ]
-                     };
--            this._networks.push(apObj);
-+            apObj.ssidText = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
-+            needsupdate = true;
-         }
- 
-         // check if this enables new connections for this group
-@@ -1198,12 +1260,44 @@ NMDeviceWireless.prototype = {
-             if (this._connectionValidForAP(connection, accessPoint) &&
-                 apObj.connections.indexOf(connection) == -1) {
-                 apObj.connections.push(connection);
-+
-+                // this potentially changes the order
-+                needsupdate = true;
-             }
-         }
- 
--        // update everything
--        this._clearSection();
--        this._createSection();
-+        if (needsupdate) {
-+            if (apObj.item)
-+                apObj.item.destroy();
-+
-+            if (pos != -1)
-+                this._networks.splice(pos, 1);
-+
-+            if (this._networks.length == 0) {
-+                // only network in the list
-+                this._networks.push(apObj);
-+                this._clearSection();
-+                this._createSection();
-+                return;
-+            }
-+
-+            // skip networks that should appear earlier
-+            let menuPos = 0;
-+            for (pos = 0;
-+                 pos < this._networks.length &&
-+                 this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+                if (this._networks[pos] != this._activeNetwork)
-+                    menuPos++;
-+            }
-+
-+            // (re-)add the network
-+            this._networks.splice(pos, 0, apObj);
-+
-+            if (this._shouldShowConnectionList()) {
-+                menuPos += (this._activeConnectionItem ? 1 : 0);
-+                this._createNetworkItem(apObj, menuPos);
-+            }
-+        }
-     },
- 
-     _accessPointRemoved: function(device, accessPoint) {
-@@ -1315,6 +1409,12 @@ NMDeviceWireless.prototype = {
-                     // remove the connection from the access point group
-                     connections.splice(k);
-                     anyauto = connections.length == 0;
-+
-+                    if (anyauto) {
-+                        // this potentially changes the sorting order
-+                        forceupdate = true;
-+                        break;
-+                    }
-                     if (apObj.item) {
-                         if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) {
-                             let items = apObj.item.menu.getMenuItems();
-@@ -1340,6 +1440,7 @@ NMDeviceWireless.prototype = {
-         }
- 
-         if (forceupdate || anyauto) {
-+            this._networks.sort(this._networkSortFunction);
-             this._clearSection();
-             this._createSection();
-         }
-@@ -1355,42 +1456,24 @@ NMDeviceWireless.prototype = {
-         this._connections.push(obj);
- 
-         // find an appropriate access point
--        let any = false, forceupdate = false;
-+        let forceupdate = false;
-         for (let i = 0; i < this._networks.length; i++) {
-             let apObj = this._networks[i];
- 
-             // Check if connection is valid for any of these access points
--            let any = false;
-             for (let k = 0; k < apObj.accessPoints.length; k++) {
-                 let ap = apObj.accessPoints[k];
-                 if (this._connectionValidForAP(connection, ap)) {
-                     apObj.connections.push(connection);
--                    any = true;
-+                    // this potentially changes the sorting order
-+                    forceupdate = true;
-                     break;
-                 }
-             }
--
--            if (any && this._shouldShowConnectionList()) {
--                // we need to show this connection
--                if (apObj.item && apObj.item.menu) {
--                    // We're already showing the submenu for this access point
--                    apObj.item.menu.addMenuItem(this._createAPItem(connection, apObj, true));
--                } else {
--                    if (apObj.item)
--                        apObj.item.destroy();
--                    if (apObj.connections.length == 1) {
--                        apObj.item = this._createAPItem(connection, apObj, false);
--                        this.section.addMenuItem(apObj.item);
--                    } else {
--                        apObj.item = null;
--                        // we need to force an update to create the submenu
--                        forceupdate = true;
--                    }
--                }
--            }
-         }
- 
-         if (forceupdate) {
-+            this._networks.sort(this._networkSortFunction);
-             this._clearSection();
-             this._createSection();
-         }
-@@ -1473,6 +1556,37 @@ NMDeviceWireless.prototype = {
-         return connection;
-     },
- 
-+    _createNetworkItem: function(apObj, position) {
-+        if(apObj.connections.length > 0) {
-+            if (apObj.connections.length == 1)
-+                apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
-+            else {
-+                let title = apObj.ssidText;
-+                apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
-+                apObj.item._apObj = apObj;
-+                for (let i = 0; i < apObj.connections.length; i++)
-+                    apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
-+            }
-+        } else {
-+            apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-+            apObj.item._apObj = apObj;
-+            apObj.item.connect('activate', Lang.bind(this, function() {
-+                let connection = this._createAutomaticConnection(apObj);
-+                let accessPoints = sortAccessPoints(apObj.accessPoints);
-+                this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+            }));
-+        }
-+        if (position < NUM_VISIBLE_NETWORKS)
-+            this.section.addMenuItem(apObj.item);
-+        else {
-+            if (!this._overflowItem) {
-+                this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-+                this.section.addMenuItem(this._overflowItem);
-+            }
-+            this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS);
-+        }
-+    },
-+
-     _createSection: function() {
-         if (!this._shouldShowConnectionList())
-             return;
-@@ -1482,47 +1596,14 @@ NMDeviceWireless.prototype = {
-             this.section.addMenuItem(this._activeConnectionItem);
-         }
- 
--        let activeAp = this.device.active_access_point;
--        let activeApSsid = activeAp ? activeAp.get_ssid() : null;
--
--        // we want five access points in the menu, including the active one
--        let numItems = this._activeConnection ? 4 : 5;
-+        let activeOffset = this._activeConnectionItem ? 1 : 0;
- 
-         for(let j = 0; j < this._networks.length; j++) {
-             let apObj = this._networks[j];
--            if(activeAp && ssidCompare(apObj.ssid, activeApSsid))
-+            if (apObj == this._activeNetwork)
-                 continue;
- 
--            let menuItem;
--            if(apObj.connections.length > 0) {
--                if (apObj.connections.length == 1)
--                    apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
--                else {
--                    let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _("<unknown>");
--                    apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
--                    apObj.item._apObj = apObj;
--                    for (let i = 0; i < apObj.connections.length; i++)
--                        apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
--                }
--            } else {
--                apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
--                apObj.item._apObj = apObj;
--                apObj.item.connect('activate', Lang.bind(this, function() {
--                    let connection = this._createAutomaticConnection(apObj);
--                    let accessPoints = sortAccessPoints(apObj.accessPoints);
--                    this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
--                }));
--            }
--
--            if (j < numItems)
--                this.section.addMenuItem(apObj.item);
--            else {
--                if (!this._overflowItem) {
--                    this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
--                    this.section.addMenuItem(this._overflowItem);
--                }
--                this._overflowItem.menu.addMenuItem(apObj.item);
--            }
-+            this._createNetworkItem(apObj, j + activeOffset);
-         }
-     },
- };
---
-cgit v0.9
-From 42a5531f1588ae3063e7d8ff7642e9f81c13afbd Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 27 Apr 2011 13:05:39 +0000
-Subject: network: fix a variable name
-
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 49cb3f0..d56c0b1 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -1285,7 +1285,7 @@ NMDeviceWireless.prototype = {
-             let menuPos = 0;
-             for (pos = 0;
-                  pos < this._networks.length &&
--                 this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+                 this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) {
-                 if (this._networks[pos] != this._activeNetwork)
-                     menuPos++;
-             }
---
-cgit v0.9
-From c31109800b3267df433841bff08c9383a5d669cb Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 25 Apr 2011 22:13:12 +0000
-Subject: network: simplify connection sorting by using libnm-glib functions
-
-Instead of rolling our own code, use new libnm-glib functions to do
-the same thing.  Requires libnm-glib as of
-779215c742bbe29a2c66202ec7e2e6d43edeb8ff (which will be part of 0.9).
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648648
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index d56c0b1..bf8e272 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -505,7 +505,7 @@ NMDevice.prototype = {
-     },
- 
-     connectionValid: function(connection) {
--        throw new TypeError('Invoking pure virtual function NMDevice.connectionValid');
-+        return this.device.connection_valid(connection);
-     },
- 
-     setEnabled: function(enabled) {
-@@ -723,17 +723,6 @@ NMDeviceWired.prototype = {
-         NMDevice.prototype._init.call(this, client, device, connections);
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_WIRED_SETTING_NAME)
--            return false;
--
--        let ethernetSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRED_SETTING_NAME);
--        let fixedMac = ethernetSettings.get_mac_address();
--        if (fixedMac)
--            return macCompare(fixedMac, macToArray(this.device.perm_hw_address));
--        return true;
--    },
--
-     _createSection: function() {
-         NMDevice.prototype._createSection.call(this);
- 
-@@ -876,10 +865,6 @@ NMDeviceModem.prototype = {
-         NMDevice.prototype._clearSection.call(this);
-     },
- 
--    connectionValid: function(connection) {
--        return connection._type == this._connectionType;
--    },
--
-     _createAutomaticConnection: function() {
-         // FIXME: we need to summon the mobile wizard here
-         // or NM will not have the necessary parameters to complete the connection
-@@ -913,18 +898,6 @@ NMDeviceBluetooth.prototype = {
-         NMDevice.prototype._init.call(this, client, device, connections);
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_BLUETOOTH_SETTING_NAME)
--            return false;
--
--        let bluetoothSettings = connection.get_setting_by_name(NetworkManager.SETTING_BLUETOOTH_SETTING_NAME);
--        let fixedBdaddr = bluetoothSettings.get_bdaddr();
--        if (fixedBdaddr)
--            return macCompare(fixedBdaddr, macToArray(this.device.hw_address));
--
--        return true;
--    },
--
-     _createAutomaticConnection: function() {
-         let connection = new NetworkManager.Connection;
-         connection._uuid = NetworkManager.utils_uuid_generate();
-@@ -1047,7 +1020,7 @@ NMDeviceWireless.prototype = {
-             // Check if some connection is valid for this AP
-             for (let j = 0; j < validConnections.length; j++) {
-                 let connection = validConnections[j];
--                if (this._connectionValidForAP(connection, ap) &&
-+                if (ap.connection_valid(connection) &&
-                     obj.connections.indexOf(connection) == -1) {
-                     obj.connections.push(connection);
-                 }
-@@ -1121,7 +1094,7 @@ NMDeviceWireless.prototype = {
-         if (best) {
-             for (let i = 0; i < bestApObj.accessPoints.length; i++) {
-                 let ap = bestApObj.accessPoints[i];
--                if (this._connectionValidForAP(best, ap)) {
-+                if (ap.connection_valid(best)) {
-                     this._client.activate_connection(best, this.device, ap.dbus_path, null);
-                     break;
-                 }
-@@ -1257,7 +1230,7 @@ NMDeviceWireless.prototype = {
-         // check if this enables new connections for this group
-         for (let i = 0; i < this._connections.length; i++) {
-             let connection = this._connections[i].connection;
--            if (this._connectionValidForAP(connection, accessPoint) &&
-+            if (accessPoint.connection_valid(connection) &&
-                 apObj.connections.indexOf(connection) == -1) {
-                 apObj.connections.push(connection);
- 
-@@ -1337,7 +1310,7 @@ NMDeviceWireless.prototype = {
-         item.connect('activate', Lang.bind(this, function() {
-             let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
-             for (let i = 0; i < accessPoints.length; i++) {
--                if (this._connectionValidForAP(connection, accessPoints[i])) {
-+                if (accessPoints[i].connection_valid(connection)) {
-                     this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
-                     break;
-                 }
-@@ -1346,40 +1319,6 @@ NMDeviceWireless.prototype = {
-         return item;
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_WIRELESS_SETTING_NAME)
--            return false;
--
--        let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
--        let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
--        let fixedMac = wirelessSettings.get_mac_address();
--        if (fixedMac && !macCompare(fixedMac, macToArray(this.device.perm_hw_address)))
--            return false;
--
--        if (wirelessSecuritySettings &&
--            wirelessSecuritySettings.key_mgmt != 'none' &&
--            wirelessSecuritySettings.key_mgmt != 'ieee8021x') {
--            let capabilities = this.device.wireless_capabilities;
--            if (!(capabilities & NetworkManager.DeviceWifiCapabilities.WPA) ||
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_TKIP))
--                return false;
--            if (wirelessSecuritySettings.get_num_protos() == 1 &&
--                wirelessSecuritySettings.get_proto(0) == 'rsn' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.RSN))
--                return false;
--            if (wirelessSecuritySettings.get_num_pairwise() == 1 &&
--                wirelessSecuritySettings.get_pairwise(0) == 'ccmp' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
--                return false;
--            if (wirelessSecuritySettings.get_num_groups() == 1 &&
--                wirelessSecuritySettings.get_group(0) == 'ccmp' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
--                return false;
--        }
--        return true;
--    },
--
-     _clearSection: function() {
-         NMDevice.prototype._clearSection.call(this);
- 
-@@ -1463,7 +1402,7 @@ NMDeviceWireless.prototype = {
-             // Check if connection is valid for any of these access points
-             for (let k = 0; k < apObj.accessPoints.length; k++) {
-                 let ap = apObj.accessPoints[k];
--                if (this._connectionValidForAP(connection, ap)) {
-+                if (ap.connection_valid(connection)) {
-                     apObj.connections.push(connection);
-                     // this potentially changes the sorting order
-                     forceupdate = true;
-@@ -1479,37 +1418,6 @@ NMDeviceWireless.prototype = {
-         }
-     },
- 
--    _connectionValidForAP: function(connection, ap) {
--        // copied and adapted from nm-applet
--        let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
--        if (!ssidCompare(wirelessSettings.get_ssid(), ap.get_ssid()))
--            return false;
--
--        let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
--        let fixedBssid = wirelessSettings.get_bssid();
--        if (fixedBssid && !macCompare(fixedBssid, macToArray(ap.hw_address)))
--            return false;
--
--        let fixedBand = wirelessSettings.band;
--        if (fixedBand) {
--            let freq = ap.frequency;
--            if (fixedBand == 'a' && (freq < 4915 || freq > 5825))
--                return false;
--            if (fixedBand == 'bg' && (freq < 2412 || freq > 2484))
--                return false;
--        }
--
--        let fixedChannel = wirelessSettings.channel;
--        if (fixedChannel && fixedChannel != NetworkManager.utils_wifi_freq_to_channel(ap.frequency))
--            return false;
--
--        if (!wirelessSecuritySettings)
--            return true;
--
--        return wirelessSettings.ap_security_compatible(wirelessSecuritySettings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode);
--    },
--
-     _createActiveConnectionItem: function() {
-         let activeAp = this.device.active_access_point;
-         let icon, title;
---
-cgit v0.9
-From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 17:21:45 +0000
-Subject: network: fix handling of AP flags and enhance for 802.1x
-
-All WPA APs were getting set as WPA2 due to the check for privacy;
-WPA/WPA2 APs *must* set the Privacy bit according to the standard,
-so we'd never end up in the case for NMAccessPointSecurity.WPA.
-
-Fix that, and also add flags for WPA[2] Enterprise which we'll
-use a bit later for the first-time connect case for 802.1x enabled
-access points.
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index bf8e272..6f0cdac 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -33,8 +33,10 @@ const NMAccessPointSecurity = {
-     UNKNOWN: 0,
-     NONE: 1,
-     WEP: 2,
--    WPA: 3,
--    WPA2: 4
-+    WPA_PSK: 3,
-+    WPA2_PSK: 4,
-+    WPA_ENT: 5,
-+    WPA2_ENT: 6
- };
- 
- // small optimization, to avoid using [] all the time
-@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = {
-     _getApSecurityType: function(accessPoint) {
-         if (accessPoint._secType)
-             return accessPoint._secType;
--        // XXX: have this checked by someone familiar with IEEE 802.1x
- 
-         let flags = accessPoint.flags;
-         let wpa_flags = accessPoint.wpa_flags;
-         let rsn_flags = accessPoint.rsn_flags;
-         let type;
--        if (  !(flags & NM80211ApFlags.PRIVACY)
--	      && (wpa_flags == NM80211ApSecurityFlags.NONE)
--	      && (rsn_flags == NM80211ApSecurityFlags.NONE))
--	    type = NMAccessPointSecurity.NONE;
--        else if (   (flags & NM80211ApFlags.PRIVACY)
--	            && (wpa_flags == NM80211ApSecurityFlags.NONE)
--	            && (rsn_flags == NM80211ApSecurityFlags.NONE))
--	    type = NMAccessPointSecurity.WEP;
--        else if (   !(flags & NM80211ApFlags.PRIVACY)
--	        &&  (wpa_flags != NM80211ApSecurity.NONE)
--	        &&  (rsn_flags != NM80211ApSecurity.NONE))
--	    type = NMAccessPointSecurity.WPA;
--        else
--            type = NMAccessPointSecurity.WPA2;
-+        if (rsn_flags != NM80211ApSecurityFlags.NONE) {
-+            /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */
-+            if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+	        type = NMAccessPointSecurity.WPA2_ENT;
-+	    else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+	        type = NMAccessPointSecurity.WPA2_PSK;
-+        } else if (wpa_flags != NM80211ApSecurityFlags.NONE) {
-+            if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+                type = NMAccessPointSecurity.WPA_ENT;
-+            else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+	        type = NMAccessPointSecurity.WPA_PSK;
-+        } else {
-+            if (flags & NM80211ApFlags.PRIVACY)
-+                type = NMAccessPointSecurity.WEP;
-+            else
-+                type = NMAccessPointSecurity.NONE;
-+        }
- 
-         // cache the found value to avoid checking flags all the time
-         accessPoint._secType = type;
---
-cgit v0.9
-From ae0652d13fc2d7caa3d64f2b87d174253cae5901 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 18:31:45 +0000
-Subject: network: fix initial connections to WPA[2] Enterprise APs
-
-Call out to nm-applet to do the dirty work since the dialog of
-doom is pretty complicated and we don't have a JS equivalent
-of it for now.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6f0cdac..ca4facf 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -48,6 +48,16 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
- // (the remaining are placed into More...)
- const NUM_VISIBLE_NETWORKS = 5;
- 
-+const NMAppletHelperInterface = {
-+    name: 'org.gnome.network_manager_applet',
-+    methods: [
-+        { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
-+        { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
-+        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+    ],
-+};
-+const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-+
- function macToArray(string) {
-     return string.split(':').map(function(el) {
-         return parseInt(el, 16);
-@@ -991,6 +1001,10 @@ NMDeviceWireless.prototype = {
-         this._overflowItem = null;
-         this._networks = [ ];
- 
-+        this._applet_proxy = new NMAppletProxy(DBus.session,
-+                                               'org.gnome.network_manager_applet',
-+                                               '/org/gnome/network_manager_applet');
-+
-         // breaking the layers with this, but cannot call
-         // this.connectionValid until I have a device
-         this.device = device;
-@@ -1483,9 +1497,20 @@ NMDeviceWireless.prototype = {
-             apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-             apObj.item._apObj = apObj;
-             apObj.item.connect('activate', Lang.bind(this, function() {
--                let connection = this._createAutomaticConnection(apObj);
-                 let accessPoints = sortAccessPoints(apObj.accessPoints);
--                this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+                if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
-+                    || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
-+                    // 802.1x-enabled APs get handled by nm-applet for now...
-+                    this._applet_proxy.ConnectTo8021xNetworkRemote(this.device.get_path(),
-+                                                                   accessPoints[0].dbus_path,
-+                                                                   Lang.bind(this, function(results, err) {
-+                                                                       if (err)
-+                                                                           log(err);
-+                                                                   }));
-+                } else {
-+                    let connection = this._createAutomaticConnection(apObj);
-+                    this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+                }
-             }));
-         }
-         if (position < NUM_VISIBLE_NETWORKS)
---
-cgit v0.9
-From 5090a4ccce87643081138272fb8a2fe687f1ed0a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 19:48:10 +0000
-Subject: network: request that nm-applet show the mobile broadband wizard
-
-Use nm-applet 0.8.999 API to call the mobile broadband wizard and
-activate the new connection.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index ca4facf..756b27f 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -53,7 +53,8 @@ const NMAppletHelperInterface = {
-     methods: [
-         { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
-         { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
--        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' },
-+        { name: 'ConnectTo3gNetwork', inSignature: 'o', outSignature: '' }
-     ],
- };
- const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-@@ -440,7 +441,8 @@ NMDevice.prototype = {
-             this._client.activate_connection(this._connections[0].connection, this.device, null, null);
-         } else if (this._autoConnectionName) {
-             let connection = this._createAutomaticConnection();
--            this._client.add_and_activate_connection(connection, this.device, null, null);
-+            if (connection)
-+                this._client.add_and_activate_connection(connection, this.device, null, null);
-         }
-     },
- 
-@@ -620,7 +622,8 @@ NMDevice.prototype = {
-             this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName);
-             this._autoConnectionItem.connect('activate', Lang.bind(this, function() {
-                 let connection = this._createAutomaticConnection();
--                this._client.add_and_activate_connection(connection, this.device, null, null);
-+                if (connection)
-+                    this._client.add_and_activate_connection(connection, this.device, null, null);
-             }));
-             this.section.addMenuItem(this._autoConnectionItem);
-         }
-@@ -777,6 +780,10 @@ NMDeviceModem.prototype = {
-         this.mobileDevice = null;
-         this._connectionType = 'ppp';
- 
-+        this._applet_proxy = new NMAppletProxy(DBus.session,
-+                                               'org.gnome.network_manager_applet',
-+                                               '/org/gnome/network_manager_applet');
-+
-         this._capabilities = device.current_capabilities;
-         if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
-             is_wwan = true;
-@@ -878,19 +885,13 @@ NMDeviceModem.prototype = {
-     },
- 
-     _createAutomaticConnection: function() {
--        // FIXME: we need to summon the mobile wizard here
--        // or NM will not have the necessary parameters to complete the connection
--        // pending a DBus method on nm-applet
--
--        let connection = new NetworkManager.Connection;
--        connection._uuid = NetworkManager.utils_uuid_generate();
--        connection.add_setting(new NetworkManager.SettingConnection({
--            uuid: connection._uuid,
--            id: this._autoConnectionName,
--            type: this._connectionType,
--            autoconnect: false
--        }));
--        return connection;
-+        // Mobile wizard is handled by nm-applet for now...
-+        this._applet_proxy.ConnectTo3gNetworkRemote(this.device.get_path(),
-+                                                    Lang.bind(this, function(results, err) {
-+                                                        if (err)
-+                                                            log(err);
-+                                                    }));
-+        return null;
-     }
- };
- 
---
-cgit v0.9
diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch
new file mode 100644
index 000000000..a7329166f
--- /dev/null
+++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch
@@ -0,0 +1,22 @@
+From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001
+From: Maxim Ermilov <zaspire@rambler.ru>
+Date: Tue, 24 May 2011 22:46:47 +0000
+Subject: shell-recorder: missing XFree
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650934
+---
+diff --git a/src/shell-recorder.c b/src/shell-recorder.c
+index 6555187..d297923 100644
+--- a/src/shell-recorder.c
++++ b/src/shell-recorder.c
+@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
+       *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j];
+ 
+   cairo_surface_mark_dirty (recorder->cursor_image);
++
++  XFree (cursor_image);
+ }
+ 
+ /* Overlay the cursor image on the frame. We draw the cursor image
+--
+cgit v0.9
diff --git a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
deleted file mode 100644
index 6a66c9384..000000000
--- a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 88de26138a8b79d89884ff2eb6471c5a8e3b39ca Mon Sep 17 00:00:00 2001
-From: Maxim Ermilov <zaspire@rambler.ru>
-Date: Thu, 05 May 2011 10:06:05 +0000
-Subject: shell-xfixes-cursor: missing XFree
-
-memory returned by XFixesGetCursorImage should be freed after usage.
-https://bugzilla.gnome.org/show_bug.cgi?id=642652
----
-diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c
-index 14d2b59..334503d 100644
---- a/src/shell-xfixes-cursor.c
-+++ b/src/shell-xfixes-cursor.c
-@@ -254,6 +254,7 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor)
-       xfixes_cursor->cursor_hot_y = cursor_image->yhot;
-       g_signal_emit (xfixes_cursor, signals[CURSOR_CHANGED], 0);
-     }
-+  XFree (cursor_image);
- }
- 
- static void
---
-cgit v0.9
diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
deleted file mode 100644
index d3f887c29..000000000
--- a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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-shell/st-private_fix_memory_leak.patch b/extra/gnome-shell/st-private_fix_memory_leak.patch
deleted file mode 100644
index 677a26531..000000000
--- a/extra/gnome-shell/st-private_fix_memory_leak.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 72f9f482d6f1bcb53ea2bd1606818af1f33a5a8c Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 19:21:58 +0000
-Subject: st-private: Fix memory leak
-
-==13810== 11,360 bytes in 1 blocks are definitely lost in loss record 18,574 of 18,765
-==13810==    at 0x4005447: calloc (vg_replace_malloc.c:467)
-==13810==    by 0x5191882: standard_calloc (gmem.c:107)
-==13810==    by 0x51920A7: g_malloc0 (gmem.c:196)
-==13810==    by 0x4056201: blur_pixels (st-private.c:466)
-==13810==    by 0x40573B4: _st_create_shadow_cairo_pattern (st-private.c:710)
-==13810==    by 0x4070746: st_theme_node_paint (st-theme-node-drawing.c:856)
-==13810==    by 0x3FEFFFFF: ???
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649497
----
-diff --git a/src/st/st-private.c b/src/st/st-private.c
-index d0aa89b..51798a1 100644
---- a/src/st/st-private.c
-+++ b/src/st/st-private.c
-@@ -746,7 +746,7 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
-                               (height_out - height_in) / 2.0);
-       cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
- 
--      return dst_pattern;
-+      goto out;
-     }
- 
-   /* Read all the code from the cairo_pattern_set_matrix call
-@@ -784,6 +784,8 @@ _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-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index b383bb180..04172d277 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $
+# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24')
+sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 0bc006cf1..12b8c7d90 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $
+# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=gnome-themes-standard
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ groups=('gnome')
 replaces=('gnome-themes')
 conflicts=('gnome-themes')
 source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677')
+sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 6b666f476..fe6d43a9e 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119590 2011-04-12 15:33:34Z eric $
+# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.5
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,8 +20,8 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('94168fe959743fc342812ac3a01814a1')
-sha1sums=('4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126')
+md5sums=('b7d5fbb1bddf3618c97ebeeb76408ebe')
+sha1sums=('b6d4a6bc327ef5a260d070215a14a3180b474ad8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 5550647fc..4cff80b52 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $
+# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
@@ -14,12 +14,15 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2
-        settings.ini)
-sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+        settings.ini
+        only_draw_resize_grip_if_its_window_exists.patch)
+sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
new file mode 100644
index 000000000..a6514b550
--- /dev/null
+++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
@@ -0,0 +1,28 @@
+From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Mon, 23 May 2011 13:46:59 +0000
+Subject: window: Only draw resize grip if its window exists
+
+Don't rely on priv->resize_grip_visible as the code comment in the
+variable declaration indicates.
+This fixes warnings with GtkPlug, which can cause resize_grip_visible to
+be TRUE but grid_window to be NULL - running tests/teststatusicon
+reproduces this.
+
+This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc
+---
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index b97418a..b1caa9b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget,
+   if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw)
+     ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr);
+ 
+-  if (priv->resize_grip_visible &&
++  if (priv->grip_window &&
+       gtk_cairo_should_draw_window (cr, priv->grip_window))
+     {
+       GdkRectangle rect;
+--
+cgit v0.9
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index fb98d197d..eec9417b7 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $
+# $Id: PKGBUILD 125532 2011-05-26 16:26:30Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.0.1
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2)
-sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a')
+sha256sums=('582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7')
 
 build() {
   cd "${srcdir}/$_pkgbasename-${pkgver}"
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 40322ce77..48ee41746 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $
+# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
 url="http://www.gnome.org"
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7')
+sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 8fe42ce6e..aa432f086 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 116002 2011-03-22 15:28:48Z giovanni $
+# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.39.2
+pkgver=1.39.4
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/help2man/"
 license=('GPL')
 depends=('perl-locale-gettext')
+install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('36659da3ba7a9a51813e1c4848900a28')
+md5sums=('6b1160697451ba87067231d172285840')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install
new file mode 100644
index 000000000..ab6585b91
--- /dev/null
+++ b/extra/help2man/help2man.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(help2man.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 9d0759d68..6029c1ebe 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $
+# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2010.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
@@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
          'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
 makedepends=('zip' 'cmake' 'boost')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('bfd716655461987312b2f2f00c90dcc5')
-sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch)
+md5sums=('bfd716655461987312b2f2f00c90dcc5'
+         '4393c7b31da60f230c85e63a6a2e43a0')
+sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07'
+          '52798a155a037f853f41402f797e8a4cb6bb3e07')
 
 build() {
   cd "${srcdir}"
-
+  (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch)
   mkdir build && cd build
 
   cmake "${srcdir}/${pkgname}-${pkgver}" \
diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch
new file mode 100644
index 000000000..98a70ad50
--- /dev/null
+++ b/extra/hugin/hugin-gcc46.patch
@@ -0,0 +1,16 @@
+
+diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
+--- a/src/foreign/vigra/vigra/multi_iterator.hxx	Mon Jun 25 16:36:21 2007 +0000
++++ b/src/foreign/vigra/vigra/multi_iterator.hxx	Tue Jan 25 21:14:13 2011 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+ 
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+ 
+
+
+
+
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 35cc5fa90..db4a0aba4 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 114609 2011-03-14 15:02:27Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,33 +14,40 @@ makedepends=('boost' 'pkg-config' 'intltool')
 depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2'
          'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('python2-numpy: some extensions'
-            'python-lxml: some extensions and filters')
+            'python-lxml: some extensions and filters'
+            'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-install=inkscape.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gcc46.patch')
+sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91'
+          '7163f35978538a6e223005737e8707b6f847fab3')
+
+install=install
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-python \
-    --with-perl \
-    --without-gnome-vfs \
-    --with-xft \
-    --enable-lcms \
-    --enable-poppler-cairo \
-    --disable-dependency-tracking
-
-  sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-  sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-  sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-  sed -i 's|\<python -c |python2 -c|g' share/extensions/uniconv*.py
-  sed -i 's|"python"|"python2"|g' src/main.cpp
-
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../gcc46.patch
+	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
+	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
+	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
+	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+	sed -i 's|"python"|"python2"|g' src/main.cpp
+
+	./configure --prefix=/usr \
+		--with-python \
+		--with-perl \
+		--without-gnome-vfs \
+		--with-xft \
+		--enable-lcms \
+		--enable-poppler-cairo \
+		--disable-dependency-tracking \
+
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch
new file mode 100644
index 000000000..d04914c87
--- /dev/null
+++ b/extra/inkscape/gcc46.patch
@@ -0,0 +1,849 @@
+diff -aur old/src/2geom/utils.h new/src/2geom/utils.h
+--- old/src/2geom/utils.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/2geom/utils.h	2011-05-26 14:38:55.912288964 +0000
+@@ -35,6 +35,7 @@
+ 
+ #include <cmath>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace Geom {
+ 
+diff -aur old/src/arc-context.h new/src/arc-context.h
+--- old/src/arc-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/arc-context.h	2011-05-26 14:37:30.814792031 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include <2geom/point.h>
+diff -aur old/src/box3d-context.h new/src/box3d-context.h
+--- old/src/box3d-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/box3d-context.h	2011-05-26 14:37:30.814792031 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "proj_pt.h"
+diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h
+--- old/src/conn-avoid-ref.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/conn-avoid-ref.h	2011-05-26 14:37:30.814792031 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ struct SPDesktop;
+diff -aur old/src/connection-pool.h new/src/connection-pool.h
+--- old/src/connection-pool.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/connection-pool.h	2011-05-26 14:37:30.814792031 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape
+diff -aur old/src/connector-context.h new/src/connector-context.h
+--- old/src/connector-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/connector-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -12,6 +12,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/connection.h>
+ #include "event-context.h"
+diff -aur old/src/desktop.h new/src/desktop.h
+--- old/src/desktop.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/desktop.h	2011-05-26 14:37:30.814792120 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <gdk/gdkevents.h>
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include <2geom/matrix.h>
+diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp
+--- old/src/dialogs/object-attributes.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/dialogs/object-attributes.cpp	2011-05-26 14:37:30.814792120 +0000
+@@ -13,6 +13,7 @@
+ #include <glibmm/i18n.h>
+ #include <string>
+ #include <cstring>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/ptr_fun.h>
+ #include <sigc++/adaptors/bind.h>
+diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h
+--- old/src/display/canvas-temporary-item.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/display/canvas-temporary-item.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "display/display-forward.h"
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/document.h new/src/document.h
+--- old/src/document.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/document.h	2011-05-26 14:37:30.814792120 +0000
+@@ -17,6 +17,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtk/gtksignal.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/class_slot.h>
+ 
+diff -aur old/src/document-private.h new/src/document-private.h
+--- old/src/document-private.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/document-private.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "xml/event-fns.h"
+ #include "sp-defs.h"
+diff -aur old/src/document-subset.h new/src/document-subset.h
+--- old/src/document-subset.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/document-subset.h	2011-05-26 14:37:30.814792120 +0000
+@@ -10,6 +10,7 @@
+ #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+ #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ 
+diff -aur old/src/draw-context.h new/src/draw-context.h
+--- old/src/draw-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/draw-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include <forward.h>
+diff -aur old/src/extension/timer.h new/src/extension/timer.h
+--- old/src/extension/timer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/extension/timer.h	2011-05-26 14:37:30.814792120 +0000
+@@ -13,6 +13,7 @@
+ #ifndef INKSCAPE_EXTENSION_TIMER_H__
+ #define INKSCAPE_EXTENSION_TIMER_H__
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/timeval.h>
+ #include "extension-forward.h"
+diff -aur old/src/flood-context.h new/src/flood-context.h
+--- old/src/flood-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/flood-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -11,6 +11,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtk.h>
+ #include "event-context.h"
+diff -aur old/src/gc-alloc.h new/src/gc-alloc.h
+--- old/src/gc-alloc.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc-alloc.h	2011-05-26 14:37:30.814792120 +0000
+@@ -16,6 +16,7 @@
+ #define SEEN_INKSCAPE_GC_ALLOC_H
+ 
+ #include <limits>
++#include <cstddef>
+ #include "gc-core.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/gc.cpp new/src/gc.cpp
+--- old/src/gc.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc.cpp	2011-05-26 14:37:30.814792120 +0000
+@@ -16,6 +16,7 @@
+ #include <glib/gmessages.h>
+ #include <sigc++/functors/ptr_fun.h>
+ #include <glibmm/main.h>
++#include <cstddef>
+ 
+ namespace Inkscape {
+ namespace GC {
+diff -aur old/src/gc-finalized.h new/src/gc-finalized.h
+--- old/src/gc-finalized.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc-finalized.h	2011-05-26 14:37:30.814792120 +0000
+@@ -17,6 +17,7 @@
+ #define SEEN_INKSCAPE_GC_FINALIZED_H
+ 
+ #include <new>
++#include <cstddef>
+ #include "gc-core.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/gradient-context.h new/src/gradient-context.h
+--- old/src/gradient-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gradient-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ 
+diff -aur old/src/gradient-drag.h new/src/gradient-drag.h
+--- old/src/gradient-drag.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/gradient-drag.h	2011-05-26 14:37:30.814792120 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <vector>
+ 
+diff -aur old/src/knot.h new/src/knot.h
+--- old/src/knot.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/knot.h	2011-05-26 14:37:30.814792120 +0000
+@@ -20,6 +20,7 @@
+ #include "forward.h"
+ #include <2geom/point.h>
+ #include "knot-enums.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPKnot;
+diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h
+--- old/src/libavoid/geomtypes.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/libavoid/geomtypes.h	2011-05-26 14:37:30.814792120 +0000
+@@ -29,6 +29,7 @@
+ #ifndef AVOID_GEOMTYPES_H
+ #define AVOID_GEOMTYPES_H
+ 
++#include <cstddef>
+ #include <vector>
+ #include <utility>
+ 
+diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h
+--- old/src/live_effects/lpeobject-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/lpeobject-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h
+--- old/src/live_effects/parameter/path.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/parameter/path.h	2011-05-26 14:37:30.818124452 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include "live_effects/parameter/parameter.h"
+ #include "live_effects/parameter/path-reference.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h
+--- old/src/live_effects/parameter/path-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/parameter/path-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class Path;
+diff -aur old/src/Makefile.am new/src/Makefile.am
+--- old/src/Makefile.am	2010-07-13 03:48:40.691600000 +0000
++++ new/src/Makefile.am	2011-05-26 14:37:30.814792031 +0000
+@@ -205,7 +205,7 @@
+ 
+ inkscape_SOURCES += main.cpp $(win32_sources)
+ inkscape_LDADD = $(all_libs)
+-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
+ 
+ inkview_SOURCES += inkview.cpp $(win32_sources)
+ inkview_LDADD = $(all_libs)
+diff -aur old/src/message-stack.h new/src/message-stack.h
+--- old/src/message-stack.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/message-stack.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+ #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
+ #define SEEN_INKSCAPE_MESSAGE_STACK_H
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <stdarg.h>
+diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h
+--- old/src/object-hierarchy.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/object-hierarchy.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <exception>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/signal.h>
+ #include <glib/gmessages.h>
+diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h
+--- old/src/persp3d-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/persp3d-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include "uri-references.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "persp3d.h"
+ 
+diff -aur old/src/rect-context.h new/src/rect-context.h
+--- old/src/rect-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/rect-context.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/selcue.h new/src/selcue.h
+--- old/src/selcue.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selcue.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPDesktop;
+diff -aur old/src/selection-describer.h new/src/selection-describer.h
+--- old/src/selection-describer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selection-describer.h	2011-05-26 14:37:30.818124452 +0000
+@@ -12,6 +12,7 @@
+ #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+ #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "message-context.h"
+ 
+diff -aur old/src/selection.h new/src/selection.h
+--- old/src/selection.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selection.h	2011-05-26 14:37:30.818124452 +0000
+@@ -19,6 +19,7 @@
+ #include <vector>
+ #include <map>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ //#include "libnr/nr-rect.h"
+diff -aur old/src/seltrans.h new/src/seltrans.h
+--- old/src/seltrans.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/seltrans.h	2011-05-26 14:37:30.818124452 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/point.h>
+ #include <2geom/matrix.h>
+diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h
+--- old/src/sp-conn-end.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-conn-end.h	2011-05-26 14:37:30.818124452 +0000
+@@ -2,6 +2,7 @@
+ #define SEEN_SP_CONN_END
+ 
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include "sp-use-reference.h"
+diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h
+--- old/src/sp-conn-end-pair.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-conn-end-pair.h	2011-05-26 14:37:30.818124452 +0000
+@@ -15,6 +15,7 @@
+ 
+ #include "forward.h"
+ #include "libnr/nr-point.h"
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -aur old/src/sp-gradient.h new/src/sp-gradient.h
+--- old/src/sp-gradient.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/sp-gradient.h	2011-05-26 14:37:30.818124452 +0000
+@@ -25,6 +25,7 @@
+ #include "sp-gradient-units.h"
+ #include "sp-gradient-vector.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ struct SPGradientReference;
+diff -aur old/src/spiral-context.h new/src/spiral-context.h
+--- old/src/spiral-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/spiral-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/sp-object.h new/src/sp-object.h
+--- old/src/sp-object.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-object.h	2011-05-26 14:37:30.818124452 +0000
+@@ -56,6 +56,7 @@
+ 
+ 
+ #include <glib-object.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -aur old/src/sp-offset.h new/src/sp-offset.h
+--- old/src/sp-offset.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-offset.h	2011-05-26 14:37:30.818124452 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include "sp-shape.h"
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #define SP_TYPE_OFFSET            (sp_offset_get_type ())
+diff -aur old/src/sp-pattern.h new/src/sp-pattern.h
+--- old/src/sp-pattern.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-pattern.h	2011-05-26 14:37:30.818124452 +0000
+@@ -32,6 +32,7 @@
+ #include "sp-paint-server.h"
+ #include "uri-references.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ class SPPatternReference : public Inkscape::URIReference {
+diff -aur old/src/sp-shape.h new/src/sp-shape.h
+--- old/src/sp-shape.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-shape.h	2011-05-26 14:37:30.818124452 +0000
+@@ -19,6 +19,7 @@
+ #include "sp-marker-loc.h"
+ #include <2geom/forward.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_SHAPE (sp_shape_get_type ())
+diff -aur old/src/sp-switch.h new/src/sp-switch.h
+--- old/src/sp-switch.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-switch.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "sp-item-group.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_SWITCH            (CSwitch::getType())
+diff -aur old/src/sp-text.h new/src/sp-text.h
+--- old/src/sp-text.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-text.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "sp-item.h"
+ #include "sp-string.h"
+diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h
+--- old/src/sp-tref-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-tref-reference.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include "util/share.h"
+diff -aur old/src/sp-use.h new/src/sp-use.h
+--- old/src/sp-use.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-use.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "svg/svg-length.h"
+ #include "sp-item.h"
+diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h
+--- old/src/sp-use-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-use-reference.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class Path;
+diff -aur old/src/star-context.h new/src/star-context.h
+--- old/src/star-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/star-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/style.h new/src/style.h
+--- old/src/style.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/style.h	2011-05-26 14:37:30.821456796 +0000
+@@ -24,6 +24,7 @@
+ #include "uri.h"
+ #include "sp-paint-server.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/text-context.h new/src/text-context.h
+--- old/src/text-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/text-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ /*  #include <gdk/gdkic.h> */
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtkimcontext.h>
+ 
+diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h
+--- old/src/ui/dialog/desktop-tracker.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/desktop-tracker.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_DIALOG_DESKTOP_TRACKER
+ #define SEEN_DIALOG_DESKTOP_TRACKER
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <glib/gtypes.h>
+ 
+diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h
+--- old/src/ui/dialog/document-metadata.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/document-metadata.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h
+--- old/src/ui/dialog/document-properties.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/document-properties.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>//
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h
+--- old/src/ui/dialog/inkscape-preferences.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/dialog/inkscape-preferences.h	2011-05-26 14:37:30.821456796 +0000
+@@ -28,6 +28,7 @@
+ #include <gtkmm/frame.h>
+ #include <gtkmm/notebook.h>
+ #include "ui/widget/preferences-widget.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+ #include <gtkmm/textview.h>
+diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp
+--- old/src/ui/dialog/undo-history.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/undo-history.cpp	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <glibmm/i18n.h>
+ #include <gtk/gtkimage.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ 
+diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h
+--- old/src/ui/tool/control-point.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/tool/control-point.h	2011-05-26 14:37:30.821456796 +0000
+@@ -12,6 +12,7 @@
+ #define SEEN_UI_TOOL_CONTROL_POINT_H
+ 
+ #include <boost/utility.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gdkmm.h>
+ #include <gtkmm.h>
+diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h
+--- old/src/ui/tool/control-point-selection.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/ui/tool/control-point-selection.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <memory>
+ #include <boost/optional.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/forward.h>
+ #include <2geom/point.h>
+diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h
+--- old/src/ui/tool/manipulator.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/tool/manipulator.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+ 
+ #include <set>
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <gdk/gdk.h>
+diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h
+--- old/src/ui/tool/multi-path-manipulator.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/tool/multi-path-manipulator.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+ #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "display/display-forward.h"
+ #include "forward.h"
+diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h
+--- old/src/ui/tool/node.h	2011-01-02 04:34:09.814902000 +0000
++++ new/src/ui/tool/node.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+ #include <iterator>
+ #include <iosfwd>
+ #include <stdexcept>
++#include <cstddef>
+ #include <tr1/functional>
+ #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
+diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h
+--- old/src/ui/tool/node-tool.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/tool/node-tool.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ #include <memory>
+ #include <boost/ptr_container/ptr_map.hpp>
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "forward.h"
+diff -aur old/src/ui/view/view.h new/src/ui/view/view.h
+--- old/src/ui/view/view.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/view/view.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <gdk/gdktypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "message.h"
+ #include "gc-managed.h"
+diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h
+--- old/src/ui/widget/color-picker.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/color-picker.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+ #ifndef __COLOR_PICKER_H__
+ #define __COLOR_PICKER_H__
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/button.h>
+ #include <gtkmm/dialog.h>
+diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h
+--- old/src/ui/widget/page-sizer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/page-sizer.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
+ 
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include "helper/units.h"
+diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h
+--- old/src/ui/widget/preferences-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/preferences-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -26,6 +26,7 @@
+ #include <gtkmm/drawingarea.h>
+ #include <gtkmm/frame.h>
+ #include <gtkmm/filechooserbutton.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+ 
+diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h
+--- old/src/ui/widget/selected-style.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/selected-style.h	2011-05-26 14:37:30.824789230 +0000
+@@ -23,6 +23,7 @@
+ #include <gtkmm/adjustment.h>
+ #include <gtkmm/spinbutton.h>
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h
+--- old/src/ui/widget/style-subject.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/style-subject.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ #include "libnr/nr-rect.h"
+ #include <2geom/rect.h>
+ #include "sp-item.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPDesktop;
+diff -aur old/src/uri-references.h new/src/uri-references.h
+--- old/src/uri-references.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/uri-references.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/trackable.h>
+ 
+diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h
+--- old/src/util/forward-pointer-iterator.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/forward-pointer-iterator.h	2011-05-26 14:37:30.824789230 +0000
+@@ -15,6 +15,7 @@
+ #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
+ 
+ #include <iterator>
++#include <cstddef>
+ #include "util/reference.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/util/share.h new/src/util/share.h
+--- old/src/util/share.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/share.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "gc-core.h"
+ #include <cstring>
++#include <cstddef>
+ 
+ namespace Inkscape {
+ namespace Util {
+diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h
+--- old/src/util/unordered-containers.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/unordered-containers.h	2011-05-26 14:37:30.824789230 +0000
+@@ -41,6 +41,8 @@
+ # define INK_UNORDERED_MAP __gnu_cxx::hash_map
+ # define INK_HASH __gnu_cxx::hash
+ 
++#include <cstddef>
++
+ namespace __gnu_cxx {
+ // hash function for pointers
+ // TR1 and Boost have this defined by default, __gnu_cxx doesn't
+diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h
+--- old/src/widgets/desktop-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/desktop-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -21,6 +21,7 @@
+ #include "ui/view/view-widget.h"
+ #include "ui/view/edit-widget-interface.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ // forward declaration
+diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h
+--- old/src/widgets/gradient-image.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/gradient-image.h	2011-05-26 14:37:30.824789230 +0000
+@@ -19,6 +19,7 @@
+ 
+ #include <glib.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
+diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h
+--- old/src/widgets/gradient-vector.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/gradient-vector.h	2011-05-26 14:37:30.824789230 +0000
+@@ -17,6 +17,7 @@
+ 
+ #include <glib.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include <gtk/gtkvbox.h>
+diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h
+--- old/src/widgets/sp-attribute-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/sp-attribute-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
+ 
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
+diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp
+--- old/src/widgets/sp-color-notebook.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/sp-color-notebook.cpp	2011-05-26 14:37:30.824789230 +0000
+@@ -22,6 +22,7 @@
+ #include <cstring>
+ #include <string>
+ #include <cstdlib>
++#include <cstddef>
+ #include <gtk/gtk.h>
+ #include <glibmm/i18n.h>
+ 
+diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h
+--- old/src/xml/helper-observer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/xml/helper-observer.h	2011-05-26 14:37:30.824789230 +0000
+@@ -5,6 +5,7 @@
+ #include "node.h"
+ #include "../sp-object.h"
+ //#include "../sp-object-repr.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
diff --git a/extra/inkscape/inkscape.install b/extra/inkscape/inkscape.install
deleted file mode 100644
index c4b2efa09..000000000
--- a/extra/inkscape/inkscape.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-
-post_remove() {
-  post_install
-}
diff --git a/extra/inkscape/install b/extra/inkscape/install
new file mode 100644
index 000000000..6e803bf1d
--- /dev/null
+++ b/extra/inkscape/install
@@ -0,0 +1,13 @@
+post_install() {
+	update-desktop-database -q
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+	post_install
+}
+
+
+post_remove() {
+	post_install
+}
diff --git a/extra/ipod-sharp/PKGBUILD b/extra/ipod-sharp/PKGBUILD
deleted file mode 100644
index 29ca26d97..000000000
--- a/extra/ipod-sharp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 59294 2009-11-21 20:34:51Z jgc $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-pkgname=ipod-sharp
-pkgver=0.8.5
-pkgrel=1
-pkgdesc="C# bindings for libipoddevice"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://download.banshee-project.org/ipod-sharp/"
-depends=('podsleuth' 'ndesk-dbus-glib' 'gtk-sharp-2')
-options=(!makeflags)
-source=(http://download.banshee-project.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c5b02872c75a7d61662e266e6f7a2a1aae14f71d9820a59faef2813dcd825fd')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-docs || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  rm -fr "${MONO_SHARED_DIR}"
-}
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch
deleted file mode 100644
index 20ccd4d7d..000000000
--- a/extra/kdebase-workspace/nm-09.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~	2011-04-29 03:43:20.321994578 -0700
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt	2011-04-29 03:43:33.271995023 -0700
-@@ -17,7 +17,7 @@
-     add_subdirectory(networkmanager-0.6)
-   endif (NM_0_6)
- 
--  macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+  macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
-   if (NM_0_7)
-     message(STATUS "Will build networkmanager-0.7")
-     set(HAVE_NETWORKMANAGER TRUE)
---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~	2011-04-29 03:32:33.838644845 -0700
-+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp	2011-04-29 03:40:52.308657544 -0700
-@@ -118,16 +118,16 @@
-     uint deviceType = devIface.deviceType();
-     NMNetworkInterface * createdInterface = 0;
-     switch ( deviceType ) {
--        case DEVICE_TYPE_802_3_ETHERNET:
-+        case NM_DEVICE_TYPE_ETHERNET:
-             createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
-             break;
--        case DEVICE_TYPE_802_11_WIRELESS:
-+        case NM_DEVICE_TYPE_WIFI:
-             createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_GSM:
-+        case 3:
-             createdInterface = new NMGsmNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_CDMA:
-+        case 4:
-             createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
-             break;
-             /*
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
index e1c29b24b..a5a24fb20 100644
--- a/extra/kdeedu/PKGBUILD
+++ b/extra/kdeedu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $
+# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -26,8 +26,8 @@ pkgname=('kdeedu-blinken'
          'kdeedu-rocs'
          'kdeedu-step')
 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' 'kdeedu')
@@ -46,7 +46,6 @@ build() {
     cd ${srcdir}
 	mkdir build
 	cd build
-	# rpath is needed for cantor to find R
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=OFF \
diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch
deleted file mode 100644
index 52b875513..000000000
--- a/extra/kdeplasma-applets-networkmanagement/nm-09.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Lamarque V. Souza <lamarque@gmail.com>
-Date: Sun, 17 Apr 2011 00:09:43 +0000
-Subject: Fix compilation against NetworkManager-0.8.98.
-X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&amp;a=commitdiff&amp;h=e87ceccadc833e220f73d86352968655cedc0485
----
-Fix compilation against NetworkManager-0.8.98.
-
-BUG: 271101
----
-
-
---- a/backends/NetworkManager/nmdbussettingsservice.cpp
-+++ b/backends/NetworkManager/nmdbussettingsservice.cpp
-@@ -59,7 +59,7 @@ public:
-     QHash<QUuid, QDBusObjectPath> uuidToPath;
- };
- 
--const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
-+const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings");
- const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager");
- 
- NMDBusSettingsService::NMDBusSettingsService(QObject * parent)
-
---- a/backends/NetworkManager/settings/gsmdbus.cpp
-+++ b/backends/NetworkManager/settings/gsmdbus.cpp
-@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap 
-   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
-     setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
-   } else {
--      setting->setNetworktype(NM_GSM_NETWORK_ANY);
-+      setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
-   }
-   if (map.contains("band")) {
-     setting->setBand(map.value("band").value<int>());
-@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
-       map.insert("apn", setting->apn());
-   if (!setting->networkid().isEmpty())
-       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
--  if (setting->networktype() != NM_GSM_NETWORK_ANY) {
-+  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
-       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
-   }
- 
-
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index 2347fc4f7..fb532e990 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 117405 2011-04-01 16:34:19Z ibiru $
+# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libdmapsharing
-pkgver=2.9.7
+pkgver=2.9.12
 pkgrel=1
-pkgdesc="Libdmapsharing is a library you may use to access and share DMAP content"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="A library that implements the DMAP family of protocols"
+arch=('i686' 'x86_64')
 url="http://www.flyn.org/projects/libdmapsharing/index.html"
 license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
 options=('!libtool')
 source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5eeded6d82ed2c2f6f310b9bd484798c')
+md5sums=('ec34948df21e9ba0656c917b10fed1c3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --with-mdns=avahi
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
index ba33e210d..b43d6ab53 100644
--- a/extra/libftdi/PKGBUILD
+++ b/extra/libftdi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 101400 2010-11-29 04:43:52Z allan $
+# $Id: PKGBUILD 125350 2011-05-26 02:17:50Z eric $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libftdi
-pkgver=0.18
-pkgrel=2
+pkgver=0.19
+pkgrel=1
 pkgdesc="A library to talk to FTDI chips"
-arch=("i686" "x86_64" 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.intra2net.com/en/developer/libftdi/download.php"
-license=("GPL2" "LGPL2.1")
-depends=('libusb-compat')
-makedepends=("boost")
+license=('GPL2' 'LGPL2.1')
+depends=('libusb-compat' 'gcc-libs')
+makedepends=('boost')
 options=('!libtool')
 source=("http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz")
-md5sums=('916f65fa68d154621fc0cf1f405f2726')
-sha1sums=('52401db0e7cb90a5d83f82c2859a4f8d44e52579')
+md5sums=('e6e25f33b4327b1b7aa1156947da45f3')
+sha1sums=('0f08caf8e754ace69cd682489fae3f7f09920fe1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 57df71c05..fa4540a1a 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 124609 2011-05-23 13:28:25Z ibiru $
+#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -11,14 +11,11 @@ depends=('dbus-core' 'libgcrypt' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix_crash.patch)
-sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d'
-            '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch
deleted file mode 100644
index 1e28cdb73..000000000
--- a/extra/libgnome-keyring/fix_crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 23 May 2011 08:58:49 +0000
-Subject: Fix crash from recent memleak fix (b49e32b)
-
-make_attribute_list_va() statically copies the caller's method arguments into
-the GnomeKeyringAttributeList, so we must only free the array itself, not the
-GnomeKeyringAttribute strings.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index dc271dd..4febf47 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType                  type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
-@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync  (GnomeKeyringItemType        type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items_sync (type, attributes, found);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
---
-cgit v0.9
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 9de18bb05..55cfcad8c 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $
+# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org/"
 install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         gettext-not-xml.patch)
-sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545'
+sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c'
             'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727')
 
 build() {
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index f53f584e9..9d29118a9 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 112096 2011-03-03 20:59:03Z eric $
+# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20100913
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=4
+arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
 makedepends=('doxygen' 'qt' 'boost')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 1daebcb01..614c58ea4 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112025 2011-03-03 09:42:31Z eric $
+# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
 pkgver=0.6.49
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
+arch=('i686' 'x86_64')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost')
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
new file mode 100644
index 000000000..6e2d4766f
--- /dev/null
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libqzeitgeist
+pkgver=0.7.0
+pkgrel=1
+pkgdesc="A Qt interface to the Zeitgeist event tracking system"
+url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('qt')
+makedepends=('cmake')
+source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2")
+md5sums=('e58d4b988bbab812f8bd6878d87c0956')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../QtZeitgeist-${pkgver}-Source \
+    -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 901438de5..0367ee9c9 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $
+# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.1
+pkgver=2.34.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
-sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b')
+sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 77f1d048b..24f4aea76 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $
+# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
 pkgver=0.15.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index c9395bec3..d37c740ec 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $
+# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15')
+sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 95fe0d747..d89319bd6 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112021 2011-03-03 08:05:12Z eric $
+# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=1.6.9
-pkgrel=2
+pkgver=1.6.10
+pkgrel=1
 pkgdesc="An advanced open-source document processor."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
@@ -12,14 +12,15 @@ depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus'
 makedepends=('boost')
 license=('GPL')
 source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
-	lyx.desktop)
-sha1sums=('a1acacc8a26546542e32977ae222e811c98b1ca4'
+        lyx.desktop)
+sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83'
           'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
   sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
   ./configure --prefix=/usr \
     --with-frontend=qt4 --without-included-boost
   make
diff --git a/extra/madwifi-utils/PKGBUILD b/extra/madwifi-utils/PKGBUILD
deleted file mode 100644
index ca961c3d0..000000000
--- a/extra/madwifi-utils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-pkgname=madwifi-utils
-pkgver=0.9.4.4119
-_kernver=2.6.33-ARCH
-pkgrel=1
-pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets."
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('wireless_tools')
-makedepends=('sharutils')
-provides=("madwifi-ng-utils")
-conflicts=("madwifi-ng-utils")
-replaces=("madwifi-ng-utils")
-# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
-	#http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz
-	)
-
-build() {
-  [ "${CARCH}" == "i686" ] && export ARCH=i386
-
-  export KERNELPATH=/lib/modules/${_kernver}/build
-  #cd $startdir/src/madwifi-$pkgver
-  cd $startdir/src/madwifi
-  make tools|| return 1
-  make DESTDIR=$startdir/pkg \
-       BINDIR=/usr/bin \
-       MANDIR=/usr/share/man \
-       install-tools
-}
-md5sums=('a720a20264b312c0ff906b9888bb49ae')
diff --git a/extra/madwifi/PKGBUILD b/extra/madwifi/PKGBUILD
deleted file mode 100644
index 1075c1476..000000000
--- a/extra/madwifi/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 115939 2011-03-22 14:09:32Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-_kernver=2.6.38-ARCH
-
-pkgname=madwifi
-pkgver=0.9.4.4136
-pkgrel=2
-pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('madwifi-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
-makedepends=('kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39')
-makedepends=('sharutils')
-install=madwifi-ng.install
-# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
-	#http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz
-	)
-options=(!strip)
-
-build() {
-  [ "${CARCH}" = "i686" ] && export ARCH=i386
-
-  #cd $startdir/src/$pkgname-$pkgver
-  cd $startdir/src/$pkgname
-  sed -i -e 's/-Werror//g' Makefile.inc
-  make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules
-}
-
-package() {
-  cd $startdir/src/$pkgname
-  make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules \
-       DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install-modules
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-
-  # install to wireless kernel directory
-  mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
-  mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
-  rm -r $startdir/pkg/lib/modules/$_kernver/net/
-  # gzip -9 modules
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
-md5sums=('f705acf5597ebe070efeaeb6c330748f')
diff --git a/extra/madwifi/kernel-2.6.30.patch b/extra/madwifi/kernel-2.6.30.patch
deleted file mode 100644
index f844668de..000000000
--- a/extra/madwifi/kernel-2.6.30.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ath/if_athvar.h~	2009-06-13 09:38:53.000000000 +0200
-+++ ath/if_athvar.h	2009-06-13 09:38:53.000000000 +0200
-@@ -103,11 +103,6 @@
- /*
-  * Guess how the interrupt handler should work.
-  */
--#if !defined(IRQ_NONE)
--typedef void irqreturn_t;
--#define	IRQ_NONE
--#define	IRQ_HANDLED
--#endif /* !defined(IRQ_NONE) */
- 
- #ifndef SET_MODULE_OWNER
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
diff --git a/extra/madwifi/madwifi-ng.install b/extra/madwifi/madwifi-ng.install
deleted file mode 100644
index 8681b53ed..000000000
--- a/extra/madwifi/madwifi-ng.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_remove() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 386ec0f3b..5b83cd885 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124863 2011-05-24 19:57:14Z giovanni $
+# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/moc/ChangeLog b/extra/moc/ChangeLog
deleted file mode 100644
index d494c5280..000000000
--- a/extra/moc/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2010-02-25  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.5.0_alpha4-2
-	* Added wavpack and modplug support (close FS#18449)
-
-2010-01-24  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.5.0_alpha4-1
-	* Upstream update to unstable series
-	* Fixed aac support (close FS#13164)
-
-2009-11-07  Eric Belanger  <eric@archlinux.org>
-
-	* Fixed optdepends array syntax (close FS#16053)
-
-2009-03-21  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-3
-	* Added missing libid3tag depends (close FS#13819)
-
-2009-03-07  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-2
-	* Added patch to fix playback of WMA files
-
-2009-01-11  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-1
-	* Upstream update
-	* Added libtool depends
-	* Replaced install scriptlet by optdepends
-	* Added ChangeLog
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index fa02064c6..52a4e8806 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 57012 2009-10-31 08:10:58Z allan $
+# $Id: PKGBUILD 125648 2011-05-27 17:52:54Z stephane $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=most
 pkgver=5.0.0a
-pkgrel=2
+pkgrel=3
 pkgdesc="A terminal pager similar to 'more' and 'less'"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('slang')
 license=('GPL')
 url="ftp://space.mit.edu/pub/davis/most/"
-source=(ftp://space.mit.edu/pub/davis/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('30f2131b67f61716f6fe1f65205da48b')
+source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz most-debian.patch)
+sha1sums=('99eedb7169754b9a47c7755ac48949d76531e3b2'
+          '937796040c69bae3bf735fa3cd734775c582e7d0')
+
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../most-debian.patch
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=$pkgdir install
 }
diff --git a/extra/most/most-debian.patch b/extra/most/most-debian.patch
index 4387420e8..292c83b5a 100644
--- a/extra/most/most-debian.patch
+++ b/extra/most/most-debian.patch
@@ -1,1655 +1,2313 @@
---- most-4.10.2.orig/most.1
-+++ most-4.10.2/most.1
-@@ -134,7 +134,7 @@
- Use this switch when you want to view files
- containing 8 bit characters.
- .I most
--will display the file 16 bytes per line in hexidecimal notation.
-+will display the file 16 bytes per line in hexadecimal notation.
- A typical line looks like:
- .IP
- .Ds
-@@ -185,12 +185,13 @@
- This option is meaningful only when used with the
- .B \-v
- option.
-+.TP
- .BI + lineno
- Start up at
- .IR lineno .
+--- most-5.0.0a.orig/lesskeys.rc
++++ most-5.0.0a/lesskeys.rc
+@@ -57,3 +57,8 @@
+ setkey goto_mark "'"
+ setkey find_file "E"
+ setkey edit "v"
++setkey bob "^[[7~"
++setkey eob "^[[8~"
++setkey bob "^[OH"
++setkey eob "^[OF"
++
+--- most-5.0.0a.orig/most.1
++++ most-5.0.0a/most.1
+@@ -203,7 +203,7 @@
+ .TP
+ .B +u
+ Force UTF-8 mode.  By default most will use the current locale to
+-determine if UTF-8 mode shoul be used.  The
++determine if UTF-8 mode should be used.  The
+ .B +u
+ and
+ .B \-u
+@@ -224,20 +224,28 @@
+ Start up at the line containing the first occurrence of
+ .IR string .
+ .SH "COMMAND USAGE"
+-The commands take effect immediately; it is not necessary to type a
+-carriage return.
+-.PP
+-In the following commands,
+-.I i
+-is a numerical argument
+-(1 by default).
+-.TP
+-.BR SPACE ", " CTRL-D ", " NEXT_SCREEN
+-Display another windowful, or jump
+-.I i
+-windowfuls if
+-.I i
+-is specified.
++Some commands have an optional numeric argument
++.I id
++,entered before the command.   If not given, the
++default value of 
++.I i
++is 1.
++.PP
++Commands  take effect immediately; typing a 
++.I RETURN
++after isn't necessary or correct.  (Besides,
++.I RETURN
++itself is a command.)
++.PP
++Example: to go down one line, press the
++.I DOWN_ARROW
++key. To go down 20 lines, press 
++.I 2
++then 
++.I 0
++then the
++.I DOWN_ARROW
++key.
+ .TP
+ \fBRETURN\fR, \fBDOWN_ARROW\fR, \fBV\fR, \fBCTRL-N\fR
+ Display another line, or
+@@ -341,7 +349,7 @@
+ .PD
+ Set a mark on the current line for later reference.
  .TP
--.B +c
--Make search case sensitive.
-+.B -c
-+Make searches case sensitive.
- By default, they are not.
+-.BR "INSERT_HERE, CTRL-X CTRL-X, COMMA, CTRL-K RETURN, GOLD PERIOD"
++.BR "INSERT_HERE" ", " "CTRL-X CTRL-X" ", " "COMMA" ", " "CTRL-K RETURN" ", " "GOLD PERIOD"
+ Set a mark on the current line but return to previous mark.
+ This allows the user to toggle back and forth between two positions
+ in the file.
+@@ -355,7 +363,7 @@
+ .BR "CTRL-X 2" ", " "CTRL-W 2" ", " "GOLD X"
+ Split this window in half.
  .TP
- .B +d
-@@ -482,7 +483,7 @@
- descriptors that represent the file name and line number,
- respectively.  For example, if JED is your editor, then set
- .B MOST_EDITOR 
--to 'jed %s -g %d'.
-+to 'jed %s -g %d'. This will only work where the %s preceeds the %d.
+-.BR "CTRL-X o" ", " "CTRL-W o" ", " o ", " GOLD UP ", " GOLD DOWN 
++.BR "CTRL-X o" ", " "CTRL-W o" ", " o ", " "GOLD UP" ", " "GOLD DOWN"
+ Move to other window.
  .TP
- .B MOST_HELP
- This variable may be used to specify an alternate help file.
-@@ -496,7 +497,7 @@
- .I most.rc
- on other systems.
+ .BR "CTRL-X 0" ", " "CTRL-W 0" ", " "GOLD V"
+@@ -506,13 +514,15 @@
+ .B MOST_INITFILE
+ Set this variable to specify the initialization file to load during
+ startup.  The default action is to load the system configuration file
+-and then a personal configuration file called
+-.I .mostrc
+-on Unix, and
+-.I most.rc
+-on other systems.
++from
++.I /etc/most.conf
++and then a personal configuration file located at
++.I $HOME/.mostrc
++.
  .SH CONFIGURATION FILE SYNTAX
--When most starts up, it tries to read a system confiuration file and
-+When most starts up, it tries to read a system configuration file and
+-When most starts up, it tries to read a system configuration file and
++When
++.I most
++starts up, it tries to read a system configuration file and
  then a personal configuration file.  These files may be used to
  specify keybindings and colors.
  .PP
---- most-4.10.2.orig/src/buffer.c
-+++ most-4.10.2/src/buffer.c
-@@ -44,10 +44,10 @@
- 
- Most_Buffer_Type *Most_Buf;
- 
--int Most_Num_Lines;
-+long long Most_Num_Lines;
- 
--unsigned int Most_C_Offset;
--int Most_C_Line;
-+unsigned long long Most_C_Offset;
-+long long Most_C_Line;
- 
- static unsigned char *beg_of_line1(void)
- {
-@@ -61,24 +61,29 @@
-      {
- 	if (*pos == '\n')
- 	  {
--	     pos--;
--	     while ((pos > Most_Beg)
--		    && (*pos != '\n'))
-+	     pos--; /* Skip back the new-line. */
-+	     /* This block is UTF-8 safe, because it only scans the
-+		buffer for a new-line, and doesn't count
-+		characters. */
-+	     while ((pos > Most_Beg) && (*pos != '\n'))
- 	       pos--;
- 
--	     if (*pos != '\n') return pos;
-+	     if (*pos != '\n') return Most_Beg;
-+	     /* from here on *pos == '\n' */
- 	     if (pos + 1 != cpos)
- 	       return pos + 1;
- 	  }
-      }
--   else pos--;
-+   else
-+     pos = SLutf8_bskip_char(Most_Beg, pos);
- 
-    if (*pos != '\n')
-      {
--	while ((pos > Most_Beg)
--	       && (*pos != '\n'))
-+	/* This block is UTF-8 safe. See comment above. */
-+	while ((pos > Most_Beg) && (*pos != '\n'))
- 	  pos--;
- 	if (*pos != '\n') return Most_Beg;
-+	/* from here on *pos == '\n' */
- 	return pos + 1;
-      }
- 
-@@ -93,55 +98,6 @@
-    return pos;
- }
- 
--
--static unsigned char *forward_columns (unsigned char *b, unsigned char *e, unsigned int num_cols)
--{
--   unsigned int col = 0;
--
--   while ((b < e)
--	  && (col < num_cols))
--     {
--	unsigned char ch = *b++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
--	  {
--	     col++;
--	     continue;
--	  }
--	
--	if ((ch == '\b') || (ch == '\t') || (ch == '\r'))
--	  switch (ch)
--	    {
--	     case '\b':
--	       if (Most_V_Opt == 0)
--		 {
--		    if (col > 0) col--;
--		 }
--	       else col += 2;
--	       break;
--	       
--	     case '\r':
--	       if (Most_V_Opt == 0)
--		 col = 0;
--	       else 
--		 col += 2;
--	       break;
--	       
--	     case '\t':
--	       if (Most_T_Opt == 0)
--		 col = Most_Tab_Width * (col/Most_Tab_Width + 1);
--	       else
--		 col += 2;
--	       break;
--	    }
--	else if (ch & 0x80)
--	  col += 3;
--	else
--	  col += 2;
--     }
--   return b;
--}
--
- /* does not move point */
- static unsigned char *end_of_line1(void)
- {
-@@ -164,6 +120,9 @@
- 
-    if (*pos != '\n')
-      {
-+	/* This block is UTF-8 safe, because it only scans the buffer
-+	   for a new-line, and doesn't count characters. */
-+
- 	n = pmax - pos;
- 	n2 = n % 8;
- 	pmax = pos + (n - 8);
-@@ -215,7 +174,7 @@
-    ncols = SLtt_Screen_Cols-1;
-    while (1)
-      {
--	unsigned char *next_b = forward_columns (b, e, ncols);
-+	unsigned char *next_b = most_forward_columns (b, e, ncols, 1);
- 	if ((next_b == e) || (next_b == b))
- 	  break;
- 	
-@@ -237,11 +196,12 @@
-      return e;
- 
-    if (b == NULL) b = most_beg_of_line ();
--   b = forward_columns (b, e, SLtt_Screen_Cols-1);
-+   b = most_forward_columns (b, e, SLtt_Screen_Cols-1, 1);
-    
-    /* Do not wrap the line if the last character falls on the last column 
-     * of the display.
-     */
-+   /* FIXME potential bug if dealing with multi-byte char. */
-    if ((b + 1 <= e) 
-        && (b + 1 < Most_Eob) 
-        && (b[1] == '\n'))
-@@ -250,10 +210,10 @@
-    return b;
- }
- 
--int most_forward_line(int save)
-+long long most_forward_line(long long save)
- {
--   int m;
--   register int n = save;
-+   long long m;
-+   register long long n = save;
-    unsigned char *p;
-    unsigned char *pmax;
- 
-@@ -346,14 +306,14 @@
- }
- 
- /* Count lines in the region.  A half line counts as 1 */
--int most_count_lines(unsigned char *beg, unsigned char *end)
-+long long most_count_lines(unsigned char *beg, unsigned char *end)
- {
--   int save_line, n;
-+   long long save_line, n;
-    unsigned char *save_beg, *save_eob;
--   unsigned int save_pos;
-+   unsigned long long save_pos;
-    int dn = 1000;
- 
--   if (Most_B_Opt) return(1 + (int)(end - beg) / 16);
-+   if (Most_B_Opt) return(1 + (long long)(end - beg) / 16);
- 
-    save_line = Most_C_Line; save_beg = Most_Beg; save_eob = Most_Eob;
-    save_pos = Most_C_Offset;
-@@ -371,9 +331,9 @@
-    return(n);
- }
- 
--void most_goto_line(int line)
-+void most_goto_line(long long line)
- {
--   int dif_c, dif_b,dif_t;
-+   long long dif_c, dif_b,dif_t;
- 
-    if (line < 1) line = 1;
-    most_read_to_line(line);
-@@ -420,7 +380,7 @@
- }
- 
- /* return line the point is on without the final '\n's  */
--int most_extract_line(unsigned char **beg, unsigned char **end)
-+long long most_extract_line(unsigned char **beg, unsigned char **end)
- {
-    *beg = most_beg_of_line();
-    *end = end_of_line (*beg);
-@@ -428,12 +388,12 @@
-    return 0;
- }
- 
--int most_what_line(unsigned char *pos)
-+long long most_what_line(unsigned char *pos)
- {
--   unsigned int save_pos;
--   int save_line, dir;
--   register int dif_c, dif_b,dif_t;
--   int ret;
-+   unsigned long long save_pos;
-+   long long save_line, dir;
-+   register long long dif_c, dif_b,dif_t;
-+   long long ret;
- 
-    if (Most_B_Opt)
-      {
-@@ -517,7 +477,7 @@
- }
- 
- /* given a buffer position, find the line and column */
--void most_find_row_column(unsigned char *pos, int *r, int *c)
-+void most_find_row_column(unsigned char *pos, long long *r, long long *c)
- {
-    unsigned char *beg;
-    unsigned int save_offset;
-@@ -545,7 +505,10 @@
-     /* Now we have found the line it is on so.... */
-    beg = most_beg_of_line();
-    *c = 1;
--   while (beg++ < pos) *c = *c + 1;
-+   if (Most_UTF8_Mode)
-+     while ((beg = SLutf8_skip_char(beg, pos)) < pos) *c = *c + 1;
-+   else
-+     while (beg++ < pos) *c = *c + 1;
-    Most_C_Line = save_line;
-    Most_C_Offset = save_offset;
- }
---- most-4.10.2.orig/src/buffer.h
-+++ most-4.10.2/src/buffer.h
-@@ -23,12 +23,12 @@
- 
- extern Most_Buffer_Type *Most_Buf;
- extern unsigned char *Most_Beg, *Most_Eob;
--extern int Most_Num_Lines;
-+extern long long Most_Num_Lines;
- 
- /* Offset of current position from beginning of buffer */
--extern unsigned int Most_C_Offset;
-+extern unsigned long long Most_C_Offset;
- 
--extern int Most_C_Line;
-+extern long long Most_C_Line;
- /*
-  *  Current line number.  If at the beginning of the buffer, it is 1.  If
-  *  we are at the last point of the buffer it is the number of lines.
-@@ -37,26 +37,26 @@
- /* This routine does not move the point */
- extern unsigned char *most_beg_of_line(void);
- 
--extern int most_forward_line(int);
-+extern long long most_forward_line(long long);
- /* This routine moves the point forward n lines. n can be negative.
-    It returns the number moved. */
- 
--extern void most_goto_line(int);
-+extern void most_goto_line(long long);
- /* Move the point somewhere on the nth line of the buffer returning
-    C_POS */
- 
--extern int most_what_line(unsigned char *);
-+extern long long most_what_line(unsigned char *);
- /* return the line number of position 'argument'. Does not move point */
- 
- /* count the number of lines in the region delimited by beg and end.
-    Counts lines from beg up to end but does not count end.
-    Does not move point. */
--extern int most_count_lines(unsigned char *, unsigned char *);
--extern int most_extract_line(unsigned char **, unsigned char **);
-+extern long long most_count_lines(unsigned char *, unsigned char *);
-+extern long long most_extract_line(unsigned char **, unsigned char **);
- 
- extern Most_Buffer_Type *most_switch_to_buffer(Most_Buffer_Type *);
- extern Most_Buffer_Type *most_create_buffer(char *);
--extern void most_find_row_column(unsigned char *, int *, int *);
-+extern void most_find_row_column(unsigned char *, long long *, long long *);
- 
- #endif
- 
---- most-4.10.2.orig/src/keym.c
-+++ most-4.10.2/src/keym.c
-@@ -228,7 +228,7 @@
- static void goto_percent_cmd(void)
- {
-    unsigned char *pos;
--   int n;
-+   long long n;
- 
-    if (Most_Digit_Arg != (int *) NULL) n = *Most_Digit_Arg;
-    else
-@@ -282,7 +282,7 @@
- 
- static void find_next_cmd(void)
- {
--   int col, line, n = 1;
-+   long long col, line, n = 1;
-    unsigned long ofs;
- 
-    if (Most_Digit_Arg != NULL) n = *Most_Digit_Arg;
-@@ -309,7 +309,7 @@
- #else
- 				 "Search: ",
- #endif
--				 Most_Search_Str,
-+				 (char *) Most_Search_Str,
- 				 MOST_SEARCH_BUF_LEN
- 				 ) == -1) return;
-    Most_Curs_Offset = Most_C_Offset;
-@@ -325,7 +325,7 @@
- #else
- 				 "Search Backwards: ",
- #endif
--				 Most_Search_Str,
-+				 (char *) Most_Search_Str,
- 				 MOST_SEARCH_BUF_LEN) == -1) return;
-    find_next_cmd();
- }
---- most-4.10.2.orig/src/line.c
-+++ most-4.10.2/src/line.c
-@@ -87,8 +87,7 @@
-    while (b < end)
-      {
-         ch = *b++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
-+	if (most_isprint(ch))
- 	  {
- 	     *s++ = ch;
- 	     continue;
-@@ -108,103 +107,156 @@
- 
-    if (end > Most_Eob) end = Most_Eob;
- 
--   sprintf (buf, "0x%08X: ", Most_C_Offset);
-+   sprintf (buf, "0x%08llX: ", Most_C_Offset);
-    ascii_format_line (beg, end, buf + 12);
-    SLsmg_write_string (buf);
-    SLsmg_erase_eol ();
- }
- 
--static int most_analyse_line(unsigned char *begg, unsigned char *endd, 
--			     char *out, char *attributes)
-+int most_isprint(unsigned char ch)
- {
--   unsigned char *beg, *end;
--   unsigned int min_col, max_col;
--   unsigned int i, i_max;
-+   /* Can this be directly replaced with isprint? */
-+   return (ch >= ' ' && ch < 0x7F) || ch >= SLsmg_Display_Eight_Bit;
-+}
-+
-+static void most_analyse_line(unsigned char *beg, unsigned char *end,
-+			      unsigned char *out, char *attributes)
-+{
-+   unsigned char *pout;
-+   char* pattributes;
-+
-+   /* Holds the number of columns for the current character counting
-+    * from the left margin (in contrast to the leftmost visible
-+    * column).
-+    */
-+   unsigned int col;
-+
-+   /* Holds the number of the column up to which to apply the
-+    * current/following formatting. Only meaningful when format_rlim > i.
-+    */
-+   unsigned int format_rlim;
- 
--   beg = begg;
--   end = endd;
--   i = i_max = 0;
--   min_col = Most_Column - 1;
--   max_col = min_col + SLtt_Screen_Cols;
-+   beg = most_forward_columns(beg, end, Most_Column - 1, 0);
-+   pout = out;
-+   pattributes = attributes;
-+   col = format_rlim = 0;
- 
-    while (beg < end)
-      {
- 	char attr = ' ';
--	unsigned char ch;
-+	unsigned char ch = *beg++;
- 
--	if ('\n' == (ch = *beg++))
-+	if ('\n' == ch)
- 	  break;
- 	
- 	if ((ch == '\r') && (Most_V_Opt == 0))
- 	  {
--	     if (i > i_max) i_max = i;
--	     i = 0;
-+	     if (col > format_rlim) format_rlim = col;
-+	     col = 0;
- 	     continue;
- 	  }
- 	
- 	if ((ch == '\b') && (Most_V_Opt == 0))
- 	  {
--	     if (i > i_max) i_max = i;
--	     if (i > 0)
--	       i--;
-+	     if (col > format_rlim) format_rlim = col;
-+	     if (col > 0)
-+	       {
-+		  if (Most_UTF8_Mode)
-+		    {
-+		       SLwchar_Type wc;
-+		       pout = SLutf8_bskip_char(out, pout);
-+		       if (SLutf8_decode(pout, pout + SLUTF8_MAX_MBLEN, &wc, NULL))
-+			 {
-+			    unsigned int char_len = SLwchar_wcwidth(wc);
-+			    if (char_len > 1)
-+			      col -= char_len - 1;
-+			 }
-+		    }
-+		  else
-+		    pout--;
-+		  pattributes--;
-+		  col--;
-+	       }
- 	     continue;
- 	  }
- 	
--	if (i < i_max)		       /* overstrike */
-+	if (col < format_rlim)		       /* overstrike */
- 	  {
- 	     attr = 'b';
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  if (out[i-min_col] == '_')
-+		  if (*pout == '_')
- 		    attr = 'u';
- 		  else if (ch == '_')
- 		    {
- 		       attr = 'u';
--		       ch = out[i - min_col];
-+		       ch = *pout;
- 		    }
- 	       }
- 	     if (ch == ' ')
- 	       {
--		  i++;
-+		  col++;
- 		  continue;
- 	       }
- 	     /* drop */
- 	  }
--	
--	if ((ch >= ' ') && (ch < 0x7F))
--	  {
--	     if ((i >= min_col) && (i < max_col))
-+
-+	if (Most_UTF8_Mode) {
-+	   unsigned char *prev = --beg;
-+	   SLwchar_Type wc;
-+	   unsigned int len;
-+
-+	   if (SLutf8_decode(beg, end, &wc, NULL))
-+	     {
-+	        unsigned int char_len = SLwchar_wcwidth(wc);
-+		if (char_len > 1)
-+	          col += char_len - 1;
-+	     }
-+
-+	   beg = SLutf8_skip_char(beg, end);
-+	   len = beg - prev;
-+
-+	   if (len > 1) {
-+	     /* Non-ASCII char, display it. */
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = ch;
--		  attributes[i-min_col] = attr;
-+		  memcpy(pout, prev, len);
-+		  pout += len;
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     continue;
--	  }
--	
--	if (ch >= SLsmg_Display_Eight_Bit)
-+	   }
-+	}
-+
-+	if (most_isprint(ch))
- 	  {
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = ch;
--		  attributes[i-min_col] = attr;
-+		  *pout++ = ch;
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     continue;
- 	  }
- 
- 	if ((ch == '\t') && (Most_T_Opt == 0) && (Most_Tab_Width))
- 	  {
--
--	     int nspaces = Most_Tab_Width * (i/Most_Tab_Width + 1) - i;
-+	     /* Tab expansion must take into consideration the
-+	      * leftmost visible column. However, variable col holds the
-+	      * number of columns from the left margin and must be
-+	      * corrected.
-+	      */
-+	     int vis_col = col + Most_Column - 1;
-+	     int nspaces = Most_Tab_Width - (vis_col % Most_Tab_Width);
- 	     while (nspaces > 0)
- 	       {
--		  if ((i >= min_col) && (i < max_col))
-+		  if (col < SLtt_Screen_Cols)
- 		    {
--		       out[i-min_col] = ' ';
--		       attributes[i-min_col] = attr;
-+		       *pout++ = ' ';
-+		       *pattributes++ = attr;
- 		    }
--		  i++;
-+		  col++;
- 		  nspaces--;
- 	       }
- 	     continue;
-@@ -212,36 +264,36 @@
- 
- 	if (ch & 0x80)
- 	  {
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = '~';
--		  attributes[i-min_col] = attr;
-+		  *pout++ = '~';
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     ch &= 0x7F;
- 	     /* drop */
- 	  }
- 	
--	if ((i >= min_col) && (i < max_col))
-+	if (col < SLtt_Screen_Cols)
- 	  {
--	     out[i-min_col] = '^';
--	     attributes[i-min_col] = attr;
-+	     *pout++ = '^';
-+	     *pattributes++ = attr;
- 	  }
--	i++;
-+	col++;
- 	
- 	if (ch == 0x7F) ch = '?';
- 	else ch += '@';
- 	
--	if ((i >= min_col) && (i < max_col))
-+	if (col < SLtt_Screen_Cols)
- 	  {
--	     out[i-min_col] = ch;
--	     attributes[i-min_col] = attr;
-+	     *pout++ = ch;
-+	     *pattributes++ = attr;
- 	  }
--	i++;
-+	col++;
-      }
- 
--   if (i < i_max) 
--     i = i_max;
-+   if (col < format_rlim) 
-+     col = format_rlim;
- 
-    /* Now add "..." if selective display.  To do that, the next line needs to 
-     * be dealt with to determine whether or not it will be hidden.
-@@ -249,7 +301,7 @@
-    if (Most_Selective_Display 
-        && (Most_W_Opt == 0)
-        && (beg < Most_Eob)
--       && ((i >= min_col) && (i < max_col)))
-+       && (col < SLtt_Screen_Cols))
-      {
- 	if (*beg == '\n') beg++;
- 
-@@ -260,37 +312,29 @@
- 	if ((beg >= Most_Eob) || (*beg == '\n') 
- 	    || (most_apparant_distance(beg) >= Most_Selective_Display))
- 	  {
--	     i_max = i + 3;
--	     while (i < i_max)
-+	     /* Add an ellipsis, if they fit on the screen. */
-+	     int rlimit = col + 3;
-+	     while (col < rlimit)
- 	       {
--		  if (i < max_col)
-+		  if (col < SLtt_Screen_Cols)
- 		    {
--		       out[i] = '.';
--		       attributes[i] = ' ';
-+		       *pout++ = '.';
-+		       *pattributes++ = ' ';
- 		    }
--		  i++;
-+		  col++;
- 	       }
- 	  }
-      }
--   
--   i_max = i;
- 
--   if (i < min_col)
--     i = min_col;
--   else if (i >= max_col)
--     i = max_col;
--
--   i -= min_col;
--
--   out[i] = 0;
--   attributes[i] = 0;
--   return i_max;
-+   *pout = 0;
-+   *pattributes = 0;
- }
- 
--static void output_with_attr (unsigned char *out, unsigned char *attr)
-+static void output_with_attr (unsigned char *out, char *attr)
- {
--   unsigned char at, ch, lat;
-+   unsigned char at, lat;
-    unsigned char *p = out;
-+   unsigned char *pmax = p + strlen((char *) p);
- 
-    if (Most_V_Opt) 
-      {
-@@ -299,7 +343,7 @@
-      }
- 
-    lat = ' ';
--   while ((ch = *p) != 0)
-+   while (p < pmax)
-      {
- 	if (lat != *attr)
- 	  {
-@@ -321,7 +365,7 @@
- 	     else most_tt_normal_video ();
- 	     lat = at;
- 	  }
--	p++;
-+	p = SLutf8_skip_char(p, pmax);
- 	attr++;
-      }
- 
-@@ -340,10 +384,11 @@
- void most_display_line (void)
+@@ -520,13 +530,13 @@
+ .PP
+ .B    setkey  function-name  key-sequence
+ .PP
+-The 
++The
+ .I setkey
+ command requires two arguments.  The
+ .I function-name
+ argument specifies the function that is to be executed as a response
+ to the keys specified by the
+-.I key-sequence 
++.I key-sequence
+ argument are pressed.  For example,
+ .PP
+       setkey   "up"     "^P"
+@@ -544,9 +554,9 @@
+ .PP
+        unsetkey "^F"
+ .PP
+-Colors may be defined through the use of the 
++Colors may be defined through the use of the
+ .I color
+-keyword in the the configuration file using the syntax:
++keyword in the configuration file using the syntax:
+ .PP
+ .B     color OBJECT-NAME FOREGROUND-COLOR BACKGROUND-COLOR
+ .PP    
+@@ -589,19 +599,19 @@
+ for valuable comments and criticisms.
+ I would especially like to thank those individuals
+ who have contributed code to
+-.IR most.
++.IR most .
+ .PP
+ Mats Akerberg, Henk D. Davids, Rex O. Livingston, and Mark
+ Pizzolato contributed to the early VMS versions of
+-.IR most.
++.IR most .
+ In particular, Mark worked on it to get it ready for DECUS.
+ .PP
+ Foteos Macrides <MACRIDES@SCI.WFEB.EDU> adapted 
+ .IR most 
+-for use in 
++for use in
+ .IR cswing 
+ and
+-.IR gopher.
++.IR gopher .
+ A few features of the present version of
+ .IR most
+ was inspired from his work.
+@@ -613,7 +623,7 @@
+ automatic detection of zipped files.
+ .PP
+ I would also like to thank Shinichi Hama for his valuable criticisms of
+-.IR most.
++.IR most .
+ .PP
+ Javier Kohen was instrumental in the support for UTF-8.
+ .PP
+--- most-5.0.0a.orig/src/file.h
++++ most-5.0.0a/src/file.h
+@@ -22,6 +22,7 @@
+ #define MOST_MAX_FILES 4096
+ #define MOST_GUNZIP_POPEN_FORMAT "gzip -dc \"%s\""
+ #define MOST_BZIP2_POPEN_FORMAT "bzip2 -dc \"%s\""
++#define MOST_LZMA_POPEN_FORMAT "lzma -dc '%s'"
+ 
+ extern void most_reread_file (void);
+ extern void most_read_to_line (int);
+--- most-5.0.0a.orig/src/file.c
++++ most-5.0.0a/src/file.c
+@@ -77,7 +77,7 @@
+ static int open_compressed_file(char *file, int mode, int *size)
  {
-    unsigned char *beg, *end;
--   unsigned int len;
-+#if 0
-    unsigned char dollar;
-+#endif
-    static unsigned char *line;
--   static unsigned char *attr;
-+   static char *attr;
-    static unsigned int line_len;
- 
-    if (Most_B_Opt)
-@@ -357,37 +402,43 @@
-    if (line_len < (unsigned int)(SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN)
-      {
- 	SLfree ((char *) line);
--	SLfree ((char *) attr);
-+	SLfree (attr);
- 	
- 	line_len = (SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN;
- 	
- 	if ((NULL == (line = (unsigned char *) SLmalloc (line_len)))
--	    || (NULL == (attr = (unsigned char *) SLmalloc (line_len))))
-+	    || (NULL == (attr = SLmalloc (line_len))))
- 	  most_exit_error ("Out of memory");
-      }
+    int fd;
+-   char buf[4], cmdbuf[2*MAX_PATHLEN];
++   char buf[6], cmdbuf[2*MAX_PATHLEN];
+    struct stat st;
  
-    (void) most_extract_line (&beg, &end);
+ # ifdef O_BINARY
+@@ -97,7 +97,7 @@
  
--   len = most_analyse_line(beg, end, (char *) line, (char *) attr);
-+   most_analyse_line(beg, end, line, attr);
+    if (fd < 0) return fd;
  
-+#if 0
-+   /* Currently the dollar sign is not always being written at the
-+      rightmost column when displaying multi-byte characters. */
-    dollar = 0;
-    if (Most_W_Opt)
-      {
--	if ((end < Most_Eob)
--	    && (*end != '\n'))
--	  dollar = '\\';
-+       if ((end < Most_Eob)
-+           && (*end != '\n'))
-+         dollar = '\\';
-      }
-    else if (len > (unsigned int) SLtt_Screen_Cols + (Most_Column - 1))
-      dollar = '$';
--   
-+
-    if (dollar)
+-   if (4 == read(fd, buf, 4))
++   if (6 == read(fd, buf, 6))
       {
--	line[SLtt_Screen_Cols-1] = dollar;
--	attr[SLtt_Screen_Cols-1] = ' ';
--	line[SLtt_Screen_Cols] = 0;
--	attr[SLtt_Screen_Cols] = 0;
-+       unsigned char *pline =
-+	 most_forward_columns(line, line + line_len, SLtt_Screen_Cols-1, 1);
-+       *pline = dollar;
-+       *(pline+1) = 0;
-+       attr[SLtt_Screen_Cols-1] = ' ';
-+       attr[SLtt_Screen_Cols] = 0;
-      }
--   
-+#endif
-+
-    output_with_attr (line, attr);
-    SLsmg_erase_eol ();
- }
-@@ -398,21 +449,34 @@
- int most_apparant_distance (unsigned char *pos)
- {
-    int i;
--   unsigned char *save_pos, ch;
-+   unsigned char *save_pos, *beg, ch;
-    unsigned int save_offset;
+ 	char *cmd = NULL;
  
-    save_offset = Most_C_Offset;
-    save_pos = pos;
-    Most_C_Offset = (unsigned int) (pos - Most_Beg);
--   pos = most_beg_of_line();
-+   beg = pos = most_beg_of_line();
-    Most_C_Offset = save_offset;
- 
-    i = 0;
-    while (pos < save_pos)
-      {
--	ch = *pos++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
-+	ch = *pos;
-+
-+	if (Most_UTF8_Mode) {
-+	   unsigned char *prev = pos;
-+	   int len;
-+	   pos = SLutf8_skip_char(pos, save_pos);
-+	   len = pos - prev;
-+	   if (len > 1) {
-+	     i++;
-+	     continue;
-+	   }
-+	} else {
-+	   pos++;
-+	}
-+
-+	if (most_isprint(ch))
+@@ -113,6 +113,13 @@
  	  {
- 	     i++;
- 	     continue;
-@@ -420,7 +484,13 @@
- 
- 	if (!Most_V_Opt && (ch == '\b'))
- 	  {
--	     if (i > 0) i--;
-+	     if (i > 0)
-+	       {
-+		  if (Most_UTF8_Mode)
-+		    i -= pos - SLutf8_bskip_char(beg, pos);
-+		  else
-+		    i--;
-+	       }
+ 	     cmd = MOST_BZIP2_POPEN_FORMAT;
  	  }
- 	else if (!Most_V_Opt && (ch == '\015')) /* ^M */
- 	  {
-@@ -439,3 +509,95 @@
-      }
-    return i;
- }
-+
-+/*
-+ * Returns a pointer to the num_cols'th character after the one
-+ * pointed at b. Invisible character runs are not counted toward this
-+ * limit, i.e. strings that represent attributes, such as "_\b" for
-+ * underlines.
-+ *
-+ * If multi_column is non-zero, characters spanning more than one
-+ * column will add their extra width to the column count.
-+ *
-+ * If there the end of the buffer is reached, as delimited by argument
-+ * e, then e is returned.
-+ */
-+unsigned char *most_forward_columns (unsigned char *beg, unsigned char *e, unsigned int num_cols, int multi_column)
-+{
-+   unsigned int col = 0;
-+   unsigned int prev_width = 1;
-+   unsigned char* b = beg;
-+
-+   while ((b < e)
-+	  && ((col < num_cols)
-+	      || (*b == '\b')
-+	      || (*b == '\r')))
-+     {
-+	unsigned char ch = *b;
-+
-+	if (Most_UTF8_Mode)
++	else if ((buf[0] == (char) 0xff)
++	    && (buf[1] == 'L') && (buf[2] == 'Z')
++	    && (buf[3] == 'M') && (buf[4] == 'A')
++	    && (buf[5] == (char) 0x00))
 +	  {
-+	     unsigned char *prev = b;
-+	     int len;
-+	     b = SLutf8_skip_char(b, e);
-+	     len = b - prev;
-+	     if (len > 1)
-+	       {
-+		  if (multi_column)
-+		    {
-+		        SLwchar_Type wc;
-+			if (SLutf8_decode(prev, e, &wc, NULL))
-+			  col += prev_width = SLwchar_wcwidth(wc);
-+		    }
-+		  else
-+		    col++;
-+		  continue;
-+	       }
++	     cmd = MOST_LZMA_POPEN_FORMAT;
 +	  }
-+	else
-+	  b++;
-+
-+	if (most_isprint(ch))
-+	  {
-+	     col++;
-+	     prev_width = 1;
-+	     continue;
-+	  }
-+
-+	if ((ch == '\b') || (ch == '\t') || (ch == '\r'))
-+	  switch (ch)
-+	    {
-+	     case '\b':
-+	       if (Most_V_Opt == 0)
-+		 {
-+		    if (col > 0) col -= prev_width;
-+		 }
-+	       else col += 2;
-+	       break;
-+
-+	     case '\r':
-+	       if (Most_V_Opt == 0)
-+		 col = 0;
-+	       else
-+		 col += 2;
-+	       break;
+ 	
+ 	if (cmd != NULL)
+ 	  {
+--- most-5.0.0a.orig/autoconf/config.guess
++++ most-5.0.0a/autoconf/config.guess
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2005-04-22'
++timestamp='2009-12-30'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,23 +18,25 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
 +
-+	     case '\t':
-+	       if (Most_T_Opt == 0)
-+		 col = Most_Tab_Width * (col/Most_Tab_Width + 1);
-+	       else
-+		 col += 2; /* ^I is two chars long. */
-+	       break;
-+	    }
-+	else if (ch & 0x80)
-+	  col += 3;
-+	else
-+	  col += 2;
-+     }
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -53,8 +56,9 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 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."
+@@ -66,11 +70,11 @@
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+-       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
+     --version | -v )
+-       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
+     --help | --h* | -h )
+-       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+@@ -104,7 +108,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -123,7 +127,7 @@
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac ;'
++esac ; set_cc_for_build= ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -158,6 +162,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -166,7 +171,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -196,55 +201,23 @@
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+-	exit 0 ;;
+-    amd64:OpenBSD:*:*)
+-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    amiga:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    cats:OpenBSD:*:*)
+-	echo arm-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    hp300:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    luna88k:OpenBSD:*:*)
+-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    macppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme88k:OpenBSD:*:*)
+-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvmeppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sgi:OpenBSD:*:*)
+-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:OpenBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+@@ -297,40 +270,43 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit 0 ;;
++	exit ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+-	exit 0 ;;
++	exit ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+-	exit 0 ;;
++	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+-	exit 0;;
++	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+-	exit 0 ;;
++	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+-	exit 0 ;;
++	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+-	exit 0 ;;
++	exit ;;
+     *:z/VM:*:*)
+ 	echo s390-ibm-zvmoe
+-	exit 0 ;;
++	exit ;;
+     *:OS400:*:*)
+         echo powerpc-ibm-os400
+-	exit 0 ;;
++	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+-	exit 0;;
++	exit ;;
++    arm:riscos:*:*|arm:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+-	exit 0;;
++	exit ;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -338,32 +314,51 @@
+ 	else
+ 		echo pyramid-pyramid-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+-	exit 0 ;;
++	exit ;;
+     DRS?6000:unix:4.0:6*)
+ 	echo sparc-icl-nx6
+-	exit 0 ;;
++	exit ;;
+     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
+-    i86pc:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+ 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+@@ -372,10 +367,10 @@
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+ 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+-	exit 0 ;;
++	exit ;;
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+@@ -387,10 +382,10 @@
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+-	exit 0 ;;
++	exit ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+@@ -401,40 +396,40 @@
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+         echo m68k-milan-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+         echo m68k-hades-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+-	exit 0 ;;
++	exit ;;
+     RISC*:ULTRIX:*:*)
+ 	echo mips-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -458,32 +453,33 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c \
+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+-	exit 0 ;;
++	exit ;;
+     Motorola:*:4.3:PL8-*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+-	exit 0 ;;
++	exit ;;
+     m88k:CX/UX:7*:*)
+ 	echo m88k-harris-cxux7
+-	exit 0 ;;
++	exit ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+-	exit 0 ;;
++	exit ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+@@ -499,29 +495,29 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit 0 ;;
++ 	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+-	exit 0 ;;
++	exit ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ 	echo m88k-tektronix-sysv3
+-	exit 0 ;;
++	exit ;;
+     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ 	echo m68k-tektronix-bsd
+-	exit 0 ;;
++	exit ;;
+     *:IRIX*:*:*)
+ 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+-	exit 0 ;;
++	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+     i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ia64:AIX:*:*)
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+@@ -529,7 +525,7 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
+@@ -544,15 +540,19 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+-		echo rs6000-ibm-aix3.2.5
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+-	exit 0 ;;
+-    *:AIX:*:[45])
++	exit ;;
++    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -565,28 +565,28 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+-	exit 0 ;;                           # report: romp-ibm BSD 4.3
++	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+-	exit 0 ;;
++	exit ;;
+     DPX/2?00:B.O.S.:*:*)
+ 	echo m68k-bull-sysv3
+-	exit 0 ;;
++	exit ;;
+     9000/[34]??:4.3bsd:1.*:*)
+ 	echo m68k-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+@@ -648,9 +648,19 @@
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+-	    # avoid double evaluation of $set_cc_for_build
+-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    eval $set_cc_for_build
 +
-+   /* Last character was too wide. Backstep it. */
-+   if (col > num_cols)
-+     b = SLutf8_bskip_char(beg, b);
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
 +
-+   return b;
-+}
---- most-4.10.2.orig/src/line.h
-+++ most-4.10.2/src/line.h
-@@ -7,5 +7,7 @@
- 
- extern void most_display_line(void);
- extern int most_apparant_distance(unsigned char *);
-+extern int most_isprint(unsigned char);
-+extern unsigned char *most_forward_columns (unsigned char *, unsigned char *, unsigned int, int);
- #endif
- 
---- most-4.10.2.orig/src/most.c
-+++ most-4.10.2/src/most.c
-@@ -125,7 +125,7 @@
-    ch = *(++str);
-    if ( ch == '/')
-      {
--	strcpy (Most_Search_Str,++str);
-+	strcpy ((char *) Most_Search_Str,++str);
- 	return;
-      }
- 
-@@ -329,7 +329,8 @@
- 
- static void do_most (char *file, int start)
- {
--   int piped, row, col;
-+   int piped;
-+   long long row, col;
- 
-    most_get_cdir(Most_C_Dir);
- 
-@@ -347,7 +348,7 @@
-    Most_Curs_Offset = Most_C_Offset;
- 
-    if (*Most_Search_Str
--       && ((row = most_search (Most_Beg + Most_C_Offset, 1, &col)) > 0))
-+       && ((row = most_search (Most_Beg + Most_C_Offset, 1LL, &col)) > 0))
-      most_goto_line(row);
-    else
-      {
-@@ -455,13 +456,7 @@
- 
-    SLtt_get_terminfo();
- #if SLANG_VERSION >= 20000
--#if 0
--   Most_UTF8_Mode = SLutf8_enable (1);
--   if (Most_UTF8_Mode)
--     {
--	fprintf (stderr, "UTF-8 Mode is in effect\n");
--     }
--#endif
-+   Most_UTF8_Mode = SLutf8_enable (-1);
- #endif
-    SLtt_Ignore_Beep = 1;
-    if (No_Colors) 
---- most-4.10.2.orig/src/most.h
-+++ most-4.10.2/src/most.h
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#define SLANG_REGEXP
- extern int Most_S_Opt;
- extern int Most_A_Opt;             /* automatically choose -b if necessary */
- extern int Most_V_Opt;             /* display control chars */
---- most-4.10.2.orig/src/search.c
-+++ most-4.10.2/src/search.c
-@@ -20,6 +20,7 @@
- */
- #include "config.h"
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <string.h>
- #include <slang.h>
-@@ -31,18 +32,18 @@
- #include "display.h"
- #include "search.h"
- 
--/* Note!!!  The regular expression searches may not work.  I have not
-- * tested them.
-- * FIXME!!!
-- */
--
- int Most_Case_Sensitive = 0;
--char Most_Search_Str[256];
-+unsigned char Most_Search_Str[256];
- int Most_Search_Dir = 1;
- 
- #include "jdmacros.h"
- 
--#define UPCASE(ch) ((!Most_Case_Sensitive && (ch <= 'z') && (ch >= 'a')) ? (ch - 32) : ch)
-+#if SLANG_VERSION < 20000
-+# define NORM_CHAR(ch) ((!Most_Case_Sensitive) ? toupper(ch) : ch)
-+# define UPCASE(ch) NORM_CHAR(ch)
-+#else
-+# define NORM_CHAR(ch) (ch)
-+#endif
- 
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
- 
-@@ -78,7 +79,7 @@
-  * This function is called by the V8 regcomp to report
-  * errors in regular expressions.
-  */
--static void regerror(char *s)
-+static void regerror(const char *s)
- {
-    char	string[256];
- 
-@@ -95,13 +96,17 @@
-  *	      0	 error
-  *
-  */
--static int do_regcomp(unsigned char *key)
-+static int do_regcomp(const unsigned char *key)
- {
-    static int old_Most_Case_Sensitive;
--   unsigned char UpCaseKey[sizeof(savepattern)];
- # ifndef HAVE_V8_REGCOMP
-    int	posn;			/* reg exp error at this offset */
- # endif
-+# if SLANG_VERSION < 20000
-+   unsigned char UpCaseKey[sizeof(savepattern)];
-+# else
-+   int re_flags = 0;
-+# endif
- 
-    /*
-     *	Only recompile search string if it has changed
-@@ -124,6 +129,7 @@
- 
-    old_Most_Case_Sensitive = Most_Case_Sensitive;
- 
-+# if SLANG_VERSION < 20000
-    if ( Most_Case_Sensitive == 0 )
-      {
- 	register unsigned char	*p;		/* ptr to UpCaseKey */
-@@ -141,6 +147,7 @@
- 
- 	*p = '\0';
-      }
-+# endif
- 
-    strcpy((char *)savepattern, (char *)key);
- 
-@@ -162,7 +169,12 @@
- #  else
-    if (Regexp != NULL)
-      SLregexp_free (Regexp);
--   if (NULL == (Regexp = SLregexp_compile ((char *)key, Most_Case_Sensitive ? 0 : SLREGEXP_CASELESS)))
-+
-+   if (!Most_Case_Sensitive)
-+     re_flags |= SLREGEXP_CASELESS;
-+   if (Most_UTF8_Mode)
-+     re_flags |= SLREGEXP_UTF8;
-+   if (NULL == (Regexp = SLregexp_compile ((char *)key, re_flags)))
-      posn = -1;
-    else
-      posn = 0;
-@@ -187,7 +199,7 @@
-  * Call the appropriate regular expression execute function
-  */
- 
--static unsigned char *do_regexec(unsigned char *string)
-+static unsigned char *do_regexec(const unsigned char *string, size_t length)
- {
- # ifdef	HAVE_V8_REGCOMP
-    if ( regexec(regpattern, (char *)string) )
-@@ -196,40 +208,46 @@
-      return( NULL );
- # else
- #  if SLANG_VERSION < 20000
--   return ( SLang_regexp_match(string, strlen((char *)string), &regdata) );
-+   return ( SLang_regexp_match(string, length, &regdata) );
- #  else
--   return (unsigned char *)SLregexp_match (Regexp, (char *)string, strlen ((char *)string));
-+   return (unsigned char *)SLregexp_match (Regexp, (char *)string, length);
- #  endif
- # endif	/* HAVE_V8_REGCOMP */
- }
- 
- /*
-- *  Make a upper case copy of a string.	 Also changes any "c\b" character
-- *  strings into just "" so that highlighted and underlined characters
-- *  can be searched.
-+ *  Changes any "c\b" character strings into just "" so that
-+ *  highlighted and underlined characters can be searched.  Stores in
-+ *  length the new size of the string, after the aforementioned
-+ *  changes.
-+ *
-+ *  If using a version of S-Lang that does not support case
-+ *  insensitive regular expressions, this function upper cases the
-+ *  input string, as well.
-  *
-  *  Reuses malloced memory, so a copy cannot be retained between calls.
-  */
- 
--static unsigned char *StrUpCaseCopy(unsigned char *input)
-+static const unsigned char *StrNormCopy(const unsigned char *input,
-+					size_t *length)
- {
-    static unsigned char *uppercase;	/* ptr to malloced area */
-    static size_t	  bufsize;	/* size of malloced area */
--   unsigned char	 *src;		/* ptr to source */
-+   const unsigned char	 *src;		/* ptr to source */
-+   const unsigned char	 *end;		/* ptr to end of source */
-    register unsigned char *dest;	/* ptr to destination */
-    register int	  idx;	/* index into uppercase[] */
--   register unsigned char c;		/* source character */
--   size_t		  length;	/* size of string to copy */
- 
-    src = input;
--   length = strlen((char *)src) + 1;	/* len of line plus terminator */
-+   end = input + *length;
- 
--   if ( length > bufsize )
-+   if ( *length >= bufsize )
-      {
- 	if ( uppercase != (unsigned char *)NULL )
- 	  free(uppercase);
- 
--	bufsize = (length > 256 ) ? length : 256;	/* 256 byte default */
-+	/* len of line plus terminator */
-+	bufsize = (*length >= 256 ) ? *length + 1 : 256; /* 256 byte default */
- 
- 	uppercase = (unsigned char *)malloc(bufsize);
- 	if ( uppercase == (unsigned char *)NULL )
-@@ -242,8 +260,9 @@
- 
-    dest = uppercase;
- 
--   for ( idx = 0 ; (c = *src) != '\0' ; src++ )
-+   for ( idx = 0 ; src < end ; src++ )
-      {
-+	unsigned char c = *src;
- 	if ( c == '\b' )		/* backspace */
- 	  {
- 	     if ( idx-- > 0 )
-@@ -252,54 +271,79 @@
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -658,11 +668,11 @@
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     ia64:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ia64-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -690,219 +700,248 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+-	exit 0 ;;
++	exit ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 	echo hppa1.1-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+-	exit 0 ;;
++	exit ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+-	exit 0 ;;
++	exit ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+-	exit 0 ;;
++	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
  	else
- 	  {
- 	     if ( idx++ >= 0 )
--	       *dest++ = UPCASE(c);
-+	       *dest++ = NORM_CHAR(c);
- 	  }
-      }
- 
-    *dest = '\0';		/* add termination */
- 
-+   *length = dest - uppercase;
-    return(uppercase);
- }
- 
- /*
-- *  Given an offset into a copy made by StrUpCaseCopy() and a pointer to the
-+ *  Given an offset into a copy made by StrNormCopy() and a pointer to the
-  *  original string, returns a pointer into the original string corresponding
-  *  to this offset.
-  */
- 
--static unsigned char *GetOrigPtr(unsigned char *original, int offset)
-+static const unsigned char *
-+GetOrigPtr(const unsigned char *original, int offset,
-+	   const unsigned char *end)
- {
--   register unsigned char *p = original;
-+   const unsigned char *p = original;
-    register int	    j = offset;
- 
-     /*
-      *	Step through, adjusting offset according to backspaces found
-      */
--   while ( *p != '\0' )
-+   while ( p < end )
-      {
-+	const unsigned char *next;
-+	if (Most_UTF8_Mode)
-+	  next = SLutf8_skip_char((unsigned char*) p, (unsigned char*) end);
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+-	exit 0 ;;
++	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit 0 ;;
++        exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     *:UNICOS/mp:*:*)
+ 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit 0 ;;
++        exit ;;
+     5000:UNIX_System_V:4.*:*)
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-	exit 0 ;;
++	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	exit 0 ;;
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+-	exit 0 ;;
+-    i*:MINGW*:*)
++	exit ;;
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+-	exit 0 ;;
++	exit ;;
++    i*:windows32*:*)
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+-	exit 0 ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit 0 ;;
++	exit ;;
++    *:Interix*:*)
++    	case ${UNAME_MACHINE} in
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    authenticamd | genuineintel | EM64T)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+-	exit 0 ;;
++	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+ 	echo i586-pc-interix
+-	exit 0 ;;
++	exit ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+-	exit 0 ;;
+-    amd64:CYGWIN*:*:*)
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+-	exit 0 ;;
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+-	exit 0 ;;
++	exit ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+ 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+-	exit 0 ;;
++	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+-	exit 0 ;;
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	else
-+	  next = p + 1;
-+	size_t length_last = next - p;
-+
- 	if ( *p == '\b' )
--	  j++;
-+	  j += length_last;
++	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     crisv32:Linux:*:*)
+ 	echo crisv32-axis-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     frv:Linux:*:*)
+     	echo frv-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     m32r*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
+-    mips:Linux:*:*)
++	exit ;;
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips
+-	#undef mipsel
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+-	;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit 0 ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit 0 ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit 0 ;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
++	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -910,87 +949,40 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+-	exit 0 ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+-	exit 0 ;;
++	exit ;;
+     sh64*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+-	exit 0 ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0 ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0 ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit 0 ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#ifdef __INTEL_COMPILER
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+-	;;
++	exit ;;
++    xtensa*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+-	exit 0 ;;
++	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+@@ -998,27 +990,27 @@
+ 	# I just have to hope.  -- rms.
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
++	exit ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+-	exit 0 ;;
++	exit ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+-	exit 0 ;;
+-	i*86:syllable:*:*)
++	exit ;;
++    i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+-	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	exit ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
++	exit ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1026,15 +1018,16 @@
  	else
--	  j--;
-+	  j -= length_last;
- 
- 	if ( j < 0 )
- 	  break;
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+-	exit 0 ;;
+-    i*86:*:5:[78]*)
++	exit ;;
++    i*86:*:5:[678]*)
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+@@ -1052,73 +1045,86 @@
  	else
--	  p++;
-+ 	  p = next;
-      }
- 
-    return(p);
- }
- #endif	/* HAVE_V8_REGCOMP || SLANG_REGEXP */
- 
-+/* Returns a pointer to the first occurrence of '\n' in string beg, or
-+ * end if no '\n' can be found between inclusive beg and exclusive
-+ * end.
-+ */
-+static const unsigned char *
-+find_eol(const unsigned char *beg, const unsigned char *end)
-+{
-+   const unsigned char *p;
-+   if ( (p = memchr(beg, '\n', end - beg)) != NULL)
-+     return p;
-+   else
-+     return end;
-+}
-+
- /* This routine returns the 1 + position of first match of key in str.
-    key is modified to match the case of str. */
- /* We should try to optimize this routine */
- /* searches from beg up to but not including end */
- 
--static unsigned char *forw_search_region(unsigned char *beg,
--					 unsigned char *end,
--					 unsigned char *key)
-+static const unsigned char *
-+forw_search_region(const unsigned char *beg,
-+		   const unsigned char *end,
-+		   const unsigned char *key)
- {
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
-     /*
-@@ -307,10 +351,11 @@
-      *	to be broken into lines.
-      *
-      */
--   unsigned char	*p;		/* temp pointer */
--   unsigned char	*linebeg;	/* beginning of working line */
--   unsigned char	*copy;		/* ptr to upper case copy */
-+   const unsigned char	*linebeg;	/* beginning of working line */
-+   const unsigned char	*lineend;	/* end of working line */
-+   const unsigned char	*norm_line;	/* ptr to normalized line */
-    unsigned char	*match;		/* ptr to matching string */
-+   int			anchored_re;
- 
-     /*
-      *	Compile "key" into an executable regular expression
-@@ -318,58 +363,35 @@
-    if ( do_regcomp(key) == 0 )
-      return(Most_Eob);
- 
--    /*
--     *	For regular expression searches we need to do a line by line
--     *	search, so it is necessary to temporarily replace '\n' with '\0'
--     *	characters.
--     */
--   p = beg;
--   linebeg = beg;
-+   anchored_re = key[0] == '^';
- 
--   while (linebeg < end)
-+   for ( linebeg = beg ; linebeg < end ; linebeg = lineend + 1 )
-      {
--	while ((p < end) && (*p != '\n')) p++;
--	if (p == end) break;
--	*p = 0;
-+	size_t length;
- 
--	if ( Most_Case_Sensitive == 0 )	/* i.e. case insensitive */
--	  {
--	     copy = StrUpCaseCopy(linebeg);
--	     if ( copy == (unsigned char *)NULL )
--	       return(Most_Eob);
--	  }
-+ 	lineend = find_eol(linebeg, end);
-+
-+	length = lineend - linebeg;
-+	if (0 == length) continue; /* Skip empty lines. */
-+
-+	norm_line = StrNormCopy(linebeg, &length);
-+	if ( norm_line == NULL )
-+	  return(Most_Eob);
- 
- 	/*
- 	 * Quick sanity check for beginning of line archored tests.
--	 * If 1st char of key is "^", then the character before linebeg (which
--	 * must be beyond the start of the window), must be a "\n",
--	 * otherwise do_regexec() isn't called.
-+	 * If 1st char of key is "^", then the character before
-+	 * linebeg (which must be within the buffer), must be a "\n".
- 	 */
--	if ( 
--# if 0
--	     ((*key != '^') 
--	      || (linebeg > Most_Win->beg_pos && linebeg[-1] == '\n'))
--	     &&
--#endif
--	     (match = do_regexec(Most_Case_Sensitive ? linebeg : copy)))
-+	if ( !(anchored_re && (linebeg <= Most_Beg || linebeg[-1] != '\n'))
-+	     && (match = do_regexec(norm_line, length)) )
- 	  {
--	     *p = '\n';
--	     if ( Most_Case_Sensitive == 0 )
--	       {
--		/*
--		 *  Use offset into "copy" as idx to find point in
--		 *  real line.
--		 */
--		  return( GetOrigPtr(linebeg, match - copy) );
--	       }
--	     else
--	       {
--		  return( match );
--	       }
-+	     /*
-+	      *  Use offset into "norm_line" as idx to find point in
-+	      *  real line.
-+	      */
-+	     return( GetOrigPtr(linebeg, match - norm_line, lineend) );
- 	  }
--
--	*p++ = '\n';
--	linebeg = p;
-      }
- 
-    return(Most_Eob);
-@@ -475,23 +497,18 @@
-  *  pattern "key".
-  */
- 
--static unsigned char *back_search_region(unsigned char *beg,
--					 unsigned char *end,
--					 unsigned char *key)
-+static const unsigned char *
-+back_search_region(const unsigned char *beg,
-+		   const unsigned char *end,
-+		   const unsigned char *key)
- {
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
--   register unsigned char	*p;
--   unsigned char		*endp,		/* end of line */
--   *lastmatch,	/* last match in line */
-+   const unsigned char	*p;
-+   const unsigned char	*endp,		/* end of line */
-+   *lastmatch,		/* last match in line */
-    *endprevline,	/* end of line before this one */
-    *match;		/* ptr to matching string */
--   unsigned char		savec;		/* last char on line */
--
--    /*
--     *	Compile "key" into an executable regular expression
--     */
--   if ( do_regcomp(key) == 0 )
--     return(Most_Eob);
-+   int			anchored_re;
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit 0 ;;
++        # the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++        exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+-	exit 0 ;;
++	exit ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+-	exit 0 ;;
++	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+ 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     mini*:CTIX:SYS*5:*)
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+ 	echo m68k-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+-	exit 0 ;;
++	exit ;;
+     M68*:*:R3V[5678]*:*)
+-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && echo i486-ncr-sysv4 && exit 0 ;;
++          && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+-	exit 0 ;;
++	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	exit ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+@@ -1126,73 +1132,94 @@
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+-        exit 0 ;;
++        exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
+     i*86:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo ${UNAME_MACHINE}-stratus-vos
+-	exit 0 ;;
++	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+-	exit 0 ;;
++	exit ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+-	exit 0 ;;
++	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit 0 ;;
++        exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+-	exit 0 ;;
++	exit ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+-	exit 0 ;;
++	exit ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+-	exit 0 ;;
++	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
+-	    *86) UNAME_PROCESSOR=i686 ;;
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1200,25 +1227,25 @@
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+-	exit 0 ;;
++	exit ;;
+     NSE-?:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+-	exit 0 ;;
++	exit ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+-	exit 0 ;;
++	exit ;;
+     DS/*:UNIX_System_V:*:*)
+ 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+@@ -1229,41 +1256,50 @@
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+-	exit 0 ;;
++	exit ;;
+     *:TENEX:*:*)
+ 	echo pdp10-unknown-tenex
+-	exit 0 ;;
++	exit ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+-	exit 0 ;;
++	exit ;;
+     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ 	echo pdp10-xkl-tops20
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+-	exit 0 ;;
++	exit ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+-	exit 0 ;;
++	exit ;;
+     SEI:*:*:SEIUX)
+         echo mips-sei-seiux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	exit 0 ;;
++	exit ;;
+     *:*VMS:*:*)
+     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+-	    A*) echo alpha-dec-vms && exit 0 ;;
+-	    I*) echo ia64-dec-vms && exit 0 ;;
+-	    V*) echo vax-dec-vms && exit 0 ;;
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
+ 	esac ;;
+     *:XENIX:*:SysV)
+ 	echo i386-pc-xenix
+-	exit 0 ;;
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1295,7 +1331,7 @@
+ #endif
  
-     /*
-      *	Starting from the end of the buffer, break the buffer into lines
-@@ -501,84 +518,60 @@
-      *	and isn't that what we want to do in a reverse search.
-      */
-    endp = end;
--   lastmatch = Most_Eob;
--   while ( 1 )			/* forever loop */
--     {
--	if ( (endp < beg) )
--	  return(Most_Eob);		/* Reach start of buffer, no match */
-+   endprevline = end;
-+   match = Most_Eob;
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix"); exit (0);
++  printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
  
--	/* Find the real end of current line */
--	if ( (p = (unsigned char *)strchr((char *)endp, '\n')) != NULL )
--	  endp = p;
+ #if defined (hp300) && !defined (hpux)
+@@ -1384,11 +1420,12 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
+ 
+ # Apollos put the system type in the environment.
+ 
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+@@ -1397,22 +1434,22 @@
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     c34*)
+ 	echo c34-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c38*)
+ 	echo c38-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c4*)
+ 	echo c4-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     esac
+ fi
+ 
+@@ -1423,9 +1460,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+--- most-5.0.0a.orig/autoconf/config.sub
++++ most-5.0.0a/autoconf/config.sub
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2005-04-22'
++timestamp='2010-01-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,22 +22,26 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
 -
--	savec = *endp;
--	*endp = '\0';			/* terminate line with NULL */
-+   /* Find out whether the regexp attempts to match a line boundary.
-+    * In this case, only a match on the full line should be attempted.
-+    */
-+   anchored_re = key[strlen((const char *) key)-1] == '$';
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
  
-+   while ( endp > beg )
-+     {
- 	/* Find the beginning of line */
- 	for ( p = endp - 1 ; (p >= beg) && (*p != '\n') ; p-- )
- 	  {
- 	  }
- 
-+	if ( p < beg )
-+	  break;
 +
- 	endprevline = p;
- 
--	p++;			/* point to 1st char after newline */
-+	/*
-+	 * Quick sanity check for end of line archored tests.  If last
-+	 * char of key is "$", then the character after endp (which
-+	 * must be within the buffer), must be a "\n".
-+	 */
-+	if ( anchored_re && endp < Most_Eob && endp[0] != '\n' )
-+	  {
-+	     endp = p;
-+	     continue;
-+	  }
- 
- 	/*
- 	 *  Keep searching forward in this line till no more matches
- 	 */
--	if ( Most_Case_Sensitive == 0 )		/* i.e. case insensitive */
-+	do
- 	  {
--	     unsigned char	*copy;		/* ptr to upper case copy */
--	     unsigned char	*savecopy;	/* copy of "copy" */
--
--	     copy = StrUpCaseCopy(p);
--	     if ( copy == (unsigned char *)NULL )
--	       return(Most_Eob);
-+	     lastmatch = match;
- 
--	     savecopy = copy;
--
--	    /*
--	     * Quick sanity check for beginning of line archored tests.
--	     * Must be at start of line.
--	     */
--	     while ( ((*key != '^') || (copy == savecopy))
--		    && (match = do_regexec(copy)) )
--	       {
--		  if ( GetOrigPtr(p, match - savecopy) > end )
--		    break;
--		  lastmatch = match;
--		  if ( *lastmatch == '\0' )	/* key must be "$" or "^" */
--		    break;
--		  copy = lastmatch + 1;		/* character after match */
--	       }
-+	     if (Most_UTF8_Mode)
-+	       p = SLutf8_skip_char((unsigned char*) p, (unsigned char*) endp);
-+	     else
-+	       p++;
- 
--	     if ( lastmatch != Most_Eob )	/* found a match */
--	       lastmatch = GetOrigPtr(p, lastmatch - savecopy);
--	  }
--	else
--	  {
--	    /*
--	     * Quick sanity check for beginning of line archored tests.
--	     * Must be at start of buffer or start of line
--	     */
--	     while ( ( (*key != '^') || (p == endprevline + 1) )
--		    && (match = do_regexec(p)) )
--	       {
--		  if ( match > end )
--		    break;
--		  lastmatch = match;
--		  if ( *lastmatch == '\0' )	/* key must be "$" or "^" */
--		    break;
--		  p = lastmatch + 1;		/* character after match */
--	       }
-+	     match = forw_search_region(p, endp, key);
- 	  }
-+	while ( match <= endp );
- 
--	*endp = savec;
- 	if ( lastmatch != Most_Eob )	/* found a match */
- 	  return(lastmatch);
- 
- 	endp = endprevline;
-      }
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 +
-+   return(Most_Eob);		/* Reached start of buffer, no match */
- #else
-    char ch, char1, work[256];
-    unsigned char *pos;
-@@ -670,15 +663,15 @@
- #endif	/* HAVE_V8_REGCOMP || SLANG_REGEXP */
- }
- 
--int most_search(unsigned char *from, int repeat, int *col)
-+long long most_search(const unsigned char *from, int repeat, long long *col)
- {
-     /* return the line match was found as well as line number,
-      * search from i on; assume that line_array match the i so we need
-      * no initial lookup */
- 
--   int test, save_line, the_col, row, s_len;
-+   long long test, save_line, the_col, row, s_len;
-    char string[300];
--   unsigned char *pos;
-+   const unsigned char *pos;
-    unsigned int save_ofs;
-    unsigned int found_ofs;
- 
-@@ -687,7 +680,10 @@
-    save_line = Most_C_Line;
-    found_ofs = Most_Eob - Most_Beg;
-    *col = 0;
--   s_len = strlen (Most_Search_Str);
-+   if (Most_UTF8_Mode)
-+     s_len = SLutf8_strlen (Most_Search_Str, 0);
-+   else
-+     s_len = strlen ((char *) Most_Search_Str);
-    pos = from;
- 
-    if (*Most_Search_Str)
---- most-4.10.2.orig/src/search.h
-+++ most-4.10.2/src/search.h
-@@ -6,7 +6,7 @@
- extern int Most_Case_Sensitive;
- extern int Most_Search_Dir;
- #define MOST_SEARCH_BUF_LEN	256
--extern char Most_Search_Str[MOST_SEARCH_BUF_LEN];
--extern int most_search(unsigned char *, int, int *);
-+extern unsigned char Most_Search_Str[MOST_SEARCH_BUF_LEN];
-+extern long long most_search(const unsigned char *, int, long long *);
- #endif
- 
---- most-4.10.2.orig/src/window.c
-+++ most-4.10.2/src/window.c
-@@ -48,10 +48,11 @@
- 
- Most_Window_Type *Most_Win;
- Most_Window_Type *Most_Top_Win;
--int Most_Top_Line;		       /* row number of top window */
--int Most_Curs_Row;
--int Most_Curs_Col;
--int Most_Column = 1;
-+long long Most_Top_Line;		       /* row number of top window */
-+long long Most_Curs_Row;
-+long long Most_Curs_Col;
-+/* The leftmost visible column. */
-+long long Most_Column = 1;
- int Most_Restore_Width_To = 0;
- char Most_Mini_Buf[256];
- unsigned long Most_Curs_Offset;
-@@ -156,7 +157,7 @@
- 	SLsmg_write_nchars (buf + point, len - point);
- 	if (col < SLtt_Screen_Cols)
- 	  break;
--	buf++; point--; len--;      /* FIXME for UTF-8 */
-+	buf++; point--; len--;
-      }
-    SLsmg_erase_eol ();
-    SLsmg_gotorc (SLtt_Screen_Rows - 1, col);
-@@ -227,6 +228,8 @@
- {
-    SLang_RLine_Info_Type *rli;
-    unsigned int flags = SL_RLINE_BLINK_MATCH;
-+   if (Most_UTF8_Mode)
-+     flags |= SL_RLINE_UTF8_MODE;
-    
-    if (NULL == (rli = SLrline_open (SLtt_Screen_Cols, flags)))
-      return NULL;
-@@ -258,7 +261,7 @@
- 
-    /* do not use default.  The up arrow can always get it back. */
-    if ((what != NULL) 
--       && (*what) && (what != Most_Search_Str))
-+       && (*what) && (what != (char *) Most_Search_Str))
-      {
- 	if (-1 == SLrline_set_line (Most_RLI, what))
- 	  return -1;
-@@ -593,7 +596,8 @@
-    unsigned int num_chars;
-    unsigned int field_width, info_len;
-    unsigned char *eob;
--   int r, x;
-+   int r;
-+   long long x;
- 
-    eob = Most_Eob;
- #if MOST_HAS_MMAP
-@@ -601,20 +605,20 @@
-      eob = Most_Beg + Most_Buf->mmap_size;
- #endif
-    
--   if (eob == Most_Beg) x = 100;
-+   if (eob == Most_Beg) x = 100LL;
-    else
-      {
--	x = Most_C_Offset * 100;
-+	x = Most_C_Offset * 100LL;
- 	x = x / (eob - Most_Beg);
-      }
- 
-    if (Most_C_Line + (Most_Win->bot - Most_Win->top + 1) >= Most_Num_Lines)
--     x = 100;
-+     x = 100LL;
- 
-    /* for files with end of file above the bottom row (due to window manipulations) */
--   if (x > 100) x = 100;
-+   if (x > 100LL) x = 100LL;
- 
--   sprintf (info, "(%d,%d) %d%%", Most_C_Line, Most_Column, x);
-+   sprintf (info, "(%lld,%lld) %d%%", Most_C_Line, Most_Column, (int)x);
- 
-    r = Most_Win->bot + 1;
-    most_goto_rc (r,1);
---- most-4.10.2.orig/src/window.h
-+++ most-4.10.2/src/window.h
-@@ -5,11 +5,11 @@
- typedef struct _Most_Window_Type
- {
-    unsigned long top_offset; /* offset of top line of window from bob */
--   int beg_line;             /* line number of top */
--   int curs_line;            /* line number of curs pos */
--   int curs_col;             /* column number of curs pos */
-+   long long beg_line;       /* line number of top */
-+   long long curs_line;      /* line number of curs pos */
-+   long long curs_col;       /* column number of curs pos */
-    unsigned long curs_offset;  /* pos of cursor from bob*/
--   int col;                  /* column offset */
-+   long long col;             /* column offset */
-    int n_lines;              /* number of lines of buffer (mode dependent) */
-    int top;                  /* screen location of top */
-    int bot;                  /* screen location of bot */
-@@ -29,9 +29,9 @@
- extern Most_Window_Type *Most_Win;
- extern Most_Window_Type *Most_Top_Win;
- extern unsigned long Most_Curs_Offset;
--extern int Most_Column;
--extern int Most_Curs_Row;
--extern int Most_Curs_Col;
-+extern long long Most_Column;
-+extern long long Most_Curs_Row;
-+extern long long Most_Curs_Col;
- #define MOST_MINI_BUF_LEN	256
- extern char Most_Mini_Buf[MOST_MINI_BUF_LEN];
- extern int Most_Selective_Display;
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -70,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 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."
+@@ -83,11 +89,11 @@
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+-       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
+     --version | -v )
+-       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
+     --help | --h* | -h )
+-       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+@@ -99,7 +105,7 @@
+     *local*)
+        # First pass through any local machine types.
+        echo $1
+-       exit 0;;
++       exit ;;
+ 
+     * )
+        break ;;
+@@ -118,8 +124,10 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -145,10 +153,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++        -bluegene*)
++	        os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -170,6 +181,10 @@
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -186,6 +201,10 @@
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -230,23 +249,28 @@
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
++	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| lm32 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
++	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+@@ -255,31 +279,40 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| moxie \
++	| mt \
+ 	| msp430 \
++	| nios | nios2 \
+ 	| ns16k | ns32k \
+-	| openrisc | or32 \
++	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| rx \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+-	| sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
++	| ubicom32 \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+@@ -299,28 +332,32 @@
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
++	| avr-* | avr32-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| lm32-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+@@ -329,27 +366,35 @@
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
++	| mt-* \
+ 	| msp430-* \
++	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| romp-* | rs6000-* | rx-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
+ 	| tron-* \
++	| ubicom32-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
++		;;
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -413,6 +458,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -421,10 +470,26 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
++        cegcc)
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -453,8 +518,8 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
++	cr16)
++		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -492,6 +557,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -646,6 +715,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -657,10 +734,17 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++        microblaze)
++		basic_machine=microblaze-xilinx
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -686,6 +770,9 @@
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+@@ -761,9 +848,8 @@
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+-	or32 | or32-*)
++	openrisc | openrisc-*)
+ 		basic_machine=or32-unknown
+-		os=-coff
+ 		;;
+ 	os400)
+ 		basic_machine=powerpc-ibm
+@@ -785,6 +871,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -794,6 +888,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -850,6 +950,10 @@
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -876,6 +980,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -887,6 +995,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -976,6 +1087,15 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
++	tile*)
++		basic_machine=tile-unknown
++		os=-linux-gnu
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -1051,6 +1171,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1089,13 +1213,10 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1142,6 +1263,9 @@
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++        -auroraux)
++	        os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1162,26 +1286,30 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1199,7 +1327,7 @@
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+@@ -1311,6 +1439,11 @@
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
++	-dicos*)
++		os=-dicos
++		;;
++        -nacl*)
++	        ;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1333,6 +1466,12 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++        score-*)
++		os=-elf
++		;;
++        spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1342,9 +1481,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+@@ -1370,6 +1509,9 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
++        mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+@@ -1388,6 +1530,9 @@
+ 	*-be)
+ 		os=-beos
+ 		;;
++	*-haiku)
++		os=-haiku
++		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+@@ -1496,7 +1641,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+@@ -1559,7 +1704,7 @@
+ esac
+ 
+ echo $basic_machine$os
+-exit 0
++exit
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD
index 93558817f..aa356da64 100644
--- a/extra/multitail/PKGBUILD
+++ b/extra/multitail/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 79574 2010-05-04 15:01:54Z kevin $
+# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Roberto Carvajal <roberto@archlinux.org>
 
 pkgname=multitail
-pkgver=5.2.6
+pkgver=5.2.8
 pkgrel=1
-pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
-arch=(i686 x86_64 'mips64el')
+pkgdesc="Lets you view one or multiple files like the original tail program"
+arch=(i686 x86_64)
 license=('GPL')
 url="http://www.vanheusden.com/multitail"
 depends=('ncurses')
 backup=(etc/multitail.conf)
 source=(${url}/${pkgname}-${pkgver}.tgz)
-md5sums=('6496b3d78660ff8d11c743a0d03cca34')
+md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  /usr/bin/make || return 1
-  /bin/install -D -m 755 multitail ${startdir}/pkg/usr/bin/multitail
-  /bin/install -D -m 644 multitail.1 ${startdir}/pkg/usr/share/man/man1/multitail.1
-  /bin/install -D -m 644 multitail.conf ${startdir}/pkg/etc/multitail.conf
+  cd ${srcdir}/${pkgname}-${pkgver}
+  /usr/bin/make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail
+  /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1
+  /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 0f40309d1..7f1a0f89a 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $
+# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z 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=2
+pkgver=3.0.2.1
+pkgrel=1
 pkgdesc="A window manager for GNOME3"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gtk-doc')
+makedepends=('intltool' 'gnome-doc-utils')
 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
-        squash_some_leaks.patch)
-sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708'
-            'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c')
 
 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
deleted file mode 100644
index 0e6b506bc..000000000
--- a/extra/mutter/squash_some_leaks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 94cdc6efa..7ba50f3f1 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $
+# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.0.1.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,8 +14,8 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index b43b0526d..bcfd1aa15 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $
+# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $
+# Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
-# KEEP LIBTOOL FILES!
 pkgname=neon
-pkgver=0.29.3
-pkgrel=3
+pkgver=0.29.6
+pkgrel=1
 pkgdesc="HTTP and WebDAV client library with a C interface"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('krb5' 'expat' 'ca-certificates')
 url="http://www.webdav.org/neon/"
-source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ba1015b59c112d44d7797b62fe7bee51')
-options=('libtool')
+source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('591e0c82e6979e7e615211b386b8f6bc')
+options=('libtool') # FS#16067
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-    --with-expat --enable-shared --disable-static \
-    --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+    --with-expat \
+    --enable-shared \
+    --disable-static \
+    --with-ssl=openssl \
+    --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/neverball/ChangeLog b/extra/neverball/ChangeLog
deleted file mode 100644
index d4c6561ca..000000000
--- a/extra/neverball/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-01-18  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.4-2
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-09-20  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.4-1
-	* Upstream update
-
-2009-09-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.3-1
-	* Upstream update
-
-2009-08-16  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.2-1
-	* Upstream update
-	* Added physfs depends
-	* Fixed file permissions
-
-2009-08-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-2.1
-	* Built i686 package without sse (close FS#15849)
-
-2009-07-01  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-2
-	* Rebuilt against libjpeg 7
-
-2009-04-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-1
-	* Upstream update
-	* Removed sdl_image and sdl_mixer depends: not needed anymore
-	* Added libpng, libjpeg and libvorbis depends
-
-2009-02-03  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.0-1
-	* Upstream update
-	* Updated url
-	* Added mesa makedepends
-	* Switched to upstream desktop file and icons
-	* Removed wrapper scripts
-	* Added mapc binary
-	* Added locales, man pages and docs
-	* Added ChangeLog
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 1bf49cf8f..7b918c9ec 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108496 2011-01-31 15:55:57Z jgc $
+# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.8.7
+pkgver=4.8.8
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('97e30989a56ab813453b71261849c200'
+md5sums=('b3a961d2e0ff3331745220984c70b6a9'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
@@ -32,6 +32,10 @@ build() {
       --enable-optimize \
       --disable-debug ${confflags}
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   NSPR_LIBS=`./config/nspr-config --libs`
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index d0768b67a..88c740808 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 109101 2011-02-06 10:02:09Z andyrtr $
+# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=nss
-pkgver=3.12.9
+pkgver=3.12.10
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
@@ -11,14 +11,14 @@ _nsprver=4.8.7
 depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
+options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-options=('!strip')
-md5sums=('bd32f183ca28440c1744650be31a9ccc'
+md5sums=('027954e894f02732f4e66cd854261145'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 1d7d537dd..5211c17d2 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118407 2011-04-06 16:43:17Z andrea $
+# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
 pkgver=13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,17 @@ url="http://launchpad.net/ntrack/"
 license=('LGPL')
 depends=('qt' 'libnl' 'gcc-libs')
 makedepends=('python2')
-optdepends=('python2')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz")
-md5sums=('90596b924a108f8b4eea52239ba64369')
-options=('!libtool')
+source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
+        'dead-loop-fix.patch')
+md5sums=('90596b924a108f8b4eea52239ba64369'
+         '02bda6ae15ef04b6a7d9273c37752681')
+options=('!libtool' '!emptydirs')
 
 build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
+
+  patch -p0 -i "${srcdir}"/dead-loop-fix.patch
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch
new file mode 100644
index 000000000..133bb4ace
--- /dev/null
+++ b/extra/ntrack/dead-loop-fix.patch
@@ -0,0 +1,14 @@
+=== modified file 'modules/ntrack-libnl.c'
+--- modules/ntrack-libnl.c	2011-04-25 16:28:19 +0000
++++ modules/ntrack-libnl.c	2011-04-25 17:25:24 +0000
+@@ -394,6 +394,9 @@
+ 		if (rtnl_link_get_ifindex(link) > iindex)
+ 			break;
+ 		i = i->next;
++
++		if (i == linklist)
++			break;
+ 	}
+ 	return result;
+ }
+
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 814b4a97f..05883a1d8 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $
+# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,8 +7,8 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.7.11
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=5
+arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
@@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
              'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('07c2a2535b4d7436b5ec7685fe063fec')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+        nm09-pidgin.patch
+        nm09-more.patch)
+md5sums=('07c2a2535b4d7436b5ec7685fe063fec'
+         '744a21b4dbaf949dba7cd3b75b12b4fe'
+         'a673659d86c7a65aa710f7c8c7feda82')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Update for NetworkManager 0.9 connection states
+  # (http://developer.pidgin.im/ticket/13505)
+  # (http://developer.pidgin.im/ticket/13859)
+  patch -Np1 -i "$srcdir/nm09-pidgin.patch"
+  patch -Np1 -i "$srcdir/nm09-more.patch"
+
   # Use Python 2
   sed -i 's/env python$/\02/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
@@ -51,7 +61,7 @@ package_pidgin(){
   install=pidgin.install
 
   cd "$srcdir/pidgin-$pkgver"
-  
+
   # For linking
   make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
 
@@ -72,7 +82,7 @@ package_libpurple(){
            'cyrus-sasl-plugins')
   optdepends=('avahi: Bonjour protocol support'
               'dbus-python: for purple-remote and purple-url-handler')
-  
+
   cd "$srcdir/pidgin-$pkgver"
 
   for _dir in libpurple share/sounds share/ca-certs m4macros po; do
@@ -100,3 +110,5 @@ package_finch(){
 
   rm "$pkgdir"/usr/share/man/man1/pidgin.1
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch
new file mode 100644
index 000000000..8c708df9a
--- /dev/null
+++ b/extra/pidgin/nm09-more.patch
@@ -0,0 +1,49 @@
+diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
+--- pidgin-2.7.11/libpurple/network.c.nm09more	2011-04-26 12:01:27.700085246 -0500
++++ pidgin-2.7.11/libpurple/network.c	2011-05-24 13:13:28.185165657 -0500
+@@ -833,8 +833,20 @@ purple_network_is_available(void)
+ 			purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
+ 	}
+ 
+-	if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
+-		return TRUE;
++	switch (nm_state)
++	{
++		case NM_STATE_UNKNOWN:
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_CONNECTED_LOCAL:
++		case NM_STATE_CONNECTED_SITE:
++		case NM_STATE_CONNECTED_GLOBAL:
++#else
++		case NM_STATE_CONNECTED:
++#endif
++			return TRUE;
++		default:
++			break;
++	}
+ 
+ 	return FALSE;
+ 
+@@ -1170,9 +1182,14 @@ purple_network_init(void)
+ 		                                     NM_DBUS_SERVICE,
+ 		                                     NM_DBUS_PATH,
+ 		                                     NM_DBUS_INTERFACE);
++		/* NM 0.6 signal */
+ 		dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+ 		dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
+ 		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
++		/* NM 0.7 and later signal */
++		dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
++		dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
++		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
+ 
+ 		dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
+ 		                                       DBUS_SERVICE_DBUS,
+@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
+ #ifdef HAVE_NETWORKMANAGER
+ 	if (nm_proxy) {
+ 		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
++		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
+ 		g_object_unref(G_OBJECT(nm_proxy));
+ 	}
+ 	if (dbus_proxy) {
diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch
new file mode 100644
index 000000000..1c2471d1f
--- /dev/null
+++ b/extra/pidgin/nm09-pidgin.patch
@@ -0,0 +1,38 @@
+diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
+--- pidgin-2.7.10/libpurple/network.c.foo	2011-03-10 02:21:43.920933267 -0600
++++ pidgin-2.7.10/libpurple/network.c	2011-03-10 02:23:11.466838793 -0600
+@@ -71,6 +71,10 @@
+ #include <dbus/dbus-glib.h>
+ #include <NetworkManager.h>
+ 
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static DBusGConnection *nm_conn = NULL;
+ static DBusGProxy *nm_proxy = NULL;
+ static DBusGProxy *dbus_proxy = NULL;
+@@ -863,7 +867,13 @@ nm_update_state(NMState state)
+ 
+ 	switch(state)
+ 	{
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_CONNECTED_LOCAL:
++		case NM_STATE_CONNECTED_SITE:
++		case NM_STATE_CONNECTED_GLOBAL:
++#else
+ 		case NM_STATE_CONNECTED:
++#endif
+ 			/* Call res_init in case DNS servers have changed */
+ 			res_init();
+ 			/* update STUN IP in case we it changed (theoretically we could
+@@ -880,6 +890,9 @@ nm_update_state(NMState state)
+ 		case NM_STATE_ASLEEP:
+ 		case NM_STATE_CONNECTING:
+ 		case NM_STATE_DISCONNECTED:
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_DISCONNECTING:
++#endif
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index a2a7721cf..92c049e73 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 121957 2011-04-30 20:53:21Z eric $
+# $Id: PKGBUILD 125726 2011-05-28 15:54:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1
-pkgrel=3
+pkgver=2.90.1.git20110528
+pkgrel=1
 pkgdesc="An iTunes-like music player/libary"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -20,8 +20,8 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
 options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz)
-sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8e73675d36a90950034862e1aaa8db96267c8c4563823983d3ee2dc239c0a4f0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/rxvt-unicode/popup-menu-hang.diff b/extra/rxvt-unicode/popup-menu-hang.diff
deleted file mode 100644
index 09bb3c64b..000000000
--- a/extra/rxvt-unicode/popup-menu-hang.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/perl/urxvt-popup
-===================================================================
-RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v
-retrieving revision 1.15
-diff -u -r1.15 urxvt-popup
---- src/perl/urxvt-popup	24 Dec 2007 08:21:40 -0000	1.15
-+++ src/perl/urxvt-popup	2 Aug 2009 08:22:52 -0000
-@@ -120,7 +120,7 @@
-    $self->refresh;
- 
-    # might fail, but try anyways
--   $self->grab ($self->{data}{event}{time}, 1)
-+   $self->grab ($self->{data}{event}{time})
-       and $self->allow_events_async;
- 
-    on_button_press $self, $self->{data}{event} if $self->{data}{event}{button};
-@@ -132,7 +132,7 @@
-    my ($self, $event) = @_;
- 
-    # should definitely not fail
--   $self->grab ($self->{data}{event}{time}, 1)
-+   $self->grab ($self->{data}{event}{time})
-       and $self->allow_events_async;
- }
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 0a650eb85..e9755aada 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,29 +1,40 @@
-# $Id: PKGBUILD 84723 2010-07-03 19:29:41Z ibiru $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
-pkgver=1.4.9
-pkgrel=2
-pkgdesc="A Input Method development platform"
-arch=("i686" "x86_64" 'mips64el')
-url="http://www.scim-im.org/projects/scim"
+pkgver=1.4.10
+pkgrel=1
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('gtk2' 'gcc-libs')
 makedepends=('intltool')
 backup=('etc/scim/config' 'etc/scim/global')
 options=('!libtool')
-install=scim.install
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
-        gcc45.patch)
-md5sums=('975ba34b01304ea8166ac8ea27aa9e88'
-         '9d7b41421424cedcbc5740098afa4921')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz")
+sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf')
+
+install=install
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/gcc45.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnu-ld --with-x --disable-static
-  make
-  make DESTDIR=$pkgdir install
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./bootstrap
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		--with-gnu-ld \
+		--with-x \
+
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
 }
diff --git a/extra/scim/gcc45.patch b/extra/scim/gcc45.patch
deleted file mode 100644
index 267a2bbf6..000000000
--- a/extra/scim/gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur scim-1.4.9.orig//src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
---- scim-1.4.9.orig//src/ltdl.cpp	2008-11-02 01:42:40.000000000 -0500
-+++ scim-1.4.9/src/ltdl.cpp	2010-07-04 00:19:58.924925581 -0500
-@@ -3361,7 +3361,7 @@
- {
-   lt_dlhandle	handle		= 0;
-   char *	tmp		= 0;
--  char *	ext		= 0;
-+  const char *	ext		= 0;
-   size_t	len;
-   int		errors		= 0;
- 
diff --git a/extra/scim/install b/extra/scim/install
new file mode 100644
index 000000000..405061cb4
--- /dev/null
+++ b/extra/scim/install
@@ -0,0 +1,13 @@
+post_install() {
+	echo -n 'updating gtk.immodules... '
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	echo 'done.'
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/scim/scim.install b/extra/scim/scim.install
deleted file mode 100644
index 1097ea400..000000000
--- a/extra/scim/scim.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 435321d1b..1d1af26d0 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 87629 2010-08-17 13:33:30Z bisson $
-# Maintainer:
+# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
 pkgver=1.7.1.3
-pkgrel=1
-pkgdesc='Relay for bidirectional data transfer via socket, pty, pipe, file and more'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
+pkgrel=2
+pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
+license=('GPL2')
+arch=('i686' 'x86_64')
 depends=('readline' 'openssl' 'tcp_wrappers')
-makedepends=('imake')
 source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz")
 sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man
-  make depend || return 1
-  make || return 1
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install || return 1
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
 }
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 0c582933f..5f2c69b20 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111993 2011-03-02 22:17:55Z ibiru $
+# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 4c0943fa1..98cbad621 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $
+# $Id: PKGBUILD 125552 2011-05-26 16:51:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=2.32.4
+pkgver=2.32.5
 pkgrel=1
 url="http://www.hadess.net/totem.php3"
 pkgdesc="Totem playlist parser library"
@@ -12,7 +12,7 @@ depends=('gmime' 'libsoup-gnome')
 makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2)
-sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6')
+sha256sums=('f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d')
 
 build() {
   cd "${srcdir}/totem-pl-parser-${pkgver}"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index ff9fb8a51..75b5f10da 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $
+# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 url="http://www.hadess.net/totem.php3"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'custom')
@@ -27,7 +27,7 @@ build() {
 
 package_totem() {
   pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas')
+  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index fac9cc594..30a9704c2 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $
+# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.10
+pkgver=0.9.11
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
 replaces=('devicekit-power')
 options=('!libtool')
 source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288')
+sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 436ec5ddd..43f4aa5a4 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $
+# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=vigra
-pkgver=1.7.0
-pkgrel=6
+pkgver=1.7.1
+pkgrel=2
 pkgdesc="Computer vision library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
@@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num
 optdepends=('python2: for python bindings'
             'boost-libs: for python bindings')
 options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch)
-md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76')
-sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
+	vigra-1.7.1.gcc460.patch)
+md5sums=('2bde208e0fd7626770169dd4fa097282'
+         '25ef8bc26bc38ee67e5b512d2acd0166')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-src
-  patch -p1 < ../libpng-1.4.patch
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DWITH_VIGRANUMPY=1 \
       -DDOCINSTALL=share/doc 
@@ -28,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-src
+  cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   # license
   install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/vigra/libpng-1.4.patch b/extra/vigra/libpng-1.4.patch
deleted file mode 100644
index 3c69e8eb8..000000000
--- a/extra/vigra/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
---- vigra1.6.0-orig/src/impex/png.cxx	2010-01-20 19:46:57.000000000 -0500
-+++ vigra1.6.0/src/impex/png.cxx	2010-01-20 19:47:55.000000000 -0500
-@@ -270,8 +270,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch
new file mode 100644
index 000000000..46f194dbc
--- /dev/null
+++ b/extra/vigra/vigra-1.7.1.gcc460.patch
@@ -0,0 +1,33 @@
+diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
+--- vigra-1.7.1.old/include/vigra/random_forest.hxx	2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/random_forest.hxx	2011-01-28 00:16:32.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <set>
+ #include <list>
+ #include <numeric>
++#include <stddef.h>
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx	2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/sifImport.hxx	2011-01-28 00:23:31.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <fstream>
+ #include <cstring>
+ #include <vector> 
++#include <stddef.h>
+ #include "vigra/multi_array.hxx"
+ 
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx	2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/multi_iterator.hxx	2011-01-28 00:23:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+ 
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+ 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index efe3dac2e..e54d2ecb6 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,30 +1,44 @@
-# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $
+# $Id: PKGBUILD 125719 2011-05-28 14:45:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
-pkgbase=vlc
-pkgname=('vlc' 'vlc-plugin')
+pkgname=vlc
 pkgver=1.1.9
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
-makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
-             'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-             'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-             'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-             'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
-             'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio'
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
+           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'lirc-utils' 'gnutls' 'libcaca')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
+            'libpulse: PulseAudio support')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
@@ -37,35 +51,12 @@ build() {
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-mozilla \
               --with-live555-tree=/usr/lib/live \
               --enable-realrtsp
   make
 }
-
-package_vlc() {
-  pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-  depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
-           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-  optdepends=('avahi: for service discovery using bonjour protocol'
-              'libnotify: for notification plugin'
-              'ncurses: for ncurses interface support'
-              'libdvdcss: for decoding encrypted DVDs'
-              'lirc-utils: for lirc plugin'
-              'libavc1394: for devices using the 1394ta AV/C'
-              'libdc1394: for IEEE 1394 plugin'
-              'kdelibs: KDE Solid hardware integration'
-              'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-              'libpulse: PulseAudio support')
-  options=('!libtool')
-  conflicts=('vlc-pulse-plugin')
-  replaces=('vlc-pulse-plugin')
-  install=vlc.install
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}/" install
 
@@ -73,20 +64,4 @@ package_vlc() {
     install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
         "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
-
-  rm -rf "${pkgdir}/usr/lib/mozilla"
-}
-
-package_vlc-plugin() {
-  pkgdesc="VLC mozilla browser plugin"
-  depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  #for linking against libvlc
-  make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-  make -C projects/mozilla DESTDIR="${pkgdir}/" install
-
-  #clean up libvlc
-  make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
 }
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index 24ba5d5c2..ec1cd77a8 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 112017 2011-03-03 06:20:54Z eric $
+# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all@ya.com>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.8.5
-pkgrel=3
+pkgver=1.8.6
+pkgrel=1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,7 +16,7 @@ makedepends=('boost')
 install=wesnoth.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         wesnoth-libpng-1.4.0.patch)
-md5sums=('a800285d1406690755dd0ea22b98b6df'
+md5sums=('f1c3179869b01b61e253e74aeb241034'
          'ca7412ffc4682ef55ddf82d56b0e2f08')
 
 build() {
diff --git a/extra/xaw3d/ChangeLog b/extra/xaw3d/ChangeLog
deleted file mode 100644
index 077b24d3d..000000000
--- a/extra/xaw3d/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2009-05-10  Jan de Groot  <jgc@archlinux.org>
-
-	* xaw3d 1.5E-2
-	* Build without libxp (requires latest imake)
-	* Simplify PKGBUILD a bit
-	* Add extra patches from Fedora
-	* Fix URL
-
-2008-12-14  Eric Belanger  <eric@archlinux.org>
-
-	* xaw3d 1.5E-1
-	* Upstream update
-	* Updated url
-	* Added misc. patches
-	* Added ChangeLog
diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD
index 47d56dc44..9063e3a4d 100644
--- a/extra/xorg-iceauth/PKGBUILD
+++ b/extra/xorg-iceauth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $
+# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-iceauth
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="ICE authority file utility"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libice')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2)
-sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310')
+sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e')
 
 build() {
   cd "${srcdir}/iceauth-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/iceauth-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD
index 85a358954..192dcce39 100644
--- a/extra/xorg-xauth/PKGBUILD
+++ b/extra/xorg-xauth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $
+# $Id: PKGBUILD 125581 2011-05-26 20:38:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xauth
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="X.Org authorization settings program"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,12 +12,16 @@ depends=('libxmu')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2)
-sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290')
+sha1sums=('10a68367ecc60a641b9aa89e6f24f7ca71f23874')
 
 build() {
   cd "${srcdir}/xauth-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xauth-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD
index f4f07366d..5a8334b7a 100644
--- a/extra/zile/PKGBUILD
+++ b/extra/zile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104088 2010-12-28 17:55:43Z kevin $
+# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=zile
-pkgver=2.3.21
+pkgver=2.3.24
 pkgrel=1
 pkgdesc="A small, fast, and powerful Emacs clone"
 arch=(i686 x86_64 'mips64el')
@@ -13,12 +13,16 @@ makedepends=('help2man')
 depends=('ncurses')
 license=('GPL')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4bac1dc5d7e6fb5c13bd6677bca34b11')
+md5sums=('fe77d801ba69e0fb9b4914a04b9ff506')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-md5sums=('ec2834a42789477c55e7d44bc9438de1')
+
author	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-29 22:59:51 -0500
committer	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-29 22:59:51 -0500
commit	0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch)
tree	98b1d03925fafa426c20c3075d69145c8bb2f4d8 /extra
parent	b18caf89fb235f174419d578a7da0237e456ef3d (diff)
parent	c399070d50c89903ec1dea55aa4aa5147a367565 (diff)