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

Conflicts:
	community/pari/PKGBUILD
	extra/xfce4-mpc-plugin/PKGBUILD
	extra/xfce4-session/PKGBUILD
	testing/kmod/PKGBUILD
	testing/xf86-video-sis/PKGBUILD

18 files changed, 111 insertions, 90 deletions

diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 88c789324..76227e5ca 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 64418 2012-02-13 04:02:27Z spupykin $
+# $Id: PKGBUILD 64460 2012-02-14 00:48:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=1.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
 license=('GPL')
 depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
 	 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv')
-makedepends=('krb5' 'cmake' 'damageproto')
+makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
 conflicts=('freerdp-git')
 changelog=${pkgname}.changelog
 options=('!libtool')
@@ -20,7 +20,7 @@ md5sums=('1282189a87893bf196da20382e45f6c1')
 
 build() {
   cd `find ${srcdir}/ -type d -name FreeRDP-\*`
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
   make
 }
 
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index cbb837564..8ff73274b 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60745 2011-12-17 14:07:20Z spupykin $
+# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 
 pkgname=gsoap
-pkgver=2.8.6
+pkgver=2.8.7
 pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
 makedepends=('autoconf' 'automake')
 source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
         LICENSE)
-md5sums=('c0b962c6216bcf59255dc4288783252f'
+md5sums=('48a8dfddffd8f10b3ca82a6a9583e206'
          '27aaa3f5166db94d44044c11a7b2c37b')
 
 build() {
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index 01d2fc6d9..f635331b3 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 56828 2011-10-14 00:16:01Z bisson $
+# $Id: PKGBUILD 64451 2012-02-13 22:53:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=pari
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://pari.math.u-bordeaux.fr/'
 license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'readline' 'libx11')
 makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail')
 source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d96250cd8b3e426f548a832f2f44fdfd30fd32b6')
+sha1sums=('c83314bb993161a60e1e46ae7616072858414354')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index ee664488b..f94cfaa42 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.0.17
+_dcpkgver=2.0.18
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
@@ -18,10 +18,10 @@ depends=('dovecot='$_dcpkgver)
 makedepends=()
 conflicts=('dovecot-sieve' 'pigeonhole-hg')
 source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz"
-	"dovecot.conf")
+        "dovecot.conf")
 options=('!libtool')
-md5sums=('f50151dd20eb5acbac2b546e586f2d43'
-         '564b771c339f69a477c06babf53e11c2')
+sha256sums=('49829e4aed763848b63b2bf9e288d4bc94020c924ce0621bc850e0a4bf4821ab'
+            'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
 
 build() {
   cd "$srcdir/dovecot-2.0-$pkgname-$pkgver"
@@ -32,9 +32,9 @@ build() {
 
 package() {
   cd "$srcdir/dovecot-2.0-$pkgname-$pkgver"
-  
+
   make DESTDIR="$pkgdir/" install
 
   install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf"
-} 
+}
 
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 96ec86721..2fb95b21b 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64408 2012-02-13 02:27:42Z spupykin $
+# $Id: PKGBUILD 64462 2012-02-14 00:49:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Remmina is a remote desktop client written in GTK+. "
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/remmina/"
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index b1c3873be..2fb6b0fc3 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63765 2012-02-05 12:13:04Z ibiru $
+# $Id: PKGBUILD 64445 2012-02-13 15:08:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
 makedepends=('intltool')
@@ -12,7 +12,7 @@ url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd')
+md5sums=('4fc003cb655aa45b77c9f2ee45ba6d4f')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 75477bfeb..817f7c7d7 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142553 2011-11-12 07:19:26Z allan $
+# $Id: PKGBUILD 150154 2012-02-13 15:50:03Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.2.12
-pkgrel=4
+pkgver=5.5.4
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
         'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
 	'0001-set-MTU-via-sysfs-if-file-is-available.patch')
-sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
+sha1sums=('8aa42abd28d49cce5b179998490c36f6c490e338'
           'b67b9ce6a2faaca75fea356966a16be2283b7db0'
           'ee85adac972a8172a9d9b3a1bdd46e0430301582'
           'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
@@ -30,7 +30,8 @@ build() {
   patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
 
   # configure variables
-  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
+  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
+	--rundir=/run
 
   # Build
   make
diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD
index f8f652191..adfb8d063 100644
--- a/extra/basket/PKGBUILD
+++ b/extra/basket/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 149623 2012-02-08 20:36:29Z pierre $
+# $Id: PKGBUILD 150150 2012-02-13 15:03:16Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=basket
 pkgver=1.81
-pkgrel=2
+pkgrel=3
 pkgdesc="All-purpose notes taker for KDE."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://basket.kde.org/"
-depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme')
+depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
 license=('GPL')
 source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('cbb1bc5ca7c2ad1485c433c00a8f65a1')
+sha1sums=('209d92048523f341259d79510fa56977690e5dfc')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$startdir/pkg install
+  cd $srcdir/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/basket/basket.install b/extra/basket/basket.install
index 3e1f2f1f5..2308e6e3e 100644
--- a/extra/basket/basket.install
+++ b/extra/basket/basket.install
@@ -1,5 +1,6 @@
 post_install() {
         xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 3a6e3f964..fdcc7fc9e 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,49 +1,47 @@
-# $Id: PKGBUILD 142442 2011-11-09 21:20:39Z guillaume $
+# $Id: PKGBUILD 150160 2012-02-13 19:59:22Z ibiru $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
 pkgver=4.3
-pkgrel=1
+pkgrel=4
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
 license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst')
-makedepends=('pyrex' 'bluez')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
+makedepends=('bluez')
 optdepends=('bluez: bluetooth support')
 backup=(etc/brltty.conf etc/conf.d/brltty.conf)
 options=('!makeflags' '!emptydirs')
-source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz
+install=brltty.install
+source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
         'brltty'
         'brltty.conf')
-#        'brltty-4.2-S_ISCHR.patch'
 md5sums=('5ada573f88df32b6150db3b9a620e20b'
          '831ebaf0c56091702929c68805d20c4f'
          'a8ab8b3dd059e96e1734bc9cdcf844fc')
-#         '5954b289efaf2ff17676d06de9a88854'
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CFLAGS+="${CFLAGS} -D_GNU_SOURCE" \
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --localstatedir=/var \
+    --with-screen-driver=a2 \
     --enable-gpm \
     --disable-java-bindings \
     --disable-caml-bindings \
     PYTHON=/usr/bin/python2
 
-#  patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-  install -D -m755 ${srcdir}/brltty ${pkgdir}/etc/rc.d/brltty
-  install -D -m644 ${srcdir}/brltty.conf ${pkgdir}/etc/conf.d/brltty.conf
-  install -D -m644 Documents/brltty.conf ${pkgdir}/etc/brltty.conf
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install
+  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
+  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
+  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
 }
diff --git a/extra/brltty/brltty.install b/extra/brltty/brltty.install
new file mode 100644
index 000000000..952ae58ff
--- /dev/null
+++ b/extra/brltty/brltty.install
@@ -0,0 +1,20 @@
+post_install () {
+     getent group brlapi  &>/dev/null || groupadd -r brlapi
+     if [ ! -e /etc/brlapi.key ]; then
+         mcookie >/etc/brlapi.key
+         chmod 0640 /etc/brlapi.key
+         chgrp brlapi /etc/brlapi.key
+         echo "Please add your user to the brlapi group."
+     fi
+}
+
+post_upgrade () {
+    post_install
+}
+
+post_remove () {
+    getent group brlapi >/dev/null 2>&1 && groupdel brlapi
+    if [ -e /etc/brlapi.key ]; then
+        rm -f /etc/brlapi.key
+    fi
+}
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index d54633b23..e1c39c45e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146277 2012-01-07 21:39:13Z andyrtr $
+# $Id: PKGBUILD 150139 2012-02-13 12:13:16Z 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>
 
 pkgname=dovecot
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,8 +24,9 @@ backup=(etc/dovecot/dovecot.conf
 	etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
-source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('41c10dffa56e228b9176833db2efaac5'
+source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
+md5sums=('4fdee96b390a287d75b51ffcf6abe30f'
+         'c317125fd613a6ed207fbaf7d7543163'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 4badc4ab2..98c07df7c 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143709 2011-11-28 15:22:07Z foutrelis $
+# $Id: PKGBUILD 150129 2012-02-13 08:08:25Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.1.9
+pkgver=0.1.10
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5')
+sha256sums=('c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316')
 
 build() {
   cd "$srcdir/garcon-$pkgver"
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 8d63f8280..71595ad27 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144879 2011-12-08 21:06:55Z juergen $
+# $Id: PKGBUILD 150146 2012-02-13 14:36:40Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.25.1
-pkgrel=3
+pkgver=5.26.0
+pkgrel=1
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b'
+sha1sums=('bc7448486478b217c333605c6d8f6c0bbdd3526c'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 321e10401..3ed70cd8f 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149964 2012-02-11 23:31:17Z allan $
+# $Id: PKGBUILD 150143 2012-02-13 14:12:46Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.4.3
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
@@ -19,7 +19,7 @@ optdepends=('texinfo: for help-support in octave'
 source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
 options=('!emptydirs')
 install=octave.install
-sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
+sha1sums=('62116e090d257a601e9d605f969dd87b7de1ffce')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 47e381721..9d424235f 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $
+# $Id: PKGBUILD 150137 2012-02-13 11:40:55Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.6
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'chrpath')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('0605a8006ea752ec2d1d7fc4791d1c75'
+md5sums=('39a1d0567a20b416177eb1a8afe225a7'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
-
 build() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}" 
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index ba710c5fd..51570bd6b 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 149252 2012-02-06 16:30:37Z foutrelis $
+# $Id: PKGBUILD 150133 2012-02-13 10:09:13Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mpc-plugin
-pkgver=0.3.6
-pkgrel=2
-pkgdesc="plugin to control the music player daemon from the xfce4-panel"
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
+arch=('i686' 'x86_64' 'mips64el')
+license=('BSD')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libmpd>=0.16.1')
+depends=('xfce4-panel' 'libmpd>=0.16.1')
 makedepends=('intltool')
-options=(!libtool)
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a6366662885d803dcebd82bbb91ed3c7')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ae9b285e24385e27cfd797ab605a1b7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -29,6 +29,7 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index a385ea3a8..6cc9f2fd5 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141722 2011-11-02 15:10:56Z foutrelis $
+# $Id: PKGBUILD 150131 2012-02-13 08:12:40Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
-pkgver=4.8.2
-pkgrel=3.1
+pkgver=4.8.3
+pkgrel=1
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -20,7 +20,7 @@ replaces=('xfce4-toys')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
+sha256sums=('f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"