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

Conflicts: extra/flac/PKGBUILD extra/glib/PKGBUILD extra/gnome-control-center/PKGBUILD extra/qiv/PKGBUILD extra/vamp-plugin-sdk/PKGBUILD extra/vcdimager/PKGBUILD extra/xorg-server/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-08-11 11:14:03 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-08-11 11:14:03 -0300
commit: 828f6a7c0f0285abf2b1fb91895406dcb5d5b0e5 (patch)
tree: fb283e1b49ba0e6a1fbb3748cc6600facf62fdc4 /extra
parent: 015d5bbcdc8bd4c24cd79582d13225844045d2ec (diff)
parent: e81c6fe4fb38144709923b2da3ab68a01712a26b (diff)
26 files changed, 417 insertions, 225 deletions
diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD
index 161e43890..25e2b51e0 100644
--- a/extra/aterm/PKGBUILD
+++ b/extra/aterm/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 47932 2009-07-29 18:24:49Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=aterm
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An xterm replacement with transparency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aterm.sourceforge.net/"
 license=('GPL')
-depends=('libxext' 'libsm')
+depends=('libx11')
 makedepends=('libxt')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('c2eede028e1011e0ec7035cf319c9b5a')
@@ -19,7 +18,11 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-transparency=yes \
     --enable-background-image --enable-fading --enable-menubar \
-    --enable-graphics || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --enable-graphics
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 179624811..776e0e882 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $
+# $Id: PKGBUILD 134967 2011-08-09 17:31:55Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dovecot
 pkgver=2.0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
@@ -26,7 +26,7 @@ backup=(etc/dovecot/dovecot.conf
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
 md5sums=('fd8a0702275a61332db7353dadff0f92'
-         'd020d43eab4ded6fb379dadc570a9490')
+         '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -66,9 +66,4 @@ package() {
   install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/
 
   rm ${pkgdir}/etc/dovecot/README
-
-  # install dovecot userdir - https://bugs.archlinux.org/task/20533
-  install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty}
-  chmod 755 ${pkgdir}/var/run/dovecot
-  chmod 750 ${pkgdir}/var/run/dovecot/login
 }
diff --git a/extra/dovecot/dovecot.install b/extra/dovecot/dovecot.install
index 51d1509ee..ddec178a4 100644
--- a/extra/dovecot/dovecot.install
+++ b/extra/dovecot/dovecot.install
@@ -11,9 +11,9 @@ post_install() {
   fi
 
   if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot dovecot &> /dev/null
+    usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null
   else
-    useradd -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot -m -r dovecot &> /dev/null
+    useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null
   fi 
 
   # dovenull
@@ -24,9 +24,9 @@ post_install() {
   fi
 
   if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull dovenull &> /dev/null
+    usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null
   else
-    useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null
+    useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null
   fi 
   
   # harden some permissions
@@ -36,15 +36,19 @@ post_install() {
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-    post_install $1
       if [ "`vercmp $2 2.0.0`" -lt 0 ]; then
         # important upgrade notice
         echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE"
         echo "> ------------------------------------"
         echo "> see http://wiki2.dovecot.org/Upgrading/2.0"
 	echo "> make sure, you convert the dovecot.conf file"
-    fi
-
+      fi
+      if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then
+        # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later
+        userdel dovecot &> /dev/null
+        userdel dovenull &> /dev/null
+      fi
+    post_install $1
 }
 
 # arg 1:  the old package version
diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh
index b7555fe50..e8966bd55 100755
--- a/extra/dovecot/dovecot.sh
+++ b/extra/dovecot/dovecot.sh
@@ -1,36 +1,69 @@
 #!/bin/bash
 
+daemon_name=dovecot
+
 . /etc/rc.conf
 . /etc/rc.d/functions
+#. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+        pidof -o %PPID $daemon_name
+}
 
-PID=`pidof -o %PPID /usr/sbin/dovecot`
 case "$1" in
-  start)
-  stat_busy "Starting Dovecot"
-    [ -z "$PID" ] && /usr/sbin/dovecot
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dovecot
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping Dovecot"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dovecot
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
+        start)
+                stat_busy "Starting $daemon_name daemon"
+
+                PID=$(get_pid)
+                if [[ -z $PID ]]; then
+                        [[ -f /var/run/$daemon_name.pid ]] &&
+                                rm -f /var/run/$daemon_name.pid
+                # RUN
+                $daemon_name
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        echo $(get_pid) > /var/run/$daemon_name.pid
+                        add_daemon $daemon_name
+                        stat_done
+                fi
+                else
+                        stat_fail
+                        exit 1
+                fi
+                ;;
+
+        stop)
+                stat_busy "Stopping $daemon_name daemon"
+                PID=$(get_pid)
+                # KILL
+                [[ -n $PID ]] && kill $PID &> /dev/null
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        rm -f /var/run/$daemon_name.pid &> /dev/null
+                        rm_daemon $daemon_name
+                        stat_done
+                fi
+                ;;
+
+        restart)
+                $0 stop
+                sleep 3
+                $0 start
+                ;;
+
+        status)
+                stat_busy "Checking $daemon_name status";
+                ck_status $daemon_name
+                ;;
+
+        *)
+                echo "usage: $0 {start|stop|restart|status}"
 esac
+
 exit 0
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index ec11d1c4b..71e2f1d5a 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $
+# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64 mips64el)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        fix-generation-po.patch)
+sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06'
+            'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-generation-po.patch"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-install \
       --disable-scrollkeeper --enable-dbus
diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch
new file mode 100644
index 000000000..ebec28433
--- /dev/null
+++ b/extra/ekiga/fix-generation-po.patch
@@ -0,0 +1,24 @@
+From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
+Date: Tue, 19 Jul 2011 08:15:52 +0000
+Subject: Fix generation of po translation files
+
+Bug introduced by commit 2bfaf29.
+---
+diff --git a/configure.ac b/configure.ac
+index 63d8685..eefae22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes")
+ dnl #########################################################################
+ dnl  Support for internationalization
+ dnl ########################################################################
+-AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix])
++GETTEXT_PACKAGE=AC_PACKAGE_NAME
++AC_SUBST(GETTEXT_PACKAGE)  # needed by gettext in po directory
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
+ AM_GLIB_GNU_GETTEXT
+ 
+ 
+--
+cgit v0.9
diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index 4a507612d..df4d98eb1 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -1,29 +1,51 @@
-# $Id: PKGBUILD 48440 2009-08-02 03:15:27Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
-pkgname=flac
+pkgbase=flac
+pkgname=('flac' 'flac-doc')
 pkgver=1.2.1
-pkgrel=2
-pkgdesc="Free Lossless Audio Codec"
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://flac.sourceforge.net/"
-license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
-depends=('glibc' 'libogg')
+license=('BSD' 'GPL')
+depends=('libogg')
 makedepends=('nasm' 'xmms')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz flac-1.2.1-gcc-4.3-includes.patch)
-md5sums=('153c8b15a54da428d1f0fadc756c22c7' 'b9d245422bbc547b18a72897366bea77')
-sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
+source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz 
+	flac-1.2.1-gcc-4.3-includes.patch)
+md5sums=('153c8b15a54da428d1f0fadc756c22c7'
+         'b9d245422bbc547b18a72897366bea77')
+sha1sums=('bd54354900181b59db3089347cc84ad81e410b38'
+          '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-sse \
-    --disable-rpath --with-pic || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch"
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \
+    --disable-sse --disable-rpath --with-pic
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make check
+}
+
+package_flac() {
+  pkgdesc="Free Lossless Audio Codec"
+  optdepends=('xmms: for using the xmms plugin')
+  options=('!libtool' '!docs')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_flac-doc() {
+  pkgdesc="Developer documentation for the Free Lossless Audio Codec"
+  depends=('flac')
 
-  # install license
-  install -Dm0644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.Xiph" || return 1
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" -C doc install
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index dc2d075a1..1bb00ade4 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD 55861 2009-10-15 02:42:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=8.1
+pkgrel=9
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL')
-depends=('glibc' 'texinfo')
+depends=('glibc')
 options=('!libtool')
 install=glib.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
 	gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\
+md5sums=('6fe30dad87c77b91b632def29dd69ef9'
+         '877b3330e822a4be69a0f8a8c268cfd7'
          'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\
-         'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
+          'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
+          'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../gcc340.patch || return 1
-  patch -Np0 -i ../aclocal-fixes.patch || return 1
+  patch -Np1 -i ../gcc340.patch
+  patch -Np0 -i ../aclocal-fixes.patch
 
-  [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu"
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $CONFIGFLAG
+  [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --infodir=/usr/share/info $CONFIGFLAG
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/glib/glib.install b/extra/glib/glib.install
index 140fd2fe9..c0046feba 100644
--- a/extra/glib/glib.install
+++ b/extra/glib/glib.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(glib.info.gz)
 
 post_install() {
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 945af2f09..476f7c22e 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $
+# $Id: PKGBUILD 134972 2011-08-09 17:45:09Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
-optdepends=('apg: adds password generation for user accounts')
-makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop')
+optdepends=('mesa-demos-libre: provides glxinfo for graphics information'
+            'apg: adds password generation for user accounts')
+makedepends=('gnome-doc-utils' 'intltool' 'networkmanager' 'namcap')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-control-center.install
@@ -22,6 +23,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --disable-scrollkeeper --disable-update-mimedb
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
 
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 38617dc2e..08e91fcaf 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $
+# $Id: PKGBUILD 134977 2011-08-09 18:01:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -24,6 +24,8 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/bin --disable-static --enable-pulse
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index a5f794452..56881e4bb 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 62528 2010-01-09 20:34:27Z tpowa $
+# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
-pkgver=6.0.4
+pkgver=6.0.5
 pkgrel=1
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,12 +10,14 @@ license=('custom')
 depends=('libtiff' 'pam' 'ghostscript')
 makedepends=('smtp-server')
 url="http://www.hylafax.org/"
-backup=(var/spool/hylafax/bin/{faxrcvd,notify} \
-	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} \
+backup=(var/spool/hylafax/bin/{faxrcvd,notify}
+	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
 	var/spool/hylafax/etc/hosts.hfaxd) 
-source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \
-        hylafax.cron.daily config.local)
-options=('!makeflags')
+source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
+        hylafax 
+        hylafax.cron.daily 
+        config.local
+        configure-6.0.5.patch)
 
 # build as root for successful build!
 build() {
@@ -26,16 +28,22 @@ build() {
     useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
     useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
   fi
-  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} || return 1
-  mkdir -p $pkgdir/var/{spool/hylafax,lock} || return 1
-  cd $srcdir/${pkgname}-${pkgver} || return 1
+  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p $pkgdir/var/{spool/hylafax,lock}
+  cd $srcdir/${pkgname}-${pkgver}
 
-  cp ../config.local . || return 1
-  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1
-  make || return 1
-  make ROOT=$pkgdir install || return 1
-  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax || return 1
-  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax || return 1
+  cp ../config.local .
+  # fix compiling
+  patch -Np0 -i ../configure-6.0.5.patch
+  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
+  make
+}
+
+package () {
+  cd $srcdir/${pkgname}-${pkgver}
+  make ROOT=$pkgdir install
+  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
+  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax
   # remove group if created
   if [ $uucp_created -eq 1 ]; then
     userdel uucp &>/dev/null
@@ -44,13 +52,14 @@ build() {
   fi
   # add missing awk file for notify-4.1 script
   install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
-  	$spkgdir/var/spool/hylafax/bin/notify.awk || return 1
+  	$spkgdir/var/spool/hylafax/bin/notify.awk
   # fix permission on /var/lock
   chmod 1777 $pkgdir/var/lock
 
   install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
 }
-md5sums=('6ba4bc3a47c9d2634de1b14f4ab34c80'
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
          '6602288a405324d8c8e3c5eac2bf19fd'
          '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a')
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d')
diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch
new file mode 100644
index 000000000..e1f1126a5
--- /dev/null
+++ b/extra/hylafax/configure-6.0.5.patch
@@ -0,0 +1,11 @@
+--- configure.old	2011-08-08 10:19:37.619657223 +0200
++++ configure	2011-08-08 10:20:26.422189170 +0200
+@@ -2882,7 +2882,7 @@
+ 	echo '#define HAS_FCHMOD 1'
+ 	Note "... configure use of fchmod"
+ 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
+-	    unistd.h libc.h $OSFCNH sys/stat.h
++	    unistd.h $OSFCNH sys/stat.h libc.h
+     }
+     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
+ 	unistd.h sys/stat.h
diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install
index d9d991e6b..bd97d42bd 100644
--- a/extra/hylafax/hylafax.install
+++ b/extra/hylafax/hylafax.install
@@ -42,8 +42,3 @@ pre_remove() {
   userdel fax &>/dev/null
   print_remove
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD
index 5da319fdc..13274421d 100644
--- a/extra/libogg/PKGBUILD
+++ b/extra/libogg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104973 2011-01-05 16:46:37Z heftig $
+# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $
 # Maintainer: 
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libogg
-pkgver=1.2.2
-pkgrel=1.1
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Ogg bitstream and framing library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/ogg/"
@@ -13,27 +13,26 @@ depends=('glibc')
 options=('!libtool')
 source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz
         config_types.h)
-md5sums=('203c28a1d356b641253c960365e4cc48'
+md5sums=('84a35715170f2cd4c77a4448772b95d5'
          'a4d786b1b1955cb85b64fd16cbbee3f9')
 
 build() {
-    cd $srcdir/${pkgname}-${pkgver}
-    ./configure --prefix=/usr 
-    make
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr 
+  make
 }
 
 package() {
-    cd $srcdir/${pkgname}-${pkgver}
-    make DESTDIR=$pkgdir install
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
 
-    # install BSD license
-    install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-	$pkgdir/usr/share/licenses/$pkgname/COPYING
+# install BSD license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-    # Resolve multilib conflict
-    if [[ $CARCH == "x86_64" ]]; then
-      mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h
-      install -m 644 "$srcdir/config_types.h" \
-        "${pkgdir}/usr/include/ogg/config_types.h"
-    fi
+# Resolve multilib conflict
+  if [[ $CARCH == "x86_64" ]]; then
+    mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h
+    install -m 644 "$srcdir/config_types.h" \
+      "${pkgdir}/usr/include/ogg/config_types.h"
+  fi
 }
diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index 4dca6ad0d..dbf451fa8 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -1,30 +1,38 @@
-# $Id: PKGBUILD 47944 2009-07-29 19:36:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk> and Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=nedit
 pkgver=5.5
-pkgrel=5
+pkgrel=6
 pkgdesc="A Unix text editor for programmers and general users"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nedit.org/"
 license=('GPL')
 depends=('lesstif' 'libxpm')
-source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch)
-md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' 'ae1f56ae9b23163882051720ac52412d')
-sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
+source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 
+	nedit_xorg_composite_fix.patch)
+md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe'
+         'ae1f56ae9b23163882051720ac52412d')
+sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
+          '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../nedit_xorg_composite_fix.patch || return 1
-  sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux || return 1
-  sed -i 's|fgets|//fgets|' util/check_lin_tif.c || return 1
-  sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux || return 1
-  sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c || return 1
+  patch -p1 < ../nedit_xorg_composite_fix.patch
+  sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux
+  sed -i 's|fgets|//fgets|' util/check_lin_tif.c
+  sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux
+  sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
 
-  make linux || return 1
-  install -D -m755 source/nedit "${pkgdir}/usr/bin/nedit" || return 1
-  install -D -m755 source/nc "${pkgdir}/usr/bin/nedit-client" || return 1
-  install -D -m644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" || return 1
-  install -D -m644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" || return 1
+  make linux docs
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
+  install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
+  install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
+  install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1"
+  install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html"
 }
diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD
index affe7369a..94505ed1d 100644
--- a/extra/qiv/PKGBUILD
+++ b/extra/qiv/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 84750 2010-07-04 02:53:11Z angvp $
+# $Id: PKGBUILD 134996 2011-08-09 20:30:46Z eric $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Paul Mattal <paul@archlinux.org>
+
 pkgname=qiv
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.2.4
+pkgrel=1
 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://spiegl.de/qiv/"
 license=('GPL2')
 depends=('file' 'gtk2' 'imlib2')
-makedepends=('pkgconfig')
 source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
-url="http://spiegl.de/qiv/"
-md5sums=('f692f665ad429f13c732156351420850')
+md5sums=('1425f89c90f9c045858fccf24d894c97')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver || return 1
-	make || return 1
-	install -D -m 0755 qiv $startdir/pkg/usr/bin/qiv || return 1
-	install -D -m 0644 qiv.1 $startdir/pkg/usr/share/man/man1/qiv.1 || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -D -m 0755 qiv "$pkgdir/usr/bin/qiv"
+  install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1"
 }
diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD
index 5326396dc..f13c7c7e0 100644
--- a/extra/rubberband/PKGBUILD
+++ b/extra/rubberband/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com>
 
 pkgname=rubberband
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Time-stretching and pitch-shifting audio library and utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,17 @@ url="http://www.breakfastquay.com/rubberband/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk')
 makedepends=('ladspa')
-source=(http://code.breakfastquay.com/attachments/download/1/$pkgname-$pkgver.tar.bz2)
-md5sums=('c5f288d644fcd46bd159e187bcc33f25')
+source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2"
+        'gcc46.patch')
+md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc'
+         '7c2f404975da6052f6b80eac12efbeb4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # fix gcc 4.6 compatibility
+  patch -Np1 -i "$srcdir/gcc46.patch"
+
   ./configure --prefix=/usr
   make
 }
@@ -24,7 +29,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-	make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/rubberband/gcc46.patch b/extra/rubberband/gcc46.patch
new file mode 100644
index 000000000..38ac76d42
--- /dev/null
+++ b/extra/rubberband/gcc46.patch
@@ -0,0 +1,10 @@
+--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
+@@ -21,6 +21,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <cstddef>
+ 
+ /**
+  * @mainpage RubberBand
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index a86d3e9a0..0d4d21212 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,28 +1,40 @@
-# $Id: PKGBUILD 84807 2010-07-04 16:07:26Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=snd
-pkgver=11.6
+pkgver=12.3
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
-depends=('lesstif' 'fam')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a48bb692ecba320fe6aa2e00fd6d360b')
-sha1sums=('383978c94a1f503e331f8f84b21df375fb208c27')
+depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw')
+makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm'
+             'timidity++' 'mpg123' 'vorbis-tools' 'gmp')
+optdepends=('ladspa' 'wavpack' 'flac' 'speex'
+            'timidity++' 'mpg123' 'vorbis-tools')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('e1dab6945b9583f02aa6ae73d3780c98')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --without-gsl --without-fftw
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --with-alsa \
+              --with-jack
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make prefix="$pkgdir/usr" install
+
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 3686445e1..62e1d8555 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.20
-pkgrel=2
+pkgver=1.1.22
+pkgrel=1
 pkgdesc="The Apache Tomcat Native Library"
 arch=('i686' 'x86_64')
 url="http://tomcat.apache.org/"
@@ -11,7 +11,7 @@ license="Apache"
 depends=('apr' 'openssl')
 makedepends=('java-environment')
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('fb2b9d073cb6575c2d0020eda266ca0c')
+md5sums=('44d764f8d99d0454c7337ba9701558ee')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 2474db6da..599b1c642 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id: PKGBUILD 134888 2011-08-08 13:42:21Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
 pkgname=vamp-plugin-sdk
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
-pkgdesc="The Vamp audio analysis plugin system"
+pkgdesc="The Vamp audio analysis plug-in system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vamp-plugins.org/"
 license=('BSD')
 depends=('gcc-libs' 'libsndfile')
-#options=('!libtool')
-source=(http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz
-        gcc44.patch)
-md5sums=('13252077a73987dae72a9174e529b6b9'
+options=('!libtool')
+source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz"
+        'gcc44.patch')
+md5sums=('037cdb83f20a331ff1fa07d54550c773'
          'a07e3ef9c657a56cf2e8c4afc0ba1cec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # gcc 4.4 compatibility
-  patch -Np1 -i ../gcc44.patch
-
   ./configure --prefix=/usr
   make
 }
@@ -29,7 +26,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 
   install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index e3d114dbb..f824436cd 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -1,24 +1,32 @@
-# $Id: PKGBUILD 59898 2009-11-29 15:48:57Z jgc $
+# $Id: PKGBUILD 135066 2011-08-10 01:37:52Z eric $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vcdimager
-pkgver=0.7.23
-pkgrel=7
-pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
+pkgver=0.7.24
+pkgrel=1
+pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vcdimager.org/"
+license=('GPL')
 depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt')
 options=('!libtool')
 install=vcdimager.install
 source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5e7d80fdbf0037ad20e438f2a9573253')
+md5sums=('3af22978fd79c79d5fda6513b6811145')
 
 build() {
   cd "${srcdir}/${pkgname}-${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
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vcdimager/vcdimager.install b/extra/vcdimager/vcdimager.install
index faa9748c2..79e07b5bc 100644
--- a/extra/vcdimager/vcdimager.install
+++ b/extra/vcdimager/vcdimager.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(vcd-info.info.gz vcdimager.info.gz vcdxrip.info.gz)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index d40dd9d01..7550063d1 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $
+# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.3.901
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp')
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        #git-fixes.patch
+        randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
         bg-none-revert.patch
         xserver-1.10-pointer-barriers.patch
-        xorg-redhat-die-ugly-pattern-die-die-die.patch
         autoconfig-nvidia.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
-         # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
+sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+          '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
-          '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
           'f9328fd7bc931bb02c8909ecfcef35403de33782'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
@@ -31,18 +29,19 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  # Upstream post-release commit
+  patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch"
 
-  patch -Np1 -i "${srcdir}/vbe-fix-malloc-size-bug.patch"
+  # Add pointer barrier support, patch from Fedora
+  patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
 
   # Patches from ~ajax/xserver xserver-next branch
   patch -Np1 -i "${srcdir}/bg-none-revert.patch"
 
-  # Upstream fixes from 1.10 branch
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
+  autoreconf
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \
@@ -66,10 +65,10 @@ build() {
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
-      --with-dri-driver-path=/usr/lib/xorg/modules/dri \
       --with-fontrootdir=/usr/share/fonts
   make
 
+  # Disable subdirs for make install rule to make splitting easier
   sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
       -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
       -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
@@ -88,7 +87,7 @@ package_xorg-server-common() {
   make -C xkb DESTDIR="${pkgdir}" install-data
 
   install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+  install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
 
   install -m755 -d "${pkgdir}/usr/lib/xorg"
   install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
new file mode 100644
index 000000000..36d28ded0
--- /dev/null
+++ b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
@@ -0,0 +1,36 @@
+From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri, 29 Jul 2011 23:12:06 +0000
+Subject: randr: Compare all the bytes in RRPostPendingProperties
+
+RRPostPendingProperties tries to compare the pending and current
+property values to decide whether they're actually changing.  However,
+it does this using a memcmp that passes in pending_value->size as the
+number of bytes.  This is actually the number of elements, where each
+element is (pending_value->format / 8) bytes long.  This causes the
+pending value to not be propagated if the first pending_value->size
+bytes are the same and only the end of it is changing.
+
+Fix this by computing the total number of bytes to compare in the
+memcmp.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
+---
+diff --git a/randr/rrproperty.c b/randr/rrproperty.c
+index ba04c16..61e7bb4 100644
+--- a/randr/rrproperty.c
++++ b/randr/rrproperty.c
+@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
+ 	    pending_value->format == current_value->format &&
+ 	    pending_value->size == current_value->size &&
+ 	    !memcmp (pending_value->data, current_value->data,
+-		     pending_value->size))
++		     pending_value->size * (pending_value->format / 8)))
+ 	    continue;
+ 
+ 	if (RRChangeOutputProperty (output, property->propertyName,
+--
+cgit v0.8.3-6-g21f6
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-08-11 11:14:03 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-08-11 11:14:03 -0300
commit	828f6a7c0f0285abf2b1fb91895406dcb5d5b0e5 (patch)
tree	fb283e1b49ba0e6a1fbb3748cc6600facf62fdc4 /extra
parent	015d5bbcdc8bd4c24cd79582d13225844045d2ec (diff)
parent	e81c6fe4fb38144709923b2da3ab68a01712a26b (diff)