Mon Feb 27 23:15:24 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-02-27 23:15:24 +0000
committer: root <root@rshg054.dnsready.net> 2012-02-27 23:15:24 +0000
commit: 1f567a9d58d16b76320168f0624aa55bd6320284 (patch)
tree: e4e7ffadc364d582fccd8543ad1543fa9741a8a7 /extra
parent: f6a79a3f5989efc8db63af942851c56f0c462bb1 (diff)
45 files changed, 418 insertions, 266 deletions
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 3d1f631f8..d727893cb 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 140489 2011-10-15 15:29:09Z ibiru $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 151492 2012-02-26 17:43:00Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
 # Contributor: Andreas W. Hauser <andy-aur@splashground.de>
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
 pkgname=eclipse
-pkgver=3.7.1
-_internal_pkgver=3.7.1
-pkgrel=2
-_date=201109091335
+pkgver=3.7.2
+pkgrel=1
+_date=201202080800
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
@@ -16,40 +16,36 @@ depends=('java-environment' 'gtk2' 'unzip' 'libwebkit')
 install=${pkgname}.install
 makedepends=('zip')
 license=("EPL/1.1")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz"
-	'eclipse.svg' 'eclipse.sh' 'eclipse.desktop'
-	'eclipse.ini.patch')
-md5sums=('c7f3e186e7996d3a8afc16eec9e9e71f'
-         '77cff7543ccf7e177cb6667f5a20ce19'
+source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
+	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
+md5sums=('79b90faa1ee6e7af1910c3a5077b594f'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba8a37e30a7ebd69774cec87c69e8c44'
-         '017b2a68edc48a752a7e27c7aceef797')
-[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk-${CARCH}.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='b8b37135600d92c373514ce5bb094143'
+         '77cff7543ccf7e177cb6667f5a20ce19')
+[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
+[ "$CARCH" = "x86_64" ] && md5sums[0]='6a0fd32cb6a986032a67defab3753476'
 
 package() {
-  cd "${srcdir}/eclipse"
-
-  # patch to increase default memory limits
-  patch -Np1 -i "${srcdir}/eclipse.ini.patch"
+  cd "$srcdir/eclipse"
 
   # install eclipse
-  install -m755 -d "${pkgdir}/usr/share"
-  mv "${srcdir}/eclipse" "${pkgdir}/usr/share/"
+  install -m755 -d "$pkgdir/usr/share"
+  mv "$srcdir/eclipse" "$pkgdir/usr/share/"
 
   # install misc
-  install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/applications \
-    ${pkgdir}/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
-  install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse"
-  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse.png \
-    "${pkgdir}/usr/share/icons/hicolor/16x16/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse32.png \
-    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse48.png \
-    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/eclipse.png"
+  install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
+    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
+  install -m755 "$srcdir/eclipse.sh" "$pkgdir/usr/bin/eclipse"
+  install -m644 "$srcdir/eclipse.desktop" "$pkgdir/usr/share/applications/"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \
+    "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \
+    "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \
+    "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png"
 
   # install icon
-  install -Dm644 ${srcdir}/eclipse.svg \
-    ${pkgdir}/usr/share/icons/hicolor/scalable/apps/eclipse.svg
+  install -Dm644 "$srcdir"/eclipse.svg \
+    "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.2.v20120109-1030/bin/runant.py
 }
diff --git a/extra/eclipse/eclipse.install b/extra/eclipse/eclipse.install
index 6b59b396e..c3485476c 100644
--- a/extra/eclipse/eclipse.install
+++ b/extra/eclipse/eclipse.install
@@ -1,9 +1,5 @@
 post_install() {
-  # Prevent a bug, where eclipse hangs without this.
-  # See http://aur.archlinux.org/packages.php?ID=12173
-  xulrunner --register-global >/dev/null 2>&1
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
@@ -11,5 +7,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post-install $1
 }
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 16f608ea1..4a057f4bb 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 123615 2011-05-11 19:36:33Z jgc $
+# $Id: PKGBUILD 151400 2012-02-26 10:21:51Z pierre $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
+
 pkgname=gc
 pkgver=7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A garbage collector for C and C++"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 license=('GPL')
-source=(http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz)
+source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
 depends=('gcc-libs')
-options=(!libtool)
+options=('!libtool')
 md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-cplusplus
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/share/gc"
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 542723645..203c72616 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 148758 2012-02-05 11:49:24Z ibiru $
+# $Id: PKGBUILD 151505 2012-02-26 21:44:47Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.13
-pkgrel=2
+pkgver=1.3.14
+pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
          'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
+sha1sums=('307fb59e60685721c365da4c2f593523743ca599')
 
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index eda29fb4c..290c911dc 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 131001 2011-07-09 12:31:33Z ronald $
+# $Id: PKGBUILD 151402 2012-02-26 10:25:31Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Juergen Hoetzel <juergen.archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gsl
 pkgver=1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers"
 url="http://www.gnu.org/software/gsl/gsl.html"
-source=(http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz)
+source=("http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz")
 install=gsl.install
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -21,10 +21,10 @@ build() {
 
     cd ${srcdir}/${pkgname}-${pkgver}
     ./configure --prefix=/usr
-    make || return 1
+    make
 }
 
 package() {
     cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install || return 1
+    make DESTDIR=${pkgdir} install
 }
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 2c2f6c7f3..d364c697f 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151362 2012-02-25 17:02:24Z andrea $
+# $Id: PKGBUILD 151475 2012-02-26 16:56:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
@@ -13,7 +13,7 @@ depends=('kdevelop-pg-qt')
 makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
 sha1sums=('51511e78067a98a69003ba8bc36cf677dba9c69a'
           '03747b9abcc6a7144a5e6ec914e513fc258c29b8')
 
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index c7bebec61..6e6b4a14e 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151360 2012-02-25 17:01:38Z andrea $
+# $Id: PKGBUILD 151473 2012-02-26 16:55:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('459dbbc51f157b9a9322bf429bec84a881473f32')
 
 build() {
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 6792028a4..d67701217 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151358 2012-02-25 17:00:52Z andrea $
+# $Id: PKGBUILD 151477 2012-02-26 16:56:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,7 +14,7 @@ depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('1049eb9c723225c24a38cf2e34381feb370013fc')
 
 build() {
diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD
index 3397db220..96972796a 100644
--- a/extra/libdmx/PKGBUILD
+++ b/extra/libdmx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97777 2010-11-01 22:06:48Z jgc $
+# $Id: PKGBUILD 151404 2012-02-26 10:27:46Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdmx
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Distributed Multihead extension library"
 arch=('x86_64' 'i686')
 url="http://xorg.freedesktop.org/"
@@ -11,13 +11,17 @@ license=('custom')
 depends=('dmxproto' 'libxext')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('49aeab743cb8b667829efda140487b69a7148676')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index ee278cfd7..62b81f057 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97194 2010-10-27 14:16:19Z jgc $
+# $Id: PKGBUILD 151406 2012-02-26 10:29:26Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
-options=(!libtool)
-source=(${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2)
+options=('!libtool')
+source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
 sha1sums=('2b33fa17369605303ae70a7de1aa681879249c92')
 
 build() {
   cd "${srcdir}/libFS-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/libFS-${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/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 444460e89..308b99e4f 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 132743 2011-07-25 18:52:55Z heftig $
+# $Id: PKGBUILD 151408 2012-02-26 10:35:06Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
 pkgver=2.2.10
-pkgrel=1
-arch=(i686 x86_64)
+pkgrel=2
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2)
-options=(!libtool !emptydirs)
+makedepends=('gcc-libs')
+options=('!libtool' '!emptydirs')
+source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2")
 sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
-package_libsigc++() {
+package_libsigc++ () {
   pkgdesc="Libsigc++ implements a full callback system for use in widget libraries - V2"
   depends=('gcc-libs')
   provides=("libsigc++2.0=${pkgver}")
   replaces=('libsigc++2.0')
   conflicts=('libsigc++2.0')
+
   cd "${srcdir}/libsigc++-${pkgver}"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
+  make DESTDIR="${pkgdir}" install
 }
 
 package_libsigc++-docs() {
@@ -35,6 +37,7 @@ package_libsigc++-docs() {
   provides=("libsigc++2.0-docs=${pkgver}")
   replaces=('libsigc++2.0-docs')
   conflicts=('libsigc++2.0-docs')
+
   cd "${srcdir}/libsigc++-${pkgver}/docs"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD
index 854af09b6..23cec885b 100644
--- a/extra/libxcomposite/PKGBUILD
+++ b/extra/libxcomposite/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97802 2010-11-01 22:21:28Z jgc $
+# $Id: PKGBUILD 151410 2012-02-26 10:37:09Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxcomposite
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Composite extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'compositeproto')
 makedepends=('xorg-util-macros')
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2)
+options=('!libtool')
+source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2")
 sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec')
 
 build() {
   cd "${srcdir}/libXcomposite-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXcomposite-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxdmcp/PKGBUILD b/extra/libxdmcp/PKGBUILD
index b247b9028..e07fc3fc8 100644
--- a/extra/libxdmcp/PKGBUILD
+++ b/extra/libxdmcp/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97611 2010-10-31 16:26:42Z jgc $
+# $Id: PKGBUILD 151412 2012-02-26 10:38:01Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxdmcp
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Display Manager Control Protocol library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xproto' 'glibc')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2")
 sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f')
 
 build() {
   cd "${srcdir}/libXdmcp-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXdmcp-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxevie/PKGBUILD b/extra/libxevie/PKGBUILD
index ac39bc680..712663b54 100644
--- a/extra/libxevie/PKGBUILD
+++ b/extra/libxevie/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97772 2010-11-01 22:04:34Z jgc $
+# $Id: PKGBUILD 151414 2012-02-26 10:40:20Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxevie
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 EvIE extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext')
 makedepends=('xorg-util-macros' 'evieext')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXevie-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXevie-${pkgver}.tar.bz2")
 sha1sums=('84e2dc6e35c4a82f1a4d1fe4723fba58364c3bec')
 
 build() {
   cd "${srcdir}/libXevie-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXevie-${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/libxext/PKGBUILD b/extra/libxext/PKGBUILD
index af85db2de..a9f1a38ff 100644
--- a/extra/libxext/PKGBUILD
+++ b/extra/libxext/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 123247 2011-05-09 13:35:22Z jgc $
+# $Id: PKGBUILD 151416 2012-02-26 10:41:55Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxext
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 miscellaneous extensions library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'xextproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2")
 sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d')
 
 build() {
   cd "${srcdir}/libXext-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXext-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD
index d4e8ee97e..535bfbafe 100644
--- a/extra/libxfixes/PKGBUILD
+++ b/extra/libxfixes/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119203 2011-04-11 10:42:49Z jgc $
+# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfixes
 pkgver=5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 miscellaneous 'fixes' extension library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -11,13 +11,17 @@ license=('custom')
 depends=('libx11' 'fixesproto>=5.0')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2")
 sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0')
 
 build() {
   cd "${srcdir}/libXfixes-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXfixes-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index edcbf82e5..c9f7fa2d4 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97606 2010-10-31 16:23:04Z jgc $
+# $Id: PKGBUILD 151420 2012-02-26 10:44:21Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxft
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="FreeType-based font drawing library for X"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,13 +11,17 @@ url="http://xorg.freedesktop.org/"
 depends=('fontconfig' 'libxrender')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2")
 sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f')
 
 build() {
   cd "${srcdir}/libXft-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXft-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD
index 87801ba8c..854639a03 100644
--- a/extra/libxinerama/PKGBUILD
+++ b/extra/libxinerama/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 97812 2010-11-01 22:26:22Z jgc $
+# $Id: PKGBUILD 151422 2012-02-26 10:45:32Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
+
 pkgname=libxinerama
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Xinerama extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'xineramaproto')
 makedepends=('xorg-util-macros')
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
+options=('!libtool')
+source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2")
 sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4')
 
 build() {
   cd "${srcdir}/libXinerama-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/libXinerama-${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/libxkbfile/PKGBUILD b/extra/libxkbfile/PKGBUILD
index 90e05db37..ce7599452 100644
--- a/extra/libxkbfile/PKGBUILD
+++ b/extra/libxkbfile/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97571 2010-10-31 16:00:12Z jgc $
+# $Id: PKGBUILD 151424 2012-02-26 10:46:54Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxkbfile
 pkgver=1.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 keyboard file manipulation library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('0fed539ffbc05859bc666b425fafa42e046bef5f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static 
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index 172af84ab..f37bb9799 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97601 2010-10-31 16:17:53Z jgc $
+# $Id: PKGBUILD 151426 2012-02-26 10:48:08Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxmu
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 miscellaneous micro-utility library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -11,13 +11,17 @@ depends=('libxext' 'libxt')
 makedepends=('xorg-util-macros')
 license=('custom')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2")
 sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd')
 
 build() {
   cd "${srcdir}/libXmu-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-  make 
+  make
+}
+
+package() {
+  cd "${srcdir}/libXmu-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD
index fc3117259..5e33fa581 100644
--- a/extra/libxp/PKGBUILD
+++ b/extra/libxp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106876 2011-01-19 17:19:25Z ibiru $
+# $Id: PKGBUILD 151429 2012-02-26 10:49:41Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxp
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 X Print Library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,7 +11,7 @@ url="http://xorg.freedesktop.org/"
 depends=('libxext' 'printproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2")
 license=('custom')
 sha1sums=('9c76823c7cfcb43f097963d0c930dcc4e38807a8')
 
@@ -19,6 +19,10 @@ build() {
   cd "${srcdir}/libXp-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/libXp-${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/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD
index 676fd9e31..864adaad3 100644
--- a/extra/libxpm/PKGBUILD
+++ b/extra/libxpm/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 97596 2010-10-31 16:14:25Z jgc $
+# $Id: PKGBUILD 151430 2012-02-26 10:50:09Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=libxpm
 pkgver=3.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 pixmap library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxt' 'libxext')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2")
 sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b')
 
 build() {
   cd "${srcdir}/libXpm-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXpm-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD
index 8414f6745..c697ad4de 100644
--- a/extra/libxres/PKGBUILD
+++ b/extra/libxres/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97782 2010-11-01 22:08:57Z jgc $
+# $Id: PKGBUILD 151432 2012-02-26 10:51:47Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxres
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Resource extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('libxext')
 makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros')
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2)
+options=('!libtool')
+source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2")
 sha1sums=('d3a36f9b6ae430da91f2cbae409916f605074195')
 
 build() {
   cd "${srcdir}/libXres-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXres-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD
index a6fbca454..66c2834b4 100644
--- a/extra/libxss/PKGBUILD
+++ b/extra/libxss/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 97566 2010-10-31 15:57:08Z jgc $
+# $Id: PKGBUILD 151434 2012-02-26 10:53:02Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
+
 pkgname=libxss
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Screen Saver extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'scrnsaverproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2")
 sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19')
 
 build() {
   cd "${srcdir}/libXScrnSaver-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc
   make
+}
+
+package() {
+  cd "${srcdir}/libXScrnSaver-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD
index 989e384c3..92fffec19 100644
--- a/extra/libxt/PKGBUILD
+++ b/extra/libxt/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 114251 2011-03-11 12:33:08Z jgc $
+# $Id: PKGBUILD 151437 2012-02-26 10:54:39Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxt
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 toolkit intrinsics library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libx11')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
 sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5')
 
 build() {
   cd "${srcdir}/libXt-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXt-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD
index bcdf92d29..2945d5a89 100644
--- a/extra/libxtst/PKGBUILD
+++ b/extra/libxtst/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97591 2010-10-31 16:11:54Z jgc $
+# $Id: PKGBUILD 151438 2012-02-26 10:55:16Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxtst
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Testing -- Resource extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'libxi' 'recordproto' 'inputproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2")
 sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72')
 
 build() {
   cd "${srcdir}/libXtst-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXtst-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index a06c89882..ffaebd312 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 97586 2010-10-31 16:08:34Z jgc $
+# $Id: PKGBUILD 151440 2012-02-26 10:56:31Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxv
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Video extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'videoproto')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2")
 sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c')
 
 build() {
   cd "${srcdir}/libXv-${pkgver}"
   ./configure --prefix=/usr --disable-static 
   make
+}
+
+package() {
+  cd "${srcdir}/libXv-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD
index 3efb46c39..413672bd1 100644
--- a/extra/libxvmc/PKGBUILD
+++ b/extra/libxvmc/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 87580 2010-08-17 07:10:11Z jgc $
+# $Id: PKGBUILD 151442 2012-02-26 10:57:39Z pierre $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxvmc
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Video Motion Compensation extension library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libxv>=1.0.5')
+depends=('libxv')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2")
 sha1sums=('4ace7e7ce6b646b5715b2efa561affc89bc87f91')
 
 build() {
   cd ${srcdir}/libXvMC-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/libXvMC-${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/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index f954897da..82cb21881 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144867 2011-12-08 20:35:39Z foutrelis $
+# $Id: PKGBUILD 151494 2012-02-26 18:15:27Z 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.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -130,6 +130,11 @@ package_llvm() {
   install -d "$pkgdir/etc/ld.so.conf.d"
   echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
 
+  # Symlink LLVMgold.so into /usr/lib/bfd-plugins
+  # (https://bugs.archlinux.org/task/28479)
+  install -d "$pkgdir/usr/lib/bfd-plugins"
+  ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so"
+
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/extra/lzop/PKGBUILD b/extra/lzop/PKGBUILD
index 240422d27..b507594a4 100644
--- a/extra/lzop/PKGBUILD
+++ b/extra/lzop/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98428 2010-11-08 21:29:39Z andrea $
+# $Id: PKGBUILD 151444 2012-02-26 10:58:51Z pierre $
 # Maintainer:
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lzop
 pkgver=1.03
-pkgrel=1
+pkgrel=2
 pkgdesc="File compressor using lzo lib"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.lzop.org/"
 depends=('lzo2')
-source=(http://www.lzop.org/download/${pkgname}-${pkgver}.tar.gz)
+source=("http://www.lzop.org/download/${pkgname}-${pkgver}.tar.gz")
 md5sums=('006c5e27fb78cdd14a628fdfa5aa1905')
 
 build() {
diff --git a/extra/mailman/PKGBUILD b/extra/mailman/PKGBUILD
index a7b140030..d5ebc7277 100644
--- a/extra/mailman/PKGBUILD
+++ b/extra/mailman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151051 2012-02-24 15:02:06Z pierre $
+# $Id: PKGBUILD 151503 2012-02-26 20:39:48Z pierre $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=mailman
 pkgver=2.1.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Mailing list manager with built in web access"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,13 @@ build() {
   # fix calls to /usr/bin/python
   find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
   # fix directory permissions to satisfy check_perms
-  patch -Np1 -i ${srcdir}/mailman-2.1-build.patch
+  patch -p1 -i ${srcdir}/mailman-2.1-build.patch
+  # set some sane defaults before the configure script has a chance to screw them up
+  sed -e 's/@MAILHOST@/localhost/g' \
+      -e 's/@URLHOST@/localhost/g' \
+      -e 's/@MAILMAN_USER@/mailman/g' \
+      -e 's/@MAILMAN_GROUP@/mailman/g' \
+      -i Mailman/Defaults.py.in
 
   ./configure --without-permcheck \
               --prefix=/usr/lib/mailman \
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 956214576..6da684037 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150772 2012-02-21 21:03:35Z ronald $
+# $Id: PKGBUILD 151390 2012-02-26 08:18:31Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
@@ -18,7 +18,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=('62116e090d257a601e9d605f969dd87b7de1ffce')
+sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/pdns-recursor/PKGBUILD b/extra/pdns-recursor/PKGBUILD
index c344995ac..cf2e32d9b 100644
--- a/extra/pdns-recursor/PKGBUILD
+++ b/extra/pdns-recursor/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 109116 2011-02-06 10:26:46Z andyrtr $
+# $Id: PKGBUILD 151458 2012-02-26 11:37:32Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pdns-recursor
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PowerDNS recursor"
 url="http://www.powerdns.com"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('gcc-libs>=4.5.2' 'lua')
+depends=('gcc-libs' 'lua')
 makedepends=('boost')
-#options=(!makeflags)
 backup=('etc/powerdns/recursor.conf')
-source=(http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2
-        pdns-recursor.rc)
+source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2"
+        'pdns-recursor.rc')
 md5sums=('87daeeebb6f7af9e07814ff6c43300dd'
          '5b3aa3c8ed2edf55821af16cfb7ef252')
 
diff --git a/extra/pdns/PKGBUILD b/extra/pdns/PKGBUILD
index 9506deee3..8226a5868 100644
--- a/extra/pdns/PKGBUILD
+++ b/extra/pdns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 115160 2011-03-17 09:56:37Z andrea $
+# $Id: PKGBUILD 151459 2012-02-26 11:41:02Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pdns
-pkgver=2.9.22
-pkgrel=7
+pkgver=2.9.22.6
+pkgrel=1
 pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.powerdns.com"
 license=('GPL')
 depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'libldap')
@@ -14,14 +14,14 @@ provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 install=pdns.install
-options=(!makeflags !libtool)
+options=('!makeflags' '!libtool')
 backup=('etc/powerdns/pdns.conf')
-source=(http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz
-        2.9.18-default-mysql-options.patch
-        pdns-2.9.22-gcc44.patch
-        pdns.rc
-        pdns.conf)
-md5sums=('8a6ff842733aca885577eb54e983a1ff'
+source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz"
+        '2.9.18-default-mysql-options.patch'
+        'pdns-2.9.22-gcc44.patch'
+        'pdns.rc'
+        'pdns.conf')
+md5sums=('ff97ba980b322adb61c3e9c9e9c4adef'
          '90fb32e843326d14359c508cef855929'
          '530642273005bdabae27792098834ea6'
          '16e2d32e9781be7afa8f1700740bcdb0'
@@ -29,8 +29,8 @@ md5sums=('8a6ff842733aca885577eb54e983a1ff'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/2.9.18-default-mysql-options.patch"
-  patch -Np1 -i "${srcdir}/pdns-2.9.22-gcc44.patch"
+  patch -p1 -i "${srcdir}/2.9.18-default-mysql-options.patch"
+  patch -p1 -i "${srcdir}/pdns-2.9.22-gcc44.patch"
   touch AUTHORS NEWS
   libtoolize --force --copy
   aclocal
@@ -46,6 +46,10 @@ build() {
     --disable-recursor \
     --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/rc.d"
   rm "${pkgdir}/etc/powerdns/pdns.conf-dist"
diff --git a/extra/procmail/PKGBUILD b/extra/procmail/PKGBUILD
index 4fe479094..b7e780796 100644
--- a/extra/procmail/PKGBUILD
+++ b/extra/procmail/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 118844 2011-04-08 11:25:08Z andyrtr $
+# $Id: PKGBUILD 151448 2012-02-26 11:17:19Z pierre $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=procmail
 pkgver=3.22
-pkgrel=4
+pkgrel=5
 pkgdesc="Highly configurable auto mail processing."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.procmail.org"
 license=('GPL' 'custom:Artistic')
 depends=('glibc' 'sh')
 makedepends=('smtp-server')
-source=(#http://www.procmail.org/${pkgname}-${pkgver}.tar.gz # currently down
-	ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/${pkgname}-${pkgver}.tar.gz
-	procmail-3.22-getline.patch)
+source=(#"http://www.procmail.org/${pkgname}-${pkgver}.tar.gz" # currently down
+        "ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/${pkgname}-${pkgver}.tar.gz"
+        'procmail-3.22-getline.patch')
 md5sums=('1678ea99b973eb77eda4ecf6acae53f1'
          'cf8e5d4854050ab0c836e07406a3dfa9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/procmail-3.22-getline.patch
+  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
 }
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index c87a281b3..c628eb158 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 136104 2011-08-23 01:58:09Z heftig $
+# $Id: PKGBUILD 151450 2012-02-26 11:24:29Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
 pkgver=2.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable Windows Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.ekiga.org/"
 license=('GPL')
-depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
+depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
 sha256sums=('a0985848da2ea06a4df804a650fd800ff52a01f889c116595b9a67fc35537140')
 
 build() {
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index fba0c5d51..74a638fd9 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 96778 2010-10-24 17:01:27Z ibiru $
+# $Id: PKGBUILD 151452 2012-02-26 11:26:30Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
 
 pkgname=pycrypto
-pkgver=2.3
+pkgver=2.5
 pkgrel=1
 pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('python2')
 url="http://www.dlitz.net/software/pycrypto/"
-license=(custom)
-source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182')
+license=('custom')
+source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('e950a78184e2a7defccf5d45e0c29c1e9edeb29984433f0d110a21e9631e38de')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/pyorbit/PKGBUILD b/extra/pyorbit/PKGBUILD
index 930dd0dda..c0d5c5921 100644
--- a/extra/pyorbit/PKGBUILD
+++ b/extra/pyorbit/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 89716 2010-09-03 12:01:46Z remy $
+# $Id: PKGBUILD 151454 2012-02-26 11:28:37Z pierre $
 # Mantainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pyorbit
 pkgver=2.24.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for ORBit2"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.pygtk.org"
-depends=('python2' 'orbit2>=2.14.16')
+depends=('python2' 'orbit2')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2)
+source=("http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('574593815e75ee6e98062c75d6d1581f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index bc7ba43b7..e68fd04e8 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 151098 2012-02-24 21:08:06Z giovanni $
+# $Id: PKGBUILD 151463 2012-02-26 12:17:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'aalib'
-         'libxinerama' 'libtar' 'libtiger' 'lua' 'v4l-utils' 'smbclient' 
-         'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 
-         'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass'
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
+         'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
          'xcb-util-keysyms' 'ttf-freefont')
-makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'libgcrypt'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca' 'librsvg' 'portaudio' 'oss' 
-             'ncurses' 'libgme' 'schroedinger' 'udev' 'projectm' 'twolame' 
-             'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager' 'xosd')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
+             'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
+             'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
+             'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -30,28 +28,30 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
             'vdpau-video: vdpau back-end for nvidia'
             'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray support' 
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
             'oss: for OSS audio support'
             'portaudio: for portaudio support'
             'twolame: for TwoLAME mpeg2 encoder plugin'
             'projectm: for ProjectM visualisation plugin'
-            'udev: for service discovery using udev'
             'libcaca: for colored ASCII art video output'
             'libgme: for libgme plugin'
             'librsvg: for SVG plugin'
-            'libgcrypt: support for some plugins'
             'gnome-vfs: for GNOME Virtual File System support'
             'libgoom2: for libgoom plugin'
             'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support')
+            'xosd: for xosd support'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
+            'fluidsynth: for synthesizer MIDI FluidSynth'
+            'smbclient: for SMB access plugin')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
         'access_smb_link_to_smbclient.patch')
@@ -74,7 +74,6 @@ build() {
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-real \
               --enable-realrtsp \
               --enable-xosd \
               --enable-aa \
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index a8c893f44..ce7cad83b 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 143994 2011-12-01 15:45:52Z giovanni $
+# $Id: PKGBUILD 151466 2012-02-26 12:39:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.3.6
-pkgrel=2
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
 license=('GPL')
-depends=('gnutls')
+depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('db2392b8e31738f79f0898f77eda8daa')
+md5sums=('62bb5002b2ba9e5816dfeededc3fa276')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index 16fa2e0cb..0b78657f9 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,34 +1,43 @@
-# $Id: PKGBUILD 149238 2012-02-06 16:19:07Z foutrelis $
+# $Id: PKGBUILD 151509 2012-02-26 21:57:00Z foutrelis $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-battery-plugin
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A battery monitor plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2696307f34f6b9630fcaaea102004e78')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
+        show-time-when-on-battery.patch)
+sha256sums=('c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f'
+            '7cabd72a462406295e438a2aae89c09af9f759b5c257f7ecd19ae02c81250575')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+
+  # Fix FS#27438: Remaining time not shown on some systems
+  patch -Np1 -i "$srcdir/show-time-when-on-battery.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-battery-plugin/show-time-when-on-battery.patch b/extra/xfce4-battery-plugin/show-time-when-on-battery.patch
new file mode 100644
index 000000000..d5ed36460
--- /dev/null
+++ b/extra/xfce4-battery-plugin/show-time-when-on-battery.patch
@@ -0,0 +1,21 @@
+From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001
+From: flo <florian.a.jung@web.de>
+Date: Fri, 18 Feb 2011 17:21:12 +0000
+Subject: Show time when on battery power (bug #3736).
+
+---
+diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
+index 87339b7..838a760 100644
+--- a/panel-plugin/libacpi.c
++++ b/panel-plugin/libacpi.c
+@@ -787,7 +787,7 @@ int read_acpi_state_sysfs(int battery)
+ 			acpistate->rcapacity = read_sysfs_int(buf);
+ 			acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
+ 		}
+-		if (strcmp(name,"current_now") == 0)
++		if ((strcmp(name,"current_now") == 0) || (strcmp(name,"power_now") == 0))
+ 		{
+ 			sprintf(buf,"%s/%s",batteries[battery], name);
+ 			acpistate->prate = read_sysfs_int(buf);
+--
+cgit v0.9.0.2
diff --git a/extra/xfce4-battery-plugin/xfce4-battery-plugin.install b/extra/xfce4-battery-plugin/xfce4-battery-plugin.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-battery-plugin/xfce4-battery-plugin.install
+++ b/extra/xfce4-battery-plugin/xfce4-battery-plugin.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 6ab299b08..736c67f15 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,38 +1,45 @@
-# $Id: PKGBUILD 148978 2012-02-05 11:58:42Z ibiru $
+# $Id: PKGBUILD 151507 2012-02-26 21:47:29Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' 
-makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools')
-optdepends=('gnu-netcat: for hddtemp access')
-options=(!libtool !makeflags)
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2edf376d140449ca42c4e4f591e626f8')
+depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hddtemp' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnu-netcat')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3dd27348f7b38b55e53aa8d851cdb80e090b8830ca9e705bf32641679f08d326')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--datadir=/usr/share \
-	--datarootdir=/usr/share \
-	--disable-static \
-	--with-pathhddtemp=/usr/sbin/hddtemp \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Satisfy the check that hddtemp is queryable via netcat
+  # (https://bugs.archlinux.org/task/28275)
+  echo ohai | nc -l -p 7634 -s localhost -c &
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --datadir=/usr/share \
+    --datarootdir=/usr/share \
+    --disable-static \
+    --with-pathhddtemp=/usr/sbin/hddtemp \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
index 17ca8f78a..ef6375367 100644
--- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
+++ b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
@@ -1,11 +1,25 @@
-post_install() {
+post_common() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
+post_install() {
+  post_common
+
+  echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+  echo '> crash on start.'
+}
+
 post_upgrade() {
-  post_install $1
+  post_common
+
+  if (($(vercmp $2 1.2.3-4) < 0)); then
+    echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+    echo '> crash on start.'
+  fi
 }
 
 post_remove() {
-  post_install $1
+  post_common
 }
+
+# vim:set ts=2 sw=2 et:
author	root <root@rshg054.dnsready.net>	2012-02-27 23:15:24 +0000
committer	root <root@rshg054.dnsready.net>	2012-02-27 23:15:24 +0000
commit	1f567a9d58d16b76320168f0624aa55bd6320284 (patch)
tree	e4e7ffadc364d582fccd8543ad1543fa9741a8a7 /extra
parent	f6a79a3f5989efc8db63af942851c56f0c462bb1 (diff)