Fri Aug 19 23:14:46 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-08-19 23:14:47 +0000
committer: root <root@rshg054.dnsready.net> 2011-08-19 23:14:47 +0000
commit: c6a4d3790fc33558d9af322dac15d2bd6d34ac0b (patch)
tree: 934e1d11b80c8529b23dcb07b626c5b81e8b156d /community
parent: 59eecef62ae9aa7dd391310f30293318f641c59c (diff)
51 files changed, 688 insertions, 347 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 3d7b7dbb7..19a015c8a 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=aria2
 pkgver=1.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
 url='http://aria2.sourceforge.net/'
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index 77a930762..ed73f1dc5 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47741 2011-05-25 05:00:38Z svenstaro $
+# $Id: PKGBUILD 54443 2011-08-18 15:06:14Z bluewind $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=ekg2
-pkgver=0.3.0
-pkgrel=2
+pkgver=0.3.1
+pkgrel=1
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
 arch=('i686' 'x86_64')
 url="http://ekg2.org/"
@@ -37,3 +37,4 @@ package() {
   rm -rf $pkgdir/usr/libexec
   chmod -R 755 $pkgdir/usr/lib/perl5
 }
+md5sums=('68fc05b432c34622df6561eaabef5a40')
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 2ca8fdff9..3e422ffcb 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47441 2011-05-23 10:00:33Z jelle $
+# $Id: PKGBUILD 54445 2011-08-18 15:06:21Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64')
 url="http://filezilla-project.org/"
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index f845453fe..6c8447953 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45796 2011-04-29 10:42:30Z spupykin $
+# $Id: PKGBUILD 54447 2011-08-18 15:06:31Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64')
 url="http://freerdp.sourceforge.net"
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index 045076658..df4c6569a 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 7908 2010-01-12 10:36:09Z spupykin $
+# $Id: PKGBUILD 54449 2011-08-18 15:06:35Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64)
 url="http://camaya.net/gloox"
@@ -17,6 +17,6 @@ md5sums=('f8eacf1c6476e0a309b453fd04f90e31')
 build() {
   cd $startdir/src/gloox-$pkgver
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=$startdir/pkg install
 }
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index a2a05176b..f74cfa8c7 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48665 2011-06-03 22:32:57Z stephane $
+# $Id: PKGBUILD 54451 2011-08-18 15:06:41Z bluewind $
 # 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=2
+pkgrel=3
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD
index 7853bc4e5..60f87df16 100644
--- a/community/gsasl/PKGBUILD
+++ b/community/gsasl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52207 2011-07-21 16:33:45Z spupykin $
+# $Id: PKGBUILD 54453 2011-08-18 15:06:47Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 # Maintainer: Orivej Desh <smpuj@bk.ru>
 
 pkgname=gsasl
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
 arch=("i686" "x86_64")
 url="http://josefsson.org/gsasl/"
diff --git a/community/gtk-gnutella/PKGBUILD b/community/gtk-gnutella/PKGBUILD
index fa9a562c3..3fb207387 100644
--- a/community/gtk-gnutella/PKGBUILD
+++ b/community/gtk-gnutella/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52275 2011-07-23 01:33:22Z ebelanger $
+# $Id: PKGBUILD 54455 2011-08-18 15:06:51Z bluewind $
 # Contributor: Dan McGee <dan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gtk-gnutella
 pkgver=0.97
-pkgrel=1
+pkgrel=2
 pkgdesc="A Gnutella client written in C"
 arch=('i686' 'x86_64')
 url="http://gtk-gnutella.sourceforge.net/"
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 2f3e08236..ee5e44c65 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51213 2011-07-05 21:18:23Z spupykin $
+# $Id: PKGBUILD 54457 2011-08-18 15:06:59Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gwenhywfar
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64)
 url="http://www.aquamaniac.de"
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 003198220..e85372405 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ifuse
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64')
diff --git a/community/jabberd14/PKGBUILD b/community/jabberd14/PKGBUILD
index 8d3a89c38..f9edde54f 100644
--- a/community/jabberd14/PKGBUILD
+++ b/community/jabberd14/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44176 2011-04-04 11:41:59Z spupykin $
+# $Id: PKGBUILD 54463 2011-08-18 15:07:21Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=jabberd14
 pkgver=1.6.1.1
-pkgrel=9
+pkgrel=10
 pkgdesc="old (1.4) jabber server branch"
 arch=(i686 x86_64)
 url="http://jabberd.org/"
@@ -18,13 +18,15 @@ source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz
 	build-fix.patch
 	jabberd)
 md5sums=('597c7ee14518ba22b1cee883b4737d87'
-         'fde211eaeecfaf569d29e548a8c24d29'
+         'ad795626f26c01700a23515e0e75d654'
          '5869169394d70977858320648075c7a6')
 
 build() {
   cd $srcdir/jabberd14-$pkgver
+  export LDFLAGS="$LDFLAGS -lgcrypt"
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/build-fix.patch
+  echo "#undef HAVE_GNUTLS_EXTRA" >>config.h
+  [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch
   make -j1
   make DESTDIR=$pkgdir install
   install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd
diff --git a/community/jabberd14/build-fix.patch b/community/jabberd14/build-fix.patch
index 705ddccfd..4f39b523e 100644
--- a/community/jabberd14/build-fix.patch
+++ b/community/jabberd14/build-fix.patch
@@ -1,219 +1,84 @@
-Only in jabberd14-1.6.1.1.my: config.h
-Only in jabberd14-1.6.1.1.my: config.log
-Only in jabberd14-1.6.1.1.my: config.status
-Only in jabberd14-1.6.1.1.my/dialback: .deps
-Only in jabberd14-1.6.1.1.my/dialback: dialback_in.lo
-Only in jabberd14-1.6.1.1.my/dialback: dialback.lo
-Only in jabberd14-1.6.1.1.my/dialback: dialback_out.lo
-Only in jabberd14-1.6.1.1.my/dialback: libjabberddialback.la
-Only in jabberd14-1.6.1.1.my/dialback: .libs
-Only in jabberd14-1.6.1.1.my/dialback: Makefile
-Only in jabberd14-1.6.1.1.my/dnsrv: .deps
-Only in jabberd14-1.6.1.1.my/dnsrv: dnsrv.lo
-Only in jabberd14-1.6.1.1.my/dnsrv: libjabberddnsrv.la
-Only in jabberd14-1.6.1.1.my/dnsrv: .libs
-Only in jabberd14-1.6.1.1.my/dnsrv: Makefile
-Only in jabberd14-1.6.1.1.my/dnsrv: srv_resolv.lo
-Only in jabberd14-1.6.1.1.my/jabberd: acl.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_accept.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_connect.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_dir.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_file.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_format.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_importspool.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_load.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_null.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_stderr.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_stdout.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_syslog.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_to.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: base_unsubscribe.lo
-Only in jabberd14-1.6.1.1.my/jabberd/base: .deps
-Only in jabberd14-1.6.1.1.my/jabberd/base: libjabberdbase.la
-Only in jabberd14-1.6.1.1.my/jabberd/base: .libs
-Only in jabberd14-1.6.1.1.my/jabberd/base: Makefile
-Only in jabberd14-1.6.1.1.my/jabberd: config.lo
-Only in jabberd14-1.6.1.1.my/jabberd: deliver.lo
-Only in jabberd14-1.6.1.1.my/jabberd: .deps
-Only in jabberd14-1.6.1.1.my/jabberd: gcrypt_init.lo
-Only in jabberd14-1.6.1.1.my/jabberd: heartbeat.lo
-Only in jabberd14-1.6.1.1.my/jabberd: jabberd
-Only in jabberd14-1.6.1.1.my/jabberd: jabberd.o
-Only in jabberd14-1.6.1.1.my/jabberd/lib: base64.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: crc32.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: .deps
-Only in jabberd14-1.6.1.1.my/jabberd/lib: expat.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: hash.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: hmac.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: jid.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: jpacket.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: jutil.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: karma.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: libjabberdlib.la
-Only in jabberd14-1.6.1.1.my/jabberd/lib: .libs
-Only in jabberd14-1.6.1.1.my/jabberd/lib: Makefile
-Only in jabberd14-1.6.1.1.my/jabberd/lib: messages.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: pool.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: rate.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: socket.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: str.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: xhash.lo
-diff -wbBur jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1.my/jabberd/lib/xmlnode.cc
---- jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2007-04-07 19:43:18.000000000 +0000
-+++ jabberd14-1.6.1.1.my/jabberd/lib/xmlnode.cc	2010-06-04 15:31:02.000000000 +0000
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2011-08-09 00:37:29.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2007-04-07 23:43:18.000000000 +0400
 @@ -910,8 +910,8 @@
      }
  
      /* separate this step from the next one, and check for a predicate in this step */
--    start_predicate = strchr(path, '[');
--    next_step = strchr(path, '/');
-+    start_predicate = strchr((char*)path, '[');
-+    next_step = strchr((char*)path, '/');
+-    start_predicate = strchr((char*)path, '[');
+-    next_step = strchr((char*)path, '/');
++    start_predicate = strchr(path, '[');
++    next_step = strchr(path, '/');
      if (start_predicate == NULL && next_step == NULL) {
  	this_step = pstrdup(p, path);
      } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) {
-@@ -1833,7 +1833,8 @@
+@@ -1833,8 +1833,7 @@
      if (lang != NULL && strchr(lang, '-') != NULL) {
  	snprintf(general_lang, sizeof(general_lang), "%s", lang);
  	if (strchr(lang, '-') != NULL) {
--	    strchr(lang, '-')[0] = 0;
-+	    char *tmp = strchr((char*)lang, '-');
-+	    tmp[0] = 0;
+-	    char *tmp = strchr((char*)lang, '-');
+-	    tmp[0] = 0;
++	    strchr(lang, '-')[0] = 0;
  	} else {
  	    general_lang[0] = 0;
  	}
-Only in jabberd14-1.6.1.1.my/jabberd/lib: xmlnode.lo
-Only in jabberd14-1.6.1.1.my/jabberd/lib: xstream.lo
-Only in jabberd14-1.6.1.1.my/jabberd: libjabberd.la
-Only in jabberd14-1.6.1.1.my/jabberd: .libs
-diff -wbBur jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1.my/jabberd/log.cc
---- jabberd14-1.6.1.1/jabberd/log.cc	2007-07-20 13:56:59.000000000 +0000
-+++ jabberd14-1.6.1.1.my/jabberd/log.cc	2010-06-04 15:34:05.000000000 +0000
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc	2011-08-09 00:37:29.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/log.cc	2007-07-20 17:56:59.000000000 +0400
 @@ -86,7 +86,7 @@
      char *pos, c = '\0';
      if(zone != NULL && debug__zones != NULL)
      {
--	pos = strchr(zone,'.');
-+	pos = strchr((char*)zone,'.');
+-	pos = strchr((char*)zone,'.');
++	pos = strchr(zone,'.');
          if(pos != NULL)
          {
              c = *pos;
-Only in jabberd14-1.6.1.1.my/jabberd: log.lo
-Only in jabberd14-1.6.1.1.my/jabberd: Makefile
-Only in jabberd14-1.6.1.1.my/jabberd: mio.lo
-Only in jabberd14-1.6.1.1.my/jabberd: mio_raw.lo
-diff -wbBur jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1.my/jabberd/mio_tls.cc
---- jabberd14-1.6.1.1/jabberd/mio_tls.cc	2007-07-16 23:20:44.000000000 +0000
-+++ jabberd14-1.6.1.1.my/jabberd/mio_tls.cc	2010-06-04 15:33:36.000000000 +0000
-@@ -612,7 +612,8 @@
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc	2011-08-09 00:53:55.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/mio_tls.cc	2007-07-17 03:20:44.000000000 +0400
+@@ -43,7 +43,6 @@
+ #include <vector>
+ #include <list>
+ #include <iostream>
+-#include <gnutls/openpgp.h>
+ 
+ // Tell gcrypt that we are using libpth - had to move this to a plain C file
+ extern "C" void mio_tls_gcrypt_init(void);
+@@ -613,8 +612,7 @@
  	    }
  
  	    // load OpenPGP key/certificate
--	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
-+//	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
-+	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
+-//	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
+-	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
++	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
  	    if (ret < 0) {
  		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
  		continue;
-@@ -631,7 +632,8 @@
+@@ -633,8 +631,7 @@
  	    }
  
  	    // load the OpenPGP keyring
--	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
-+//	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
-+	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
+-//	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
+-	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
++	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
  	    if (ret < 0) {
  		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
  		continue;
-@@ -640,6 +642,8 @@
+@@ -643,8 +640,6 @@
  	    continue;
  	}
  
-+
-+/*
+-
+-/*
  	// load GnuPG trustdb
  	if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
  	    char const *const file = xmlnode_get_data(cur);
-@@ -656,6 +660,7 @@
+@@ -661,7 +656,6 @@
  		continue;
  	    }
  	}
-+*/
+-*/
  
  	// setup protocols to use
  	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
-Only in jabberd14-1.6.1.1.my/jabberd: mio_tls.lo
-Only in jabberd14-1.6.1.1.my/jabberd: mio_xml.lo
-Only in jabberd14-1.6.1.1.my/jabberd: mtq.lo
-Only in jabberd14-1.6.1.1.my/jabberd: subjectAltName_asn1_tab.lo
-Only in jabberd14-1.6.1.1.my/jabberd: xdb.lo
-Only in jabberd14-1.6.1.1.my: jabber.xml.dist
-Only in jabberd14-1.6.1.1.my/jsm: authreg.lo
-Only in jabberd14-1.6.1.1.my/jsm: deliver.lo
-Only in jabberd14-1.6.1.1.my/jsm: .deps
-Only in jabberd14-1.6.1.1.my/jsm: jsm.lo
-Only in jabberd14-1.6.1.1.my/jsm: libjabberdsm.la
-Only in jabberd14-1.6.1.1.my/jsm: .libs
-Only in jabberd14-1.6.1.1.my/jsm: Makefile
-Only in jabberd14-1.6.1.1.my/jsm/modules: .deps
-Only in jabberd14-1.6.1.1.my/jsm/modules: libjabberdsmmods.la
-Only in jabberd14-1.6.1.1.my/jsm/modules: .libs
-Only in jabberd14-1.6.1.1.my/jsm/modules: Makefile
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_admin.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_agents.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_announce.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_crypt.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_digest.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_plain.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_browse.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_disco.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_echo.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_example.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_last.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_log.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_offline.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_ping.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_presence.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_privacy.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_register.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_roster.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_stat.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_time.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_useridpolicy.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_vcard.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_version.lo
-Only in jabberd14-1.6.1.1.my/jsm/modules: mod_xml.lo
-Only in jabberd14-1.6.1.1.my/jsm: modules.lo
-Only in jabberd14-1.6.1.1.my/jsm: offline.lo
-Only in jabberd14-1.6.1.1.my/jsm: serialization.lo
-Only in jabberd14-1.6.1.1.my/jsm: server.lo
-Only in jabberd14-1.6.1.1.my/jsm: sessions.lo
-Only in jabberd14-1.6.1.1.my/jsm: users.lo
-Only in jabberd14-1.6.1.1.my/jsm: util.lo
-Only in jabberd14-1.6.1.1.my: .libs
-Only in jabberd14-1.6.1.1.my: libtool
-Only in jabberd14-1.6.1.1.my: Makefile
-Only in jabberd14-1.6.1.1.my/man: jabberd.8
-Only in jabberd14-1.6.1.1.my/man: jabber.xml.5
-Only in jabberd14-1.6.1.1.my/man: Makefile
-Only in jabberd14-1.6.1.1.my/po: Makefile
-Only in jabberd14-1.6.1.1.my/pthsock: client.lo
-Only in jabberd14-1.6.1.1.my/pthsock: .deps
-Only in jabberd14-1.6.1.1.my/pthsock: libjabberdpthsock.la
-Only in jabberd14-1.6.1.1.my/pthsock: .libs
-Only in jabberd14-1.6.1.1.my/pthsock: Makefile
-Only in jabberd14-1.6.1.1.my: qwe
-Only in jabberd14-1.6.1.1.my: stamp-h1
-Only in jabberd14-1.6.1.1.my/xdb_file: .deps
-Only in jabberd14-1.6.1.1.my/xdb_file: libjabberdxdbfile.la
-Only in jabberd14-1.6.1.1.my/xdb_file: .libs
-Only in jabberd14-1.6.1.1.my/xdb_file: Makefile
-Only in jabberd14-1.6.1.1.my/xdb_file: xdb_file.lo
-Only in jabberd14-1.6.1.1.my/xdb_file: xdbfiletool
-Only in jabberd14-1.6.1.1.my/xdb_file: xdbfiletool.o
-Only in jabberd14-1.6.1.1.my/xdb_sql: .deps
-Only in jabberd14-1.6.1.1.my/xdb_sql: libjabberdxdbsql.la
-Only in jabberd14-1.6.1.1.my/xdb_sql: .libs
-Only in jabberd14-1.6.1.1.my/xdb_sql: Makefile
-Only in jabberd14-1.6.1.1.my/xdb_sql: xdb_sql.lo
diff --git a/community/java6-oracle/PKGBUILD b/community/java6-oracle/PKGBUILD
new file mode 100644
index 000000000..b273b9b1b
--- /dev/null
+++ b/community/java6-oracle/PKGBUILD
@@ -0,0 +1,156 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
+
+pkgname=('jre6' 'jdk6')
+pkgbase=java6-oracle
+pkgver=6u27
+pkgrel=1
+pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
+arch=('i686' 'x86_64')
+  [ "${CARCH}" = 'i686' ]   && _arch=i586
+  [ "${CARCH}" = 'x86_64' ] && _arch=x64
+url='http://java.sun.com'
+license=('custom')
+# oracle moved it ...
+#        'https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh'
+source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}-b07/jdk-${pkgver}-linux-${_arch}.bin"
+        'construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true'
+        'java-control-panel.desktop'
+        'java-monitoring-and-management-console.desktop'
+        'java-policy-settings.desktop'
+        'java-visualvm.desktop'
+        'java-web-start.desktop'
+        'jre.profile'
+        'jre.profile.csh'
+        'jdk.profile'
+        'jdk.profile.csh'
+        'derby-network-server'
+        'derby-network-server.conf'
+        'javaws-launcher')
+
+[ "${CARCH}" = 'i686' ] && md5sums=('bdb5f05bd20c6aa9a4729726191bf6fd')
+[ "${CARCH}" = 'x86_64' ] && md5sums=('94f93a3ff03f824a238ecd79ad90433e')
+md5sums+=('94065b612df0046d9ae758943f9f6a75'
+         'e4d814c0f310d77ed6990c731bccd0fb'
+         '4bc2b0be93f76ed07b471e3c89eb5a8a'
+         '8e3cec7ab641ec449cabd068be583f5c'
+         '9ba148ebabce8ed3351b813a9a66b6e5'
+         '619ec32235dcfe454234ef4316f8a7cc'
+         '7cd3dc10e7a37468cad4053a067dcd01'
+         'cc90df2df6fe80fab885a80036d420a1'
+         'b83ab5742651b4234b7d2e20785c6693'
+         '6f4cbf332816d2c4e9578ecd1d0dce7f'
+         'a279e195e249000646895d93e199860d'
+         '4bdff6982c66d24a879c424aaac3d04d'
+         '45c15a6b4767288f2f745598455ea2bf')
+
+build() {
+  mkdir unbundle-jdk
+  cd unbundle-jdk
+  sh ../jdk-${pkgver}-linux-$_arch.bin --accept-license
+  cd ..
+  sh construct.sh unbundle-jdk linux-jdk linux-jre
+}
+
+package_jre6() {
+  pkgdesc="Oracle's Java Runtime Environment"
+  depends=('glibc' 'libxtst')
+  provides=('j2re' 'java-runtime=6')
+  conflicts=('j2re' 'java-runtime' 'jre')
+  replaces=('j2re')
+  install='jre.install'
+
+  # main files
+  mkdir -p ${pkgdir}/opt/java
+  cp -R linux-jdk/jre ${pkgdir}/opt/java
+
+  # profiles
+  install -D ${srcdir}/jre.profile \
+    ${pkgdir}/etc/profile.d/jre.sh
+  install -D ${srcdir}/jre.profile.csh \
+    ${pkgdir}/etc/profile.d/jre.csh
+
+  mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
+
+  if [ "$CARCH" = "i686" ]; then
+    ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
+  else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
+  fi
+
+  # licenses
+  install -d ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \
+    ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/LICENSE \
+    ${pkgdir}/usr/share/licenses/jre
+  install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \
+    ${pkgdir}/usr/share/licenses/jre
+
+  # Fix system prefs folder (FS#18872)
+  install -d ${pkgdir}/etc/.java/.systemPrefs
+
+  # Fix FS#22509 - [jre] Clicking a .jnlp file does not launch that file but launch javaws -viewer instead 
+  install ${srcdir}/javaws-launcher \
+    ${pkgdir}/opt/java/jre/bin
+}
+
+package_jdk6() {
+  pkgdesc="Oracle's Java Development Kit"
+  depends=('glibc' 'jre6')
+  provides=('java-environment=6' 'j2sdk')
+  conflicts=('java-environment' 'j2sdk' 'jdk')
+  replaces=('j2sdk')
+  install='jdk.install'
+
+  #copy icon
+  install -D -m644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
+    ${pkgdir}/usr/share/pixmaps/java.png
+
+  # main files
+  rm -rf linux-jdk/jre
+  install -d ${pkgdir}/opt
+  mv linux-jdk ${pkgdir}/opt/java
+
+  # profiles
+  install -D ${srcdir}/jdk.profile \
+    ${pkgdir}/etc/profile.d/jdk.sh
+  install -D ${srcdir}/jdk.profile.csh \
+    ${pkgdir}/etc/profile.d/jdk.csh
+
+  # licenses
+  install -d ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/COPYRIGHT \
+    ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/LICENSE \
+    ${pkgdir}/usr/share/licenses/jdk
+  install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \
+    ${pkgdir}/usr/share/licenses/jdk
+
+  # desktop entries
+  install -Dm644 ${srcdir}/java-control-panel.desktop \
+    ${pkgdir}/usr/share/applications/java-control-panel.desktop
+  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
+    ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
+  install -Dm644 ${srcdir}/java-policy-settings.desktop \
+    ${pkgdir}/usr/share/applications/java-policy-settings.desktop
+  install -Dm644 ${srcdir}/java-visualvm.desktop \
+    ${pkgdir}/usr/share/applications/java-visualvm.desktop
+  install -Dm644 ${srcdir}/java-web-start.desktop \
+    ${pkgdir}/usr/share/applications/java-web-start.desktop
+
+  # javadb (apache derby) daemon files
+  install -D ${srcdir}/derby-network-server \
+    ${pkgdir}/etc/rc.d/derby-network-server
+  install -D -m644 ${srcdir}/derby-network-server.conf \
+    ${pkgdir}/etc/conf.d/derby-network-server
+
+  # remove dangling links, probably need to find out more about them
+  for i in kinit ktab klist; do
+    rm ${pkgdir}/opt/java/bin/${i}
+    rm ${pkgdir}/opt/java/man/ja_JP.eucJP/man1/${i}.1
+    rm ${pkgdir}/opt/java/man/man1/${i}.1
+  done
+}
diff --git a/community/java6-oracle/derby-network-server b/community/java6-oracle/derby-network-server
new file mode 100644
index 000000000..f2b36ea56
--- /dev/null
+++ b/community/java6-oracle/derby-network-server
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/profile.d/jdk.sh
+. $DERBY_HOME/bin/derby_common.sh
+
+DAEMON_NAME="derby-network-server"
+DAEMON_CONF="/etc/conf.d/$DAEMON_NAME"
+DAEMON_PID="/var/run/$DAEMON_NAME.pid"
+
+[ -f $DAEMON_CONF ] && . $DAEMON_CONF
+
+DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start"
+DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown"
+
+case "$1" in
+  start)
+    stat_busy "Starting Derby Network Server"
+
+    if ck_daemon $DAEMON_NAME; then
+        $DERBY_START_CMD > /dev/null &
+
+        PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'`
+        
+        if [ -z "$PID" ]; then
+            stat_fail
+        else
+            echo $PID > $DAEMON_PID
+            add_daemon $DAEMON_NAME
+            sleep 2
+            stat_done
+        fi    
+    else
+        stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Derby Network Server"
+
+    if ck_daemon $DAEMON_NAME; then
+        stat_fail
+    else
+        $DERBY_STOP_CMD > /dev/null &
+
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm -f $DAEMON_PID
+            rm_daemon $DAEMON_NAME
+            stat_done
+        fi
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 5
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/community/java6-oracle/derby-network-server.conf b/community/java6-oracle/derby-network-server.conf
new file mode 100644
index 000000000..ef7478254
--- /dev/null
+++ b/community/java6-oracle/derby-network-server.conf
@@ -0,0 +1,2 @@
+DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log"
+
diff --git a/community/java6-oracle/java-control-panel.desktop b/community/java6-oracle/java-control-panel.desktop
new file mode 100644
index 000000000..476e04a82
--- /dev/null
+++ b/community/java6-oracle/java-control-panel.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=/opt/java/bin/jcontrol
+GenericName[cs]=Nastavení prostředí Java
+GenericName=Java Environment Settings
+Icon=java
+Name[cs]=Nastavení Javy
+Name=Java Control Panel
+Path=
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Settings;Java;
diff --git a/community/java6-oracle/java-monitoring-and-management-console.desktop b/community/java6-oracle/java-monitoring-and-management-console.desktop
new file mode 100644
index 000000000..c0e1e59f6
--- /dev/null
+++ b/community/java6-oracle/java-monitoring-and-management-console.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/opt/java/bin/jconsole
+Icon=java
+Name[cs]=Konzole monitorování a správy prostředí Java
+Name=Java Monitoring and Management Console
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/community/java6-oracle/java-policy-settings.desktop b/community/java6-oracle/java-policy-settings.desktop
new file mode 100644
index 000000000..1009301b1
--- /dev/null
+++ b/community/java6-oracle/java-policy-settings.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Exec=/opt/java/bin/policytool
+Icon=java
+Name[cs]=Nastavení politiky Java aplikací
+Name=Java Policy Settings
+Path=
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Settings;Java;
diff --git a/community/java6-oracle/java-visualvm.desktop b/community/java6-oracle/java-visualvm.desktop
new file mode 100644
index 000000000..8aa9527c8
--- /dev/null
+++ b/community/java6-oracle/java-visualvm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Exec=/opt/java/bin/jvisualvm
+GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
+GenericName=Java Monitoring and Performance Monitoring Tool
+Icon=java
+Name=Java VisualVM
+Path=
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/community/java6-oracle/java-web-start.desktop b/community/java6-oracle/java-web-start.desktop
new file mode 100644
index 000000000..a8a25f9e2
--- /dev/null
+++ b/community/java6-oracle/java-web-start.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Exec=/opt/java/jre/bin/javaws-launcher %f
+GenericName[cs]=Spravovat a spouštět aplikace Java Web Start
+GenericName=Manage and run Java Web Start Applications
+Icon=java
+MimeType=application/x-java-jnlp-file;
+Name[cs]=Java Web Start
+Name=Java Web Start
+Path=
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Network;Java;
diff --git a/community/java6-oracle/javaws-launcher b/community/java6-oracle/javaws-launcher
new file mode 100644
index 000000000..2831dfcbb
--- /dev/null
+++ b/community/java6-oracle/javaws-launcher
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$@" ]; then
+  exec javaws -viewer
+else
+  exec javaws "$@"
+fi
diff --git a/community/java6-oracle/jdk.install b/community/java6-oracle/jdk.install
new file mode 100644
index 000000000..abe08b6a0
--- /dev/null
+++ b/community/java6-oracle/jdk.install
@@ -0,0 +1,7 @@
+post_install() {
+  echo "The jdk package is licensed software."
+  echo "You MUST read and agree to the license stored in"
+  echo "/opt/java/LICENSE before using it."
+
+  echo 'Please relogin to include jdk in your PATH'
+}
diff --git a/community/java6-oracle/jdk.profile b/community/java6-oracle/jdk.profile
new file mode 100644
index 000000000..f9d5deb68
--- /dev/null
+++ b/community/java6-oracle/jdk.profile
@@ -0,0 +1,4 @@
+export J2SDKDIR=/opt/java
+export PATH=$PATH:/opt/java/bin:/opt/java/db/bin
+export JAVA_HOME=/opt/java
+export DERBY_HOME=/opt/java/db
diff --git a/community/java6-oracle/jdk.profile.csh b/community/java6-oracle/jdk.profile.csh
new file mode 100644
index 000000000..3626e7287
--- /dev/null
+++ b/community/java6-oracle/jdk.profile.csh
@@ -0,0 +1,4 @@
+setenv J2SDKDIR /opt/java
+setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin
+setenv JAVA_HOME /opt/java
+setenv DERBY_HOME /opt/java/db
diff --git a/community/java6-oracle/jre.install b/community/java6-oracle/jre.install
new file mode 100644
index 000000000..111da3c2a
--- /dev/null
+++ b/community/java6-oracle/jre.install
@@ -0,0 +1,20 @@
+post_install() {
+   echo "The jre package is licensed software."
+	echo "You MUST read and agree to the license stored in"
+	echo "/opt/java/jre/LICENSE before using it."
+	if [ -f /etc/mailcap ] ; then
+		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+	fi
+	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
+
+  echo 'Please relogin to include jre in your PATH.'
+}
+
+post_remove() {
+	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
+	if [ "$mailcap" != "" ] ; then
+		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+	else
+		rm /etc/mailcap
+	fi
+}
diff --git a/community/java6-oracle/jre.profile b/community/java6-oracle/jre.profile
new file mode 100644
index 000000000..ded0efe81
--- /dev/null
+++ b/community/java6-oracle/jre.profile
@@ -0,0 +1,2 @@
+export PATH=$PATH:/opt/java/jre/bin
+export JAVA_HOME=${JAVA_HOME:-/opt/java/jre}
diff --git a/community/java6-oracle/jre.profile.csh b/community/java6-oracle/jre.profile.csh
new file mode 100644
index 000000000..a4e72ddf4
--- /dev/null
+++ b/community/java6-oracle/jre.profile.csh
@@ -0,0 +1,4 @@
+setenv PATH ${PATH}:/opt/java/jre/bin
+if (! "$?JAVA_HOME" ) then
+  setenv JAVA_HOME /opt/java/jre
+endif
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 167677500..b8bb7f281 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 54428 2011-08-18 10:36:01Z andrea $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -13,13 +13,13 @@ url="http://www.kphotoalbum.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs' 'docbook-xsl')
+makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
 optdepends=('kdeedu-marble: integration with Marble'
 	'kipi-plugins: add extra functionality'
 	'kdemultimedia-mplayerthumbs: video thumbnails')
 install=${pkgname}.install
-source=("http://www.kphotoalbum.org/data/download/${pkgname}-${pkgver}.tar.bz2"
-	'fix-docbook-build.patch'
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'fix-docbook-build.patch'
         'fix-with-exiv2-0.21.patch')
 md5sums=('c00a5f179e487ac89fccf8dfb3cd6ef0'
          '1b48553af74f0488fdad55758e911e3a'
@@ -31,7 +31,7 @@ build() {
   patch -Np0 -i ${srcdir}/fix-docbook-build.patch
   patch -Np0 -i ${srcdir}/fix-with-exiv2-0.21.patch
 
-  rm -rf build && mkdir build
+  mkdir build
   cd build
 
   cmake ../${pkgname}-${pkgver} \
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 49f850d9a..4dc307ca4 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53361 2011-08-03 09:42:41Z spupykin $
+# $Id: PKGBUILD 54465 2011-08-18 15:07:27Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64')
 url="http://gobby.0x539.de"
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 3e784e39e..77d2e1977 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50018 2011-06-23 13:20:44Z spupykin $
+# $Id: PKGBUILD 54467 2011-08-18 15:07:35Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=libmicrohttpd
 pkgver=0.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libmicrohttpd/"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index f15f7c2ad..b17d54d64 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53366 2011-08-03 09:43:53Z spupykin $
+# $Id: PKGBUILD 54469 2011-08-18 15:07:52Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 9c1767d95..216f40192 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51689 2011-07-13 08:09:55Z spupykin $
+# $Id: PKGBUILD 54471 2011-08-18 15:08:02Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=mailutils
 pkgver=2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/mailutils/"
diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD
index 2aee17a20..a762e584e 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47062 2011-05-15 17:37:33Z lfleischer $
+# $Id: PKGBUILD 54473 2011-08-18 15:08:10Z bluewind $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: AkiraYB <brunoyb!yahoo,com,br>
 
 pkgname=minbif
 pkgver=1.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc='An IRC gateway to IM networks that uses libpurple.'
 arch=('i686' 'x86_64')
 url='http://minbif.im/'
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index 26d8d2eea..abee474a9 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 7956 2010-01-12 23:28:07Z giovanni $
+# $Id: PKGBUILD 54475 2011-08-18 15:08:16Z bluewind $
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=net6
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
 arch=('i686' 'x86_64')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
 options=('!libtool')
-source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('506776416d8aea2b9ea13a81f9145383')
+source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('506776416d8aea2b9ea13a81f9145383'
+         '18ac67590d6bce0a0a4a6a21af8da429')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-
+  patch -Rp1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch
new file mode 100644
index 000000000..7e932bce6
--- /dev/null
+++ b/community/net6/build-fix.patch
@@ -0,0 +1,24 @@
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp
+--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp	2011-08-09 00:19:29.000000000 +0400
++++ net6-1.3.12/inc/encrypt.hpp	2009-11-15 16:02:46.000000000 +0300
+@@ -34,7 +34,7 @@
+ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
+ typedef gnutls_transport_ptr gnutls_transport_ptr_t;
+ typedef gnutls_dh_params gnutls_dh_params_t;
+-//typedef gnutls_connection_end gnutls_connection_end_t;
++typedef gnutls_connection_end gnutls_connection_end_t;
+ 
+ class dh_params: private net6::non_copyable
+ {
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp
+--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp	2011-08-09 00:20:12.000000000 +0400
++++ net6-1.3.12/src/encrypt.cpp	2009-11-15 16:02:46.000000000 +0300
+@@ -25,7 +25,7 @@
+ {
+ 	const unsigned int DH_BITS = 1024;
+ 
+-	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
++	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
+ 	{
+ 		net6::gnutls_session_t session;
+ 		gnutls_init(&session, end);
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index 8d0ac39a9..f61ad81cf 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 16899 2010-05-12 17:57:00Z jlichtblau $
+# $Id: PKGBUILD 54477 2011-08-18 15:08:22Z bluewind $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=nzbget
 pkgver=0.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Downloads from Usenet using .nzb files"
 arch=('i686' 'x86_64')
 url="http://nzbget.sourceforge.net/"
@@ -19,7 +19,10 @@ build() {
 #  autoreconf -fi || return 1
 #uudeview ("uulib") has been removed, and "it did not work well anyway"
   ./configure --prefix=/usr --enable-parcheck || return 1
-  make || return 1
+  make 
+}
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
 
 #other files
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 1e21d2200..3948b5727 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54322 2011-08-16 21:46:14Z bfanella $
+# $Id: PKGBUILD 54399 2011-08-18 05:37:17Z bfanella $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=openbox
 pkgver=3.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 url="http://openbox.org"
@@ -28,12 +28,13 @@ build() {
   	# FS#11455
   	patch -p1 -i "${srcdir}"/which-2.20.patch
   	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-  	  data/autostart/openbox-xdg-autostart
+  		data/autostart/openbox-xdg-autostart
   
 	./configure --prefix=/usr \
     		--with-x \
     		--enable-startup-notification \
-    		--sysconfdir=/etc
+    		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/openbox
   
 	make
 }
@@ -43,7 +44,7 @@ package() {
   	make DESTDIR="${pkgdir}" install
 
   	sed -i "s:startkde:/usr/bin/\0:" \
-  	  "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
+  		"${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
   	sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
-    	  "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
+    		"${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
 }
diff --git a/community/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD
index d4f30af3b..7b6007a69 100644
--- a/community/remmina-plugins/PKGBUILD
+++ b/community/remmina-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42191 2011-03-15 12:35:58Z spupykin $
+# $Id: PKGBUILD 54479 2011-08-18 15:08:28Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=remmina-plugins
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Remina plugins"
 #"Remmina supports multiple network protocols in an integrated and consistant user interface.
 # Currently RDP, VNC, XDMCP and SSH are supported."
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 1f78c2daa..a3b0c17fa 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53977 2011-08-10 20:52:33Z spupykin $
+# $Id: PKGBUILD 54481 2011-08-18 15:08:38Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
 pkgver=5.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD
new file mode 100644
index 000000000..2d74ed30a
--- /dev/null
+++ b/community/ruby-ncurses/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 2365 2009-09-16 18:43:17Z shusmann $
+# Contributor: Jeff Mickey <j@codemac.net>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+
+pkgname=ruby-ncurses
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="This ruby extension makes most functions, constants, and external variables of the C library ncurses accessible from the Ruby programming language."
+arch=('i686' 'x86_64')
+url="http://ncurses-ruby.berlios.de"
+license=('GPL')
+depends=('ruby')
+source=(http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2)
+md5sums=('63fd3d09a51cdd745e1ed37f85621ea2')
+
+build()  {
+	cd $srcdir/ncurses-ruby-$pkgver
+
+	ruby extconf.rb
+  	make
+}
+
+package() {
+	cd $srcdir/ncurses-ruby-$pkgver
+	make DESTDIR=$pkgdir install
+}
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index eaff100cd..6efbe0334 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 43064 2011-03-23 21:53:14Z kchen $
+# $Id: PKGBUILD 54483 2011-08-18 15:08:42Z bluewind $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
@@ -30,7 +30,11 @@ build() {
     --with-readline \
     --with-tcl --with-tk \
     --with-x --without-emacs
-  make; make DESTDIR="$pkgdir" install
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
 
   # fix manpage symlink
   rm -f $pkgdir/usr/share/man/man1/gst-reload.1
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 268736beb..84e963398 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44915 2011-04-12 21:25:17Z angvp $
+# $Id: PKGBUILD 54488 2011-08-18 18:11:38Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: unexist <unexist@dorfelite.net>
 # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com>
 pkgname=subtle
-pkgver=0.9.2773
-pkgrel=2
+pkgver=0.10.3008
+pkgrel=1
 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
 arch=("i686" "x86_64")
 url="http://subtle.subforge.org"
@@ -14,11 +14,11 @@ makedepends=("ruby" "pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm")
 provides=("subtle")
 conflicts=("subtle-hg")
 backup=("etc/xdg/subtle/subtle.rb")
-source=(http://subforge.org/attachments/download/50/$pkgname-$pkgver-mu.tbz2)
-md5sums=('bbae53d6c16cfe25186003e9e28504f8')
 install=subtle.install
+source=(http://subforge.org/attachments/download/75/$pkgname-$pkgver-nu.tbz2)
+md5sums=('10961e02f45a7ce9fc7ca5b11360f001')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver-mu"
+  cd "$srcdir/$pkgname-$pkgver-nu"
   rake destdir=$pkgdir install 
 }
diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install
index 36fa9bafe..363d963c5 100644
--- a/community/subtle/subtle.install
+++ b/community/subtle/subtle.install
@@ -1,4 +1,7 @@
 post_upgrade() {
+  echo "ATTENTION:"
+  echo "This release of subtle (0.10.3008) includes awesome changes that might break your config, so please check http://subforge.org/projects/subtle and enjoy the new features"
+  echo ""
   echo "In order to use sur you have to install the following dependencies: curb and minitar with"
   echo "You can use this gem command: "
   echo "  gem install curb minitar"
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 88a0a5139..0235cbcef 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
-pkgver=0.8.2
+pkgver=0.9
 pkgrel=1
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64')
@@ -12,24 +13,22 @@ url='https://github.com/muennich/sxiv'
 depends=('libx11' 'xproto' 'imlib2')
 source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
-        'config.h')
-md5sums=('6948b4c02f9458c4160c6e458228b85f'
+	'config.h')
+md5sums=('865f1e542669ad6d7932fcd4664fb481'
          '1dda85ff6bed4de337f8fb303075ed11'
-         '8018e9f2f63b155098428be9dbaf8b5c')
+	 '05c3801bf32c2861c3c7b37073664db3')
 
 build() {
-  cd sxiv-${pkgver}
+  	cd "sxiv-${pkgver}"
 
-  cp ${srcdir}/config.h .
-
-  make
+	cp "$srcdir/config.h" .
+	make
 }
 
 package() {
-  cd sxiv-${pkgver}
-
-  make PREFIX=${pkgdir}/usr install
+  	cd "sxiv-${pkgver}"
 
-  install -D -m644 ${srcdir}/sxiv.desktop \
-    ${pkgdir}/usr/share/applications/sxiv.desktop
+  	make PREFIX="${pkgdir}/usr" install
+	install -D -m644 ${srcdir}/sxiv.desktop \
+    		${pkgdir}/usr/share/applications/sxiv.desktop
 }
diff --git a/community/sxiv/config.h b/community/sxiv/config.h
index 14a65bd4f..dd9efe89f 100644
--- a/community/sxiv/config.h
+++ b/community/sxiv/config.h
@@ -1,41 +1,119 @@
-/* default window dimensions (overwritten via -g option): */
-#define WIN_WIDTH    800
-#define WIN_HEIGHT   600
-
-/* default color for window background:                   *
- * (see X(7) "COLOR NAMES" section for valid values)      */
-#define BG_COLOR     "#999999"
-/* default color for thumbnail selection:                 */
-#define SEL_COLOR    "#0040FF"
-
-/* how should images be scaled when they are loaded?:     *
- * (also controllable via -d/-s/-Z/-z options)            *
- *   SCALE_DOWN: 100%, but fit large images into window,  *
- *   SCALE_FIT:  fit all images into window,              *
- *   SCALE_ZOOM: use current zoom level, 100% at startup  */
-#define SCALE_MODE   SCALE_DOWN
-
-/* levels (percent) to use when zooming via '-' and '+':  */
+#ifdef _WINDOW_CONFIG
+
+/* default window dimensions (overwritten via -g option):      */
+enum { WIN_WIDTH  = 800, WIN_HEIGHT = 600 };
+
+/* default color for window background:                        *
+ * (see X(7) "COLOR NAMES" section for valid values)           */
+static const char * const BG_COLOR  = "#777777";
+/* default color for thumbnail selection:                      */
+static const char * const SEL_COLOR = "#DDDDDD";
+
+#endif
+#ifdef _IMAGE_CONFIG
+
+/* how should images be scaled when they are loaded?:          *
+ * (also controllable via -d/-s/-Z/-z options)                 *
+ *   SCALE_DOWN: 100%, but fit large images into window,       *
+ *   SCALE_FIT:  fit all images into window,                   *
+ *   SCALE_ZOOM: use current zoom level, 100% at startup       */
+static const scalemode_t SCALE_MODE = SCALE_DOWN;
+
+/* levels (percent) to use when zooming via '-' and '+':       */
 static const float zoom_levels[] = {
 	 12.5,  25.0,  50.0,  75.0,
 	100.0, 150.0, 200.0, 400.0, 800.0
 };
 
-/* default dimension of thumbnails (width == height):     */
-#define THUMB_SIZE   60
-
-/* enable external commands (defined below)? 0=off, 1=on: */
-#define EXT_COMMANDS 0
-
-/* external commands and corresponding key mappings:      */
-#ifdef MAIN_C
-#if    EXT_COMMANDS
-static const command_t commands[] = {
-	/* ctrl-...     reload?  command, '#' is replaced by filename */
-	{  XK_comma,    True,    "jpegtran -rotate 270 -copy all -outfile # #" },
-	{  XK_period,   True,    "jpegtran -rotate 90 -copy all -outfile # #" },
-	{  XK_less,     True,    "mogrify -rotate -90 #" },
-	{  XK_greater,  True,    "mogrify -rotate +90 #" }
-};
 #endif
+#ifdef _THUMBS_CONFIG
+
+/* default dimension of thumbnails (width == height):          */
+enum { THUMB_SIZE = 60 };
+
+#endif
+#ifdef _MAPPINGS_CONFIG
+
+/* keyboard mappings for image and thumbnail mode:             */
+static const keymap_t keys[] = {
+	/* ctrl    key              function           argument      */
+	{ False,   XK_q,            quit,              (arg_t) None },
+	{ False,   XK_r,            reload,            (arg_t) None },
+	{ False,   XK_f,            toggle_fullscreen, (arg_t) None },
+	{ False,   XK_a,            toggle_antialias,  (arg_t) None },
+	{ False,   XK_A,            toggle_alpha,      (arg_t) None },
+	{ False,   XK_Return,       switch_mode,       (arg_t) None },
+
+	{ False,   XK_g,            first,             (arg_t) None },
+	{ False,   XK_G,            last,              (arg_t) None },
+	{ False,   XK_n,            navigate,          (arg_t) +1 },
+	{ False,   XK_space,        navigate,          (arg_t) +1 },
+	{ False,   XK_p,            navigate,          (arg_t) -1 },
+	{ False,   XK_BackSpace,    navigate,          (arg_t) -1 },
+	{ False,   XK_bracketright, navigate,          (arg_t) +10 },
+	{ False,   XK_bracketleft,  navigate,          (arg_t) -10 },
+
+	{ False,   XK_D,            remove_image,      (arg_t) None },
+
+	{ False,   XK_h,            move,              (arg_t) DIR_LEFT },
+	{ False,   XK_Left,         move,              (arg_t) DIR_LEFT },
+	{ False,   XK_j,            move,              (arg_t) DIR_DOWN },
+	{ False,   XK_Down,         move,              (arg_t) DIR_DOWN },
+	{ False,   XK_k,            move,              (arg_t) DIR_UP },
+	{ False,   XK_Up,           move,              (arg_t) DIR_UP },
+	{ False,   XK_l,            move,              (arg_t) DIR_RIGHT },
+	{ False,   XK_Right,        move,              (arg_t) DIR_RIGHT },
+
+	{ True,    XK_h,            pan_screen,        (arg_t) DIR_LEFT },
+	{ True,    XK_Left,         pan_screen,        (arg_t) DIR_LEFT },
+	{ True,    XK_j,            pan_screen,        (arg_t) DIR_DOWN },
+	{ True,    XK_Down,         pan_screen,        (arg_t) DIR_DOWN },
+	{ True,    XK_k,            pan_screen,        (arg_t) DIR_UP },
+	{ True,    XK_Up,           pan_screen,        (arg_t) DIR_UP },
+	{ True,    XK_l,            pan_screen,        (arg_t) DIR_RIGHT },
+	{ True,    XK_Right,        pan_screen,        (arg_t) DIR_RIGHT },
+
+	{ False,   XK_H,            pan_edge,          (arg_t) DIR_LEFT },
+	{ False,   XK_J,            pan_edge,          (arg_t) DIR_DOWN },
+	{ False,   XK_K,            pan_edge,          (arg_t) DIR_UP },
+	{ False,   XK_L,            pan_edge,          (arg_t) DIR_RIGHT },
+
+	{ False,   XK_plus,         zoom,              (arg_t) +1 },
+	{ False,   XK_equal,        zoom,              (arg_t) +1 },
+	{ False,   XK_KP_Add,       zoom,              (arg_t) +1 },
+	{ False,   XK_minus,        zoom,              (arg_t) -1 },
+	{ False,   XK_KP_Subtract,  zoom,              (arg_t) -1 },
+	{ False,   XK_0,            zoom,              (arg_t) None },
+	{ False,   XK_KP_0,         zoom,              (arg_t) None },
+	{ False,   XK_w,            fit_to_win,        (arg_t) None },
+	{ False,   XK_W,            fit_to_img,        (arg_t) None },
+
+	{ False,   XK_less,         rotate,            (arg_t) DIR_LEFT },
+	{ False,   XK_greater,      rotate,            (arg_t) DIR_RIGHT },
+
+	                            /* open the current image with given program:  */
+	{ True,    XK_g,            open_with,         (arg_t) "gimp" },
+
+	                            /* run shell command line on the current file,
+	                             * '#' is replaced by filename:                */
+	{ True,    XK_less,         run_command,       (arg_t) "mogrify -rotate -90 #" },
+	{ True,    XK_greater,      run_command,       (arg_t) "mogrify -rotate +90 #" },
+	{ True,    XK_comma,        run_command,       (arg_t) "jpegtran -rotate 270 -copy all -outfile # #" },
+	{ True,    XK_period,       run_command,       (arg_t) "jpegtran -rotate 90 -copy all -outfile # #" },
+};
+
+/* mouse button mappings for image mode:                       */
+static const button_t buttons[] = {
+	/* ctrl    shift    button       function      argument      */
+	{ False,   False,   Button1,     navigate,     (arg_t) +1 },
+	{ False,   False,   Button3,     navigate,     (arg_t) -1 },
+	{ False,   False,   Button2,     drag,         (arg_t) None },
+	{ False,   False,   Button4,     move,         (arg_t) DIR_UP },
+	{ False,   False,   Button5,     move,         (arg_t) DIR_DOWN },
+	{ False,   True,    Button4,     move,         (arg_t) DIR_LEFT },
+	{ False,   True,    Button5,     move,         (arg_t) DIR_RIGHT },
+	{ True,    False,   Button4,     zoom,         (arg_t) +1 },
+	{ True,    False,   Button5,     zoom,         (arg_t) -1 },
+};
+
 #endif
diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install
index 02fd31189..410e17b44 100644
--- a/community/sxiv/sxiv.install
+++ b/community/sxiv/sxiv.install
@@ -1,10 +1,10 @@
 post_install () {
-  echo "* Look into config.h to customize sxiv to your needs."
-  echo "  Use 'makepkg --skipinteg' to rebuild the package after changing config.h."
-  echo "* Create the directory ~/.sxiv/ to enable thumbnail caching."
-  echo "  See sxiv(1) for more information."
+  	echo "* Look into config.h to customize sxiv to your needs."
+  	echo "  Use 'makepkg --skipinteg' to rebuild the package after changing config.h."
+	echo "* Create the directory ~/.sxiv/ to enable thumbnail caching."
+  	echo "  See sxiv(1) for more information."
 }
 
 post_upgrade () {
-  post_install ${1}
+  	post_install ${1}
 }
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index 59cbb4d36..6655b0948 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 50309 2011-06-28 09:32:14Z spupykin $
+# $Id: PKGBUILD 54413 2011-08-18 09:29:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
 pkgver=10.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -13,14 +13,17 @@ depends=('lm_sensors')
 optdepends=('tk: to use isag'
 	    'gnuplot: to use isag')
 options=(zipman)
+backup=('etc/conf.d/sysstat'
+	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
         sysstat)
 md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579'
-         'ad46159609a2c13b4a46b506ff847bf6')
+         '0241e3dd701cf7badbd3bb8408fb7bc9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
+  conf_dir=/etc/conf.d ./configure --prefix=/usr \
+	--enable-yesterday \
 	--mandir=/usr/share/man \
 	--enable-install-isag \
 	--disable-man-group
@@ -30,7 +33,6 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat
   install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat
   install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat
   install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat
diff --git a/community/sysstat/sysstat b/community/sysstat/sysstat
index d8e312a18..e914567b8 100644
--- a/community/sysstat/sysstat
+++ b/community/sysstat/sysstat
@@ -2,11 +2,12 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/sysstat
 
 case "$1" in
   start)
     stat_busy "Writing SysStat restart record"
-    /usr/lib/sa/sadc -L -F -
+    /usr/lib/sa/sadc -L -F ${SADC_OPTIONS} -
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 049bcb05e..8b5d25fed 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,46 +1,39 @@
-# $Id: PKGBUILD 52920 2011-07-29 21:10:45Z spupykin $
+# $Id: PKGBUILD 54423 2011-08-18 09:42:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
-pkgver=0.10.21
-pkgrel=1
+pkgver=0.10.22
+pkgrel=2
 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/tracker/"
 license=('GPL')
-depends=('upower' 'poppler-glib' 'gstreamer0.10-base' 'libgee'  'gnome-desktop' 'libnotify' 'xdg-utils' 'gtkhtml'
-	 'libgsf' 'gnome-panel-bonobo' 'exempi' 'networkmanager')
-makedepends=('intltool' 'gnome-panel' 'evolution' 'totem-plparser' 'icu')
-# 'nautilus'
-optdepends=('nautilus'
-	    'enca'
-	    'gtkhtml'
-	    'gnome-panel'
-	    'totem-plparser'
-	    'icu'
-	    'taglib'
-	    'giflib')
-options=('!libtool')
+depends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' 'poppler-glib'
+	 'libgsf' 'icu' 'enca' 'xdg-utils')
+makedepends=('gobject-introspection' 'intltool' 'giflib' 'gstreamer0.10-base'
+	     'totem-plparser' 'evolution' 'taglib' 'nautilus' 'gnome-panel')
+optdepends=('giflib: extractor for GIF data'
+	    'gstreamer0.10-base: video extractor'
+	    'totem-plparser: playlist support'
+	    'evolution: Evolution email data miner'
+	    'taglib: writeback for audio files'
+	    'nautilus: nautilus-extension'
+	    'gnome-panel: tracker-search-bar')
+options=('!emptydirs' '!libtool')
 conflicts=('libtracker')
-provides=("libtracker")
+provides=('libtracker')
 install=tracker.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2)
-md5sums=('200e15db4e2ae9acbd439947219c0d7f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2
+	tracker-0.10-gnome3-nautilus-extension.patch)
+md5sums=('1248742586be5c95871ea59718457657'
+         '316f1647afe178a87400a476ef1b62a0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  export PYTHON=`which python2`
-  for file in tests/functional-tests/*.py; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-      sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-  done
-
+  patch -Ni ../tracker-0.10-gnome3-nautilus-extension.patch
   ./configure --prefix=/usr --sysconfdir=/etc  --libexecdir=/usr/lib/$pkgname \
-    --enable-video-extractor=gstreamer --disable-hal \
-    --disable-miner-evolution --disable-nautilus-extension
+    --disable-unit-tests --enable-video-extractor=gstreamer --disable-network-manager
   make
 }
 
diff --git a/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch b/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch
new file mode 100644
index 000000000..95e1097dd
--- /dev/null
+++ b/community/tracker/tracker-0.10-gnome3-nautilus-extension.patch
@@ -0,0 +1,11 @@
+--- configure	2011-08-05 13:04:41.000000000 +0200
++++ configure.new	2011-08-17 14:02:07.303473086 +0200
+@@ -19120,7 +19120,7 @@
+ TRACKER_NAUTILUS_EXTENSION_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
+                                      gio-unix-2.0   >= $GLIB_REQUIRED
+                                      gthread-2.0    >= $GLIB_REQUIRED
+-                                     gtk+-2.0       >= $GTK_REQUIRED
++                                     gtk+-3.0       >= $GTK_REQUIRED
+                                      libnautilus-extension"
+ 
+ 
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 942ee4a41..749bcebd6 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 43879 2011-03-30 18:59:05Z spupykin $
+# $Id: PKGBUILD 54418 2011-08-18 09:30:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: sracker <smb.sac@gmail.com>
 
 pkgname=xdebug
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64')
@@ -17,29 +17,29 @@ backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
 	xdebug-5.2.ini
 	xdebug.ini)
-md5sums=('fcdf078e715f44b77f13bac721ad63ce'
+md5sums=('3a9c3402063c8163de6e419ddc8d96e7'
          '6b7fdbbe0bf381bda40e77e29981f439'
          '68de800943369d4c76bdf7eb35c8463b')
 
 build() {
-  local PHPVER=$(php -r 'echo phpversion();')
+  local PHPVER=`php -r 'echo phpversion();'`
 
-  cd $srcdir/$pkgname-$pkgver || return 1
-  phpize || return 1
-  ./configure --prefix=/usr --enable-xdebug || return 1
-  make || return 1
+  cd $srcdir/$pkgname-$pkgver
+  phpize
+  ./configure --prefix=/usr --enable-xdebug
+  make
 
-  cd debugclient || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd debugclient
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$pkgdir install
 
-  cd $srcdir/$pkgname-$pkgver || return 1
+  cd $srcdir/$pkgname-$pkgver
   if [ "$PHPVER" \< "5.3.0" ] ; then
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so || return 1
-    install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini || return 1
+    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so
+    install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini
   else
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so || return 1
-    install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini || return 1
+    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
+    install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini
   fi
 }
author	root <root@rshg054.dnsready.net>	2011-08-19 23:14:47 +0000
committer	root <root@rshg054.dnsready.net>	2011-08-19 23:14:47 +0000
commit	c6a4d3790fc33558d9af322dac15d2bd6d34ac0b (patch)
tree	934e1d11b80c8529b23dcb07b626c5b81e8b156d /community
parent	59eecef62ae9aa7dd391310f30293318f641c59c (diff)