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

Conflicts:
	community/dopewars/PKGBUILD
	community/flightgear/PKGBUILD
	extra/bmp/PKGBUILD
	extra/qemu/PKGBUILD
	extra/sbcl/PKGBUILD

29 files changed, 754 insertions, 119 deletions

diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD
index 35ba084ca..95c0534e9 100644
--- a/community/acpitool/PKGBUILD
+++ b/community/acpitool/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 24573 2010-08-26 12:50:31Z lcarlier $
+# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 # Contributor: Milosz Piglas <archeofuture@gmail.com>
 
 pkgname=acpitool
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="ACPI client - replacement for apm tool"
 url="http://sourceforge.net/projects/acpitool/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2)
 depends=('gcc-libs')
-md5sums=('9e4ec55201be0be71ffbc56d38b42b57')
+source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
+	linux-3.0.patch)
+md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
+         'eb149edb32be6cdf20a7d16beb3e9f70')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
+  patch -p1 <$srcdir/linux-3.0.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/acpitool/linux-3.0.patch b/community/acpitool/linux-3.0.patch
new file mode 100644
index 000000000..ba454a0c2
--- /dev/null
+++ b/community/acpitool/linux-3.0.patch
@@ -0,0 +1,18 @@
+diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
+--- acpitool-0.5.1/src/acpitool.cpp	2009-08-13 23:37:48.000000000 +0400
++++ acpitool-0.5.1.my/src/acpitool.cpp	2011-08-11 21:53:17.000000000 +0400
+@@ -205,8 +205,12 @@
+ 	Kernel_24 = 1;           
+ 	Kernel_26 = 0;
+     }
+-        
+-    if(strncmp(str,"2.6",3)==0)
++    else if(strncmp(str,"2.6",3)==0)
++    {
++	Kernel_24 = 0;
++	Kernel_26 = 1;
++    }
++    else
+     {
+ 	Kernel_24 = 0;           
+ 	Kernel_26 = 1;
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 5190d90c6..061e57461 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53589 2011-08-06 08:10:57Z giovanni $
+# $Id: PKGBUILD 54056 2011-08-12 21:56:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.13
+pkgver=0.8.14
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('5612e030dce1cd5e46762d0dcaed00b0'
+md5sums=('61e41474f9104ea8513bd21e8754b7be'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index 4433977cc..4116a23d3 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51778 2011-07-14 18:25:43Z schuay $
+# $Id: PKGBUILD 54061 2011-08-13 02:36:39Z ebelanger $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -6,41 +6,42 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=5
+pkgrel=6
 pkgdesc="A drug dealing game set in New York"
 url="http://dopewars.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk2' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses')
+depends=('gtk2' 'alsa-lib' 'audiofile' 'sdl_mixer' 'ncurses')
 install='dopewars.install'
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('debf749de9053dc2fb2e74c37ae06206')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
 
     ./configure --prefix=/usr --localstatedir=/var/games \
         --mandir=/usr/share/man
     make
 }
+
 package() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
 
-    make DESTDIR=$pkgdir install
+    make DESTDIR="$pkgdir" install
 
     # setup shortcut menu entries
-    mkdir -p $pkgdir/usr/share/applications
-    mv $pkgdir/usr/share/gnome/apps/Games/dopewars.desktop \
-       $pkgdir/usr/share/applications
-    rm -r $pkgdir/usr/share/gnome
+    mkdir -p "$pkgdir/usr/share/applications"
+    mv "$pkgdir/usr/share/gnome/apps/Games/dopewars.desktop" \
+       "$pkgdir/usr/share/applications"
+    rm -r "$pkgdir/usr/share/gnome"
 
     # set appropriate permissions and destinations
-    chown root:games $pkgdir/usr/bin/dopewars
-    chmod 2755 $pkgdir/usr/bin/dopewars
-    chown root:games $pkgdir/var/games
-    chmod 775 $pkgdir/var/games
+    chown root:games "$pkgdir/usr/bin/dopewars"
+    chmod 2755 "$pkgdir/usr/bin/dopewars"
+    chown root:games "$pkgdir/var/games"
+    chmod 775 "$pkgdir/var/games"
 
     # Handle the scores file creation in the install script
-    rm $pkgdir/var/games/dopewars.sco
+    rm "$pkgdir/var/games/dopewars.sco"
 }
 
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index bfdb31285..54909e46e 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 50330 2011-06-28 12:02:03Z spupykin $
+# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=flightgear
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64 'mips64el')
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'flightgear-data' 'openscenegraph' 'subversion')
+arch=(i686 x86_64 mips64el)
+depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
 makedepends=('boost')
 license=("GPL")
 url="http://www.flightgear.org"
 options=('!makeflags')
-#source=(ftp://ftp.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz)
-source=(http://ftp.linux.kiev.ua/pub/fgfs/Source/FlightGear-$pkgver.tar.gz)
-md5sums=('549aa45171480082f5b6e5e8d5ce8930')
+source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
+md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
 
 build() {
-  cd $startdir/src/FlightGear-$pkgver
-  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
+  cd $srcdir/fg-flightgear
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $startdir/src/FlightGear-$pkgver
-  make DESTDIR=$startdir/pkg install
+  depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
+  cd $srcdir/fg-flightgear
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index b91ae57da..bb70c97e7 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 53990 2011-08-11 07:04:13Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -11,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.1
-pkgrel=4
+pkgver=2.99.2
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -21,12 +22,12 @@ groups=('gambas3')
 makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
          'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2'
          'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ab4c182b9d7dfec06b3a42bb002a779a'
+md5sums=('247a13e28972985766855a6bc4d6d368'
          'b284be39d147ec799f1116a6abc068b4'
          'a8ec8e5a6aba7a7e453ce7a35c1800a9')
 
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index ed9b26701..e0c68877d 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,24 +1,36 @@
-# $Id: PKGBUILD 43364 2011-03-25 11:11:43Z mherych $
+# $Id: PKGBUILD 54036 2011-08-12 13:08:25Z lfleischer $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools')
-optdepends=('esound')
+makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils')
+optdepends=('alsa-lib: for ALSA support'
+            'jack: for JACK support'
+            'libquicktime: for movie encoding'
+            'pulseaudio: for PulseAudio support'
+            'v4l-utils: for video conversion')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
 md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6')
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   rm -rf cpuinfo.sh
-  ./configure --prefix=/usr \
-  	--without-doxygen
-  make || return 1
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/share/info/dir
+
+  ./configure --prefix=/usr --without-doxygen
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir/usr/share/info/dir"
 }
diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD
new file mode 100644
index 000000000..70985c530
--- /dev/null
+++ b/community/lash/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: DonVla <donvla@users.sourceforge.net>
+
+pkgname=lash
+pkgver=0.6.0~rc2
+_relver=0.6.0.594
+pkgrel=5
+pkgdesc="A session management system for JACK and ALSA"
+arch=('i686' 'x86_64')
+options=('!libtool')
+url="http://lash-audio.org"
+license=('GPL')
+depends=('dbus-core' 'gtk2' 'jack' 'libxml2' 'python2')
+install=$pkgname.install
+source=("http://download.savannah.gnu.org/releases/lash/${pkgname}-${pkgver}.tar.bz2" "makefile.patch")
+md5sums=('af1dc4f4ceb284b1b0845de4f4c2fe47'
+         '24ceb7e3d008c25e1490102983165612')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_relver}"
+  patch -p0 < "${srcdir}/makefile.patch"
+
+  # Python2 fixes
+  export PYTHON="python2"
+  sed -i "s#env python#&2#" clients/lash_control
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${_relver}"
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community/lash/lash.install b/community/lash/lash.install
new file mode 100644
index 000000000..a169a2211
--- /dev/null
+++ b/community/lash/lash.install
@@ -0,0 +1,6 @@
+post_install() {
+  printf "\n"
+  printf "==> You might need to add following line to your /etc/services(without quotes):\n"
+  printf "==> \"lash	14541/tcp	# LASH client/server protocol\"\n"
+  printf "\n"
+}
diff --git a/community/lash/makefile.patch b/community/lash/makefile.patch
new file mode 100644
index 000000000..3d35a1d2d
--- /dev/null
+++ b/community/lash/makefile.patch
@@ -0,0 +1,14 @@
+--- docs/Makefile.in.orig	2008-11-09 22:45:28.000000000 +0100
++++ docs/Makefile.in	2011-07-23 17:12:26.000000000 +0200
+@@ -527,9 +527,9 @@
+ @HAVE_TEXI2HTML_TRUE@	  mkdir -lash-manual-html-split; \
+ @HAVE_TEXI2HTML_TRUE@	fi
+ @HAVE_TEXI2HTML_TRUE@	cd lash-manual-html-one-page && \
+-@HAVE_TEXI2HTML_TRUE@	  texi2html --number ../$(top_srcdir)/docs/lash-manual.texi
++@HAVE_TEXI2HTML_TRUE@	  texi2html --number-footnotes --number-sections ../$(top_srcdir)/docs/lash-manual.texi
+ @HAVE_TEXI2HTML_TRUE@	cd lash-manual-html-split && \
+-@HAVE_TEXI2HTML_TRUE@	  texi2html --number --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
++@HAVE_TEXI2HTML_TRUE@	  texi2html --number-footnotes --number-sections --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
+ @HAVE_TEXI2HTML_TRUE@	touch html-manual-stamp
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 00f4ad0df..23024aec9 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50319 2011-06-28 10:21:19Z spupykin $
+# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=openscenegraph
-pkgver=2.8.5
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,9 @@ makedepends=('cmake' 'libvncserver')
 optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
 conflicts=('openthreads')
 provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-md5sums=('de844947d410726ba50ed07eb6319e6f')
+#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
+source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
+md5sums=('121829b854349a9e9d1aebc25cf3e52d')
 
 build() {
   cd OpenSceneGraph-$pkgver
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index f5e95e73d..92ea3ded2 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $
+# $Id: PKGBUILD 54037 2011-08-12 13:13:29Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=oss
-pkgver=4.2_2004
-pkgrel=2
+pkgver=4.2_2005
+pkgrel=1
 pkgdesc="Open Sound System UNIX audio architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.opensound.com/"
@@ -23,7 +23,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
 	"soundon.patch"
 	"remove-hal.patch"
 	)
-md5sums=('256aba264d523fb8ee444aaacfb8d3da'
+md5sums=('964b1ec63b48b22baba6688fe2fc0633'
          'b9a380a0ac8896390d71ac13676f27e1'
          'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index f19c3c1be..5ca5b140c 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 53903 2011-08-09 19:26:51Z spupykin $
+# $Id: PKGBUILD 54009 2011-08-11 18:03:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=parcellite
 pkgver=1.0.2rc3
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK+ clipboard manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://parcellite.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+	history_menu_crash_patch)
+md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3'
+         '8fd6e07fa907865ca4db7b3e13441ce6')
 
 build() {
   cd "$srcdir/parcellite-$pkgver"
+  (cd src && patch -p0 <$srcdir/history_menu_crash_patch)
   ./configure --prefix=/usr --sysconfdir=/etc
   make
   make DESTDIR="$pkgdir" install
diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch
new file mode 100644
index 000000000..961106839
--- /dev/null
+++ b/community/parcellite/history_menu_crash_patch
@@ -0,0 +1,39 @@
+Index: main.c
+===================================================================
+--- main.c	(revision 232)
++++ main.c	(working copy)
+@@ -1199,24 +1199,28 @@
+     {
+       GString* string = g_string_new((gchar*)element->data);
+       /* Ellipsize text */
+-      if (string->len > prefs.item_length)
++      glong len = g_utf8_strlen(string->str, string->len);
++      if (len > prefs.item_length)
+       {
+         switch (prefs.ellipsize)
+         {
+           case PANGO_ELLIPSIZE_START:
+-            string = g_string_erase(string, 0, string->len-(prefs.item_length));
++            string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
+             string = g_string_prepend(string, "...");
+             break;
+           case PANGO_ELLIPSIZE_MIDDLE:
+-            string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length));
+-            string = g_string_insert(string, (string->len/2), "...");
++            ; /* to avoid wierd gcc error */
++            gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2);
++            gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2);
++            string = g_string_erase(string, p1 - string->str, p2 - p1);
++            string = g_string_insert(string, p1 - string->str, "...");
+             break;
+           case PANGO_ELLIPSIZE_END:
+-            string = g_string_truncate(string, prefs.item_length);
++            string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
+             string = g_string_append(string, "...");
+             break;
+         }
+-      }
++      }
+ 		  /* Remove control characters */
+       gsize i = 0;
+       while (i < string->len)
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index 767c61739..9336274c2 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 35759 2010-12-22 11:17:45Z lfleischer $
+# $Id: PKGBUILD 54150 2011-08-13 19:36:37Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
-pkgver=20100106
-pkgrel=3
+pkgver=20110622
+pkgrel=1
 pkgdesc='ELF prelinking utility to speed up dynamic linking.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
 backup=('etc/prelink.conf')
-source=("http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'prelink.conf'
-        'arch-x86_64-dynamic_linker.patch')
-md5sums=('56e2a1b5a478795352bf6e4d2bc6e0ab'
+md5sums=('2863a9c9e68d076916bf9a46ad6bca78'
          '0793ed49e9b31c125cba4d936c333cf6'
          'b347580536e078b34c547742d36a3e9d')
+source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.bz2/${md5sums[0]}/${pkgname}-${pkgver}.tar.bz2"
+        'prelink.conf'
+        'arch-x86_64-dynamic_linker.patch')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index c6a528fe6..4e3e69e34 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 52003 2011-07-19 16:41:14Z spupykin $
+# $Id: PKGBUILD 54014 2011-08-11 18:04:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=qps
 pkgver=1.10.15
 _dlpkgver=5946
-pkgrel=1
+pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
 depends=('qt')
 arch=('i686' 'x86_64')
 license="GPL"
-source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
-md5sums=('25a6c6f8ac9172a6874e3514edf1eda1')
+source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2
+	version-patch.diff)
+md5sums=('25a6c6f8ac9172a6874e3514edf1eda1'
+         'e323a796a3dbf44a99af386e867f7848')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p0 <$srcdir/version-patch.diff
   qmake
   make
 }
diff --git a/community/qps/version-patch.diff b/community/qps/version-patch.diff
new file mode 100644
index 000000000..bfddd2a0a
--- /dev/null
+++ b/community/qps/version-patch.diff
@@ -0,0 +1,14 @@
+--- proc_linux.cpp	2011-07-17 08:03:52.000000000 -0400
++++ proc_linux.cpp.new	2011-08-09 11:09:47.278589772 -0400
+@@ -1962,7 +1962,10 @@
+ 	    int result;
+ 
+         result = sscanf(p, "%d.%d.%d", &major, &minor, &patch);
+-        if(result < 3) {
++        if(result == 2) {
++		patch = 0;
++	}
++        else if(result < 3) {
+ 			fprintf(stderr, "Qps: can't determine version, read %s \n",	p);
+ 			fprintf(stderr, "please report this bug.\n");
+ 			exit(1);
diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD
index 13f8b6f97..96b89ac1c 100644
--- a/community/rusxmms/PKGBUILD
+++ b/community/rusxmms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 14511 2010-04-04 18:33:41Z spupykin $
+# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -6,12 +6,12 @@ pkgname=rusxmms
 pkgver=1.2.11_csa43
 _xmmsver=1.2.11
 _csaver=csa43
-pkgrel=2
+pkgrel=3
 pkgdesc="XMMS with librcc"
 arch=(i686 x86_64 'mips64el')
 license=(GPL)
 url="http://rusxmms.sourceforge.net/"
-depends=(libsm libxxf86vm zlib gtk libvorbis esd alsa-lib libgl librcc librcd openssl)
+depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl)
 makedepends=(mesa patch)
 provides=(xmms)
 conflicts=(xmms)
@@ -22,16 +22,24 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506'
          '8f387dd2e5c95f8730979e09687b6e02')
 
 build() {
-  cd ${startdir}/src/xmms-${_xmmsver}
+  cd "${srcdir}"/xmms-${_xmmsver}
 
 if true; then
-  ln -s $srcdir/RusXMMS2 $srcdir/xmms-${_xmmsver}/RusXMMS2
-  (cd $srcdir/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) || return 1
+  ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2
+  (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh)
 
-  mv $srcdir/RusXMMS2/source/* $srcdir/xmms-${_xmmsver}/libxmms/ && \
-#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' $srcdir/xmms-${_xmmsver}/libxmms/Makefile.am && \
-  aclocal && automake && autoconf || return 1
-  (cd libxmms && aclocal && automake && autoconf) || return 1
+  mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/
+#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \
+
+# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done.
+#  aclocal
+# automake
+autoconf
+  sed -i 's/unicode.c//g' Input/mpg123/Makefile.in
+  sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in
+
+
+  (cd libxmms && aclocal && automake && autoconf)
 
   case $CARCH in
     x86_64)
@@ -46,13 +54,17 @@ if true; then
   esac
 fi
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make
+}
+
+package(){
+  cd "${srcdir}"/xmms-${_xmmsver}
+  make DESTDIR="$pkgdir" install
 
-  mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
-  install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications && \
-  install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm || return 1
+  mkdir -p "$pkgdir"/usr/share/{applications,pixmaps}
+  install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications
+  install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm
   # don't want wmxmms
-  rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms && \
-  rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1}
+  rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms
+  rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1}
 }
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index a120b9f65..abe367c63 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -2,20 +2,20 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=scrotwm
-pkgver=0.9.33
+pkgver=0.9.34
 pkgrel=1
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64')
 url="http://www.scrotwm.org"
 license=('custom:ISC')
-depends=('dmenu' 'libxrandr' 'profont')
+depends=('dmenu' 'libxrandr' 'libxtst' 'profont')
 makedepends=('libxt')
 optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
 backup=(etc/scrotwm.conf)
 source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('fcfd0aba8e48217e26db823226640547'
+md5sums=('d38e296dd0bf014046e82cd42932f398'
          'a67cfe51079481e5b0eab1ad371379e3'
          '6132ba773ee00f39d8f67ac0347a9814')
 
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index c183908ef..2838b76b7 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 52817 2011-07-28 21:00:43Z svenstaro $
+# $Id: PKGBUILD 54051 2011-08-12 21:19:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
@@ -7,7 +7,7 @@ pkgname=sfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20110728
+    pkgver=1.99.git20110812
 fi
 
 pkgrel=1
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 2b688116e..47fb6260e 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 50327 2011-06-28 11:35:39Z spupykin $
+# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=simgear
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64 'mips64el')
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
 makedepends=('boost')
 license=("GPL")
-url="http://www.simgear.org"
+#url="http://www.simgear.org"
+url="https://gitorious.org/fg"
 options=('!makeflags')
-source=(ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/SimGear-$pkgver.tar.gz)
-md5sums=('414bea545ea1e8ce17e4aa0809159cec')
+source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
+	build-fix.patch)
+md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
+         '905a05cc1364c067b3b9574d41cef7fa')
 
 build() {
-  cd $startdir/src/SimGear-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/fg-simgear
+#  patch -p1 <$srcdir/build-fix.patch
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $startdir/src/SimGear-$pkgver
-  make DESTDIR=$startdir/pkg install
+  cd $srcdir/fg-simgear
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/simgear/build-fix.patch b/community/simgear/build-fix.patch
new file mode 100644
index 000000000..da4ba81f8
--- /dev/null
+++ b/community/simgear/build-fix.patch
@@ -0,0 +1,71 @@
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
+@@ -70,9 +70,6 @@
+   osg::ref_ptr<osg::RefMatrix> mModelView;
+ };
+ 
+-osgUtil::RegisterRenderBinProxy
+-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+-
+ class SGClipGroup::CullCallback : public osg::NodeCallback {
+ public:
+   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
+@@ -51,8 +51,6 @@
+   class ClipRenderBin;
+ 
+   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
+-
+-  static osgUtil::RegisterRenderBinProxy clipBinProxy;
+ };
+ 
+ #endif
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
+@@ -21,6 +21,7 @@
+ #include <osgDB/ReadFile>
+ #include <osgDB/Input>
+ #include <osgDB/ParameterOutput>
++#include <osgDB/DatabasePager>
+ 
+ #include <simgear/debug/logstream.hxx>
+ #include <simgear/structure/OSGVersion.hxx>
+@@ -67,9 +68,12 @@
+     unsigned childNum = getNumChildren();
+     setTimeStamp(childNum, 0);
+     double priority=1.0;
++/*
++FIXME:!!!
+     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
+                          getDatabaseRequest(childNum),
+                          _readerWriterOptions.get());
++*/
+ }
+ 
+ bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
+diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
+--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
+@@ -31,6 +31,7 @@
+ #include <simgear/screen/extensions.hxx>
+ #include <simgear/screen/RenderTexture.h>
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "bbcache.hxx"
+ 
+diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
+--- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
++++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
+@@ -145,6 +145,7 @@
+ #endif
+ 
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "tr.h"
+ 
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 698163689..d22d93518 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.8.1
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('custom')
 install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
-md5sums=('7ddeb1ff048401e55af0d1c11038f937'
+md5sums=('3f73fb051215df3633a554d81e67a452'
          '98be780cddb2a0915bbab15ad93644f1')
 
 build() {
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 3f2e01124..14212e190 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48297 2011-05-31 09:33:14Z spupykin $
+# $Id: PKGBUILD 53999 2011-08-11 17:49:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
-_basever=2.3.0
-_timestamp=20110511
+_basever=2.4.0
+_timestamp=20110806
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
@@ -15,15 +15,18 @@ depends=('ncurses')
 makedepends=('help2man')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('bbbbaeb145ae12e5fe6154707807b90e')
+source=("tomoyo-tools-${_basever}-${_timestamp}.tar.gz::http://sourceforge.jp/frs/redir.php?m=iij&f=%2Ftomoyo%2F52848%2Ftomoyo-tools-${_basever}-${_timestamp}.tar.gz"
+	build-fix.patch)
+md5sums=('111109a71684f48bcac58bba07b8f49e'
+         '063c85ec6c56b90796ced9c203098f41')
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    make -j1
+  cd "${srcdir}/${pkgname}"
+  patch -p1 <$srcdir/build-fix.patch
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make INSTALLDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}"
+  make INSTALLDIR="${pkgdir}" install
 }
diff --git a/community/tomoyo-tools/build-fix.patch b/community/tomoyo-tools/build-fix.patch
new file mode 100644
index 000000000..ca949072b
--- /dev/null
+++ b/community/tomoyo-tools/build-fix.patch
@@ -0,0 +1,11 @@
+diff -wbBur tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c
+--- tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-06 04:00:00.000000000 +0400
++++ tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-11 21:47:05.000000000 +0400
+@@ -35,6 +35,7 @@
+ #include <dirent.h>
+ #define _GNU_SOURCE
+ #include <sched.h>
++#include <linux/sched.h>
+ #include <sys/mount.h>
+ 
+ static _Bool wait_data(const int fd)
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 214c31f00..fec3402fb 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53882 2011-08-09 08:32:11Z spupykin $
+# $Id: PKGBUILD 54076 2011-08-13 09:16:09Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('30f5cc976f063694f93cbdf9b83dc2ea')
+md5sums=('6684eb7a990b9cedf4257f41bfddb584')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
new file mode 100644
index 000000000..b07dafb05
--- /dev/null
+++ b/community/zynaddsubfx/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id: PKGBUILD 54081 2011-08-13 09:18:00Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: DonVla <donvla@users.sourceforge.net>
+
+_p=ZynAddSubFX
+pkgname=zynaddsubfx
+pkgver=2.4.1
+pkgrel=3
+pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
+arch=('i686' 'x86_64')
+url="http://zynaddsubfx.sourceforge.net"
+license=('GPL')
+depends=('fltk' 'fftw' 'lash')
+makedepends=('mxml' 'cmake')
+options=('!emptydirs')
+source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$_p-$pkgver.tar.bz2"
+        "$pkgname.desktop" "$pkgname.svg"
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch")
+md5sums=('59eb69ce24d6f8c605f8ba43958d0526'
+         '5da6735ee59fdfa21f171fdc4d6c80cb'
+         '6f7e9c3ce3947088a10c99c46a65431f'
+         'eb95d339ff5deac8c6b54965f04a8c60'
+         '49464a33ab9c4250520eda0df7705663')
+
+build() {
+  cd "$srcdir/$_p-$pkgver"
+
+  # patches
+  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
+  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+
+  [ -d build ] || mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack ..
+  make
+
+  # build external programs
+  cd ../ExternalPrograms/Spliter && make
+  cd ../Controller && sed -i "s|Box\.h|Box\.H|" ControllerUI.fl && make
+}
+
+package() {
+  cd "$srcdir/$_p-$pkgver/build"
+
+  make DESTDIR="$pkgdir/" install
+
+  # install external programs
+  install -Dm755 ../ExternalPrograms/Spliter/spliter "$pkgdir/usr/bin/spliter"
+  install -Dm755 ../ExternalPrograms/Controller/controller "$pkgdir/usr/bin/controller"
+  install -Dm644 ../ExternalPrograms/Spliter/readme.txt "$pkgdir/usr/share/doc/$pkgname/SPLITER.txt"
+
+  # banks and examples
+  install -d "$pkgdir/usr/share/$pkgname"
+  cp -a ../banks "$pkgdir/usr/share/$pkgname"
+  cp -a ../examples "$pkgdir/usr/share/$pkgname"
+
+  # desktop file and icon
+  install -Dm644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
diff --git a/community/zynaddsubfx/zynaddsubfx.desktop b/community/zynaddsubfx/zynaddsubfx.desktop
new file mode 100644
index 000000000..ebca740ef
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ZynAddSubFX
+Comment=A powerful realtime software synthesizer
+Exec=zynaddsubfx
+Icon=zynaddsubfx
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
diff --git a/community/zynaddsubfx/zynaddsubfx.svg b/community/zynaddsubfx/zynaddsubfx.svg
new file mode 100644
index 000000000..d81c651ad
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx.svg
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   width="507.1875"
+   height="509.21875"
+   sodipodi:docname="zynaddsubfx_icon.svg"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4809">
+      <stop
+         style="stop-color:#d5d8db;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4810" />
+      <stop
+         style="stop-color:#6d8ec2;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4811" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4179">
+      <stop
+         style="stop-color:#bec8c6;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4180" />
+      <stop
+         style="stop-color:#bbcac9;stop-opacity:1.0000000;"
+         offset="0.59527779"
+         id="stop4182" />
+      <stop
+         style="stop-color:#879797;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4181" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4038">
+      <stop
+         style="stop-color:#4a8a61;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4039" />
+      <stop
+         style="stop-color:#557c7d;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4040" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2162">
+      <stop
+         style="stop-color:#549c6d;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2163" />
+      <stop
+         style="stop-color:#679697;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2164" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2158">
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2159" />
+      <stop
+         style="stop-color:#a1aec2;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2160" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2158"
+       id="radialGradient2165"
+       cx="205.28555"
+       cy="152.50184"
+       r="486.22545"
+       fx="198.52472"
+       fy="148.59325"
+       gradientTransform="matrix(0.99940285,0,0,1.0005975,-127.46875,-47)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038"
+       id="linearGradient4043"
+       x1="119.48864"
+       y1="387.75519"
+       x2="462.45943"
+       y2="302.28432"
+       gradientTransform="scale(1.0666754,0.9374923)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4809"
+       id="radialGradient4184"
+       cx="-6.2401056"
+       cy="138.19312"
+       r="63.0278"
+       fx="-5.4719041"
+       fy="137.48498"
+       spreadMethod="pad"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0322663,0.96874227)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4809"
+       id="radialGradient3021"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       cx="-6.2401056"
+       cy="138.19312"
+       fx="-5.4719041"
+       fy="137.48498"
+       r="63.0278"
+       gradientTransform="scale(1.0322663,0.96874227)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.61399264"
+     inkscape:cx="305.35982"
+     inkscape:cy="328.83153"
+     inkscape:window-width="1278"
+     inkscape:window-height="760"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.13874531pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="rect2793"
+     width="497.32657"
+     height="497.92426"
+     x="8.5265961"
+     y="9.9727058"
+     rx="10"
+     ry="10.000001" />
+  <rect
+     style="fill:url(#radialGradient2165);fill-opacity:0.75;fill-rule:evenodd;stroke:#c7ffc7;stroke-width:2.67499995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     id="rect1532"
+     width="497.32657"
+     height="497.92426"
+     x="1.3287659"
+     y="1.3353081"
+     rx="10"
+     ry="10.000001" />
+  <g
+     id="g4871"
+     transform="matrix(1,0,0,0.72153,-123.39704,-123.99862)">
+    <rect
+       style="fill:url(#linearGradient4043);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.50865927pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2794"
+       width="374.5567"
+       height="328.96643"
+       x="144.30453"
+       y="199.03429"
+       rx="10.000001"
+       ry="13.85943" />
+    <path
+       style="fill:none;stroke:#fafafa;stroke-width:20;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 153.53968,361.37008 c 70.53877,201.53936 110.35828,210.2256 177.45839,6.10757 66.67288,-202.81841 104.2451,-205.61109 176.22345,0.24698"
+       id="path4175"
+       sodipodi:nodetypes="czc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:7.375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 145.99255,362.80964 c 369.96869,0 369.3724,1.43957 369.3724,1.43957"
+       id="path4176"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4852"
+     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,196.67455,583.0333)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3021);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="path4853"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
+       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
+       id="path4854"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
+       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
+       id="path4855"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4864"
+     transform="matrix(0.687211,0,0,0.854478,499.66235,-75.81607)">
+    <rect
+       style="fill:#000000;fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="rect4856"
+       width="110.64801"
+       height="545.60913"
+       x="-136.40228"
+       y="109.76131" />
+    <rect
+       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect4857"
+       width="39.393082"
+       height="442.41235"
+       x="-128.61479"
+       y="205.44652" />
+    <rect
+       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect4858"
+       width="37.357227"
+       height="525.88245"
+       x="-74.664627"
+       y="120.64261" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4860"
+       width="95.883904"
+       height="12.21513"
+       x="-128.35823"
+       y="221.73334" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4862"
+       width="95.883904"
+       height="12.21513"
+       x="-129.37616"
+       y="563.75702" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4863"
+       width="95.883904"
+       height="12.21513"
+       x="-127.34029"
+       y="386.6376" />
+  </g>
+  <g
+     id="g4875"
+     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,3.44525,587.1877)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4184);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="path4876"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
+       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
+       id="path4877"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
+       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
+       id="path4878"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>