Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/celt/PKGBUILD
	extra/llvm/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/speex/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xorg-sessreg/PKGBUILD
	extra/xorg-xdpyinfo/PKGBUILD
	extra/xorg-xset/PKGBUILD

20 files changed, 135 insertions, 122 deletions

diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD
index 3eec5da5a..211d6015b 100644
--- a/extra/celt/PKGBUILD
+++ b/extra/celt/PKGBUILD
@@ -1,34 +1,29 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 176867 2013-02-02 03:18:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Ray Rashif <schivmeister@gmail.com>
 
 pkgname=celt
-pkgver=0.11.1
-pkgrel=4
-pkgdesc='Low-latency audio communication codec'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.celt-codec.org'
-license=('BSD')
-depends=('libogg')
+pkgver=0.11.3
+pkgrel=1
+pkgdesc="Low-latency audio communication codec"
+arch=(i686 x86_64 mips64el)
+url="http://www.celt-codec.org/"
+license=(BSD)
+depends=(libogg)
 options=('!libtool')
-source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('94fe4acd241da8702c295bcd13a555e6')
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('5511732a426cc42bf986ca79b5cdd02f')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr \
-    --enable-custom-modes
-
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --enable-custom-modes
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -D -m644 COPYING \
-    ${pkgdir}/usr/share/licenses/${pkgname}/BSD
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index f7aa1b67d..f2e52639a 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,35 +1,22 @@
-# $Id: PKGBUILD 171523 2012-11-18 10:30:03Z ronald $
+# $Id: PKGBUILD 176930 2013-02-02 18:16:57Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.3.1
+pkgrel=1
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ktorrent.org/'
 license=('GPL2')
 depends=('libktorrent' 'kdebase-workspace' 'taglib')
 makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'httpserver.patch' 'groupmiewmodel.diff')
+source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 install=${pkgname}.install
-sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
-          'cef22b24af540e1bfcf13da60e4846ade106c303'
-	  '5b91b40e38afb15452bcb0644cd7ba57bc9db6eb' )
-
-options=(strip)
-
+sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# build time patch
-	patch -p0 -i "${srcdir}/httpserver.patch"
-	patch -p0 -i "${srcdir}/groupmiewmodel.diff"
-
-	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -39,6 +26,6 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/build"
+	cd build
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 2b9b64ef0..88dfd7e14 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166475 2012-09-08 08:21:58Z ronald $
+# $Id: PKGBUILD 176928 2013-02-02 18:12:44Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,10 @@ url="http://ktorrent.org/"
 license=('GPL2')
 depends=('kdelibs')
 makedepends=('automoc4' 'cmake' 'boost' 'doxygen')
-source=("http://ktorrent.org/downloads/4.3.0/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e7e813af36f5854237111fd550f4914b83f17102')
+source=("http://ktorrent.org/downloads/4.3.1/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('71b377c0cad01dca6061f1fe92f91c4cf05476b3')
 
 build() {
-  cd "${srcdir}"
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +24,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index 2bc1767ad..05c4ffb54 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166179 2012-09-05 07:50:49Z andyrtr $
+# $Id: PKGBUILD 176895 2013-02-02 07:01:31Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libvdpau
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc="Nvidia VDPAU library"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ options=('!libtool')
 license=('custom')
 source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz)
 makedepends=('libx11')
-sha1sums=('1b18b8f75eea52740af84881313d860ad5c27d0b')
+sha256sums=('9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index f04e4010b..d2a332c8e 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175116 2013-01-14 06:46:10Z foutrelis $
+# $Id: PKGBUILD 176908 2013-02-02 12:44:44Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.2
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -22,7 +22,6 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         llvm-Config-config.h
         llvm-Config-llvm-config.h
         cindexer-clang-path.patch
-        clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
         clang-3.1-fix-libprofile_rt.a-location.patch)
@@ -32,7 +31,6 @@ sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
-            '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
             'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
             '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
@@ -68,11 +66,6 @@ build() {
   # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
   patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
 
-  if [[ $CARCH == x86_64 ]]; then
-    # Adjust linker path
-    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
-  fi
-
   # Make -flto work
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
diff --git a/extra/ncftp/PKGBUILD b/extra/ncftp/PKGBUILD
index 2ce0eddcb..6dc6f19a4 100644
--- a/extra/ncftp/PKGBUILD
+++ b/extra/ncftp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151043 2012-02-24 14:26:12Z pierre $
+# $Id: PKGBUILD 176940 2013-02-02 19:50:19Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
@@ -16,20 +16,20 @@ source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.bz2")
 md5sums=('b05c7a6d5269c04891f02f43d4312b30')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  install -d ${pkgdir}/usr/share
   ./configure --prefix=/usr \
     --sysconfdir=/etc
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/share"
+  make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
 
   # Install license
   install -Dm644 doc/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 md5sums=('b05c7a6d5269c04891f02f43d4312b30')
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 54bc7cada..81c93037a 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169381 2012-10-20 09:06:34Z eric $
+# $Id: PKGBUILD 176935 2013-02-02 19:40:08Z eric $
 # Maintainer: 
 # Contributor: Dale Blount <dale@archlinux.org>
 
@@ -33,7 +33,6 @@ build() {
   patch -Np1 -i "$srcdir/libnl32.patch"
   autoreconf -f -i
 
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
   PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
@@ -52,6 +51,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
   install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
diff --git a/extra/procmail/PKGBUILD b/extra/procmail/PKGBUILD
index 92ebabde5..48a13a4a5 100644
--- a/extra/procmail/PKGBUILD
+++ b/extra/procmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151448 2012-02-26 11:17:19Z pierre $
+# $Id: PKGBUILD 176897 2013-02-02 07:04:51Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=procmail
 pkgver=3.22
-pkgrel=5
+pkgrel=6
 pkgdesc="Highly configurable auto mail processing."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.procmail.org"
@@ -20,11 +20,11 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 -i ${srcdir}/procmail-3.22-getline.patch
   yes n | make CFLAGS0="${CFLAGS} ${LDFLAGS}" LOCKINGTEST="/tmp ."
-  make BASENAME=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man install
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
+  make BASENAME=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man install
   install -D -m644 Artistic ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
   install -d -m755 ${pkgdir}/usr/share/doc/${pkgname}/examples
   install -m644 examples/* ${pkgdir}/usr/share/doc/${pkgname}/examples/
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 9cd293b53..18047acf8 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 159309 2012-05-21 11:10:25Z tomegun $
+# $Id: PKGBUILD 176919 2013-02-02 15:36:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
 
 pkgname=rasqal
 epoch=1
-pkgver=0.9.29
+pkgver=0.9.30
 pkgrel=1
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('raptor' 'mpfr')
+depends=('raptor' 'mpfr' 'util-linux')
 options=('!libtool')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
 
@@ -32,4 +32,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-md5sums=('49e4b75a0c67465edf55dd20606715fa')
+md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b')
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index a61a3ab7f..f3e237c08 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 146604 2012-01-14 02:04:54Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 176924 2013-02-02 17:56:28Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=rdesktop
 pkgver=1.7.1
-pkgrel=2.1
+pkgrel=3
 pkgdesc="An open source client for Windows Remote Desktop Services"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rdesktop.org/"
 license=('GPL3')
-depends=('libx11' 'openssl' 'libao' 'libsamplerate')
+depends=('openssl' 'libao' 'libsamplerate' 'xorg-xrandr')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
 md5sums=('c4b39115951c4a6d74f511c99b18fcf9'
@@ -17,7 +18,7 @@ md5sums=('c4b39115951c4a6d74f511c99b18fcf9'
          'bd2c9bc68bddcc2652c668753d787df7')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   # FS#15113
   patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
@@ -25,11 +26,13 @@ build() {
   # Fix libao segfault, from Fedora
   patch -i "${srcdir}/rdesktop-libao.patch"
 
-  ./configure --prefix=/usr --enable-smartcard
+  ./configure --prefix=/usr \
+    --enable-smartcard \
+    --with-ipv6
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 81462e925..498bbeaf6 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176295 2013-01-28 16:48:28Z stephane $
+# $Id: PKGBUILD 176932 2013-02-02 19:24:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
@@ -21,12 +21,12 @@ build() {
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-	      --with-bash-completion="${pkgdir}/usr/share/bash-completion/completions"
+              --with-bash-completion=/usr/share/bash-completion/completions
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make prefix="${pkgdir}/usr" install
+  make prefix="${pkgdir}/usr" bash_completiondir="${pkgdir}/usr/share/bash-completion/completions" install
 }
diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD
index 2a4d407e3..e385410b5 100644
--- a/extra/speex/PKGBUILD
+++ b/extra/speex/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 137583 2011-09-09 22:58:20Z allan $
-# Maintainer: 
+# $Id: PKGBUILD 176866 2013-02-02 03:18:03Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=speex
 pkgver=1.2rc1
-pkgrel=2.2
+pkgrel=3
 pkgdesc="A free codec for free speech"
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://www.speex.org/"
-license=('BSD')
-depends=('libogg')
+license=(BSD)
+depends=(libogg)
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae')
 
 build() {
-  cd $srcdir/speex-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd $srcdir/speex-$pkgver
-  make DESTDIR=$startdir/pkg install
-
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 5b3649cce..b4fa8e6b0 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171248 2012-11-16 22:37:18Z andrea $
+# $Id: PKGBUILD 176922 2013-02-02 17:50:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,16 +17,13 @@ md5sums=('0775647e1c34ef25364de3c178a4ed36'
          '1aa2246047b424e2d23473749368b8c6')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
 
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
   sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
 
-  # Fix build with udev 183
-  sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c
-
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
@@ -44,7 +41,7 @@ package_system-config-printer-common() {
   provides=("system-config-printer=${pkgver}")
   conflicts=('system-config-printer')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   install -d "${pkgdir}"/usr/share/${pkgbase}
   install -m644 config.py \
     debug.py \
@@ -84,6 +81,9 @@ package_system-config-printer-common() {
     install -Dm644 $file \
       "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
   done
+  
+  install -Dm755 dbus/scp-dbus-service \
+    "${pkgdir}"/usr/bin/scp-dbus-service
 }
 
 package_system-config-printer-gnome() {
@@ -91,10 +91,11 @@ package_system-config-printer-gnome() {
   depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
   optdependence=('gnome-keyring: password management')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # files provided by system-config-printer-common
+  rm "${pkgdir}"/usr/bin/scp-dbus-service
   cd "${pkgdir}"/usr/share/${pkgbase}
   rm config.py \
     debug.py \
diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff
new file mode 100644
index 000000000..cf03fa060
--- /dev/null
+++ b/extra/wireshark/01_patch-automake-1.13.diff
@@ -0,0 +1,11 @@
+--- configure.in.init	2013-02-02 22:11:27.140322526 +0100
++++ configure.in	2013-02-02 22:11:42.863854681 +0100
+@@ -1960,7 +1960,7 @@
+ sinclude(asn1/Custom.m4) dnl
+ ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(
+   Makefile
+   doxygen.cfg
diff --git a/extra/wireshark/02_enable-version.diff b/extra/wireshark/02_enable-version.diff
new file mode 100644
index 000000000..db2f3726e
--- /dev/null
+++ b/extra/wireshark/02_enable-version.diff
@@ -0,0 +1,11 @@
+--- configure.in.init	2013-02-02 22:11:42.863854681 +0100
++++ configure.in	2013-02-02 22:13:40.888683191 +0100
+@@ -185,7 +185,7 @@
+ 		  [use GnuTLS library @<:@default=yes@:>@]),
+   with_gnutls="$withval", with_gnutls="yes")
+ if test "x$with_gnutls" = "xyes"; then
+-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
++  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
+         [
+                 echo "GnuTLS found, enabling SSL decryption"
+                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 3f5ec35dc..eb009e1ab 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173181 2012-12-12 00:32:12Z eric $
+# $Id: PKGBUILD 176946 2013-02-02 21:34:52Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.4
-pkgrel=2
+pkgver=1.8.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,14 +12,17 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        enable_version.patch)
-sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac'
-            '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd')
+        01_patch-automake-1.13.diff
+        02_enable-version.diff)
+sha256sums=('d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372'
+            '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
+            'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p0 < ${srcdir}/enable_version.patch
+  patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
+  patch -p0 < ${srcdir}/02_enable-version.diff
 
   ./autogen.sh
   ./configure \
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 40f66e595..0376fcc78 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 170785 2012-11-11 10:23:19Z andyrtr $
+# $Id: PKGBUILD 176906 2013-02-02 07:15:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=7.0.0
+pkgver=7.1.0
 epoch=1
 pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.40' 'systemd-tools' 'ati-dri')
+depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c0acc81386425651aae5dfe02d89f935bb63b2a62104da0d88deac3c773ea10e')
+sha256sums=('c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index 48859fd5a..a9b930917 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $
+# $Id: PKGBUILD 176901 2013-02-02 07:10:44Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-sessreg
 pkgver=1.0.7
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Register X sessions in system utmp/utmpx databases"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -18,6 +18,10 @@ build() {
   cd "${srcdir}/sessreg-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/sessreg-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index 0d1a323fd..6c589a7ee 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $
+# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xdpyinfo
 pkgver=1.3.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Display information utility for X"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -18,6 +18,10 @@ build() {
   cd "${srcdir}/xdpyinfo-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xdpyinfo-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xset/PKGBUILD b/extra/xorg-xset/PKGBUILD
index 463cad984..c49686f8c 100644
--- a/extra/xorg-xset/PKGBUILD
+++ b/extra/xorg-xset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134284 2011-08-02 18:56:04Z jgc $
+# $Id: PKGBUILD 176905 2013-02-02 07:13:56Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xset
 pkgver=1.2.2
-pkgrel=1.1
+pkgrel=2
 pkgdesc="User preference utility for X"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -18,6 +18,10 @@ build() {
   cd "${srcdir}/xset-${pkgver}"
   ./configure --prefix=/usr --without-fontcache --without-xf86misc
   make
+ }
+ 
+package() {
+  cd "${srcdir}/xset-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"