Sun Sep 11 23:14:33 UTC 2011

92 files changed, 1682 insertions, 604 deletions

diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 59b20c371..47dfc13a0 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 54691 2011-08-23 10:03:09Z spupykin $
+# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgname=aqbanking
-pkgver=5.0.14
+pkgver=5.0.15
+_dnrel=86
 pkgrel=1
 pkgdesc="A library for online banking and financial applications"
 arch=(i686 x86_64)
@@ -12,8 +13,8 @@ url="http://www.aquamaniac.de/aqbanking"
 license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
 options=('!makeflags' '!libtool')
-source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=85&file=01&dummy=aqbanking-$pkgver.tar.gz")
-md5sums=('c489bc8a8621d77653f09cae1ceb06e8')
+source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz")
+md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc')
 
 build() {
   cd $srcdir/aqbanking-$pkgver
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index e9fb17828..93fe2247a 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54590 2011-08-20 19:35:48Z foutrelis $
+# $Id: PKGBUILD 55378 2011-09-10 20:22:39Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
-pkgver=1.2.98
-pkgrel=1
+pkgver=1.2.99
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -25,7 +25,7 @@ options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate)
-md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb'
+md5sums=('c83115c3eebb29e6f2b4cc6fe699affe'
          'a2d2b69c6220fab57cda4f531b680f9f'
          '8d69341bd4002bffd69c6e82ff6c905f')
 
@@ -63,9 +63,11 @@ package() {
   chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
 
   # Use Python 2
-  sed -i 's/env python$/\02/' \
+  sed -i 's/env python$/&2/' \
     "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
     "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
+  sed -i -r "s/['\"]python/&2/g" \
+    "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
 
   # Compile Python scripts
   python2 -m compileall "$pkgdir"
diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD
index 890b45679..3b7fec8d2 100644
--- a/community/gmerlin-avdecoder/PKGBUILD
+++ b/community/gmerlin-avdecoder/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 43369 2011-03-25 11:34:14Z mherych $
+# $Id: PKGBUILD 55358 2011-09-10 10:55:52Z pschmitz $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin-avdecoder
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Media decoding library"
 arch=('i686' 'x86_64')
 url="http://gmerlin.sourceforge.net/avdec_frame.html"
@@ -17,6 +17,10 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   rm -f cpuinfo.sh
   ./configure --prefix=/usr --without-doxygen
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index 69717e2bc..a38817828 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -5,18 +5,20 @@
 
 pkgname=gpac
 pkgver=0.4.5
-pkgrel=7
+pkgrel=8
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
-depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \
+depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad'
          'faad2' 'xvidcore' 'ffmpeg' 'freeglut')
+# 'js'
 license=('LGPL')
 options=('!makeflags') # Multiple build jobs aren't handled correctly
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libpng14-infopp-null.patch)
+        libpng14-infopp-null.patch openjpeg14.patch)
 md5sums=('755e8c438a48ebdb13525dd491f5b0d1'
-         '14d6483c9eb84434aea68596f243e0ca')
+         '14d6483c9eb84434aea68596f243e0ca'
+         '1605fc11bd49b9c8220820bb38912021')
 
 build() {
 	cd ${srcdir}/${pkgname}
@@ -29,13 +31,14 @@ build() {
 	#FS#14506
 	sed -i 's#lib64#lib#g' configure
 	patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch
+	patch -Np1 -i ${srcdir}/openjpeg14.patch
 	
 	# Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined
 	# symbol: XvQueryExtension" with our LDFLAGS :\
-	unset LDFLAGS
+	export LDFLAGS=${LDFLAGS/,--as-needed/}
 	
 	./configure --prefix=/usr --mandir=/usr/share/man --use-js=no
-	make 
+	make
 }
 
 package() {
diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch
new file mode 100644
index 000000000..68a625eeb
--- /dev/null
+++ b/community/gpac/openjpeg14.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361359
+
+Index: gpac/modules/img_in/jp2_dec.c
+===================================================================
+--- gpac.orig/modules/img_in/jp2_dec.c
++++ gpac/modules/img_in/jp2_dec.c
+@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
+ 	return GF_OK;
+ }
+ 
++char opj_version_buffer[500];
++
+ static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
+ {
++#ifndef OPENJPEG_VERSION
++	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
++	return opj_version_buffer;
++#else
+ 	return "OpenJPEG "OPENJPEG_VERSION ;
++#endif
+ }
+ 
+ 
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 770c55e33..bebd0c820 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,10 +1,12 @@
-# $Id: PKGBUILD 9274 2010-01-24 22:45:51Z foutrelis $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
+# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $
+# Maintainer:
+# Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 
+
 pkgname=mtpaint
 pkgver=3.31
-pkgrel=4
+pkgrel=5
 pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork."
 arch=('i686' 'x86_64')
 url="http://mtpaint.sourceforge.net"
@@ -16,10 +18,15 @@ md5sums=('fbe34eb25f96b6092403115f1f6ab387'
          'f84245ae1e26bd734740306b09024bb8')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	patch -Np1 -i ${srcdir}/libpng14.patch
+	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np1 -i "$srcdir/libpng14.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
-  make || return 1
-  make DESTDIR=$pkgdir install
+	make DESTDIR=${pkgdir} install
 }
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 3fefacf7e..3f5a016fd 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,10 +1,11 @@
+# $Id: PKGBUILD 55364 2011-09-10 10:56:13Z pschmitz $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com>
 # Contributor: xduugu (.desktop and install files)
 
 pkgname=mupdf
-pkgver=0.8.165
+pkgver=0.9
 pkgrel=1
 pkgdesc="lightweight PDF viewer and toolkit written in portable C"
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext')
 install=mupdf.install
 source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz")
-md5sums=('a95813737924e60d87a944d52b6a5120')
+md5sums=('76640ee16a797a27fe49cc0eaa87ce3a')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index b1e9f37ac..71929e1d7 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54922 2011-08-28 11:38:33Z giovanni $
+# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -15,7 +15,7 @@ options=('!libtool' '!docs')
 source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2
         pcscd)
 md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd'
-         '80d90388e4d2a551cb7aefe3bd5147bd')
+         'c97b6bce695222efb0f003d8e8369010')
 
 build() {
   cd "${srcdir}/pcsc-lite-${pkgver}"
diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd
index 93f869fd2..1dc5e0166 100644
--- a/community/pcsclite/pcscd
+++ b/community/pcsclite/pcscd
@@ -6,7 +6,7 @@
 DAEMON=/usr/sbin/pcscd
 NAME=pcscd
 DESC="PC/SC smart card daemon"
-PID_FILE=/var/run/pcscd/pcscd.pid 
+PID_FILE=/run/pcscd/pcscd.pid
 PCSCD_OPTIONS=
 
 case "$1" in
diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD
index e5457727c..f3c9a1c18 100644
--- a/community/preload/PKGBUILD
+++ b/community/preload/PKGBUILD
@@ -1,38 +1,47 @@
+# $Id: PKGBUILD 55344 2011-09-10 09:19:46Z andrea $
+# Maintainer:
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=preload
 pkgver=0.6.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Makes applications run faster by prefetching binaries and shared objects"
 url="http://sourceforge.net/projects/preload"
 license=('GPL2')
+depends=('glib2' 'bash')
 makedepends=('help2man' 'pkgconfig')
-depends=('glib2')
 backup=('etc/preload.conf')
 options=('!makeflags')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz \
+source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz"
         rc.preload)
 md5sums=('10786287b55afd3a2b433b4f898809f4'
          'bde0dd7867c77e7c4d10b481b5cddcd3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
   
-  install -D -m755 ../rc.preload $startdir/pkg/etc/rc.d/preload
-  rm -rf $startdir/pkg/etc/rc.d/init.d
+  install -D -m755 "${srcdir}"/rc.preload "${pkgdir}"/etc/rc.d/preload
+  rm -rf "${pkgdir}"/etc/rc.d/init.d
 
-  rm -rf $startdir/pkg/var/lib/preload/preload.state
-  rm -rf $startdir/pkg/var/log/preload.log
+  rm -rf "${pkgdir}"/var/lib/preload/preload.state
+  rm -rf "${pkgdir}"/var/log/preload.log
 
-  mkdir $startdir/pkg/etc/conf.d
-  mv $startdir/pkg/etc/sysconfig/* $startdir/pkg/etc/conf.d
-  rm -rf $startdir/pkg/etc/sysconfig
+  install -d "${pkgdir}"/etc/conf.d
+  mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d
+  rm -rf "${pkgdir}"/etc/sysconfig
 
-  sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' $startdir/pkg/etc/preload.conf
+  sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf
 }
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index 0bc108944..452f60d96 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $
+# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=znc
-pkgver=0.098
-pkgrel=3
+pkgver=0.200
+pkgrel=1
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
 license=('GPL2')
 arch=('i686' 'x86_64')
-
 depends=('c-ares' 'gcc-libs' 'openssl')
 makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl')
 optdepends=('tcl: modtcl module'
             'python: modpython module'
             'perl: modperl module'
             'cyrus-sasl: saslauth module')
-
 source=("http://znc.in/releases/znc-${pkgver}.tar.gz")
-md5sums=('5667b4acb1f01309d6eded77abac700c')
+md5sums=('da5b690bc31b007474a77aae70c9c049')
 
 build() {
-  cd znc-${pkgver}
+  cd "znc-$pkgver"
 
   ./configure --prefix=/usr \
     --enable-sasl \
@@ -34,7 +32,7 @@ build() {
 }
 
 package() {
-  cd znc-${pkgver}
+  cd "znc-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 6d75f0659..0cdca9fd1 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $
+# $Id: PKGBUILD 137787 2011-09-11 01:35:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
-pkgver=8.12
-pkgrel=3
+pkgver=8.13
+pkgrel=2
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	coreutils-uname.patch
 	coreutils-pam.patch
 	su.pam)
-md5sums=('0f7d43c2d2e24314b43a6c6267e25b90'
+md5sums=('8e1675c6c336ff55557c698706a63d6c'
          'c4fcca138b6abf6d443d48a6f0cd8833'
          'aad79a2aa6d566c375d7bdd1b0767278'
          'fa85e5cce5d723275b14365ba71a8aad')
@@ -34,7 +34,7 @@ build() {
   patch -Np1 -i ${srcdir}/coreutils-uname.patch
 
   autoreconf -v
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
               --enable-install-program=su \
               --enable-no-install-program=groups,hostname,kill,uptime \
               --enable-pam
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 0008d80ac..d6d9bbb15 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $
+# $Id: PKGBUILD 137789 2011-09-11 01:47:05Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=5
-_glibcdate=20110617
+pkgrel=6
+_glibcdate=20110908
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -15,7 +15,8 @@ license=('GPL' 'LGPL')
 groups=('base')
 depends=('linux-api-headers>=3.0' 'tzdata')
 makedepends=('gcc>=4.6')
-backup=(etc/locale.gen
+backup=(etc/gai.conf
+        etc/locale.gen
         etc/nscd.conf)
 options=('!strip')
 install=glibc.install
@@ -26,23 +27,24 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.12.1-static-shared-getpagesize.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
         glibc-2.13-futex.patch
+        glibc-2.13-dlclose-search-reset.patch
         glibc-2.14-libdl-crash.patch
-        #glibc-2.14-fix-resolver-crash-typo.patch
-        glibc-2.14-revert-4462fad3.patch
+        glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
         nscd
         locale.gen.txt
         locale-gen)
-md5sums=('e441d745609d93c907b72548ba646dad'
+md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
          '4dadb9203b69a3210d53514bb46f41c3'
          '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
          'a3ac6f318d680347bb6e2805d42b73b2'
          'b042647ea7d6f22ad319e12e796bd13e'
          '7d0154b7e17ea218c9fa953599d24cc4'
+         '22d09c58718fb3d1d31c3a6c14ca6886'
          'cea62cc6b903d222c5f26e05a3c0e0e6'
-         '46e56492cccb1c9172ed3a235cf43c6c'
+         '13728807283f111e5d9d38cf38e0a461'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
          'b587ee3a70c9b3713099295609afde49'
@@ -82,15 +84,17 @@ build() {
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
   patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
 
+  # https://bugzilla.redhat.com/show_bug.cgi?id=593675
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch
+
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
-  # This fixes the main segfault but not the assert fail (FS#24615)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
-  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
-  # resort to reverting the bad commit completely for the moment
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch
new file mode 100644
index 000000000..3ad8b418a
--- /dev/null
+++ b/core/glibc/glibc-2.13-dlclose-search-reset.patch
@@ -0,0 +1,196 @@
+From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Wed, 26 May 2010 18:28:59 +0200
+Subject: [PATCH] Fix scope handling during dl_close
+
+---
+ ChangeLog          |   12 ++++++++++++
+ elf/Makefile       |   10 +++++++++-
+ elf/dl-close.c     |    7 +++++++
+ elf/unload8.c      |   33 +++++++++++++++++++++++++++++++++
+ elf/unload8mod1.c  |    7 +++++++
+ elf/unload8mod1x.c |    1 +
+ elf/unload8mod2.c  |    7 +++++++
+ elf/unload8mod3.c  |   27 +++++++++++++++++++++++++++
+ 8 files changed, 103 insertions(+), 1 deletions(-)
+ create mode 100644 elf/unload8.c
+ create mode 100644 elf/unload8mod1.c
+ create mode 100644 elf/unload8mod1x.c
+ create mode 100644 elf/unload8mod2.c
+ create mode 100644 elf/unload8mod3.c
+
+diff --git a/elf/Makefile b/elf/Makefile
+index 59e835f..65b6deb 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -89,6 +89,7 @@ distribute	:= rtld-Rules \
+ 		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
+ 		   unload6mod1.c unload6mod2.c unload6mod3.c \
+ 		   unload7mod1.c unload7mod2.c \
++		   unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
+ 		   tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
+ 		   tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
+ 		   tst-auditmod4a.c tst-auditmod4b.c \
+@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
+ 	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
+ 	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
+ 	 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
+-	 unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
++	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
+ 	 tst-audit1 tst-audit2 \
+ 	 tst-stackguard1 tst-addr1 tst-thrlock \
+ 	 tst-unique1 tst-unique2
+@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
+ 		unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
+ 		unload6mod1 unload6mod2 unload6mod3 \
+ 		unload7mod1 unload7mod2 \
++		unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
+ 		order2mod1 order2mod2 order2mod3 order2mod4 \
+ 		tst-unique1mod1 tst-unique1mod2 \
+ 		tst-unique2mod1 tst-unique2mod2
+@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl)
+ $(objpfx)unload6mod3.so: $(libdl)
+ $(objpfx)unload7mod1.so: $(libdl)
+ $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
++$(objpfx)unload8mod3.so: $(libdl)
+ $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
+ $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
+ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
+@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl)
+ $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
+ unload7-ENV = MALLOC_PERTURB_=85
+ 
++$(objpfx)unload8: $(libdl)
++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
++
+ ifdef libdl
+ $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
+ $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 700e765..f47d5f8 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
+ 
+ 	      imap->l_scope_max = new_size;
+ 	    }
++	  else if (new_list != NULL)
++	    {
++	      /* We didn't change the scope array, so reset the search
++		 list.  */
++	      imap->l_searchlist.r_list = NULL;
++	      imap->l_searchlist.r_nlist = 0;
++	    }
+ 
+ 	  /* The loader is gone, so mark the object as not having one.
+ 	     Note: l_idx != IDX_STILL_USED -> object will be removed.  */
+diff --git a/elf/unload8.c b/elf/unload8.c
+new file mode 100644
+index 0000000..f984a38
+--- /dev/null
++++ b/elf/unload8.c
+@@ -0,0 +1,33 @@
++#include <dlfcn.h>
++#include <stdio.h>
++
++int
++main (void)
++{
++  void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
++  if (h == NULL)
++    {
++      puts ("dlopen unload8mod1.so failed");
++      return 1;
++    }
++
++  void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
++  if (h2 == NULL)
++    {
++      puts ("dlopen unload8mod1x.so failed");
++      return 1;
++    }
++  dlclose (h2);
++
++  int (*mod1) (void) = dlsym (h, "mod1");
++  if (mod1 == NULL)
++    {
++      puts ("dlsym failed");
++      return 1;
++    }
++
++  mod1 ();
++  dlclose (h);
++
++  return 0;
++}
+diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c
+new file mode 100644
+index 0000000..fe7e81c
+--- /dev/null
++++ b/elf/unload8mod1.c
+@@ -0,0 +1,7 @@
++extern void mod2 (void);
++
++void
++mod1 (void)
++{
++  mod2 ();
++}
+diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c
+new file mode 100644
+index 0000000..835b634
+--- /dev/null
++++ b/elf/unload8mod1x.c
+@@ -0,0 +1 @@
++int mod1x;
+diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c
+new file mode 100644
+index 0000000..2fd8b67
+--- /dev/null
++++ b/elf/unload8mod2.c
+@@ -0,0 +1,7 @@
++extern void mod3 (void);
++
++void
++mod2 (void)
++{
++  mod3 ();
++}
+diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c
+new file mode 100644
+index 0000000..d49e22b
+--- /dev/null
++++ b/elf/unload8mod3.c
+@@ -0,0 +1,27 @@
++#include <dlfcn.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++void
++mod3_fini2 (void)
++{
++}
++
++void
++mod3_fini (void)
++{
++  mod3_fini2 ();
++}
++
++void
++mod3 (void)
++{
++  void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
++  if (h == NULL)
++    {
++      puts ("dlopen unload8mod2.so failed");
++      exit (1);
++    }
++
++  atexit (mod3_fini);
++}
+-- 
+1.7.3.4
+
diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
new file mode 100644
index 000000000..ef91116e5
--- /dev/null
+++ b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
@@ -0,0 +1,26 @@
+From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Thu, 1 Sep 2011 10:46:14 +0200
+Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
+
+---
+ ChangeLog          |    4 ++++
+ resolv/res_query.c |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 2f7cfaa..2ded9fb 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
+ 	    && *resplen2 > (int) sizeof (HEADER))
+ 	  {
+ 	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
++	    assert (n == 0 || hp != hp2);
+ 	    hp = hp2;
+ 	  }
+ 	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+-- 
+1.7.3.4
+
diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD
index 135dafaa6..6eb622dfa 100644
--- a/core/gzip/PKGBUILD
+++ b/core/gzip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100035 2010-11-20 01:15:49Z stephane $
+# $Id: PKGBUILD 137785 2011-09-11 01:35:04Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=gzip
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU compression utility"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gzip/"
@@ -27,6 +27,11 @@ build() {
   make 
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -35,5 +40,4 @@ package() {
   install -dm755 ${pkgdir}/bin
   mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ 
   cd $pkgdir/bin
-  ln -sf ${pkgname} compress
 }
diff --git a/core/gzip/gzip.install b/core/gzip/gzip.install
index 636f91011..24c8b8fb9 100644
--- a/core/gzip/gzip.install
+++ b/core/gzip/gzip.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(gzip.info)
 
 post_install() {
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index 980ac3408..c30b355e4 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,35 +1,48 @@
-# $Id: PKGBUILD 129474 2011-06-28 04:34:20Z allan $
+# $Id: PKGBUILD 137791 2011-09-11 02:39:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 # NOTE: requires rebuilt with each new gcc version
 
-pkgname=libtool
+pkgname=('libtool' 'libltdl')
 pkgver=2.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-depends=('sh' 'tar' 'gcc=4.6.1')
-groups=('base-devel')
 options=('!libtool')
-install=libtool.install
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz)
 md5sums=('4e6144439d95d7332dc50ace6dd24c55')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
   make check
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+package_libtool() {
+  depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1')
+  groups=('base-devel')
+  install=libtool.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_libltdl() {
+  pkgdesc="A system independent dlopen wrapper for GNU libtool"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
+                         install-ltdlincludeHEADERS install-data-local
+  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
 }
diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD
index 308393932..27045eca0 100644
--- a/core/sysvinit/PKGBUILD
+++ b/core/sysvinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92996 2010-10-02 19:26:38Z eric $
+# $Id: PKGBUILD 137779 2011-09-10 22:03:10Z tomegun $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux System V Init"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
@@ -24,4 +24,9 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}dsf"
   make ROOT="${pkgdir}" install
+
+  # mountpoint is now provided by util-linux instead
+  cd "${pkgdir}"
+  rm bin/mountpoint
+  rm usr/share/man/man1/mountpoint.1
 }
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 487b8eb6d..7ac817394 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,42 +1,56 @@
-# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $
+# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.19.1
-pkgrel=3
+pkgver=2.20
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem')
+depends=('filesystem')
 replaces=('linux32' 'util-linux-ng')
 conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
 provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
-       mount-segfault-2.19.1.patch
-       two-component-linux.patch)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
+	agetty-typo.patch
+	write-freopen.patch
+	dmesg-non-printk.patch
+	dmesg-space.patch)
 optdepends=('perl: for chkdupexe support')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # add support for linux 3.0, which is needed mkswap
-  patch -Np1 -i ../two-component-linux.patch
-  # fix https://bugs.archlinux.org/task/24261
-  patch -Np1 -i ../mount-segfault-2.19.1.patch
+
+  # patches from master
+  for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do
+    patch -Np1 -i "${srcdir}/${patch}"
+  done
+
   # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
-  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  ./configure --enable-arch\
+              --enable-write\
+              --enable-raw\
+              --disable-wall\
+              --enable-partx
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -dm755 "${pkgdir}/var/lib/hwclock"
+
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('3eab06f05163dfa65479c44e5231932c'
-         '3247b52f0e4b8044f23f2f7218e2fdea'
-         '6eb23edb484adf7192e107d1c6d94bd3')
+md5sums=('4dcacdbdafa116635e52b977d9d0e879'
+         '13838c6dd8df686e0f01ad0f236d2690'
+         '465817ff8f7c08411c8011ee91b50318'
+         'f3ca75a1a22a2a739c5c22d92dc07ab0'
+         'd9768f0b42d36d72c02ac7797b922ba1')
diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch
new file mode 100644
index 000000000..a333d6280
--- /dev/null
+++ b/core/util-linux/agetty-typo.patch
@@ -0,0 +1,27 @@
+From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 7 Sep 2011 07:37:03 +0200
+Subject: [PATCH] agetty: double equals sign typo in opentty()
+
+Reported-by: Francesco Cosoleto <cosoleto@gmail.com>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ term-utils/agetty.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 733be38..35bb389 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
+ 	 * In case of a virtual console the ioctl TIOCMGET fails and
+ 	 * the error number will be set to EINVAL.
+ 	 */
+-	if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) {
++	if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) {
+ 		op->flags |= F_VCONSOLE;
+ 		if (!op->term)
+ 			op->term = DEFAULT_VCTERM;
+-- 
+1.7.6.1
+
diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch
new file mode 100644
index 000000000..ea2354420
--- /dev/null
+++ b/core/util-linux/dmesg-non-printk.patch
@@ -0,0 +1,69 @@
+From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 31 Aug 2011 12:28:39 +0200
+Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels
+
+ * dmesg(1) incorrectly assumes that lines like "<6>\n"
+   are broken.
+
+ * it's more robust to assume the end of the record is "\n<"
+
+ * print \n for empty lines
+
+Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ sys-utils/dmesg.c |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 6090f4e..8e7bb4b 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
+ 
+ 		if (!begin)
+ 			begin = p;
+-		if (*p == '\n')
+-			end = p;
+ 		if (i + 1 == rec->next_size) {
+ 			end = p + 1;
+ 			i++;
+-		}
++		} else if (*p == '\n' && *(p + 1) == '<')
++			end = p;
++
+ 		if (begin && !*begin)
+ 			begin = NULL;	/* zero(s) at the end of the buffer? */
+ 		if (!begin || !end)
+@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
+ 			}
+ 		}
+ 
+-		if (end <= begin)
+-			return -1;	/* error */
+-
+ 		if (*begin == '[' && (*(begin + 1) == ' ' ||
+ 				      isdigit(*(begin + 1)))) {
+ 			if (ctl->delta || ctl->ctime) {
+@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size,
+ 	}
+ 
+ 	while (get_next_record(ctl, &rec) == 0) {
+-		if (!rec.mesg_size)
+-			continue;
+ 
+ 		if (!accept_record(ctl, &rec))
+ 			continue;
+ 
++		if (!rec.mesg_size) {
++			putchar('\n');
++			continue;
++		}
++
+ 		if (ctl->decode && rec.level >= 0 && rec.facility >= 0)
+ 			printf("%-6s:%-6s: ", facility_names[rec.facility].name,
+ 					      level_names[rec.level].name);
+-- 
+1.7.6.1
+
diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch
new file mode 100644
index 000000000..2038888cc
--- /dev/null
+++ b/core/util-linux/dmesg-space.patch
@@ -0,0 +1,31 @@
+From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 2 Sep 2011 14:42:04 +0200
+Subject: [PATCH] dmesg: remove extra space only after time stamp
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ sys-utils/dmesg.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 8e7bb4b..b3713a0 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
+ 						break;
+ 				}
+ 			}
++			if (begin < end && *begin == ' ')
++				begin++;
+ 		}
+ 
+-		if (begin < end && *begin == ' ')
+-			begin++;
+-
+ 		rec->mesg = begin;
+ 		rec->mesg_size = end - begin;
+ 
+-- 
+1.7.6.1
+
diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch
new file mode 100644
index 000000000..a2014a107
--- /dev/null
+++ b/core/util-linux/write-freopen.patch
@@ -0,0 +1,27 @@
+From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 6 Sep 2011 03:18:46 +0200
+Subject: [PATCH] write: fix path for freopen()
+
+Reported-by: xinglp <xinglp@gmail.com>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ term-utils/write.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/write.c b/term-utils/write.c
+index a825f62..a70eb7b 100644
+--- a/term-utils/write.c
++++ b/term-utils/write.c
+@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
+ 
+ 	if (strlen(tty) + 6 > sizeof(path))
+ 		errx(EXIT_FAILURE, _("tty path %s too long"), tty);
+-	printf(path, "/dev/%s", tty);
++	snprintf(path, sizeof(path), "/dev/%s", tty);
+ 	if ((freopen(path, "w", stdout)) == NULL)
+ 		err(EXIT_FAILURE, "%s", path);
+ 
+-- 
+1.7.6.1
+
diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD
index 7990bebb4..ae6b40bc2 100644
--- a/extra/aiksaurus/PKGBUILD
+++ b/extra/aiksaurus/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 45575 2009-07-12 17:51:06Z ronald $
+# $Id: PKGBUILD 137720 2011-09-10 13:53:53Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=aiksaurus
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform, open-source thesaurus"
 url="http://aiksaurus.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64')
 options=('!libtool')
 depends=('gtk2')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	'aiksaurus-gcc44.patch')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'aiksaurus-gcc44.patch')
 md5sums=('3eae03b7c49843ccc9262e52846ea6b4'
          '7f94749172116b1529fc21b718ee7636')
 
@@ -20,9 +20,13 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # gcc44 build patch
-  patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch || return 1
+  patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch
 
   ./configure --prefix=/usr --with-gtk
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD
index 76edd3871..34e21a32f 100644
--- a/extra/apricots/PKGBUILD
+++ b/extra/apricots/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 27259 2009-02-18 02:43:34Z eric $
+# $Id: PKGBUILD 137632 2011-09-10 08:59:53Z pierre $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=apricots
 pkgver=0.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://www.fishies.org.uk/apricots.html"
-depends=('gcc-libs' 'openal>=1.6.372' 'sdl' 'freealut>=1.1.0')
-source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" \
-	"apricots-0.2.6-freealut.patch")
-md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99')
+depends=('gcc-libs' 'openal' 'sdl' 'freealut')
+source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz"
+        "apricots-0.2.6-freealut.patch")
+md5sums=('910828d717e46d8cbd9c24f702d09fbc'
+         '5f9f74082dfe162ab3ba51f6ec628f99')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make prefix=$pkgdir/usr install || return 1
+  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
+  ./configure --prefix=/usr
+  make LIBTOOL='/usr/bin/libtool'
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make prefix=$pkgdir/usr install
 }
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 7aa7466b0..81f3d85b2 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135566 2011-08-15 21:13:25Z eric $
+# $Id: PKGBUILD 137652 2011-09-10 10:56:27Z pierre $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -13,7 +13,7 @@ _svn=false
 
 pkgname=blender
 pkgver=2.59
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD
index 2cd7d1898..408e4113d 100644
--- a/extra/bmp-musepack/PKGBUILD
+++ b/extra/bmp-musepack/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 30184 2009-03-17 03:27:59Z eric $
+# $Id: PKGBUILD 137709 2011-09-10 13:05:29Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Nikos Kouremenos <nk@ebox.gr>
 
 pkgname=bmp-musepack
 pkgver=1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://musepack.net/"
 license=('BSD')
-depends=('bmp' 'libmpcdec>=1.2.5' 'taglib')
+depends=('bmp' 'libmpcdec' 'taglib')
 groups=('bmp-plugins' 'bmp-io-plugins')
 options=('!libtool')
-source=(http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2)
+source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('5fe0c9d341ca37d05c780a478f829a5f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD
index edf54ae20..bf2deef41 100644
--- a/extra/bmp-wma/PKGBUILD
+++ b/extra/bmp-wma/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 49817 2009-08-16 16:08:10Z jgc $
+# $Id: PKGBUILD 137730 2011-09-10 14:26:41Z pierre $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com>
 
 pkgname=bmp-wma
 pkgver=0.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="WMA plugin for Beep Media Player"
 url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
 license=('GPL')
 arch=('x86_64' 'i686')
 depends=('bmp')
 groups=('bmp-plugins' 'bmp-io-plugins')
-options=(!libtool !emptydirs)
-source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz
-        bmp-wma-gcc4.patch)
+options=('!libtool' '!emptydirs')
+source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz"
+        'bmp-wma-gcc4.patch')
 md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
          '730eba8f41e989dd8b56c18bcc826cc4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1
+  patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
   if [ "${CARCH}" = "x86_64" ]; then
     export CFLAGS="${CFLAGS} -fPIC"
   fi
-  ./configure --prefix=/usr --disable-static || return 1
+  ./configure --prefix=/usr --disable-static
   echo '#define HAVE_LRINTF 1' >> config.h
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD
index a2610a96f..07ec42be0 100644
--- a/extra/capi4k-utils/PKGBUILD
+++ b/extra/capi4k-utils/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 39034 2009-05-11 08:28:48Z tpowa $
+# $Id: PKGBUILD 137697 2011-09-10 12:45:15Z pierre $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4k-utils
 pkgver=050718
-pkgrel=7
+pkgrel=8
 pkgdesc="capi utils for isdn cards"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="ftp://ftp.in-berlin.de/pub/capi4linux/"
 makedepends=('ppp')
 depends=('glibc' 'bash')
-backup=(etc/capi.conf)
-source=(ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz 
-        ppp-2.4.4.patch 
-        config 
-        capi.conf 
-        capiinit.rc
-        capi-compile.patch)
-options=(!libtool)
+backup=('etc/capi.conf')
+source=('ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz'
+        'ppp-2.4.4.patch'
+        'config'
+        'capi.conf'
+        'capiinit.rc'
+        'capi-compile.patch')
+options=('!libtool')
 md5sums=('c745759b6b3d64e19763727176648cdf'
          'c5416b8b1b76a82c4bcaad76140369e1'
          '146aa9e06588511c447d7e81dafec86a'
@@ -27,24 +27,28 @@ md5sums=('c745759b6b3d64e19763727176648cdf'
 
 build() {
   cd $srcdir/$pkgname
-  patch -Np1 -i ../ppp-2.4.4.patch || return 1
+  patch -Np1 -i ../ppp-2.4.4.patch
   # fix compiling with gcc 4.2
-  patch -Np1 -i ../capi-compile.patch || return 1
+  patch -Np1 -i ../capi-compile.patch
   cp ../config .config
   # fix pppd plugin
-  sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $startdir/src/$pkgname/pppdcapiplugin/Makefile
+  sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $srcdir/$pkgname/pppdcapiplugin/Makefile
   # patch all Makefile.* and Rules.make to use our CFLAGS
   sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make
   # Arch64 fix from Gentoo
   # patch capi20/Makefile.* to use -fPIC for shared library
-  [ "$CARCH" = "x86_64" ] &&  (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.* || return 1)
+  [ "$CARCH" = "x86_64" ] &&  (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.*)
   cd capi20
   aclocal
   libtoolize --copy --force
   cd $srcdir/$pkgname
-  make subconfig || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make subconfig
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
+  make DESTDIR=$pkgdir install
   install -m755 -D $srcdir/capiinit.rc $pkgdir/etc/rc.d/capiinit
   install -m644 $srcdir/capi.conf $pkgdir/etc
   cd $pkgdir/usr/lib
diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD
index 6b4664a0d..9a5f526c1 100644
--- a/extra/capseo/PKGBUILD
+++ b/extra/capseo/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 49837 2009-08-16 16:56:46Z jgc $
+# $Id: PKGBUILD 137732 2011-09-10 14:29:41Z pierre $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capseo
 pkgver=0.3
-pkgrel=1
+pkgrel=2
+epoch=1
 pkgdesc="Capseo video codec"
 arch=('i686' 'x86_64')
 url="http://dev.gentoo.org/~trapni/capseo/"
 license=('GPL2')
 depends=('libgl' 'gcc-libs')
-options=('force' '!libtool')
+options=('!libtool')
 makedepends=('pkgconfig' 'mesa' 'libogg')
-source=(ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz)
+source=("ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz")
 md5sums=('bd869e8c9b1081e90a44567092ea8c5e')
 
 build() {
-  # start building
   cd "${srcdir}"
-  ./autogen.sh || return 1
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./autogen.sh
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD
index ad4ad301c..444a463ac 100644
--- a/extra/cmatrix/PKGBUILD
+++ b/extra/cmatrix/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 53887 2009-10-03 18:54:48Z eric $
-# Contributor: john
+# $Id: PKGBUILD 137613 2011-09-10 04:45:43Z eric $
+# Maintainer:
 
 pkgname=cmatrix
 pkgver=1.2a
-pkgrel=5
+pkgrel=6
 pkgdesc="Let you see the matrix code in your console"
 arch=('i686' 'x86_64')
 url="http://www.asty.org/cmatrix/"
 license=('GPL')
 depends=('ncurses' 'fontconfig')
-install=$pkgname.install
+install=cmatrix.install
 source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz)
 md5sums=('ebfb5733104a258173a9ccf2669968a1')
 sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
   
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-  
-  install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" || return 1
-  install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" || return 1
-  install -m644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts" || return 1
+  install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf"
+  install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt"
+  install -Dm644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts/matrix.psf.gz"
 }
diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD
index 764b691b5..df73556ce 100644
--- a/extra/cmt/PKGBUILD
+++ b/extra/cmt/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 49841 2009-08-16 18:10:08Z jgc $
+# $Id: PKGBUILD 137734 2011-09-10 14:32:08Z pierre $
 #Maintainer: Damir Perisa <damir.perisa@bluewin.ch>
 #Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=cmt
 pkgver=1.16
-pkgrel=2
+pkgrel=3
 pkgdesc="CMT for LADSPA"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.ladspa.org"
 depends=('ladspa' 'gcc-libs')
 groups=('ladspa-plugins')
-source=(http://www.ladspa.org/download/${pkgname}_src_${pkgver}.tgz)
+source=("http://www.ladspa.org/download/${pkgname}_src_${pkgver}.tgz")
 md5sums=('15a875e5aaf79c209c223babfb41cb1c')
 
 build() {
   cd "${srcdir}/${pkgname}/src"
   sed -e "/^CFLAGS/ s/-O3/${CFLAGS}/" \
       -e 's|-Werror||g' \
-      -i makefile || return 1
-  make || return 1
+      -i makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}/src"
   install -m755 -d "${pkgdir}/usr/lib/ladspa"
-  install -m755 ../plugins/cmt.so "${pkgdir}/usr/lib/ladspa/" || return 1
+  install -m755 ../plugins/cmt.so "${pkgdir}/usr/lib/ladspa/"
 }
diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD
index dd108a6df..98f83cb2c 100644
--- a/extra/compface/PKGBUILD
+++ b/extra/compface/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 32263 2009-03-29 22:19:00Z eric $
+# $Id: PKGBUILD 137677 2011-09-10 11:50:26Z pierre $
 # Maintainer: simo <simo@archlinux.org> 
 # Contributor: Manolis Tzanidakis
-#
 
 pkgname=compface
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Utils & libs to convert from/to X-Face format."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://ftp.xemacs.org/pub/xemacs/aux/"
 license=('custom')
 depends=('glibc')
-source=($url/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('62f4f79c0861ad292ba3cf77b4c48319' '27a0d5a4d695e68b4d3eebe17db77189')
+source=("$url/$pkgname-$pkgver.tar.gz" 'LICENSE')
+md5sums=('62f4f79c0861ad292ba3cf77b4c48319'
+         '27a0d5a4d695e68b4d3eebe17db77189')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \
-    INCLUDEDIR=$pkgdir/usr/include install || return 1
+    INCLUDEDIR=$pkgdir/usr/include install
   install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD
index 8051c708f..c40d81bc0 100644
--- a/extra/dasher/PKGBUILD
+++ b/extra/dasher/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 54725 2009-10-11 18:48:49Z jgc $
+# $Id: PKGBUILD 137741 2011-09-10 14:49:04Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=dasher
 pkgver=4.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('at-spi>=1.27.91' 'libgnomeui>=2.24.1' 'gnome-speech>=0.4.25' 'gconf>=2.26.2-3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.17.3')
+depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome-extra')
-options=(!emptydirs)
+options=('!emptydirs')
 install=dasher.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('83e556690ac54c4bb8c49c050510259e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
-      --disable-scrollkeeper --enable-speech || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+      --disable-scrollkeeper --enable-speech
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD
index f04cd8c56..b0eb7861f 100644
--- a/extra/dcfldd/PKGBUILD
+++ b/extra/dcfldd/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 47983 2009-07-30 02:30:21Z eric $
+# $Id: PKGBUILD 137724 2011-09-10 14:16:18Z pierre $
 # Contributor: Paul Mattal <pjmattal@elys.com>
 # Maintainer: Paul Mattal <pjmattal@elys.com>
+
 pkgname=dcfldd
 pkgver=1.3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://dcfldd.sourceforge.net/"
 license=('GPL')
-depends=(glibc)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz)
+depends=('glibc')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz")
 md5sums=('952026c872f11b53ce0ec6681a3eef0a')
 sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913')
 
 build() {
-  cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index f2651acf0..b995bb41a 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 108700 2011-02-02 16:57:59Z giovanni $
+# $Id: PKGBUILD 137783 2011-09-10 22:56:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
 
 pkgname=diffstat
 pkgver=1.54
-pkgrel=1
+pkgrel=2
 pkgdesc="Display a histogram of diff changes"
 arch=('i686' 'x86_64')
 url="http://invisible-island.net/diffstat"
 depends=('glibc')
-license=('GPL')
+license=('MIT')
 source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz")
 md5sums=('af08bef2eb37050ceb0c4fddedb2ee36')
 
@@ -18,10 +18,12 @@ build () {
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir}/ install || return 1
+
+  make DESTDIR=${pkgdir}/ install
+  install -Dm644 package/debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD
index 7b909633d..ada627216 100644
--- a/extra/dmapi/PKGBUILD
+++ b/extra/dmapi/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 47579 2009-07-24 05:47:49Z tpowa $
+# $Id: PKGBUILD 137722 2011-09-10 14:14:07Z pierre $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
 pkgname=dmapi
 pkgver=2.2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Data migration API"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://oss.sgi.com/projects/xfs/"
 license=('GPL')
 depends=('glibc')
@@ -13,16 +14,23 @@ provides=('xfsdmapi')
 conflicts=('xfsdmapi')
 replaces=('xfsdmapi')
 options=('!libtool')
-source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz)
+source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz")
 md5sums=('c6e4ace10c446bbb92576e5dd19aec24')
 
 build() {
-  cd $startdir/src/dmapi-$pkgver
+  cd $srcdir/dmapi-$pkgver
   [ "$CARCH" = "x86_64" ] && export CFLAGS="$CLFAGS -fPIC"
+  export INSTALL_USER=root
+  export INSTALL_GROUP=root
+  export DEBUG=-DNDEBUG
   autoconf
-  ./configure --prefix=$pkgdir/usr
-  make || return 1 
-  make prefix=$pkgdir/usr/ install install-dev || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/dmapi-$pkgver
+  make DIST_ROOT=$pkgdir install install-dev
   # the static lib
   install -D -m644 libdm/.libs/libdm.a $pkgdir/usr/lib/libdm.a
   # and the header file, please
diff --git a/extra/docker/PKGBUILD b/extra/docker/PKGBUILD
index 7633ee9c6..3c26eb3cc 100644
--- a/extra/docker/PKGBUILD
+++ b/extra/docker/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 36979 2009-04-29 06:44:04Z eric $
+# $Id: PKGBUILD 137718 2011-09-10 13:25:58Z pierre $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=docker
 pkgver=1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://icculus.org/openbox/2/docker/"
 license=('GPL')
 depends=('glibc' 'glib2' 'libx11')
-source=(http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz)
+source=("http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('349320bebd43babb8b43e11c7aae0293')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  install -d $pkgdir/usr/bin || return 1
-  make || return 1
-  make PREFIX=$pkgdir/usr install || return 1
+  install -d $pkgdir/usr/bin
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make PREFIX=$pkgdir/usr install
 }
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD
index e3b21ce31..7e973b374 100644
--- a/extra/dvd+rw-tools/PKGBUILD
+++ b/extra/dvd+rw-tools/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 49778 2009-08-15 15:54:31Z jgc $
+# $Id: PKGBUILD 137728 2011-09-10 14:21:31Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=dvd+rw-tools
 pkgver=7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="dvd burning tools"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fy.chalmers.se/~appro/linux/DVD+RW"
 depends=('cdrkit' 'gcc-libs')
-source=(http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz
-        buildpatch-7.0-3-20080108-karolina.patch)
+source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz"
+        'buildpatch-7.0-3-20080108-karolina.patch')
 md5sums=('8acb3c885c87f6838704a0025e435871'
          '54b4dc52f5380216d4d9fc2dd2086d31')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # fix build, thank you Karolina
-	patch -Np1 -i "${srcdir}/buildpatch-7.0-3-20080108-karolina.patch"
+  patch -Np1 -i "${srcdir}/buildpatch-7.0-3-20080108-karolina.patch"
 
-  make || return 1
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/bin"
   install -m755 -d "${pkgdir}/usr/share/man/man1"
 
-  install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/" || return 1
-  install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1 || return 1
+  install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/"
+  install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1
 }
diff --git a/extra/dvdrtools/PKGBUILD b/extra/dvdrtools/PKGBUILD
index da84f79bb..555071bef 100644
--- a/extra/dvdrtools/PKGBUILD
+++ b/extra/dvdrtools/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 46392 2009-07-17 19:24:22Z giovanni $
+# $Id: PKGBUILD 137611 2011-09-10 04:22:54Z eric $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
 pkgname=dvdrtools
 pkgver=0.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/dvdrtools/"
 license=('GPL')
-depends=('glibc' 'file')
+depends=('file' 'bash')
 makedepends=('transcode')
 optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
 conflicts=('cdrkit')
@@ -17,8 +18,12 @@ source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz)
 md5sums=('5707b7e877b853e258cd738938833006')
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 25d68877e..8fa929967 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132398 2011-07-24 09:00:59Z ibiru $
+# $Id: PKGBUILD 137654 2011-09-10 10:56:29Z pierre $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20110724
+pkgver=20110910
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' '
 makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('b6815ae13a17ab57449269bc2156546e')
+md5sums=('f726ae21f9c12551603d8a9cf301280a')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD
index edeaa1f4b..55cebf720 100644
--- a/extra/fribidi/PKGBUILD
+++ b/extra/fribidi/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 68037 2010-02-10 15:07:38Z giovanni $
+# $Id: PKGBUILD 137683 2011-09-10 12:05:16Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Nezmer <Nezmer@gmail.com>
 
 pkgname=fribidi
 pkgver=0.19.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://fribidi.org"
 depends=('glibc')
 options=('!libtool')
-source=(http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz)
+source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz")
 md5sums=('626db17d2d99b43615ad9d12500f568a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index d00cc4b2c..29eeed43a 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 64438 2010-01-20 12:11:26Z ibiru $
+# $Id: PKGBUILD 137764 2011-09-10 16:29:02Z pierre $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=gd
 pkgver=2.0.36RC1
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
-depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8')
+depends=('perl' 'libpng' 'fontconfig' 'libjpeg')
 options=('!libtool')
-source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'libpng14.patch')
 md5sums=('e876979ca3130623a4e7866d9579171a'
          '7921556f4960e8d66cf4fb67ea7101b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+  patch -Np1 -i ${srcdir}/libpng14.patch
+  ./configure --prefix=/usr --without-xpm
+  make
+}
 
-  ./configure --prefix=/usr --without-xpm || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
index a9fc4bf26..a6b0033a1 100644
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ b/extra/gecko-sharp-2.0/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 44373 2009-07-01 20:54:06Z jgc $
+# $Id: PKGBUILD 137770 2011-09-10 17:09:41Z pierre $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=gecko-sharp-2.0
 pkgver=0.13
-pkgrel=3
+pkgrel=4
 pkgdesc="C# bindings for gtkmozembed"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
 url="http://www.mono-project.com/"
-depends=('xulrunner>=1.9.1' 'gtk-sharp-2>=2.12.1')
+depends=('xulrunner' 'gtk-sharp-2')
 makedepends=('monodoc' 'pkgconfig')
-source=(http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2
-	gecko-sharp-2.0-0.12-xulrunner.patch)
+source=("http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2"
+        'gecko-sharp-2.0-0.12-xulrunner.patch')
 md5sums=('f88eaa06e71f8d8fa34cf59a3e034a6b'
-	 '4f2c07c3fb0c1a94adaa4e4c8d57608b')
+         '4f2c07c3fb0c1a94adaa4e4c8d57608b')
 
 build() {
   # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${startdir}/src/weird"
+  export MONO_SHARED_DIR="${srcdir}/weird"
   mkdir -p "${MONO_SHARED_DIR}"
 
-  # build
   cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" \
-    DESTDIR=${pkgdir} install || return 1
+  patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
+  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
+    DESTDIR=${pkgdir} install
 }
diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD
index 611d84137..7deebc84e 100644
--- a/extra/giblib/PKGBUILD
+++ b/extra/giblib/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 68041 2010-02-10 15:14:45Z giovanni $
+# $Id: PKGBUILD 137679 2011-09-10 11:58:36Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=giblib
 pkgver=1.2.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A library that feh uses as a wrapper to imlib2"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/giblib/"
 license=('MIT')
 depends=('imlib2' 'libxext' 'freetype2')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/giblib/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ff61760ef73421c5f02d2f6c8d3ac913')
+source=("http://linuxbrit.co.uk/downloads/${pkgname}-${pkgver}.tar.gz")
+md5sums=('c810ef5389baf24882a1caca2954385e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" docsdir=/usr/share/doc/giblib install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" docsdir=/usr/share/doc/giblib install
 
   # Install custom license
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index 64be3c3b7..d23208e45 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37443 2009-05-01 20:50:35Z giovanni $
+# $Id: PKGBUILD 137758 2011-09-10 15:29:12Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmetadom
 pkgver=0.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ bindings for GDome2 DOM implementation"
 arch=('i686' 'x86_64')
 url="http://gmetadom.sourceforge.net/"
@@ -12,15 +12,20 @@ license=('LGPL')
 depends=('gdome2')
 makedepends=('pkgconfig' 'ocaml')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        gmetadom-0.2.6-gcc43.patch)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gmetadom-0.2.6-gcc43.patch')
 md5sums=('7bfb5d9c6f20ffa5e790b63d1f8cb481'
          'ea0271007f8650733029327823353d0d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gmetadom-0.2.6-gcc43.patch || return 1
+  patch -Np1 -i ${srcdir}/gmetadom-0.2.6-gcc43.patch
+  export LDFLAGS=${LDFLAGS/,--as-needed}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
 }
diff --git a/extra/gnome-speech/PKGBUILD b/extra/gnome-speech/PKGBUILD
index 81b95f890..686de821f 100644
--- a/extra/gnome-speech/PKGBUILD
+++ b/extra/gnome-speech/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 30819 2009-03-22 00:34:44Z jgc $
+# $Id: PKGBUILD 137673 2011-09-10 11:43:42Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-speech
 pkgver=0.4.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Text-to-Speech"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.gnome.org"
-depends=('libbonobo>=2.24.1')
+depends=('libbonobo')
 makedepends=('intltool' 'pkgconfig' 'espeak' 'java-access-bridge' 'openjdk6')
 optdepends=('espeak: Text to speech engine'
-	    'festival: Text to speech engine'
-	    'java-access-bridge: Speech support for java')
+            'festival: Text to speech engine'
+            'java-access-bridge: Speech support for java')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('89cbc23fc131c33396c0346085759f63')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gnome-vfsmm/PKGBUILD b/extra/gnome-vfsmm/PKGBUILD
index cb81726bd..c79065313 100644
--- a/extra/gnome-vfsmm/PKGBUILD
+++ b/extra/gnome-vfsmm/PKGBUILD
@@ -1,24 +1,28 @@
-#$Id: PKGBUILD 33797 2009-04-04 20:05:13Z jgc $
+#$Id: PKGBUILD 137756 2011-09-10 15:24:38Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnome-vfsmm
 pkgver=2.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for gnome-vfs."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gnome-vfs>=2.24.1' 'glibmm>=2.20.0')
+depends=('gnome-vfs' 'glibmm')
 makedepends=('pkgconfig' 'doxygen')
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d27d34b6a8722c557366729071c1baab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gnu-netcat/PKGBUILD b/extra/gnu-netcat/PKGBUILD
index 7a1868d37..a436a9d72 100644
--- a/extra/gnu-netcat/PKGBUILD
+++ b/extra/gnu-netcat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54891 2009-10-11 20:04:37Z giovanni $
+# $Id: PKGBUILD 137726 2011-09-10 14:19:00Z pierre $
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=gnu-netcat
 pkgver=0.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU rewrite of netcat, the network piping application"
 depends=('glibc' 'texinfo')
 arch=('i686' 'x86_64')
@@ -12,12 +12,16 @@ license=('GPL')
 replaces=('netcat')
 provides=('netcat')
 install=gnu-netcat.install
-source=(http://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2)
+source=("http://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2")
 md5sums=('0a29eff1736ddb5effd0b1ec1f6fe0ef')
 
 build() {
   cd "${srcdir}/netcat-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  make
+}
+
+package() {
+  cd "${srcdir}/netcat-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index e376be4fc..4ba3370bc 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129374 2011-06-27 05:53:20Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# $Id: PKGBUILD 137793 2011-09-11 03:49:47Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
-pkgver=0.7.2
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('31deeb7acb5104d56ba2ddeafd907513')
+md5sums=('f38e33a9bc644ec1dee50fdc3dfe4d69')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -26,10 +26,10 @@ build() {
 package () {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}}
-  install -t "$pkgdir/sbin" gdisk sgdisk fixparts
-  install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8
-  install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS
+  install -d "$pkgdir"/{sbin,usr/share/{doc/gdisk,man/man8}}
+  install -t "$pkgdir/sbin" gdisk cgdisk sgdisk fixparts
+  install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,cgdisk,sgdisk}.8
+  install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 622ab8eb0..9442d5ee0 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,39 +1,30 @@
-# $Id: PKGBUILD 51199 2009-09-05 20:11:42Z andyrtr $
+# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
-# build twice that pango-graphite can pickup the new libgraphite dependency - take care when .so names happen!
-
 pkgbase=graphite
 pkgname=('libgraphite' 'pango-graphite')
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://graphite.sil.org/"
 makedepends=('pango' 'gcc-libs')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz")
 md5sums=('d35724900f6a4105550293686688bbb3')
 
 build() {
   cd "${srcdir}/silgraphite-${pkgver}"
-  pushd engine
-    ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd
-  
-  pushd wrappers/pangographite
   ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd  
+  make
 }
 
 package_libgraphite() {
- pkgdesc="SILGraphite - a \"smart font\" rendering engine - the libs and headers"
- license=('custom_SIL Dual license')
- depends=('gcc-libs')
+  pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers'
+  license=('custom_SIL Dual license')
+  depends=('gcc-libs')
 
   cd "${srcdir}/silgraphite-${pkgver}"/engine
-  make DESTDIR="$pkgdir/" install || return 1
+  make DESTDIR="$pkgdir/" install
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
@@ -41,11 +32,11 @@ package_libgraphite() {
 }
 
 package_pango-graphite() {
- pkgdesc="SILGraphite support for pango"
- license=('LGPL')
- depends=('pango' 'libgraphite')
- install=pango-graphite.install
+  pkgdesc="SILGraphite support for pango"
+  license=('LGPL')
+  depends=('pango' 'libgraphite')
+  install=pango-graphite.install
  
   cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite
-  make DESTDIR="$pkgdir/" install || return 1
-}
\ No newline at end of file
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD
index 9cc95af96..904ab4eda 100644
--- a/extra/grip/PKGBUILD
+++ b/extra/grip/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 57044 2009-10-31 11:06:52Z allan $
+# $Id: PKGBUILD 137616 2011-09-10 05:34:08Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Todd Musall <tmusall@comcast.net>
 
 pkgname=grip
 pkgver=3.3.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A cd-player and ripper for the Gnome desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nostatic.org/grip/"
 depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia')
-install=grip.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4b4233999b9f2bc85c711092553ea9aa')
+optdepends=('yelp: to display the help and notices')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+        grip-3.3.1-invalid-genre-size.patch)
+md5sums=('4b4233999b9f2bc85c711092553ea9aa'
+         '046448be7d1580e86a2211cd8661d855')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/grip-3.3.1-invalid-genre-size.patch"
+  sed -i '/[.] conftest[.]id3/s: c: ./c:' configure 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/grip/grip-3.3.1-invalid-genre-size.patch b/extra/grip/grip-3.3.1-invalid-genre-size.patch
new file mode 100644
index 000000000..c826fc6e2
--- /dev/null
+++ b/extra/grip/grip-3.3.1-invalid-genre-size.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/285105
+
+--- grip-3.3.1/src/id3.c
++++ grip-3.3.1/src/id3.c
+@@ -252,8 +252,8 @@
+       
+       if ( frames[ i ] ) {
+ 	char *c_data = NULL;
+-	char gen[ 5 ] = "(   )";
+-	char trk[ 4 ] = "   ";
++	char gen[ 6 ] = "(   )"; /* max unsigned char: 255 */
++	char trk[ 3 ] = "  "; /* max CDDA tracks: 99 */
+ 	
+ 	switch( frameids[ i ] ) {
+ 	case ID3FID_TITLE:
+@@ -278,12 +278,12 @@
+ 	  
+ 	case ID3FID_CONTENTTYPE:
+ 	  c_data = gen;
+-	  sprintf( gen, "(%d)", genre ); /* XXX */
++	  snprintf( gen, 6, "(%d)", genre );
+ 	  break;
+ 	  
+ 	case ID3FID_TRACKNUM:
+ 	  c_data = trk;
+-	  sprintf( trk, "%d", tracknum ); /* XXX */
++	  snprintf( trk, 3, "%d", tracknum );
+ 	  break;
+ 	  
+ 	default:
diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD
index aa90a4bd9..9265e60dc 100644
--- a/extra/gtkglextmm/PKGBUILD
+++ b/extra/gtkglextmm/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 134258 2011-08-02 17:37:45Z jgc $
+# $Id: PKGBUILD 137781 2011-09-10 22:38:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=gtkglextmm
 pkgver=1.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Cpp C++ bindings for gtkglext"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
@@ -12,8 +13,8 @@ depends=('gtkmm' 'gtkglext')
 makedepends=('pkgconfig')
 options=('!libtool')
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2
-        gdkspanfunc.patch)
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
+        'gdkspanfunc.patch')
 md5sums=('27c05f4d45c5fd07b6fb0f044add3056'
          'd7c8ea33c748a6857ee629c16b2d9bff')
 
@@ -23,8 +24,12 @@ build() {
   # FS#24706
   patch -Np1 -i "${srcdir}/gdkspanfunc.patch"
 
+  # automake 1.8 fix
+  sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4
+
   ./configure --prefix=/usr \
-      --disable-gtkglext-test --disable-static
+              --disable-gtkglext-test \
+              --disable-static
   make
 }
 
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index 58e10f4df..4cad6bb07 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 42290 2009-06-12 15:51:28Z giovanni $
+# $Id: PKGBUILD 137761 2011-09-10 15:35:20Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtkmathview
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ rendering engine for MathML documents"
 arch=('i686' 'x86_64')
 url="http://helm.cs.unibo.it/mml-widget/"
 license=('GPL')
-depends=('popt' 'gtk2' 't1lib' 'gmetadom>=0.2.6')
+depends=('popt' 'gtk2' 't1lib' 'gmetadom')
 options=('!libtool')
-source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
-        gtkmathview-0.8.0-gcc44.patch
-        gtkmathview-0.8.0-cond-t1.patch)
+source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz"
+        'gtkmathview-0.8.0-gcc44.patch'
+        'gtkmathview-0.8.0-cond-t1.patch')
 md5sums=('b53564e553728d4b69f7d366dfeb5299'
          '9fd261db865336c89ebf0f3545af9bc4'
          'a79a27e00908e75712bc9453b669fe61')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch || return 1
-  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch || return 1
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
   ./configure --prefix=/usr \
               --sysconfdir=/etc
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
 }
 
diff --git a/extra/id3/PKGBUILD b/extra/id3/PKGBUILD
index 046797e07..6ef72b356 100644
--- a/extra/id3/PKGBUILD
+++ b/extra/id3/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 42386 2009-06-13 14:30:24Z giovanni $
+# $Id: PKGBUILD 137772 2011-09-10 18:35:00Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=id3
 pkgver=0.78
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility to edit id3v1 and id3v2 tags"
 arch=('i686' 'x86_64')
-license=('custom')
+url="http://freshmeat.net/projects/id3"
+license=('BSD')
 depends=('gcc-libs')
-source=(http://home.wanadoo.nl/squell/files/${pkgname}-${pkgver}.tar.gz
+options=('!makeflags')
+source=(http://linux-bsd-unix.strefa.pl/${pkgname}-${pkgver}.tar.gz
         id3-0.78-gcc44.patch)
-url="http://home.wanadoo.nl/squell/id3.html"
 md5sums=('bbc2a5d8022006330e6bb51034fafb43'
          '51370be8d2624efee3683efab608a7f1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch || return 1
-  make || return 1
-  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
 
   #install license
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD
index 4c1bc6460..6c705fef2 100644
--- a/extra/java-access-bridge/PKGBUILD
+++ b/extra/java-access-bridge/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 49735 2009-08-15 14:19:33Z jgc $
+# $Id: PKGBUILD 137749 2011-09-10 15:06:48Z pierre $
 # Maitnainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=java-access-bridge
 pkgver=1.26.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Java bindings for the GNOME accessibility framework"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.gnome.org"
-depends=('java-runtime' 'gtk2>=2.16.5' 'at-spi>=1.26.0' 'libbonobo>=2.24.1')
+depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo')
 makedepends=('intltool' 'pkgconfig' 'openjdk6' 'xorg-utils')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5f08bba19531954cec82df1bcdb89df67ee890a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index 8f56a93ed..87e5d2acb 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 133446 2011-07-28 00:46:22Z andrea $
+# $Id: PKGBUILD 137656 2011-09-10 10:56:33Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,7 +37,7 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD
index b5e1c67e8..3f0fb5aad 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD 18544 2008-11-06 23:58:14Z jgc $
+# $Id: PKGBUILD 137623 2011-09-10 08:28:05Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.ladspa.org/"
-depends=('gcc-libs>=4.3')
-source=(http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz
-	hardcode-path.patch)
+depends=('gcc-libs')
+source=("http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz"
+        'hardcode-path.patch')
 md5sums=('671be3e1021d0722cadc7fb27054628e'
          '27743258232d828575d66940e6de2858')
 
 build() {
   cd "${srcdir}/${pkgname}_sdk/src"
-  patch -Np1 -i "${srcdir}/hardcode-path.patch" || return 1
-  sed -i -e 's/mkdirhier/mkdir -p/' makefile || return 1
-  make targets || return 1
+  patch -Np1 -i "${srcdir}/hardcode-path.patch"
+  sed \
+    -e 's/mkdirhier/mkdir -p/' \
+    -e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \
+    -i makefile
+  make targets
+}
+
+package() {
+  cd "${srcdir}/${pkgname}_sdk/src"
   make INSTALL_PLUGINS_DIR="${pkgdir}/usr/lib/ladspa/" \
        INSTALL_INCLUDE_DIR="${pkgdir}/usr/include/" \
-       INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install || return 1
+       INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install
 }
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index be09dc29f..8d14fbd97 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -1,42 +1,57 @@
-# $Id: PKGBUILD 62257 2010-01-05 21:48:01Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 137646 2011-09-10 10:03:09Z andrea $
+# Maintainer:
+# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=2
+pkgrel=3
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64')
 url="http://www.lesstif.org/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-	LICENSE 040_fedora_XxxxProperty-64bit.diff)
-md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f'\
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE' '040_fedora_XxxxProperty-64bit.diff')
+md5sums=('754187dbac09fcf5d18296437e72a32f'
+         'b1f320192a9154f72d83e9d3d5a25a2f'
          '30e2c0babc84696af089d55cb9cb2908')
-sha1sums=('b894e544d529a235a6a665d48ca94a465f44a4e5' '5d7f38555417cb617d7d5b7e41a93af8430dc638'\
-         '85412aba25058110db8da99da4a2c5ab44330467')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../040_fedora_XxxxProperty-64bit.diff || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc \
-    --enable-production --enable-nonstandard-conversions --enable-editres \
-    --with-xdnd --enable-build-21 --disable-debug --enable-static || return 1
-
-# fix linkage against already installed version
-  perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool || return 1
-
-  make || return 1
-
-# fix linkage against already installed version
-  for f in `find . -name \*.la -type f` ; do
-    perl -pi -e 's/^(relink_command=.*)/# $1/' $f || return 1
-  done
-
-  make -C lib/Mrm-2.1 || return 1
-  make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install || return 1
-  make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+	cd "${srcdir}"/${pkgname}-${pkgver}
+	patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
+
+	./configure --prefix=/usr \
+      --mandir=/usr/share/man \
+	  --docdir=/usr/share/doc \
+      --enable-production \
+	  --enable-nonstandard-conversions \
+      --enable-editres \
+      --with-xdnd \
+      --enable-build-21 \
+      --disable-debug \
+	  --enable-static
+
+	# fix linkage against already installed version
+	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
+
+	make
+
+	# fix linkage against already installed version
+	for f in `find . -name \*.la -type f` ; do
+	    perl -pi -e 's/^(relink_command=.*)/# $1/' $f
+	done
+
+	make -C lib/Mrm-2.1
+}
+
+package() {
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
+	make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \
+	    DESTDIR=${pkgdir} install
+	install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD
index 1a359f48d..98a6836f5 100644
--- a/extra/libavc1394/PKGBUILD
+++ b/extra/libavc1394/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 37800 2009-05-03 21:23:26Z jgc $
+# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=libavc1394
-pkgver=0.5.3
-pkgrel=3
+pkgver=0.5.4
+pkgrel=1
 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands."
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/libavc1394/"
 license=('LGPL')
-depends=('libraw1394>=2.0.2')
+depends=('libraw1394')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz)
-md5sums=('09e30b1fb5ae455b6d8407e457a711a3')
+source=("http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz")
+md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index ca1479053..fef3e85b3 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 26935 2009-02-14 19:49:35Z jgc $
+# $Id: PKGBUILD 137630 2011-09-10 08:40:20Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=libcroco
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME CSS2 parsing and manipulation toolkit"
 arch=('x86_64' 'i686')
-depends=('glib2>=2.18.4' 'libxml2>=2.7.3')
+depends=('glib2' 'libxml2')
 makedepends=('intltool' 'pkgconfig')
 license=('LGPL')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2")
 url="http://www.gnome.org"
 md5sums=('1429c597aa4b75fc610ab3a542c99209')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index 5a8e195d2..bc42228f3 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 49760 2009-08-15 15:07:38Z jgc $
+# $Id: PKGBUILD 137736 2011-09-10 14:39:31Z pierre $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libdca
 pkgver=0.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.videolan.org/developers/libdca.html"
-source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+depends=('sh')
 provides=('libdts')
 replaces=('libdts')
 options=('!libtool' '!emptydirs')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('dab6b2795c66a82a6fcd4f8343343021')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1
-  ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz" || return 1
-  ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz" || return 1
+  ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz"
+  ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz"
+  # remove dangling symlink
+  rm "${pkgdir}/usr/lib/libdts.a"
 }
diff --git a/extra/libgnomecanvasmm/PKGBUILD b/extra/libgnomecanvasmm/PKGBUILD
index dcb7eccb0..4cde2b6fa 100644
--- a/extra/libgnomecanvasmm/PKGBUILD
+++ b/extra/libgnomecanvasmm/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 33795 2009-04-04 20:02:36Z jgc $
+# $Id: PKGBUILD 137754 2011-09-10 15:22:05Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=libgnomecanvasmm
 pkgver=2.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for libgnomecanvas."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gtkmm>=2.16.0' 'libgnomecanvas>=2.26.0')
+depends=('gtkmm' 'libgnomecanvas')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('a148c99311d46397de6e4a31736771ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD
index c74560069..84d11dbad 100644
--- a/extra/libshout/PKGBUILD
+++ b/extra/libshout/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 37197 2009-05-01 03:19:30Z eric $
+# $Id: PKGBUILD 137685 2011-09-10 12:10:13Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=libshout
 pkgver=2.2.2
-pkgrel=3
+pkgrel=4
+epoch=1
 pkgdesc="Library for accessing a shoutcast/icecast server"
 arch=('i686' 'x86_64')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
-options=('!libtool' 'force')
+options=('!libtool' '!emptydirs')
 license=('LGPL')
-source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4f75fc9901c724b712c371c9a1e782d3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make LDFLAGS+=-lspeex || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make LDFLAGS+=-lspeex
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD
index 753cfd194..43a8267d0 100644
--- a/extra/libsigsegv/PKGBUILD
+++ b/extra/libsigsegv/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 31137 2009-03-24 15:49:35Z ronald $
+# $Id: PKGBUILD 137667 2011-09-10 11:21:14Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Johannes Weiner <hannes@saeurebad.de>
 
 pkgname=libsigsegv
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 pkgdesc="Page fault detection library"
 url="http://libsigsegv.sourceforge.net/"
 license=('GPL2')
 depends=('glibc')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7e24993730649d13c6eabc28bd24de35')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 107b62f24..08f0a1dac 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123180 2011-05-09 03:18:04Z eric $
+# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64')
 url="http://etla.net/libstroke/"
@@ -11,18 +11,23 @@ license=('GPL2')
 depends=('glibc')
 makedepends=('libx11' 'gtk')
 options=('!libtool')
-source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch)
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \
+        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \
+        libstroke-0.5.1-m4_syntax.patch)
 md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
          '60bbaf355355c3c66c8015b0f7feca85'
-         '96413a77e1d39d1a3223e8eb6be8ef01')
+         '96413a77e1d39d1a3223e8eb6be8ef01'
+         '93c47eef46a0cc4011a246485c5a6620')
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
-          'ee5a3635c31dba00b070a942c512cc0d53056188')
+          'ee5a3635c31dba00b070a942c512cc0d53056188'
+          'c9240937776b0572e3927e1c56d78309413c5209')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../libgstroke-Makefile.am.patch
   patch -p1 < ../libstroke-Makefile.am.patch
+  patch -p1 < ../libstroke-0.5.1-m4_syntax.patch
 
   libtoolize --force --copy
   aclocal
diff --git a/extra/libstroke/libstroke-0.5.1-m4_syntax.patch b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch
new file mode 100644
index 000000000..70bb720ee
--- /dev/null
+++ b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch
@@ -0,0 +1,58 @@
+--- libstroke-0.5.1/libstroke.m4	{cset 02bc4a5e-e9e6-4055-a406-5007a0ac3e55}
++++ libstroke-0.5.1/libstroke.m4	{local clone}
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])
+--- libstroke-0.5.1/libgstroke.m4	2011-09-10 02:59:55.000000000 -0400
++++ libstroke-0.5.1/libgstroke.m4	2011-09-10 03:01:14.000000000 -0400
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])
diff --git a/extra/libytnef/PKGBUILD b/extra/libytnef/PKGBUILD
index 8a48bb88e..5516bb5ee 100644
--- a/extra/libytnef/PKGBUILD
+++ b/extra/libytnef/PKGBUILD
@@ -1,22 +1,27 @@
 # $Id: $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andre Klitzing <aklitzing () online () de>
+
 pkgname=libytnef
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
 url="http://freshmeat.net/projects/ytnef/"
 license=('GPL')
-arch=(i686 x86_64)
-options=(!libtool)
+arch=('i686' 'x86_64')
+options=('!libtool')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6c44b955f33cf714c75a7bbe895cc352')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/lib/libytnef.a"
 }
diff --git a/extra/lxsplit/PKGBUILD b/extra/lxsplit/PKGBUILD
index cfc838f3c..86d8a1a11 100644
--- a/extra/lxsplit/PKGBUILD
+++ b/extra/lxsplit/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 26529 2009-02-08 21:47:07Z eric $
+# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lxsplit
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version"
 arch=('i686' 'x86_64')
 url="http://lxsplit.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-#source=(http://www.freebyte.com/download/$pkgname.tar.gz)
-source=(http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz")
 md5sums=('ed21a08c167c08d4d81c820782947cb1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   install -d ${pkgdir}/usr/bin
-  make || return 1
-  make INSTALL_PATH=${pkgdir}/usr/bin install || return 1
+  make INSTALL_PATH=${pkgdir}/usr/bin install
 }
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 2e859b3a3..156688814 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 137569 2011-09-09 19:59:53Z ronald $
+# $Id: PKGBUILD 137636 2011-09-10 09:15:43Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced open-source document processor."
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs')
-makedepends=('boost' 'libmythes')
+depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
+makedepends=('boost')
 license=('GPL')
 source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz \
-        lyx.desktop)
+        lyx.desktop lyxrc.dist)
+backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
 sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad')
-
+          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
+          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
+	
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
@@ -35,5 +37,9 @@ package() {
 
   # install desktop entry
   install -Dm644 "${srcdir}/lyx.desktop" "${pkgdir}/usr/share/applications/lyx.desktop"
+
+  # install default config file
+  install -Dm644 ${srcdir}/lyxrc.dist ${pkgdir}/etc/lyx/lyxrc.dist
+  ln -sf /etc/lyx/lyxrc.dist ${pkgdir}/usr/share/lyx/lyxrc.dist
 }
 
diff --git a/extra/lyx/lyxrc.dist b/extra/lyx/lyxrc.dist
new file mode 100644
index 000000000..dd18694f9
--- /dev/null
+++ b/extra/lyx/lyxrc.dist
@@ -0,0 +1,14 @@
+### This file is part of
+### ========================================================
+###          LyX, The Document Processor
+###
+###          Copyright 1995 Matthias Ettrich
+###          Copyright 1995-2011 The LyX Team.
+###
+### ========================================================
+
+# The file lyxrc.dist gives initial global options for all LyX users.
+# Almost all settings here can be overridden through the preferences in LyX.
+
+\thesaurusdir_path "/usr/share/mythes"
+\hunspelldir_path "/usr/share/myspell"
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index 4f583586b..04a0e6223 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 29372 2009-03-08 13:20:31Z jgc $
+# $Id: PKGBUILD 137665 2011-09-10 11:18:34Z pierre $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
+
 pkgname=mcpp
 pkgver=2.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Matsui's CPP implementation precisely conformed to standards"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://mcpp.sourceforge.net"
-depends=(glibc)
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-	namlen.patch)
+depends=('glibc')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 
+        'namlen.patch')
 md5sums=('512de48c87ab023a69250edc7a0c7b05'
-	 '0bfc6177a58e912a9e23e368578dd3fe')
+         '0bfc6177a58e912a9e23e368578dd3fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/namlen.patch" || return 1
-  ./configure --prefix=/usr --enable-mcpplib --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/namlen.patch"
+  ./configure --prefix=/usr --enable-mcpplib --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -sf ../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+  ln -sf ../../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 78957391c..1f9339602 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 54835 2009-10-11 19:46:55Z giovanni $
+# $Id: PKGBUILD 137711 2011-09-10 13:12:33Z pierre $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-#
 
 pkgname=metalog
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Metalog is a modern replacement for syslogd and klogd"
-arch=(i686 x86_64)
+url="http://metalog.sourceforge.net"
+license=('GPL')
+arch=('i686' 'x86_64')
 depends=('pcre')
-makedepends=('xz-utils') 
 provides=('logger')
-backup=(etc/metalog.conf etc/conf.d/metalog)
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma 
-\
-    metalog metalog.confd)
-md5sums=('df4ec89f6a0df24a43f9592ee80ab6be' 'cdd1d34eedbfbc2d9e659bf0a0f58f56'\
+backup=('etc/metalog.conf' 'etc/conf.d/metalog')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma"
+        'metalog' 'metalog.confd')
+md5sums=('df4ec89f6a0df24a43f9592ee80ab6be'
+         'cdd1d34eedbfbc2d9e659bf0a0f58f56'
          '86bccd5a02996921e29eff8a0394d11f')
-license=(GPL)
-url="http://metalog.sourceforge.net"
 
 build() {
-  # WTF: Upstream doesn't provide gzip/bz2 compressed archives
-  lzma -d -c $startdir/src/${pkgname}-1.tar.lzma | tar xf - -C $startdir/src
-  cd $startdir/src/$pkgname-1
+  cd $srcdir/$pkgname-1
   ./configure --prefix=/usr --sysconfdir=/etc
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /bin/install -D -m755 $startdir/src/metalog $startdir/pkg/etc/rc.d/metalog
-  /bin/install -D -m644 $startdir/src/metalog.confd $startdir/pkg/etc/conf.d/metalog
-  /bin/install -D -m644 metalog.conf $startdir/pkg/etc/metalog.conf
+  make
 }
 
-# vim: ts=2: ft=sh
+package() {
+  cd $srcdir/$pkgname-1
+  make DESTDIR=$pkgdir install
+  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
+  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
+  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
+}
diff --git a/extra/mp3wrap/PKGBUILD b/extra/mp3wrap/PKGBUILD
index 897198812..bb42cbb1c 100644
--- a/extra/mp3wrap/PKGBUILD
+++ b/extra/mp3wrap/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 27742 2009-02-25 05:39:42Z eric $
+# $Id: PKGBUILD 137634 2011-09-10 09:03:14Z pierre $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3wrap
 pkgver=0.5
-pkgrel=2
-pkgdesc="Tool for wrapping mp3 files --- free independent alternative to AlbumWrap"
+pkgrel=3
+pkgdesc="Tool for wrapping mp3 files. A free independent alternative to AlbumWrap"
 arch=('i686' 'x86_64')
 url="http://mp3wrap.sourceforge.net"
 license=('LGPL')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/mp3wrap/mp3wrap-$pkgver-src.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/mp3wrap/mp3wrap-$pkgver-src.tar.gz")
 md5sums=('096b46295cbe3ee2f02ca7792517dc36')
 
 build() {
   cd $srcdir/mp3wrap-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd $srcdir/mp3wrap-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/extra/naim/PKGBUILD b/extra/naim/PKGBUILD
index a6be5dcb1..d09e33ed7 100644
--- a/extra/naim/PKGBUILD
+++ b/extra/naim/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 31166 2009-03-24 21:08:09Z tpowa $
+# $Id: PKGBUILD 137675 2011-09-10 11:46:52Z pierre $
 # Maintainer: dorphell <dorphell@archlinux.org>
+
 pkgname=naim
 pkgver=0.11.8.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An ncurses AOL Instant Messenger and IRC client."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://naim.n.ml.org"
 depends=('ncurses')
-source=(http://naim.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-options=(!makeflags)
+source=("http://naim.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
+options=("!makeflags")
+md5sums=('c9622e3f75d56310829f98fa4dae1f78')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
-md5sums=('c9622e3f75d56310829f98fa4dae1f78')
diff --git a/extra/ogmtools/PKGBUILD b/extra/ogmtools/PKGBUILD
index f63436582..680260b06 100644
--- a/extra/ogmtools/PKGBUILD
+++ b/extra/ogmtools/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 68086 2010-02-10 17:57:04Z giovanni $
+# $Id: PKGBUILD 137699 2011-09-10 12:46:29Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ogmtools
 pkgver=1.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Information, extraction or creation for OGG media streams"
 arch=('i686' 'x86_64')
 url="http://www.bunkus.org/videotools/ogmtools"
 license=('GPL')
 depends=('libvorbis' 'libdvdread' 'gcc-libs')
-source=(http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=("http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('02d356e3d21d53b1d9715bab223d8996')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 087da2f78..6d8331004 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: $
+# $Id: PKGBUILD 137660 2011-09-10 10:58:56Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=openjpeg
-pkgver=1.3
-_pkgver=v1_3
-pkgrel=3
+pkgver=1.4
+_pkgver=v1_4
+_revision=r697
+pkgrel=1
 pkgdesc="An open source JPEG 2000 codec"
 arch=(i686 x86_64)
 license=('BSD')
 url="http://www.openjpeg.org"
-depends=('glibc')
-source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz
-	30_fix_build_for_debian.dpatch)
-md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9'
-	 '2557f485513e77f6dcea77f4741c4fa1')
+depends=('zlib')
+source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz
+	openjpeg-1.4-autoconf.patch)
+md5sums=('7870bb84e810dec63fcf3b712ebb93db'
+         '46d1d26b59ce546444f3fe8d7c685775')
+
+options=('!makeflags' '!libtool')
 
 build() {
-  cd "${srcdir}/OpenJPEG_${_pkgver}"
-  patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+  patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch
+  # make sure we use system libs
+  rm -rf libs
+  ./configure --prefix=/usr \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
-  tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE"
 }
diff --git a/extra/openjpeg/openjpeg-1.4-autoconf.patch b/extra/openjpeg/openjpeg-1.4-autoconf.patch
new file mode 100644
index 000000000..988b72b7d
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.4-autoconf.patch
@@ -0,0 +1,78 @@
+diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am
+--- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:47.000000000 -0600
++++ openjpeg_v1_4_sources_r697/doc/Makefile.am	2011-01-12 12:12:20.959518549 -0600
+@@ -20,30 +20,30 @@ all-local:
+ 	@cp man/man3/* .
+ 
+ install-data-hook:
+-	$(INSTALL) -d $(doc_dir)
+-	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
++	$(INSTALL) -d $(DESTDIR)$(doc_dir)
++	$(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3
+ if with_libjpwl
+-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+-	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+ endif
+-	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+-	@(cd ${mandir}/man3 && $(RM) libopenjpeg* )
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* )
+ 	@gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
+-	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
+-	@cp libopenjpeg.3.gz ${mandir}/man3
++	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1
++	@cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3
+ 	@$(RM) *\.gz
+ if with_libjpwl
+-	@(cd ${mandir}/man1 && \
++	@(cd $(DESTDIR)${mandir}/man1 && \
+ 	$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
+ 	$(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
+ 	@(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
+ endif
+-	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
++	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir)
+ 
+ uninstall-hook:
+-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+ 	$(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+-	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
+ 	$(RM) libopenjpeg* )
+-	@(cd $(doc_dir) && $(RM) * )
+-	@rmdir $(doc_dir)
++	@(cd $(DESTDIR)$(doc_dir) && $(RM) * )
++	@rmdir $(DESTDIR)$(doc_dir)
+diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am
+--- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:55.000000000 -0600
++++ openjpeg_v1_4_sources_r697/Makefile.am	2011-01-12 12:15:37.006321242 -0600
+@@ -9,7 +9,7 @@ clean-local:
+ 
+ distclean-local: clean-local
+ 
+-pkgconf_dir = /usr/lib/pkgconfig
++pkgconf_dir = $(libdir)/pkgconfig
+ 
+ install-data-hook:
+ 	@echo ""
+@@ -17,12 +17,12 @@ install-data-hook:
+ 	cat $$f/.report.txt ; \
+ 	done
+ 	@echo ""
+-	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
++	@echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)"
+ 	@echo ""
+-	@$(INSTALL) -d $(pkgconf_dir)
+-	@cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
+-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
++	@$(INSTALL) -d $(DESTDIR)$(pkgconf_dir)
++	@cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc
++	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \
+ 	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
+ 
+ uninstall-hook:
+-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
++	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 758a6b582..acb5e1164 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130693 2011-07-07 17:38:24Z andyrtr $
+# $Id: PKGBUILD 137658 2011-09-10 10:56:37Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.16.7
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
diff --git a/extra/setserial/PKGBUILD b/extra/setserial/PKGBUILD
index fea301684..590fa8003 100644
--- a/extra/setserial/PKGBUILD
+++ b/extra/setserial/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 68104 2010-02-10 18:44:17Z giovanni $
+# $Id: PKGBUILD 137681 2011-09-10 12:01:21Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=setserial
 pkgver=2.17
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows to change various attributes of a serial device"
 arch=('i686' 'x86_64')
 url="http://setserial.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        $pkgname.patch)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "$pkgname.patch")
 md5sums=('c4867d72c41564318e0107745eb7a0f2'
          '99919d3be7c1550721494070a7ace66a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i ../$pkgname.patch || return 1
+  patch -Np1 -i ../$pkgname.patch
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man || return 1
-  make || return 1
+              --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -d ${pkgdir}/usr/{bin,share/man/man8}
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD
index 0045d6837..d43d6621f 100644
--- a/extra/xcb-util/PKGBUILD
+++ b/extra/xcb-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 50472 2009-08-27 18:32:48Z ronald $
+# $Id: PKGBUILD 137766 2011-09-10 16:41:45Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=xcb-util
 pkgver=0.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility libraries for XC Binding"
 arch=('i686' 'x86_64')
 url="http://xcb.freedesktop.org"
@@ -12,15 +12,21 @@ license=('custom')
 depends=('libxcb>=1.4')
 makedepends=('gperf')
 options=('!libtool')
-source=(http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2
-        LICENSE)
+source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE')
 md5sums=('dd8968b8ee613cb027a8ef1fcbdc8fc9'
          '2672c2e72dedb40f773e989dd622f298')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD
new file mode 100644
index 000000000..009b4cd14
--- /dev/null
+++ b/gnome-unstable/gnome-documents/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 137662 2011-09-10 11:05:53Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=gnome-documents
+pkgver=0.1.91
+pkgrel=1
+pkgdesc="Documents Manager for GNOME"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL')
+groups=('gnome-extra')
+depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop'
+         'gnome-online-accounts' 'libgdata' 'tracker')
+makedepends=('intltool' 'vala')
+install=gnome-documents.install
+source=(http://download.gnome.org/sources/$pkgname/0.1/$pkgname-$pkgver.tar.xz)
+sha256sums=('b2180d86f4c162903d2e30300271f6f03b6bc351c0addb664b7ba04341c2f3b6')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/gnome-documents
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install
new file mode 100644
index 000000000..95114273e
--- /dev/null
+++ b/gnome-unstable/gnome-documents/gnome-documents.install
@@ -0,0 +1,13 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  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/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD
new file mode 100644
index 000000000..c46709460
--- /dev/null
+++ b/gnome-unstable/tracker/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 137747 2011-09-10 15:05:23Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+
+pkgbase=tracker
+pkgname=(tracker libtracker-sparql)
+pkgver=0.12.0
+_tver=${pkgver%.*}
+pkgrel=3
+pkgdesc="All-in-one indexer, search tool and metadata database"
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
+             'poppler-glib' 'libgsf' 'icu' 'enca' 'xdg-utils'
+             'networkmanager' 'gobject-introspection' 'intltool' 'giflib'
+             'gstreamer0.10-base' 'totem-plparser' 'evolution' 'taglib'
+             'nautilus' 'gnome-panel' 'firefox' 'thunderbird' 'libvorbis'
+             'flac' 'vala')
+url="http://www.gnome.org"
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
+sha256sums=('6819b5fbbcaa14ac004759e4b25962f8ef36f2c4b37908a32fcf6d7a22e5b261')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  _ffdir=/usr/lib/firefox-6.0.2/extensions
+  _tbdir=/usr/lib/thunderbird-6.0.2/extensions
+
+  # Force vala regeneration
+  find . -name '*.stamp' -delete
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/tracker \
+    --disable-unit-tests \
+    --enable-libflac \
+    --enable-libvorbis \
+    --with-firefox-plugin-dir=$_ffdir \
+    --with-thunderbird-plugin-dir=$_tbdir
+
+  make
+}
+
+package_tracker() {
+  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
+           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
+           'xdg-utils' 'networkmanager')
+  optdepends=('giflib: extractor for GIF data'
+              'gstreamer0.10-base: video extractor'
+              'totem-plparser: playlist support'
+              'evolution: Evolution email data miner'
+              'firefox: Firefox data miner'
+              'thunderbird: Thunderbird data miner'
+              'nautilus: nautilus-extension'
+              'libvorbis: Vorbis metadata extractor'
+              'flac: FLAC metadata extractor'
+              'taglib: writeback for audio files'
+              'gnome-panel: tracker-search-bar')
+  groups=('gnome-extra')
+  install=tracker.install
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+### Split libtracker-sparql
+
+  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
+  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
+  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
+
+  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
+
+  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
+    "$srcdir/sparql/usr/lib/tracker-$_tver"
+
+  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
+    "$srcdir/sparql/usr/share/vala/vapi"
+
+  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
+  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
+  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
+  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
+}
+
+package_libtracker-sparql() {
+  pkgdesc="$pkgdesc (SPARQL library)"
+  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+
+  mv "$srcdir"/sparql/* "$pkgdir"
+}
diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install
new file mode 100644
index 000000000..95114273e
--- /dev/null
+++ b/gnome-unstable/tracker/tracker.install
@@ -0,0 +1,13 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  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/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD
index 6ace33ee4..8900a4465 100644
--- a/multilib/lib32-libpng/PKGBUILD
+++ b/multilib/lib32-libpng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 37276 2011-01-13 18:48:07Z bluewind $
+# $Id: PKGBUILD 55366 2011-09-10 11:13:13Z pschmitz $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
@@ -6,8 +6,8 @@
 
 _pkgbasename=libpng
 pkgname=lib32-$_pkgbasename
-pkgver=1.4.5
-_apngver=1.4.5
+pkgver=1.4.8
+_apngver=1.4.7
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
 arch=('x86_64')
@@ -18,8 +18,8 @@ makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('37d420c7d8294aac438c150bb4335901'
-         '459affb0ac7e0f1ae4d99b88234cb3db')
+md5sums=('2ce595d571f2b06a9403ed5bcfa4ecbd'
+         '4842a4cba3487a64084ca0a7417ff1c7')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 023e8b0a9..68d45070a 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 54822 2011-08-26 18:44:09Z svenstaro $
+# $Id: PKGBUILD 55338 2011-09-10 05:09:58Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.3.27
+pkgver=1.3.28
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('d717ecec6959d8cab194c61c29c3dcdf')
+md5sums=('70574d609161cec8523804cd9364bcd2')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD
new file mode 100644
index 000000000..aad1e29fe
--- /dev/null
+++ b/testing/libnl/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 137671 2011-09-10 11:33:31Z pierre $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=libnl
+pkgver=1.1
+pkgrel=3
+pkgdesc="Library for applications dealing with netlink sockets"
+arch=('i686' 'x86_64')
+url="http://www.infradead.org/~tgr/libnl/"
+license=('GPL')
+depends=('glibc')
+source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz"
+        'fix-compilation.patch')
+md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
+         'e1f5e82c8aa1b3ad025c7b588178de1e')
+
+build() {
+  cd ${srcdir}/libnl-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-compilation.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/libnl-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/libnl/fix-compilation.patch b/testing/libnl/fix-compilation.patch
new file mode 100644
index 000000000..891562a39
--- /dev/null
+++ b/testing/libnl/fix-compilation.patch
@@ -0,0 +1,10 @@
+--- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
diff --git a/testing/mkinitcpio-nfs-utils/PKGBUILD b/testing/mkinitcpio-nfs-utils/PKGBUILD
new file mode 100644
index 000000000..c52986246
--- /dev/null
+++ b/testing/mkinitcpio-nfs-utils/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 137669 2011-09-10 11:25:12Z pierre $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=mkinitcpio-nfs-utils
+pkgver=0.2
+pkgrel=2
+pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/"
+license=('GPL2')
+depends=('glibc')
+source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}