Thu Aug 18 23:14:33 UTC 2011

36 files changed, 366 insertions, 118 deletions

diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 6c69a2021..57957d67c 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54327 2011-08-17 00:58:33Z kkeen $
+# $Id: PKGBUILD 54357 2011-08-17 12:23:10Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 pkgname=elinks
 pkgver=0.13
 _commit="30c485af4c4ba128d82171a6066594f3cfaeae5d"
-pkgrel=8
+pkgrel=9
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64")
 url="http://elinks.or.cz"
@@ -44,7 +44,7 @@ build() {
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
-              --enable-smb --without-x --enable-cgi \
+              --disable-smb --without-x --enable-cgi \
               --enable-leds --enable-256-colors --enable-html-highlight \
               --with-zlib
   make
diff --git a/community/grass/PKGBUILD b/community/grass/PKGBUILD
index e1e10c242..dcfce221a 100644
--- a/community/grass/PKGBUILD
+++ b/community/grass/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=grass
 pkgver=6.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.'
 arch=('i686' 'x86_64')
 url='http://grass.itc.it/index.php'
diff --git a/community/grass/grass.install b/community/grass/grass.install
index dc6b4eec6..07e347eb1 100644
--- a/community/grass/grass.install
+++ b/community/grass/grass.install
@@ -1,12 +1,6 @@
+## arg 1:  the new package version
 post_install() {
-    pre_remove
-}
-
-post_upgrade() {
-    pre_remove
-}
-
-pre_remove() {
-    sed -e '/\/opt\/grass-*\/lib/d' -i /etc/ld.so.conf
+  echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh'
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index b29291f44..4afae8657 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -6,18 +6,17 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.4.10
+pkgver=0.4.11
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
 url='http://nodejs.org/'
 license=('MIT')
 depends=('python2')
-makedepends=('curl') # curl used for check()
+checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
-conflicts=('nodejs-unstable')
 source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz")
-sha256sums=('57fa7ed5a818308ff485bb1c1a8ec8f1eb6a7800e14201dff65d88ce657da50a')
+sha256sums=('e009522d52c4a844c46e51c63b852899d1b7e6d949d1a139cdc16b4f6c4ab63f')
 
 build() {
   cd node-v${pkgver}
@@ -40,10 +39,7 @@ build() {
 check() {
   cd node-v${pkgver}
 
-  # only 1 test should fail afaik
-  # === release test-http-dns-fail ===
-  # https://github.com/joyent/node/issues/703
-  make test || true
+  make test
 }
 
 package() {
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
new file mode 100644
index 000000000..f7bb06784
--- /dev/null
+++ b/community/notion/PKGBUILD
@@ -0,0 +1,77 @@
+# $Id: PKGBUILD 54370 2011-08-17 15:48:41Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
+# Contributor: aunoor
+
+pkgname=notion
+pkgver=20110817
+pkgrel=1
+pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
+url="http://sourceforge.net/projects/notion/"
+arch=('i686' 'x86_64')
+license=('custom:LGPL')
+depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm')
+makedepends=('git' 'pkgconfig')
+conflicts=('ion3')
+provides=('libtu' 'libextl')
+source=()
+
+_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion"
+_gitname="notion"
+_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu"
+_gitname2="libtu"
+_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl"
+_gitname3="libextl"
+
+build() {
+    cd ${srcdir}
+
+    msg "Connecting to the git repository..."
+    if [ -d ${srcdir}/${_gitname} ]; then
+        cd ${_gitname}
+        git pull origin
+    else
+        git clone --depth 1 ${_gitroot}
+        cd ${_gitname}
+    fi
+
+    if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then
+    echo
+        git pull origin
+    else
+        git clone --depth 1 ${_gitroot2}
+      echo
+    fi
+
+    if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then
+    echo
+        git pull origin
+    else
+        git clone --depth 1 ${_gitroot3}
+    echo
+    fi
+
+    msg "GIT checkout done or server timeout"
+
+    rm -rf ${srcdir}/${_gitname}-build
+    cp -r  ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
+
+    cd ${srcdir}/${_gitname}-build
+
+    msg "Starting make..."
+
+    sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
+        -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
+        -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
+        -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
+        -i system.mk
+
+    make INCLUDES=-I${srcdir}/${_gitname}-build
+}
+
+package() {
+    cd ${srcdir}/${_gitname}-build
+    make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+    mkdir -p ${pkgdir}/usr/share/licenses/notion
+    cp LICENSE ${pkgdir}/usr/share/licenses/notion
+}
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index 5ccebd7d5..dfc1442a0 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54302 2011-08-16 14:38:12Z andrea $
+# $Id: PKGBUILD 54341 2011-08-17 07:30:50Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=obconf
-pkgver=2.0.3git20100309
+pkgver=2.0.3.git20100309
 pkgrel=1
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
 source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('122f2c46a2843175e4c3a27c3e6b8ed5')
+md5sums=('d45a1eab18aa25c18280821118368b97')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index a45136361..d445e72cf 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53541 2011-08-05 12:13:39Z stativ $
+# $Id: PKGBUILD 54346 2011-08-17 07:32:06Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 7b50171ae..186d71729 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,7 +4,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=4.7
+pkgver=4.7.1
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -15,12 +15,12 @@ depends=('ppl')
 makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
-            'sage-mathematics-spkgs: original packages used to build additional packages, in the AUR')
+            'sage-mathematics-spkgs: original packages used to build additional packages')
 options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('db4d891feed487e1696b8d01ae3b6469'
+md5sums=('4d82c6719d14a1c2d403024d989faac7'
          'dc391f12b7d17dd37326343ec0e99bbd')
 
 build() {
@@ -64,6 +64,10 @@ build() {
   # only build sage, no documents
   #make build
   make
+}
+
+check() {
+  cd sage-${pkgver}
 
   # uncomment if we want to run all the tests (warning: very long)
   #make ptestlong
@@ -92,7 +96,8 @@ package() {
   rm -f ${pkgdir}/opt/sage/install.log
   rm -rf ${pkgdir}/opt/sage/spkg/logs
 
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed), and no need to compile them, put them into aur/sage-mathematics-spkgs
+  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
+  # no need to package them together, put into sage-mathematics-spkgs
   rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
 }
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index e6c628896..0acbbbc57 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 48984 2011-06-09 06:50:51Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
+# $Id: PKGBUILD 54383 2011-08-17 20:41:29Z schiv $
+# Maintainer:
+# Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64')
@@ -14,7 +15,7 @@ depends=('kdebase-runtime' 'libofx' 'qca-ossl')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
 install=$pkgname.install
 source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('340cbec2ddc2a258bd9b5091dbdb5e92')
+md5sums=('2fa984e250359fd6008d2c601f1209ec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index b07dafb05..70ec62a40 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54081 2011-08-13 09:18:00Z spupykin $
+# $Id: PKGBUILD 54351 2011-08-17 09:49:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -7,7 +7,7 @@
 _p=ZynAddSubFX
 pkgname=zynaddsubfx
 pkgver=2.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
 arch=('i686' 'x86_64')
 url="http://zynaddsubfx.sourceforge.net"
@@ -33,7 +33,7 @@ build() {
   patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
 
   [ -d build ] || mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk ..
   make
 
   # build external programs
diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD
index a5cec46b3..390a41bfb 100644
--- a/core/diffutils/PKGBUILD
+++ b/core/diffutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102649 2010-12-09 13:50:53Z stephane $
+# $Id: PKGBUILD 135711 2011-08-18 02:10:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=diffutils
-pkgver=3.0
-pkgrel=2
+pkgver=3.1
+pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/diffutils"
@@ -13,15 +13,20 @@ groups=('base')
 depends=('glibc' 'sh')
 install=diffutils.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7624eb7e6b53ea3ce38958a092d2216e')
+md5sums=('fbb1d804849fa32ff5853f028a3be46f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/core/diffutils/diffutils.install b/core/diffutils/diffutils.install
index 3ebec2831..ae6655fba 100644
--- a/core/diffutils/diffutils.install
+++ b/core/diffutils/diffutils.install
@@ -1,5 +1,5 @@
-infodir=/usr/share/info
-filelist=(diff.info)
+infodir=usr/share/info
+filelist=(diffutils.info)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index c765d79a3..5b706c6ba 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106454 2011-01-17 12:49:41Z allan $
+# $Id: PKGBUILD 135715 2011-08-18 02:10:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=pcre
-pkgver=8.12
+pkgver=8.13
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ license=('BSD')
 depends=('gcc-libs')
 options=('!libtool')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3')
-sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea')
+md5sums=('5e595edbcded141813fa1a10dbce05cb')
+
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD
index ce4c93698..5646c7d86 100644
--- a/core/wget/PKGBUILD
+++ b/core/wget/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135508 2011-08-14 11:32:07Z allan $
+# $Id: PKGBUILD 135713 2011-08-18 02:10:18Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=wget
-pkgver=1.13
+pkgver=1.13.1
 pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('48c5384123156e7b7501d2f5b5c7189a')
+md5sums=('5c9056fcec2f398111e97be65e8592cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 56a7880d7..cb8da4e3d 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134698 2011-08-07 16:20:42Z dreisner $
+# $Id: PKGBUILD 135667 2011-08-17 07:46:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
 pkgver=1.0.24.2
-pkgrel=2
+pkgrel=3
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -18,11 +18,6 @@ source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
         alsa.conf.d
         90alsa)
 backup=(etc/conf.d/alsa)
-md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2'
-         '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '62ebef77d5617d0036012cc541dcf23c'
-         '4c8ae9f976c7df5e271a4cb91ccc7767'
-         '529216f6a46e61a546640e08ea7a0879')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -40,3 +35,8 @@ package() {
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
+md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2'
+         '2ba1a1cbf653bf1a69f8a720fd6549da'
+         '7521bf20f5b3501a510ec4462ae4a934'
+         '4c8ae9f976c7df5e271a4cb91ccc7767'
+         '529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/alsa-utils/alsaconf.patch b/extra/alsa-utils/alsaconf.patch
index ec79fe93f..48037fd3e 100644
--- a/extra/alsa-utils/alsaconf.patch
+++ b/extra/alsa-utils/alsaconf.patch
@@ -5,7 +5,7 @@ diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsacon
    distribution="redhat"
  elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
    distribution="fedora"
-+elif test -f /etc/arch-release && grep -q "Arch" /etc/arch-release; then
++elif test -f /etc/arch-release; then
 +  distribution="arch"
  elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
    distribution="slackware"
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index 217de93c7..dc128d465 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88117 2010-08-19 14:40:05Z tpowa $
+# $Id: PKGBUILD 135660 2011-08-17 06:53:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=facile
 pkgver=1.1
-pkgrel=12
+pkgrel=13
 pkgdesc="A Functional Constraint Library"
 arch=(i686 x86_64)
 url="http://www.recherche.enac.fr/opti/facile/"
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 0d2cea023..d451e3146 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 132082 2011-07-19 22:17:46Z eric $
+# $Id: PKGBUILD 135708 2011-08-18 01:12:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.2.7
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('db61c36222ad0bd1de233cf29226ff27')
-sha1sums=('b7cf680a25e9006cb3a289a2e5c786dd385577cb')
+md5sums=('70fd4285f2da7d41bdadac43458e62c9')
+sha1sums=('d4e871ad749e1807957df4e353fbb8f5510b7248')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD
index bbaa11d59..ba6a31b91 100644
--- a/extra/freenx/PKGBUILD
+++ b/extra/freenx/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 108550 2011-02-01 08:10:47Z tpowa $
+# $Id: PKGBUILD 135657 2011-08-17 06:43:27Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> 
 pkgname=freenx
 pkgver=0.7.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
 license=('GPL')
-depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage')
+depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
 backup=(opt/NX/etc/node.conf)
 install=freenx.install
 source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index 9aa292207..1bd4fffee 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123660 2011-05-12 07:33:28Z ronald $
+# $Id: PKGBUILD 135681 2011-08-17 08:07:39Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
@@ -16,7 +16,7 @@ source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'httpserver.patch')
 install=${pkgname}.install
 options=('libtool')
-md5sums=('affadf7c7198e5aa430e91ab75800296'
+md5sums=('8026d9f75257f2e52ac5ba3ce4720d55'
          '1f25b94615b0bbfa0457c99fb20de3e6')
 
 build() {
diff --git a/extra/ktorrent/ktorrent.install b/extra/ktorrent/ktorrent.install
index c3f65a3dc..91944a30f 100644
--- a/extra/ktorrent/ktorrent.install
+++ b/extra/ktorrent/ktorrent.install
@@ -1,6 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime &> /dev/null
+    update-mime-database usr/share/mime &> /dev/null
 	update-desktop-database -q
 }
 
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index a9f065c4e..baf833da8 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 132150 2011-07-21 11:38:25Z tpowa $
+# $Id: PKGBUILD 135692 2011-08-17 10:30:13Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.14.2
-pkgrel=3
+pkgrel=4
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://lablgtk.forge.ocamlcore.org/"
 depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
 makedepends=('ocaml')
+optdepends=('ocaml: for using the tools')
 source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
 options=(!makeflags)
 md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
@@ -21,5 +22,4 @@ build() {
   make opt
   make DESTDIR="${pkgdir}" install
   install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/"
-  rm -r "${pkgdir}/usr/bin"
 }
diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD
index 965b46875..b1ec2b92b 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -1,21 +1,32 @@
-# $Id: PKGBUILD 81449 2010-05-30 16:39:15Z tpowa $
+# $Id: PKGBUILD 135705 2011-08-17 16:07:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lensfun
 pkgver=0.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
 url="http://lensfun.berlios.de/"
 license=('LGPL3')
 depends=('glibc' 'glib2')
-makedepends=('python' 'libpng')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2) 
+makedepends=('python' 'libpng' 'doxygen')
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        "runtime.cpu.detection.fix.backport.patch")
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --libdir=/usr/lib || return 1
-    make all || return 1
-    make INSTALL_PREFIX="$pkgdir" install || return 1
+    sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
+    patch -p0 -i "${srcdir}/runtime.cpu.detection.fix.backport.patch"
+    ./configure \
+        --prefix=/usr \
+        --libdir=/usr/lib
+    make all
 }
-md5sums=('a10438dffae68a5988fc54b0393a3755')
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make INSTALL_PREFIX="$pkgdir" install
+}
+
+md5sums=('a10438dffae68a5988fc54b0393a3755'
+         'a2033928f263db319de78182ab12fb7d')
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index c4c779b47..b8aecf570 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 122107 2011-05-02 07:24:22Z andrea $
+# $Id: PKGBUILD 135670 2011-08-17 07:49:37Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
 license=('GPL2')
 depends=('kdelibs')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/4.1.1/${pkgname}-${pkgver}.tar.bz2")
+makedepends=('automoc4' 'cmake' 'boost' 'doxygen')
+source=("http://ktorrent.org/downloads/4.1.2/${pkgname}-${pkgver}.tar.bz2")
 options=('libtool')
-md5sums=('96de8dd6d6cea4255ce946bb4cd69836')
+md5sums=('471b25afc48e195723ac1e264c8a0fc5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index 34d929086..bdd4a274c 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126134 2011-06-01 18:06:44Z andrea $
+# $Id: PKGBUILD 135676 2011-08-17 07:52:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
 source=("http://www.libssh.org/files/0.5/${pkgname}-${pkgver}.tar.gz")
-md5sums=('9b37f45751c0ae7ba66099c1fb136946')
+md5sums=('0cd8bc9336398e23a76f4e25c1412eb4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 21822768c..3087b7bde 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 133031 2011-07-27 01:25:28Z dan $
+# $Id: PKGBUILD 135720 2011-08-18 03:34:00Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
         memcached.conf
 		memcached.sh)
 changelog=ChangeLog
-sha256sums=('4dba55457e4e7f5a3e8255325671bf1e1efbe89ee224fcc6993fcd659956d3f7'
+sha256sums=('925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6'
             '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
             '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
 
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 89109d989..a07a2bee4 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135521 2011-08-14 19:04:44Z ibiru $
+# $Id: PKGBUILD 135698 2011-08-17 15:28:40Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.12.4
-pkgrel=3
+pkgver=0.12.6
+pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
 install=telepathy-gabble.install
-md5sums=('428962565d568667d3ff1aa7eee3da51')
+md5sums=('5524c7b6a29801feedc9ffa82503911a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/multilib/lib32-acl/PKGBUILD b/multilib/lib32-acl/PKGBUILD
index 6cfc4ec30..162ebf858 100644
--- a/multilib/lib32-acl/PKGBUILD
+++ b/multilib/lib32-acl/PKGBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=lib32-acl
-pkgver=2.2.49
+pkgver=2.2.51
 pkgrel=1
 pkgdesc="Access control list libraries (32-bit)"
 arch=('x86_64')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
-depends=('lib32-attr' 'acl')
+depends=('lib32-attr>=2.4.46' 'acl')
 makedepends=('gcc-multilib')
 options=('!libtool')
-source=(http://mirrors.zerg.biz/nongnu/acl/acl-${pkgver}.src.tar.gz)
-sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5')
+source=(http://download.savannah.gnu.org/releases/acl/acl-${pkgver}.src.tar.gz)
+sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
 
 build() {
   cd "${srcdir}/acl-${pkgver}"
diff --git a/multilib/lib32-attr/PKGBUILD b/multilib/lib32-attr/PKGBUILD
index af308863a..c802e5b3b 100644
--- a/multilib/lib32-attr/PKGBUILD
+++ b/multilib/lib32-attr/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 26511 2010-09-15 22:28:05Z bluewind $
+# $Id: PKGBUILD 54388 2011-08-17 20:57:53Z lcarlier $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 _pkgbasename=attr
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.44
-pkgrel=4
+pkgver=2.4.46
+pkgrel=1
 pkgdesc="Extended attribute support library for ACL support (32-bit)"
 arch=(x86_64)
-url="http://oss.sgi.com/projects/xfs/"
+url="http://savannah.nongnu.org/projects/attr"
 license=('LGPL')
 depends=('lib32-glibc' $_pkgbasename) 
 makedepends=('gcc-multilib' 'gettext')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz)
-sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a')
+source=(http://download.savannah.gnu.org/releases/attr/attr-${pkgver}.src.tar.gz)
+sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
 
 build() {
-  cd $srcdir/attr-$pkgver 
+  cd ${srcdir}/attr-${pkgver} 
 
   export CC="gcc -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  autoconf
+  export INSTALL_USER=root INSTALL_GROUP=root
   ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32
   make 
 
   # Doesn't like building as non-root
 
-  make prefix=${pkgdir}/usr \
-    PKG_LIB_DIR=$pkgdir/usr/lib32 \
-    PKG_DEVLIB_DIR=$pkgdir/usr/lib32 \
+#  make prefix=${pkgdir}/usr \
+#    PKG_LIB_DIR=$pkgdir/usr/lib32 \
+#    PKG_DEVLIB_DIR=$pkgdir/usr/lib32 \
+  make DIST_ROOT="${pkgdir}" \
     install-lib install-dev
 
   rm -rf "${pkgdir}"/usr/{bin,include,share}
diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD
index 081db8c4a..a507e3e60 100644
--- a/multilib/lib32-udev/PKGBUILD
+++ b/multilib/lib32-udev/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=('lib32-udev')
-pkgver=171
+pkgver=173
 pkgrel=1
 arch=('x86_64')
 pkgdesc="The userspace dev tools (udev) (32-bit)"
@@ -12,9 +12,9 @@ url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 options=(!makeflags !libtool)
 depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev')
-makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
+makedepends=('gcc-multilib' 'gperf' 'gobject-introspection')
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2)
-md5sums=('bdf4617284be2ecac11767437417e209')
+md5sums=('91a88a359b60bbd074b024883cc0dbde')
 
 build() {
   export CC="gcc -m32"
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
new file mode 100644
index 000000000..81cd69fd4
--- /dev/null
+++ b/testing/usbutils/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 135703 2011-08-17 16:07:01Z tpowa $
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
+pkgname=usbutils
+pkgver=004
+pkgrel=1
+_usb_ids_date=2011.08.17
+pkgdesc="USB Device Utilities"
+arch=(i686 x86_64)
+license=('GPL')
+groups=('base')
+makedepends=('wget')
+depends=('glibc' 'libusb')
+optdepends=('python2: for lsusb.py usage'
+           'coreutils: for lsusb.py usage')
+url="http://linux-usb.sourceforge.net/"
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+        fix-python2.patch
+        usb.ids-${_usb_ids_date})  # from http://linux-usb.sourceforge.net/usb.ids
+md5sums=('481e1de453bcabbd5f43125bb4df2ab7'
+         '45766196895b4cc50b53cd56e1bbf3d1'
+         'f04c301b5363ef618f0ec776deff3117')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  rm usb.ids
+  cp $srcdir/usb.ids-${_usb_ids_date} usb.ids
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i $srcdir/fix-python2.patch
+  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  # fix pkgconfig file
+  install -dm755 $pkgdir/usr/lib
+  mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/
+}
+md5sums=('481e1de453bcabbd5f43125bb4df2ab7'
+         '45766196895b4cc50b53cd56e1bbf3d1'
+         'f04c301b5363ef618f0ec776deff3117')
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/testing/usbutils/fix-python2.patch
@@ -0,0 +1,17 @@
+--- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
++++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # lsusb.py
+ # Displays your USB devices in reasonable form.
+ # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
+@@ -16,7 +16,7 @@
+ warnsort = False
+ 
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+ 
+ esc = chr(27)
+ norm = esc + "[0;0m"
diff --git a/testing/xpdf/PKGBUILD b/testing/xpdf/PKGBUILD
new file mode 100644
index 000000000..a14ff1f34
--- /dev/null
+++ b/testing/xpdf/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 135716 2011-08-18 02:47:24Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+
+pkgname=xpdf
+#pkgver=3.03_pl1
+pkgver=3.03
+pkgrel=1
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('lesstif' 'gsfonts' 'libxt')
+optdepends=('poppler: tools that used to be included in xpdf'
+            'desktop-file-utils: for desktop environments')
+#       "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
+source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
+        'char.patch'
+        'desktop')
+sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+          '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
+          '3b6fe01636253676ffa0efe1b237a75af4721f6d')
+
+install=install
+backup=('etc/xpdfrc')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+#	patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+	patch -p1 -i ../char.patch
+
+	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+	sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--enable-multithreaded \
+		--enable-wordlist \
+		--with-freetype2-library=/usr/lib \
+		--with-freetype2-includes=/usr/include/freetype2 \
+		--x-includes=/usr/include \
+		--with-Xm-library=/usr/lib \
+		--with-Xm-includes=/usr/include \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
+	install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+	# remove libs and manpages provided by poppler
+	# pdfdetach should go there too once it is in poppler
+	for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do
+		rm "${pkgdir}/usr/bin/${tool}"
+		rm "${pkgdir}/usr/share/man/man1/${tool}.1"
+	done
+}
diff --git a/testing/xpdf/char.patch b/testing/xpdf/char.patch
new file mode 100644
index 000000000..8e49393a6
--- /dev/null
+++ b/testing/xpdf/char.patch
@@ -0,0 +1,12 @@
+diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
+--- old/xpdf/XPDFViewer.cc	2011-08-15 14:08:53.000000000 -0700
++++ new/xpdf/XPDFViewer.cc	2011-08-17 11:05:55.739431215 -0700
+@@ -1803,7 +1803,7 @@
+   menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
+   for (i = 0; i < nZoomMenuItems; ++i) {
+     n = 0;
+-    s = XmStringCreateLocalized(zoomMenuInfo[i].label);
++    s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
+     XtSetArg(args[n], XmNlabelString, s); ++n;
+     XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
+     sprintf(buf, "zoom%d", i);
diff --git a/testing/xpdf/desktop b/testing/xpdf/desktop
new file mode 100644
index 000000000..06830ecda
--- /dev/null
+++ b/testing/xpdf/desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
diff --git a/testing/xpdf/install b/testing/xpdf/install
new file mode 100644
index 000000000..c6cf149dd
--- /dev/null
+++ b/testing/xpdf/install
@@ -0,0 +1,11 @@
+post_install() {
+	[[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}