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

Conflicts:
	extra/avidemux/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/swh-plugins/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD

21 files changed, 98 insertions, 94 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 7d368870d..5ad10d94b 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48179 2011-05-29 13:13:23Z giovanni $
+# $Id: PKGBUILD 48634 2011-06-03 16:47:30Z stephane $
 # 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.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 43a6fbc75..73a9d7fb8 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 44051 2011-04-01 20:08:22Z spupykin $
+# $Id: PKGBUILD 48637 2011-06-03 16:51:06Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://couchdb.apache.org"
diff --git a/community/dar/PKGBUILD b/community/dar/PKGBUILD
index 792a6871d..79dc0b56a 100644
--- a/community/dar/PKGBUILD
+++ b/community/dar/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 42079 2011-03-13 09:21:39Z shusmann $
+# $Id: PKGBUILD 48698 2011-06-05 04:47:47Z shusmann $
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=dar
-pkgver=2.3.11
+pkgver=2.4.0
 pkgrel=1
 pkgdesc='A full featured command-line backup tool, short for Disk ARchive'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://dar.linux.free.fr/'
 license=('GPL')
-depends=('attr' 'bzip2' 'gcc-libs' 'openssl' 'zlib')
+depends=('bzip2' 'lzo2' 'libgcrypt')
+optdepends=('perl: for running some samples')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('5f8766f50069faf0a915e691372e56f8')
+md5sums=('1e0e02d3c90cdaaaf2850eff25599fba')
+options=('!libtool')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index 78a27c3f2..be3c974d1 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40270 2011-02-22 18:14:28Z spupykin $
+# $Id: PKGBUILD 48640 2011-06-03 16:55:04Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=dwdiff
 pkgver=1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="a front-end for the diff program that operates at the word level instead of the line level"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://os.ghalkes.nl/dwdiff.html"
@@ -13,8 +13,12 @@ source=(http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz)
 md5sums=('f483d8d8dab7a972ef21d5096e07fd47')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
-  make prefix=$pkgdir/usr install
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir"/usr install
 }
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index 488ba23de..dcdaaff20 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
 pkgname=fb-client
-pkgver=0.7.3
+pkgver=0.8
 pkgrel=1
 pkgdesc="Client for paste.xinu.at"
 arch=('i686' 'x86_64' 'mips64el')
@@ -9,6 +9,7 @@ license=('GPL3')
 depends=('curl')
 optdepends=('xclip: for automatically copying the URL into the clipboard')
 source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz)
+md5sums=('d7d1edb2d6fc22004bad8a10392c2f7d')
 
 build() {
   cd "$srcdir/fb-$pkgver"
@@ -20,8 +21,6 @@ package() {
   cd "$srcdir/fb-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/fb/COPYING"
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('eca03932db65d02a8e69e25224f14599')
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index 8703c0fea..3c7e384f8 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,30 +1,29 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.05.1
+pkgver=11.06
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils')
+depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
 optdepends=('mashup: for printing from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('27e1501ec6426286bc1da935fd2fa7e9')
-replaces=('fotox')
+md5sums=('e636e10f6a46f0a813e704f18eac3176')
+install=fotoxx.install
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   make PREFIX=/usr \
     CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \
     LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" 
-  sed -i '8,9d' data/desktop
+  sed -i 's+^# ++' data/desktop 
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir PREFIX=/usr install
+  rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop 
   install -Dm644 data/desktop \
-    $pkgdir/usr/share/applications/$pkgname.desktop 
-  make MENUFILE1=$pkgdir/usr/share/applications/$pkgname.desktop \
-    DESTDIR=$pkgdir PREFIX=/usr install
-rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop 
+    $pkgdir/usr/share/applications/$pkgname.desktop
 }
diff --git a/community/fotoxx/fotoxx.install b/community/fotoxx/fotoxx.install
index 03d1a4eaf..90156a79c 100644
--- a/community/fotoxx/fotoxx.install
+++ b/community/fotoxx/fotoxx.install
@@ -1,17 +1,9 @@
 post_install() {
- echo "Adding desktop file"
- echo "[Desktop Entry]" > /usr/share/applications/fotoxx.desktop
- echo "Name=fotoxx" >> /usr/share/applications/fotoxx.desktop
- echo "Categories=Graphics" >> /usr/share/applications/fotoxx.desktop
- echo "Type=Application" >> /usr/share/applications/fotoxx.desktop
- echo "Terminal=false" >> /usr/share/applications/fotoxx.desktop
-	echo "Exec=/usr/bin/fotoxx" >> /usr/share/applications/fotoxx.desktop
- echo "Icon=/usr/share/icons/fotoxx.png" >> /usr/share/applications/fotoxx.desktop
- echo "GenericName=Digital Photo Editor" >> /usr/share/applications/fotoxx.desktop
+  update-desktop-database -q	
 }
 post_update() {
- post_install
+  update-desktop-database -q
 }
-pre_remove() {
-  [ -f /usr/share/applications/fotoxx.desktop ] && rm /usr/share/applications/fotoxx.desktop
+post_remove() {
+  update-desktop-database -q
 }
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 7839af753..f217b2504 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45211 2011-04-18 12:45:17Z spupykin $
+# $Id: PKGBUILD 48665 2011-06-03 22:32:57Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-base
 pkgver=1.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
@@ -19,12 +19,16 @@ source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
 md5sums=('7faab4891ae6c1e7a6c806d6da368410')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   source /etc/profile.d/GNUstep.sh
   ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/
   # fix file ownership
   sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble
   make VERBOSE=1
-  make DESTDIR=$pkgdir install
-  chown -R root.root $pkgdir/
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chown -R root.root "$pkgdir/"
 }
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD
index 4abaf32a9..10a54a374 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 36565 2011-01-04 21:08:42Z jlichtblau $
+# $Id: PKGBUILD 48628 2011-06-03 15:58:27Z stephane $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: m0rph <m0rph.mailbox@gmail.com>
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goldendict.berlios.de/"
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 794ac6fdc..9b0a52782 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,10 +1,11 @@
+# $Id: PKGBUILD 48593 2011-06-03 07:34:58Z andrea $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: garion < garion @ mailoo.org >
-# Contributor:leemars
+# Contributor: leemars
 
 pkgname=ibus-qt
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc='IBus qt library and IBus qt input method plugin'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -15,15 +16,16 @@ source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
 md5sums=('769e8872ca8a59327b2073ce2f142589')
 
 build() {
-  cd ${pkgname}-${pkgver}-Source
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
-
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  
+  cmake ../${pkgname}-${pkgver}-Source \
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-Source
-
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index 1b19e605c..b3f1f9b02 100755
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37821 2011-01-18 09:28:10Z lcarlier $
+# $Id: PKGBUILD 48689 2011-06-04 20:28:04Z lcarlier $
 # Maintainer: Carlier Laurent <lordheavym@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgname=libfbclient
 pkgver=2.5.0.26074
-pkgrel=2
+pkgrel=3
 pkgdesc="Client library for Firebird."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.firebirdsql.org/"
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 7476fdd31..1e4ff5faf 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 41732 2011-03-08 17:21:40Z ibiru $
+# $Id: PKGBUILD 48795 2011-06-05 19:15:38Z bfanella $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
 pkgname=libraw
 _pkgbasename=LibRaw
-pkgver=0.13.2
+pkgver=0.13.5
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,16 +14,17 @@ license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
 options=('!makeflags')
 source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('e92895f6b8f975be63f59448c1b8a79b')
+md5sums=('bf6894f6a60b411da012f58a0954e910')
 
 build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  ./configure --prefix=/usr
-  make
+  	cd ${srcdir}/${_pkgbasename}-${pkgver}
+  
+	./configure --prefix=/usr
+	make
 }
 
 package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  	cd ${srcdir}/${_pkgbasename}-${pkgver}
 
-  make DESTDIR=${pkgdir} install
+  	make DESTDIR=${pkgdir} install
 }
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 25f922cd8..0de6cc82b 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $
+# $Id: PKGBUILD 48662 2011-06-03 19:43:21Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=0.7.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 25314acaa..ac1c1d47d 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 45812 2011-04-29 12:03:32Z spupykin $
+# $Id: PKGBUILD 48659 2011-06-03 19:34:11Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
 pkgver=2011.03.28
 _pkgsubver=387002
-pkgrel=3
+pkgrel=4
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
 license=('LGPL')
 depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'glib2' 'uriparser' 'libsigc++' 'libxss')
-makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse')
+makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst')
 optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm')
 options=('docs' '!libtool')
 install=$pkgname.install
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index 6a8bc29eb..10d4fee18 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 45321 2011-04-20 07:05:05Z jelle $
+# $Id: PKGBUILD 48779 2011-06-05 15:15:50Z vegai $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,6 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-md5sums=('b5b1f2ecc7327505e360047236b09d06')
 
 build() {
   cd ${pkgname}-${pkgver} 
@@ -36,3 +35,5 @@ package() {
 
   make install
 }
+
+md5sums=('825f6274bd46a1d56f4e95ef25a325ca')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 73aa20e61..aa0b2006a 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45351 2011-04-20 15:07:06Z spupykin $
+# $Id: PKGBUILD 48652 2011-06-03 17:21:22Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributer: mpie <michael.kyne-phillips1@ntlworld.com>
 
@@ -6,7 +6,7 @@ pkgname=parrot
 pkgver=3.3.0
 #_rel=devel
 _rel=stable
-pkgrel=1
+pkgrel=2
 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages"
 arch=(i686 x86_64 'mips64el')
 url="http://www.parrotcode.org/"
diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD
index 30746deb3..d6148decb 100644
--- a/community/sword/PKGBUILD
+++ b/community/sword/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sword
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="SWORD libraries for Bible programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.crosswire.org/sword/index.jsp"
@@ -14,13 +14,13 @@ md5sums=('a7dc4456e20e915fec46d774b690e305')
 backup=('etc/sword.conf')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --with-icu 
   make 
 }
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} install_config
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install_config
 }
 
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index cafa11dc2..c6378a352 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47317 2011-05-21 17:27:47Z jelle $
+# $Id: PKGBUILD 48620 2011-06-03 13:51:59Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -7,31 +7,29 @@
 
 pkgname=tea
 pkgver=29.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tea-editor.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'aspell' 'hunspell')
 install=tea.install
-source=(http://downloads.sourceforge.net/tea-editor/$pkgname-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/tea-editor/${pkgname}-${pkgver}.tar.bz2
         tea.desktop)
 md5sums=('1c900e7f57a0fe72fb4cc481450a5b32'
          '377ace3363124f4c086de0babb820761')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  qmake
+  qmake PREFIX=/usr/bin
   make
 }
-package(){
-  cd ${srcdir}/$pkgname-$pkgver
-  make INSTALL_ROOT=${pkgdir} install
 
-  install -Dm755  ${pkgdir}/usr/local/bin/tea ${pkgdir}/usr/bin/tea
-  rm -rf ${pkgdir}/usr/local
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
 
-  install -Dm644 ${srcdir}/tea.desktop ${pkgdir}/usr/share/applications/tea.desktop
-  install -Dm644 icons/tea_icon_v2.png ${pkgdir}/usr/share/pixmaps/tea.png
+  install -Dm644 "${srcdir}/tea.desktop" "${pkgdir}/usr/share/applications/tea.desktop"
+  install -Dm644 icons/tea_icon_v2.png "${pkgdir}/usr/share/pixmaps/tea.png"
 }
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 5f6a28550..fb9bfe001 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48573 2011-06-02 16:37:10Z spupykin $
+# $Id: PKGBUILD 48646 2011-06-03 17:05:43Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
 pkgver=0.10.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/tracker/"
diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD
index 756e41e3f..db518bfbc 100644
--- a/community/xulrunner-oss/PKGBUILD
+++ b/community/xulrunner-oss/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=xulrunner-oss
 pkgver=2.0.1
 _ffoxver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment compiled with OSS support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 7621ce2df..3c326284e 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43397 2011-03-25 16:19:23Z schiv $
+# $Id: PKGBUILD 48643 2011-06-03 16:57:46Z stephane $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,7 +7,7 @@
 
 pkgname=yaz
 pkgver=4.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')