Tue May 17 22:43:03 UTC 2011

20 files changed, 171 insertions, 155 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 724a4f824..cb362d105 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z giovanni $
+# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10552
+pkgver=10561
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('b3685a792e92c2900dbb3eaeba7cc65d')
+md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD
index 34012adae..7c2b457ca 100644
--- a/extra/arj/PKGBUILD
+++ b/extra/arj/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 49803 2009-08-16 14:37:35Z jgc $
-# Maintainer: Travis Willard <travisw@wmpub.ca>
+# $Id: PKGBUILD 124090 2011-05-16 15:11:39Z andrea $
+# Maintainer:
+# Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Gergely Tamas <dice@mfa.kfki.hu>
 
 pkgname=arj
 pkgver=3.10.22
-pkgrel=5
+pkgrel=6
 pkgdesc="Free and portable clone of the ARJ archiver"
 url="http://arj.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
+options=('!makeflags')
 depends=('glibc')
-makedepends=('autoconf')
-options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
         001_arches_align.patch
         002_no_remove_static_const.patch
         003_64_bit_clean.patch
@@ -22,33 +22,28 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3'
          '395dfa8cc500ffae648777f8f241be88'
          '56b3cf96ec485b0d824761457417fcc0'
          '4630a7254dfc6c8d8c7e696aa4a58f4a')
-sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b'
-          '7f8904f8c89bacbbeec8c431d627efbb8da2f259'
-          '919a3c02a1e039803502c21175d69f7703d13026'
-          'd506338e34b40ef5cac6ec14c858fd651a354aaf'
-          '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Add gentoo patches
-  patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1
-  patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1
-  patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1
-  patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1
+  patch -p1 -i "${srcdir}/001_arches_align.patch"
+  patch -p1 -i "${srcdir}/002_no_remove_static_const.patch"
+  patch -p1 -i "${srcdir}/003_64_bit_clean.patch"
+  patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch"
 
-  # Build!
   cd gnu
-  aclocal || return 1
-  autoconf || return 1
+  aclocal
+  autoconf
   rm -f config.{guess,sub}
-  _autover=$(automake --version | head -n1 | awk '{ print $4 }')
-  cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1
-  ./configure --prefix=/usr || return 1
+  cp /usr/share/automake-1.11/config.{guess,sub} .
+  ./configure --prefix=/usr
   cd ..
-  make prepare || return 1
-  make || return 1
+  make prepare
+  make
+}
 
-  # Install!
-  make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD
index 0acf34868..8bd23555e 100644
--- a/extra/cairomm/PKGBUILD
+++ b/extra/cairomm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109789 2011-02-12 19:30:52Z ibiru $
+# $Id: PKGBUILD 124057 2011-05-16 10:35:03Z jgc $
 # Maintainer: Kevin <kevin@archlinux.org>
 # Contributor: criminy <criminy@gmail.com>
 
 pkgname=cairomm
-pkgver=1.9.8
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="C++ bindings to Cairo vector graphics library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('cairo' 'libsigc++')
 makedepends=('pkgconfig')
 source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool' '!emptydirs')
-md5sums=('6d5ce1138dbb09c58038ab6f766d5e88')
+sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index 317e30290..5caa4b2f1 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 49847 2009-08-16 18:36:23Z jgc $
-# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# $Id: PKGBUILD 124095 2011-05-16 15:14:02Z andrea $
+# Maintainer:
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cvsps
 pkgver=2.1
-pkgrel=2
-pkgdesc="Generating 'patchset' information from a CVS repository."
+pkgrel=3
+pkgdesc="Generating 'patchset' information from a CVS repository"
 url="http://www.cobite.com/cvsps/"
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64')
 depends=('zlib')
-source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=/usr || return 1
-  make prefix="${pkgdir}/usr" install || return 1
+  make prefix=/usr
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD
index 83615cc69..1b4bf6abe 100644
--- a/extra/fam/PKGBUILD
+++ b/extra/fam/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 42581 2009-06-16 05:20:11Z tpowa $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $
+# Maintainer:
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fam
 pkgver=2.7.0
-pkgrel=14
+pkgrel=15
 pkgdesc="File Alteration Monitor"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('rpcbind' 'gcc-libs' 'bash')
 url="http://oss.sgi.com/projects/fam/"
-backup=(etc/fam/fam.conf)
+backup=('etc/fam/fam.conf')
 options=('!makeflags') # Don't !libtool
 source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
 	fam-2.7.0-dnotify.patch
@@ -23,25 +24,29 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39'
          '47b41e0b0498793af004696a096d7da1'
          '2638b8ffacb9f03b6e438e08ea7b290a'
          'fc0cabc0ac4f819680401eb3090c29c9'
-         '0b4dd9894ccc03f57787f9dfc0a7bd6f')
+         '92a37f9eb6ad0e60ded9c70e9ad93a88')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1
-  patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1
-  patch -Np0 -i ${srcdir}/fam-2.7.0-limits.patch || return 1
-  patch -Np1 -i ${srcdir}/fam-2.7.0-buildfixes.patch || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch
+  patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch
+  patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch
+  patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch
 
-  chmod 755 configure || return 1
+  chmod 755 configure
 
-  autoheader || return 1
-  aclocal || return 1
-  automake -a -c || return 1
-  autoconf || return 1
-  libtoolize --copy --force || return 1
+  autoheader
+  aclocal
+  automake -a -c
+  autoconf
+  libtoolize --copy --force
 
   ./configure --prefix=/usr --sysconfdir=/etc/fam
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  install -D -m755 ../fam ${pkgdir}/etc/rc.d/fam
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam
 }
diff --git a/extra/fam/fam b/extra/fam/fam
index 53dd2a4a6..5fc54a6df 100755
--- a/extra/fam/fam
+++ b/extra/fam/fam
@@ -9,7 +9,7 @@ case "$1" in
     #Check for running portmap, start when not running
     ck_daemon rpcbind && /etc/rc.d/rpcbind start
     stat_busy "Starting File Alteration Monitor"
-    if [ ! -f /var/run/daemons/rpcbind ]; then
+    if ck_daemon rpcbind; then
       stat_fail
       echo "ERROR: rpcbind is not running"
       exit 1
diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD
index 1ec025127..e25c5dd47 100644
--- a/extra/farsight2/PKGBUILD
+++ b/extra/farsight2/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 111877 2011-03-01 15:02:05Z ibiru $
+# $Id: PKGBUILD 124105 2011-05-16 15:51:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: William Díaz <wdiaz@archlinux.us>
 
 pkgname=farsight2
-pkgver=0.0.26
+pkgver=0.0.28
 pkgrel=1
 pkgdesc="Audio/Video conference software for Instant Messengers"
 arch=('i686' 'x86_64')
 url="http://farsight.freedesktop.org"
 license=('LGPL')
-depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-python' 'python2' 'pygobject')
-optdepends=('gstreamer0.10-good-plugins: for RTP plugin'
-            'gstreamer0.10-bad-plugins: for RTP plugin')
+depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-python' 'pygobject')
 options=('!libtool' '!emptydirs')
 source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7756d910687dd2abd455fd68e83f125c')
+md5sums=('38767e775067270754a32aaf8e3a7db1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's#python-config#python2-config#' python/Makefile.in
   ./configure --prefix=/usr \
       --with-package-name='Arch Linux farsight2 package' \
       --with-package-origin='http://archlinux.org' \
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 9da2ea890..e5f2470f3 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 116996 2011-03-27 12:25:01Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org
+# $Id: PKGBUILD 124135 2011-05-16 17:24:42Z foutrelis $
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
+
 pkgname=gptfdisk
 pkgver=0.7.1
-pkgrel=1
-pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks."
+pkgrel=2
+pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64')
-url="http://www.rodsbooks.com/gdisk"
+url="http://www.rodsbooks.com/gdisk/"
+license=('GPL2')
 depends=('gcc-libs' 'util-linux' 'popt' 'icu')
+provides=('gdisk')
+conflicts=('gdisk')
 replaces=('gdisk')
-license=('GPL2')
-source=(http://www.rodsbooks.com/gdisk/$pkgname-$pkgver.tgz)
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz)
+md5sums=('7c8d810df61e81c821bef399b832e89e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+  
   make
 }
 
 package () {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m755 gdisk $pkgdir/sbin/gdisk
-  install -D -m755 sgdisk $pkgdir/sbin/sgdisk
-  install -D -m755 fixparts $pkgdir/sbin/fixparts
-  install -D -m644 gdisk.8 $pkgdir/usr/share/man/man8/gdisk.8
-  install -D -m644 sgdisk.8 $pkgdir/usr/share/man/man8/sgdisk.8
-  install -D -m644 README $pkgdir/usr/share/gdisk/README
-  install -D -m644 NEWS pkgdir/usr/share/gdisk/NEWS
+  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
 }
-md5sums=('7c8d810df61e81c821bef399b832e89e')
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index ff6f6b65a..f1bb35503 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 117562 2011-04-04 10:54:18Z jgc $
+# $Id: PKGBUILD 124029 2011-05-16 08:07:30Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=('gstreamer0.10-base')
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
-pkgver=0.10.32
-pkgrel=4
+pkgver=0.10.34
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10>=0.10.32' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'udev' 'gobject-introspection')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.34' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2)
-md5sums=('2920af2b3162f3d9fbaa7fabc8ed4d38')
+sha256sums=('7f347a60cd4317c7ea44c23e52d6e6233d2fa278b3fe3df7cbefe2bc2e253989')
 
 build() {
   cd "${srcdir}/gst-plugins-base-${pkgver}"
@@ -28,7 +28,7 @@ build() {
 
 package_gstreamer0.10-base() {
   pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
-  depends=('gstreamer0.10>=0.10.32' 'orc' 'libxv' 'udev')
+  depends=('gstreamer0.10>=0.10.34' 'orc' 'libxv')
 
   cd "${srcdir}/gst-plugins-base-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index 5b28aef7c..98528c8c1 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $
+# $Id: PKGBUILD 124034 2011-05-16 08:41:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
-pkgver=0.10.28
+pkgver=0.10.29
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool !emptydirs)
 source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
-md5sums=('6ef1588921f59d85c44ee2e49a3c97a0')
+sha256sums=('466a64dcb580d4feef701abfc90656abb3558a2e3fc1e40e43977034bebc354c')
 
 build() {
   cd "${srcdir}/gst-plugins-good-${pkgver}"
@@ -29,9 +29,8 @@ build() {
 }
 
 package_gstreamer0.10-good() {
-  depends=('gstreamer0.10-base>=0.10.32' 'bzip2')
+  depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
   pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
-  conflicts=('gstreamer0.10-bad<=0.10.17')
 
   cd "${srcdir}/gst-plugins-good-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
@@ -39,7 +38,7 @@ package_gstreamer0.10-good() {
 }
 
 package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse')
+  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev')
   pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
   groups=('gstreamer0.10-plugins')
   replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index ad3fe3b57..4ab9fea99 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 117108 2011-03-28 19:26:10Z ibiru $
+# $Id: PKGBUILD 124039 2011-05-16 08:56:43Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.17
-pkgrel=2
+pkgver=0.10.18
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool)
 source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('504ed6508c3a8f035a2002ed69d68506')
+md5sums=('04a7009a4efea2844075949c111f5e4d')
 
 build() {
   cd "${srcdir}/gst-plugins-ugly-${pkgver}"
@@ -25,7 +25,7 @@ build() {
 
 package_gstreamer0.10-ugly() {
   pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.32')
+  depends=('gstreamer0.10-base>=0.10.34')
   
   cd "${srcdir}/gst-plugins-ugly-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index b02a3633d..89219d5bc 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 109030 2011-02-05 14:26:26Z andyrtr $
+# $Id: PKGBUILD 124024 2011-05-16 07:21:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
-pkgver=0.10.32
+pkgver=0.10.34
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=('libxml2>=2.7.8' 'glib2>=2.24.1')
-optdepends=('sh:	for feedback script')
+depends=('libxml2' 'glib2')
+optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2)
-md5sums=('442bc3d37b8511a73379143e7531d726')
+sha256sums=('85348f70dc4b70ad1beb05c9a59a64175c5058f4ee5273f89230a3c1d11b26a3')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD
index 58ebf907a..67f9170d6 100644
--- a/extra/liblqr/PKGBUILD
+++ b/extra/liblqr/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 49462 2009-08-08 15:03:23Z tpowa $
+# $Id: PKGBUILD 124082 2011-05-16 15:00:24Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=liblqr
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A seam-carving C/C++ library called Liquid Rescale"
 arch=('i686' 'x86_64')
 url="http://liblqr.wikidot.com/"
 license=('GPL')
-depends=('glibc' 'glib2')
+depends=('glib2')
 makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2)
+options=('!libtool' '!emptydirs')
+source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2")
 
 build() {
   cd "$srcdir/$pkgname-1-$pkgver"
   ./configure --prefix=/usr 
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-1-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }
 md5sums=('0e24ed3c9fcdcb111062640764d7b87a')
diff --git a/extra/nss-mdns/PKGBUILD b/extra/nss-mdns/PKGBUILD
index 6fe8d5653..643dac89f 100644
--- a/extra/nss-mdns/PKGBUILD
+++ b/extra/nss-mdns/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 56016 2009-10-17 23:24:29Z giovanni $
+# $Id: PKGBUILD 124100 2011-05-16 15:17:50Z andrea $
+# Maintainer:
 # Contributor: Travis Willard <travis@archlinux.org>
 
 pkgname=nss-mdns
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="glibc plugin providing host name resolution via mDNS"
 arch=('i686' 'x86_64')
 url="http://0pointer.de/lennart/projects/nss-mdns/"
-license=('lgpl')
+license=('LGPL')
 depends=('glibc')
 makedepends=('pkgconfig')
 backup=('etc/mdns.allow')
 install=nss-mdns.install
-source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        mdns.allow)
+source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'mdns.allow')
 md5sums=('03938f17646efbb50aa70ba5f99f51d7'
          '904abb492fb1f56722826c0c3a997bf0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --prefix=/ \
     --disable-lynx \
     --enable-avahi
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  mkdir -p ${startdir}/pkg/etc
-  install -m644 ../mdns.allow ${startdir}/pkg/etc/mdns.allow
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "${srcdir}"/mdns.allow "${pkgdir}"/etc/mdns.allow
 }
 
diff --git a/extra/nss-mdns/nss-mdns.install b/extra/nss-mdns/nss-mdns.install
index ed0fd0c24..85e4d269a 100644
--- a/extra/nss-mdns/nss-mdns.install
+++ b/extra/nss-mdns/nss-mdns.install
@@ -18,7 +18,3 @@ EOM
 
   post_install
 }
-
-op=$1
-shift
-$op $*
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index b13f84bc4..06eb95726 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $
+# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
-pkgver=3.1.8
+pkgver=3.1.9
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
@@ -11,7 +11,7 @@ depends=('php')
 license="PHP"
 source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
 backup=('etc/php/conf.d/apc.ini')
-md5sums=('bb1147933a61aa70ceffe53cc6f2920f')
+md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa')
 
 build() {
 	cd $srcdir/APC-$pkgver
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index e08295597..fcbe92107 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 117503 2011-04-04 08:59:49Z jgc $
+# $Id: PKGBUILD 124052 2011-05-16 10:27:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.16.4
+pkgver=0.16.5
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2b996ca77dad04b422f67238daab48e7')
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz)
+md5sums=('2b6e0c26b77a943df3b9bb02d67ca236')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -25,8 +25,6 @@ build() {
       --enable-poppler-qt4 \
       --enable-poppler-glib
   make
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
 }
 
 package_poppler() {
@@ -35,6 +33,8 @@ package_poppler() {
   conflicts=("poppler-qt3<${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD
index c324c9e43..07affddf2 100644
--- a/extra/telepathy-farsight/PKGBUILD
+++ b/extra/telepathy-farsight/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 120813 2011-04-26 16:12:15Z ibiru $
+# $Id: PKGBUILD 124113 2011-05-16 16:15:50Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 pkgname=telepathy-farsight
-pkgver=0.0.17
+pkgver=0.0.18
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
 license=('GPL')
-depends=('telepathy-glib' 'farsight2' 'gstreamer0.10-base')
+depends=('telepathy-glib' 'farsight2')
 makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f98377802d38333924f6f1a955a2d42a')
+md5sums=('984be4153c635ca1b2010de27d74eff4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 1fc08ac55..2feeea9b5 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120253 2011-04-21 18:20:55Z ibiru $
+# $Id: PKGBUILD 124130 2011-05-16 17:05:51Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=telepathy-glib
-pkgver=0.14.5
+pkgver=0.14.6
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2911d33b45744cdc41774c91f6b837c2')
+md5sums=('ab8cf90283ef3382de1d20d87c9d970a')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wvdial/PKGBUILD b/extra/wvdial/PKGBUILD
index 91026ced8..916a2c514 100644
--- a/extra/wvdial/PKGBUILD
+++ b/extra/wvdial/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 57749 2009-11-01 22:53:25Z giovanni $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 123798 2011-05-13 06:53:04Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=wvdial
 pkgver=1.61
-pkgrel=2
+pkgrel=3
 pkgdesc="A dialer program to connect to the Internet"
 url="http://alumnit.ca/wiki/index.php?page=WvDial"
 arch=('i686' 'x86_64')
 license=('custom')
-depends=('wvstreams>=4.6.1' 'ppp')
-source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+depends=('wvstreams' 'ppp' 'gcc-libs')
+makedepends=('lockdev')
+options=('!makeflags' '!buildflags')
+source=("http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('acd3b2050c9b65fff2aecda6576ee7bc')
 
 build() {
-  unset LDFLAGS
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure
-  make || return 1
-  make prefix=${pkgdir}/usr PPPDIR=${pkgdir}/etc/ppp/peers install || return 1
-  install -Dm644 COPYING.LIB ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make LOCKDEV="-llockdev"
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make prefix="${pkgdir}"/usr PPPDIR="${pkgdir}"/etc/ppp/peers install
+  install -Dm644 COPYING.LIB "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }