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

Conflicts:
	community/abuse/PKGBUILD
	extra/glibmm/PKGBUILD

22 files changed, 196 insertions, 102 deletions

diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD
index 9e41d3e35..705a4c446 100644
--- a/community/abuse/PKGBUILD
+++ b/community/abuse/PKGBUILD
@@ -1,55 +1,33 @@
-# $Id: PKGBUILD 8618 2008-08-14 04:01:43Z kevin $
-# Committer: jlvsimoes <jlvsimoes@oninet.pt>
-# Maintainer: kevin <kevin@archlinux.org>
+# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
+# Contributor: kevin <kevin@archlinux.org>
 
 pkgname=abuse
-pkgver=0.7.1
+pkgver=0.8
 pkgrel=1
-pkgdesc="A side-scroller action game that pits you against ruthless alien killers"
-url="http://abuse.zoy.org/"
-depends=('gcc-libs' 'libgl' 'sdl')
-# abuse-data below is the original commercial levels and sound effects.
-# abuse-frabs contains community created levels.
-# abuse-lib is the original demo levels.
-# abuse-sfx is the original sound effects, included in abuse-data.
-source=(http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-${pkgver}.tar.gz
-http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-data-2.00.tar.gz
-http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-frabs-2.11.tar.gz
-abuse.patch)
-noextract=(abuse-data-2.00.tar.gz)
+pkgdesc='A side-scroller action game that pits you against ruthless alien killers.'
+arch=('i686' 'x86_64')
+url='http://abuse.zoy.org/'
 license=('GPL' 'custom')
-arch=('i686' 'x86_64' 'mips64el')
-install=abuse.install
-md5sums=('439b607f291560a8f9698a2f09cffa63'
-         '2b857668849b2dc7cd29cdd84a33c19e'
-         '0686f951289fe514846903bab36a2079'
-         '86b5256f066e994db9d57dbe1ec2a58e')
+depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
+install='abuse.install'
+source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('ec678b8dc8d00e0382d8c805c6438489')
+>>>>>>> 8867b1d4d0601b21618d44d015460739590ca01d
 
 build() {
-  cd ${srcdir}/abuse-${pkgver}
-  patch -p1 -i ${srcdir}/abuse.patch
-  ./configure --prefix=/usr --datadir=/usr/share/abuse/orig --with-x
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/abuse-${pkgver}"
 
-  mkdir -p ${pkgdir}/usr/share/abuse/{frabs,orig}
-  mkdir -p ${pkgdir}/usr/share/licenses/abuse
-
-  # original code license.  sdlport is gpl.
-  sed -n '1,/^$/ p' src/view.cpp > \
-      ${pkgdir}/usr/share/licenses/abuse/orig.code.license
+  ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
+  make
+}
 
-  # original game data.
-  cd ${pkgdir}/usr/share/abuse/orig
-  tar -xzf  ${srcdir}/abuse-data-2.00.tar.gz
-  mv README.datafiles ${pkgdir}/usr/share/licenses/abuse/orig.data.license
+package() {
+  cd "${srcdir}/abuse-${pkgver}"
 
-  # frabs data, link to sound in orignal game data.
-  cd ${pkgdir}/usr/share/abuse/frabs
-  mv ${srcdir}/abuse-frabs-2.11/* .
-  rm -f abuse.exe setup.exe art/dos4gw.exe art/spaint.exe
-  ln -s ../orig/sfx sfx
-  cp docs/index.html ${pkgdir}/usr/share/licenses/abuse/frabs.license
+  make DESTDIR="${pkgdir}" install
 
-  chown -R root:root ${pkgdir}/usr/share
+  install -d "${pkgdir}/usr/share/licenses/abuse"
+  sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
 }
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
index 54ef7c949..00e3e3cf1 100644
--- a/community/clementine/PKGBUILD
+++ b/community/clementine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 44544 2011-04-08 11:52:13Z stephane $
+# $Id: PKGBUILD 46607 2011-05-09 23:12:17Z stephane $
 #Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 #Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 #Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=clementine
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A music player and library organizer"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -16,13 +16,16 @@ optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
             'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
             'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142')
+source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+        clementine-0.7.1-fix-devicekit.patch)
+sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142'
+          'd595e2746949363680e0d64fe2fb97b524c8d27c')
 install=clementine.install
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0
+   patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch
+   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF
    make
 }
 
diff --git a/community/clementine/clementine-0.7.1-fix-devicekit.patch b/community/clementine/clementine-0.7.1-fix-devicekit.patch
new file mode 100644
index 000000000..797a2c864
--- /dev/null
+++ b/community/clementine/clementine-0.7.1-fix-devicekit.patch
@@ -0,0 +1,11 @@
+diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in
+--- clementine-0.7.1.ori/src/config.h.in	2011-03-29 12:16:15.000000000 -0700
++++ clementine-0.7.1/src/config.h.in	2011-05-09 16:00:26.505080057 -0700
+@@ -29,6 +29,7 @@
+ #cmakedefine HAVE_STATIC_SQLITE
+ 
+ #cmakedefine HAVE_DBUS
++#cmakedefine HAVE_DEVICEKIT
+ #cmakedefine HAVE_GIO
+ #cmakedefine HAVE_IMOBILEDEVICE
+ #cmakedefine HAVE_LIBARCHIVE
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 47f19f0ed..79d375f35 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=59120
+pkgver=59230
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index a96fb8ae1..ed3e329eb 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46198 2011-05-04 10:12:25Z rvanharen $
+# $Id: PKGBUILD 46667 2011-05-10 10:41:31Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-svn
-pkgver=58940
+pkgver=59304
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index 8d162a975..716999742 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46172 2011-05-04 10:03:34Z rvanharen $
+# $Id: PKGBUILD 46641 2011-05-10 10:36:24Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ecore-svn
-pkgver=58945
+pkgver=59292
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 6175a7549..8bb77afaa 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46185 2011-05-04 10:07:59Z rvanharen $
+# $Id: PKGBUILD 46654 2011-05-10 10:39:07Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=edje-svn
-pkgver=58887
+pkgver=59305
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 27f2a643b..a44a4280b 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46161 2011-05-04 09:59:52Z rvanharen $
+# $Id: PKGBUILD 46627 2011-05-10 10:33:50Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina-svn
-pkgver=58920
+pkgver=59299
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 856f5f2e3..58233f294 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=elementary-svn
-pkgver=58962
+pkgver=59308
 pkgrel=1
 pkgdesc="Enlightenment's basic widget set"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index c097ecb9d..a9e864742 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46169 2011-05-04 10:02:34Z rvanharen $
+# $Id: PKGBUILD 46636 2011-05-10 10:35:23Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
-pkgver=58958
+pkgver=59306
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index a191557d0..08f7ebf91 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46480 2011-05-07 19:12:24Z angvp $
+# $Id: PKGBUILD 46614 2011-05-10 07:06:59Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
-pkgver=4.75
-pkgrel=2
+pkgver=4.76
+pkgrel=1
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64 'mips64el')
 url="http://www.exim.org/"
@@ -13,34 +13,28 @@ backup=(etc/mail/aliases etc/mail/exim.conf \
 install=exim.install
 changelog=exim.changelog
 depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libldap')
-makedepends=('sudo')
 provides=('smtp-server')
 conflicts=('smtp-server')
 options=('!makeflags')
 source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.tar.bz2
         aliases 
-        newaliases 
         exim 
         exim.logrotate 
         exim.conf.d
         exim.Makefile
-        475format.patch
         )
-md5sums=('427fb74bbd2afbea759e6da38f25af17'
+md5sums=('58e784b33c7a2ab335ec6400346d6362'
          '4874006f0585253ddab027d441009757'
-         'ea39f58bffc16f5e3bbe59dffcf09449'
          '9aed772e87223213e8da9ca5e7376869'
          'd788c26f86a9d72a0aebb3b849fe74f2'
          'b75fe4c6e960a59a25b5f51e8f61ba3a'
-         '61e76543476f52f136c1d6c80ac1c5a1'
-         '4d5e58f07896db227ea24bea57972bd1')
+         '61e76543476f52f136c1d6c80ac1c5a1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
   # Make some configuration changes
   cp ${srcdir}/${pkgname}.Makefile Local/Makefile
-  patch -p2 < ${srcdir}/475format.patch
   make
 }
 
@@ -67,7 +61,6 @@ package() {
     >${pkgdir}/etc/mail/exim.conf
 
   cp ${srcdir}/aliases ${pkgdir}/etc/mail
-  cp ${srcdir}/newaliases ${pkgdir}/usr/sbin
   cd ${pkgdir}/usr/sbin
   for i in mailq rmail rsmtp runq sendmail 
   do
diff --git a/community/exim/exim.changelog b/community/exim/exim.changelog
index afb4f843c..562a87b75 100644
--- a/community/exim/exim.changelog
+++ b/community/exim/exim.changelog
@@ -1,3 +1,9 @@
+2010-05-09 Angel Velasquez <angvp@archlinux.org>
+    * Updated to 4.76
+    * Removed previous patch since is no longer needed
+    * Removed newaliases script FS#22744
+    * Removed sudo dependency
+
 2010-05-07 Angel Velasquez <angvp@archlinux.org>
     * Adding patch for security issue see: http://goo.gl/QBict
 
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 485bdc3c6..407c2c945 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=luakit
 pkgver=2011.05.06
-pkgrel=1
+pkgrel=2
 pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release'
 arch=('i686' 'x86_64')
 url='http://www.luakit.org/projects/luakit'
@@ -13,8 +13,8 @@ makedepends=('git' 'help2man')
 options=(!makeflags)  
 conflicts=('luakit-git' 'luakit-develop-git')
 install='luakit.install'
-source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}")
-md5sums=('eaf96d02aaecc1d8ba4f62f38565497f')
+source=("${pkgver}-r1.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
+md5sums=('ebf25ad1d37960ca8f70f13ebf45a874')
 
 build() {
   cd mason-larobina-luakit-*
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 8d9ca3488..52e644464 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 46097 2011-05-03 14:39:45Z spupykin $
+# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -11,7 +11,7 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -27,14 +27,11 @@ backup=("etc/nginx/conf/nginx.conf"
 	"etc/logrotate.d/nginx")
 source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
 	nginx)
-md5sums=('4d4e70e3c6c907cb101c97e9cf9399c8'
+md5sums=('8a528ccaab3ddba84e72443fa40b19e7'
          '837b010afcbdfe82d8e65ef00c4e14ba')
 
 build() {
-	local _src_dir=$srcdir/nginx-${pkgver}
-	local _build_dir=$_src_dir/objs
-
-	cd $_src_dir
+	cd $srcdir/nginx-${pkgver}
 	./configure \
 		--prefix=${_server_root} \
 		--sbin-path=/usr/sbin/nginx \
@@ -53,6 +50,10 @@ build() {
 		--with-ipv6
 
 	make
+}
+
+package() {
+	cd $srcdir/nginx-${pkgver}
 	make DESTDIR=$pkgdir install
 
 	install -d $pkgdir/etc/logrotate.d/
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
new file mode 100644
index 000000000..c32d7c8e8
--- /dev/null
+++ b/community/oolite/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Lone_Wolf <lonewolf@xs4all.nl>
+pkgname=oolite
+pkgver=1.75.2
+pkgrel=2
+pkgdesc="A space-sim based on the classic Elite"
+arch=('i686' 'x86_64')
+url="http://oolite-linux.berlios.de"
+license=('GPL2')
+depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu')
+makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip')
+source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2)
+md5sums=('d4b3fdc553fbd4aa4418864eebd21ede'
+         '926720981d94fd09c9e2824dbc102d5e')
+
+build() {
+    cd $srcdir
+    cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build
+
+# running 'make -f libjs.make debug=no' and/or 'make -f Makefile release'
+# works from commandline, but gives errors that cause makepkg to abort
+    cd ${srcdir}/${pkgname}-build/deps/Cocoa-deps/scripts
+    ./update-mozilla.sh
+    mkdir -p ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
+    cd ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
+    ../configure --disable-shared-js --enable-threadsafe --with-system-nspr --disable-tests --enable-trace-jscalls
+# end of lines needed to avoid makepkg aborting
+    cd ${srcdir}/${pkgname}-build
+    make -f libjs.make debug=no
+    make -f Makefile release
+}
+
+package() {
+    mkdir -p ${pkgdir}/usr/bin
+    mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite}
+    cd ${srcdir}/${pkgname}-build
+    cp -r oolite.app/* ${pkgdir}/usr/share/oolite/
+#install shellscript and icon
+    install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite
+    install -D -m644 installers/FreeDesktop/oolite-icon.png ${pkgdir}/usr/share/pixmaps/oolite-icon.png
+# copy  .desktop file
+    install -D -m644 installers/FreeDesktop/oolite.desktop ${pkgdir}/usr/share/applications/oolite.desktop
+# documentation
+    install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/
+ }
+# vim:set ts=2 sw=2 et:
diff --git a/community/oolite/oolite b/community/oolite/oolite
new file mode 100755
index 000000000..d20e28545
--- /dev/null
+++ b/community/oolite/oolite
@@ -0,0 +1,7 @@
+#!/bin/bash
+source /usr/share/GNUstep/Makefiles/GNUstep.sh
+if [ ! -d ~/.Oolite/AddOns ]; then
+      mkdir -p ~/.Oolite/AddOns
+fi
+/usr/share/oolite/oolite
+
diff --git a/community/pdmenu/PKGBUILD b/community/pdmenu/PKGBUILD
index 2d88bd867..551330631 100644
--- a/community/pdmenu/PKGBUILD
+++ b/community/pdmenu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 43384 2011-03-25 14:16:56Z spupykin $
+# $Id: PKGBUILD 46707 2011-05-10 20:39:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pdmenu
-pkgver=1.2.99
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="simple full screen menu program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,11 +11,15 @@ license=('GPL')
 depends=('gpm' 'slang')
 optdepends=('perl')
 source=(http://ftp.debian.org/debian/pool/main/p/pdmenu/pdmenu_$pkgver.tar.gz)
-md5sums=('656d9fbfedef7018521ba0299ba7f4a4')
+md5sums=('2530237cb0dca94905e03f12a320d78a')
 
 build() {
   cd $srcdir/pdmenu
   ./configure --prefix=/usr --sysconfdir=/etc
   make
+}
+
+package() {
+  cd $srcdir/pdmenu
   make INSTALL_PREFIX=$pkgdir install
 }
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index bc2ab246b..66c0a83cb 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 46699 2011-05-10 18:48:15Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
 pkgver=3.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.privoxy.org'
@@ -22,7 +22,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src
         'privoxy.logrotate.d'
         'privoxy.conf.d')
 md5sums=('9d363d738a3f3d73e774d6dfeafdb15f'
-         'a799e4d4f0ebb7f08190fa2bc961f439'
+         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
          'a364c34c8dc6eb78c9a6b777237932de'
          '27830ef79418e277b90c1c1fa933f876')
 
diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy
index eb85bd5f9..754453de5 100755
--- a/community/privoxy/privoxy
+++ b/community/privoxy/privoxy
@@ -6,17 +6,23 @@
 # source application-specific settings
 [ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
 
+# read logdir and logfile from privoxy config
+prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
+[ -n "$prld" ] || prld=/var/log/privoxy
+prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
+[ -n "$prlf" ] || prlf=logfile
+
 PID=`pidof -o %PPID /usr/sbin/privoxy`
 
 case "$1" in
   start)
     stat_busy "Starting Privoxy"
-    # create missing logfiles
-    for f in logfile jarfile; do 
-        touch "/var/log/privoxy/${f}"
-        chgrp "${PRIVOXY_GROUP}" "/var/log/privoxy/${f}"
-        chmod 0660 "/var/log/privoxy/${f}"
-    done
+    # create missing logdir and logfile
+    [ -d "$prld" ] || mkdir -p "$prld"
+    if [ ! -f "$prlf" ]; then
+      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
+        chmod 0660 "$prld/$prlf"
+    fi
     [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
                                        ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
     if [ $? -gt 0 ]; then
@@ -42,6 +48,6 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 782762d64..4dafb3ca2 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45591 2011-04-25 08:40:39Z spupykin $
+# $Id: PKGBUILD 46713 2011-05-10 20:40:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
 pkgver=0.10.10
-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/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 26aa0ab0b..de7c26dba 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -7,23 +7,32 @@
 
 pkgname=vtk
 pkgver=5.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.vtk.org'
 license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif')
+depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
 optdepends=('gnuplot: plotting tools'
             'graphviz: drawing tools')
 makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa')
 source=("http://www.vtk.org/files/release/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz")
+        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
+        'missingheader.diff')
 md5sums=('b80a76435207c5d0f74dfcab15b75181'
-         '67263bd972f923d39a60f01104368779')
+         '67263bd972f923d39a60f01104368779'
+         'f7c60ac3ccaf61c41ca508e53d895d3e')
 
 build() {
   cd VTK
 
+  # remove next time version bump
+  patch -Np1 -i ${srcdir}/missingheader.diff
+
+  # remove next time version bump
+  sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx
+
+  # fix for libpng 1.4
   for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *`
   do
     sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE}
@@ -57,6 +66,7 @@ build() {
     -DVTK_USE_BOOST:BOOL=ON \
     -DVTK_USE_INFOVIS:BOOL=ON \
     -DVTK_USE_GL2PS:BOOL=ON \
+    -DVTK_USE_MYSQL:BOOL=ON \
     -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
     -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
     -DVTK_WRAP_JAVA:BOOL=ON \
diff --git a/community/vtk/missingheader.diff b/community/vtk/missingheader.diff
new file mode 100644
index 000000000..47956d81d
--- /dev/null
+++ b/community/vtk/missingheader.diff
@@ -0,0 +1,28 @@
+From be4c4f115793598f6c8937a98bdd1f227d471540 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Tue, 19 Apr 2011 15:25:09 -0400
+Subject: [PATCH] MetaIO: Add missing include <stddef.h> for ptrdiff_t
+
+Fixes error "ptrdiff_t was not declared in this scope".
+
+Author: David Doria <daviddoria@gmail.com>
+Change-Id: I1e0dee67d26681f4119ac1fd00ecec3d139eb726
+---
+ Utilities/vtkmetaio/metaUtils.cxx |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx
+index dcb26ca..27bde1e 100644
+--- a/Utilities/vtkmetaio/metaUtils.cxx
++++ b/Utilities/vtkmetaio/metaUtils.cxx
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stddef.h>
+ 
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-- 
+1.7.0
+