Sat Aug 27 23:14:39 UTC 2011

30 files changed, 140 insertions, 101 deletions

diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index 1738cdeee..a84ef9665 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 53615 2011-08-07 02:05:15Z svenstaro $
+# $Id: PKGBUILD 54827 2011-08-26 18:55:23Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu'
 makedepends=('doxygen' 'graphviz')
 options=('!libtool')
 source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('af9f16543fa3da43f49b4a52634d2e82')
+md5sums=('9a51aae432ec71e50fb753f30f6b73fd')
 
 build() { 
 	cd ${srcdir}/ClanLib-${pkgver}
diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD
index 2ddfbbda1..400ed830f 100644
--- a/community/courier-imap/PKGBUILD
+++ b/community/courier-imap/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 49375 2011-06-15 09:29:55Z svenstaro $
+# $Id: PKGBUILD 54864 2011-08-26 22:00:47Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Committer: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=courier-imap
 pkgver=4.9.3
-pkgrel=2
+pkgrel=4
 pkgdesc="IMAP(s)/POP3(s) Server"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.courier-mta.org/imap/"
-depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'fam' 'gdbm' 'openssl')
+depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl')
 backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \
         'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \
         'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\
@@ -18,6 +18,7 @@ backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \
 conflicts=('courier-mta')
 provides=('imap-server' 'pop3-server')
 options=('!libtool')
+install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2
         courier-imap.conf.d
 		courier-imap.rc.d
@@ -27,12 +28,11 @@ source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgnam
         pop3d-ssl.rc.d)
 md5sums=('703ddbb090569436dbda61d0d62b1eb8'
          '3e08f017f6c5a52dea28f6f0dbd50b86'
-         '3e4910c5a34af68dfdeed932e573a9f9'
-         'ca799c7014d002fb9f8ff671610337bd'
-         '268693ccf3f081897b78490a70cf3211'
-         'c2e65d9b136f59eb0cf5377e7c46de88'
-         'e07c43fdf2e5ae6d73fc3281f6332b62')
-install=$pkgname.install
+         '500c37831974f4676b67e650c67a59f6'
+         '6574c8046e44698efa7452c4b445d88e'
+         '437167a58efddc523f25180df284da20'
+         '1be23fb224bde93b23da6e771bd1cf01'
+         'a326309b02fed3d7226d9aac88add7f2')
 
 # MIGRATION NOTE:
 # In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed.
diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install
index cf73119e2..9046777a7 100644
--- a/community/courier-imap/courier-imap.install
+++ b/community/courier-imap/courier-imap.install
@@ -8,7 +8,7 @@ post_upgrade() {
   echo "Example prior to this change:"
   echo "    DAEMONS=( ... courier-imap ...)"
   echo "Example after this change:"
-  echo "    DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl .. )"
+  echo "    DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )"
   echo "This allows better control over the daemons and will generate"
   echo "correct entries in /run/daemons"
   echo "An old configuration will keep working but please do migrate in time"
diff --git a/community/courier-imap/courier-imap.rc.d b/community/courier-imap/courier-imap.rc.d
index 1389221f8..8876fe401 100644
--- a/community/courier-imap/courier-imap.rc.d
+++ b/community/courier-imap/courier-imap.rc.d
@@ -18,7 +18,7 @@ case "$1" in
       /etc/rc.d/authdaemond start
       sleep ${AUTO_AUTHDAEMON_LAG}
     fi
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d
index 3430bd73e..6730d452c 100644
--- a/community/courier-imap/imapd-ssl.rc.d
+++ b/community/courier-imap/imapd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d
index ec4df03f5..867b52b78 100644
--- a/community/courier-imap/imapd.rc.d
+++ b/community/courier-imap/imapd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d
index 8b147ff32..aab0f6a95 100644
--- a/community/courier-imap/pop3d-ssl.rc.d
+++ b/community/courier-imap/pop3d-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d
index 6a2c66ad0..7b73c5a7a 100644
--- a/community/courier-imap/pop3d.rc.d
+++ b/community/courier-imap/pop3d.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD
index c678c2198..7ac0627a9 100644
--- a/community/courier-maildrop/PKGBUILD
+++ b/community/courier-maildrop/PKGBUILD
@@ -6,12 +6,12 @@
 pkgname=courier-maildrop
 _srcname=maildrop
 pkgver=2.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="mail delivery agent - procmail like but nicer syntax"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://courier-mta.org/maildrop/"
-depends=('courier-authlib>=0.63.0' 'fam' 'pcre' 'gdbm')
+depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm')
 conflicts=('courier-mta')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2)
diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index ced394074..7b4722108 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -6,10 +6,9 @@
 # -----------  NOTE TO ALL USERS ------------
 # Go read http://www.courier-mta.org/install.html b4 running or building courier
 
-
 pkgname=courier-mta
 pkgver=0.66.3
-pkgrel=1
+pkgrel=3
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -22,9 +21,9 @@ backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \
         'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \
         'etc/conf.d/courier-mta')
 url="http://courier-mta.org"
-depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
+depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
 optdepends=('libldap')
-makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam')
+makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin')
 provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
 conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp')
 options=('!libtool')
@@ -41,16 +40,16 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
         pop3d-ssl.rc.d
         webmaild.rc.d)
 md5sums=('3b28f14afe3db09b74b4845323c3e982'
-         'bc2bdbc2f5c95cee8304f98a3b3a4895'
-         'e140f320968e57cfe459cd7a3b4017e0'
+         '9055ba622efd37603186ce1f37277224'
+         '5cbeb5c323706058e545f74ad7752ebe'
          'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
-         '799ddd56ff6c9cff132e8c771dde23d9'
-         'c3b634ea6a671b660bf6a660cef57138'
-         'd7c951a7e55674778077d5123ec41006'
-         'dabac9fa0e46872049c02ef6bf83b1f0'
-         '6e9e176eb966759a1f2e3838fccf4e3c'
-         '5c0ddedca1cf2298182dbbb461c189bf'
-         'ec5c0383d617c1f4877ebba9a9727ef4')
+         'caabce8c7b66296b602316aa5af5d4c5'
+         '1c8b1b66ebafa4ff09ffc0106a9dc82c'
+         'd0cc5eab5d3e0ec33dadd0392421f63e'
+         '5873a96aa149edda281730010fb4db34'
+         'faa09e06a5dc41ee89ab1f8fa6886b63'
+         '520501daa66c0a94f2e9844ce4919a09'
+         '33a93f400c3e87bcd207295b7d7333ca')
 
 # MIGRATION NOTE:
 # In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed.
diff --git a/community/courier-mta/courier-mta.rc.d b/community/courier-mta/courier-mta.rc.d
index 6c5fbc914..416946a5a 100644
--- a/community/courier-mta/courier-mta.rc.d
+++ b/community/courier-mta/courier-mta.rc.d
@@ -18,7 +18,7 @@ case "$1" in
       /etc/rc.d/authdaemond start
       sleep ${AUTO_AUTHDAEMON_LAG}
     fi
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/courier.rc.d b/community/courier-mta/courier.rc.d
index 7c321d452..7c581a24a 100644
--- a/community/courier-mta/courier.rc.d
+++ b/community/courier-mta/courier.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/esmtpd-ssl.rc.d b/community/courier-mta/esmtpd-ssl.rc.d
index 78001332f..2a13be03f 100644
--- a/community/courier-mta/esmtpd-ssl.rc.d
+++ b/community/courier-mta/esmtpd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/esmtpd.rc.d b/community/courier-mta/esmtpd.rc.d
index 951aa3e6e..dbaa9d680 100644
--- a/community/courier-mta/esmtpd.rc.d
+++ b/community/courier-mta/esmtpd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/imapd-ssl.rc.d b/community/courier-mta/imapd-ssl.rc.d
index 7b21fda76..3dc74cfdf 100644
--- a/community/courier-mta/imapd-ssl.rc.d
+++ b/community/courier-mta/imapd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/imapd.rc.d b/community/courier-mta/imapd.rc.d
index 7a8bff410..8bce59f6c 100644
--- a/community/courier-mta/imapd.rc.d
+++ b/community/courier-mta/imapd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/pop3d-ssl.rc.d b/community/courier-mta/pop3d-ssl.rc.d
index 730c6edbf..6e7ae4e12 100644
--- a/community/courier-mta/pop3d-ssl.rc.d
+++ b/community/courier-mta/pop3d-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/pop3d.rc.d b/community/courier-mta/pop3d.rc.d
index 6ec1d82b6..25f8379ba 100644
--- a/community/courier-mta/pop3d.rc.d
+++ b/community/courier-mta/pop3d.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/webmaild.rc.d b/community/courier-mta/webmaild.rc.d
index 2337e3ce8..835cc2bf0 100644
--- a/community/courier-mta/webmaild.rc.d
+++ b/community/courier-mta/webmaild.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index ff4c7d7f0..eea40b5b0 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52709 2011-07-27 22:06:23Z spupykin $
+# $Id: PKGBUILD 54817 2011-08-26 16:20:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=0.9.1
+pkgver=0.9.2
 _pkgver=0.9
 pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
@@ -18,7 +18,7 @@ optdepends=( 'librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('7f2167ad002386b377eae8b347c26ed7')
+md5sums=('08377e80ad77c7b11f742f26fddb80f1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index c05548fba..4d7b7ffb8 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $
+# $Id: PKGBUILD 54810 2011-08-26 12:19:01Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
 
 pkgname=mldonkey
-pkgver=3.0.7
-pkgrel=3
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="A multi-network P2P client"
 arch=('i686' 'x86_64')
 url="http://mldonkey.sourceforge.net/"
@@ -17,7 +17,6 @@ optdepends=('librsvg: GUI support'
 backup=('etc/conf.d/mldonkey')
 install=mldonkey.install
 source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
-        mldonkey-gcc46.patch
         mldonkeyd
         mldonkey.conf
         mldonkey.desktop)
@@ -25,8 +24,6 @@ source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.t
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Patch comes from upstream; will go away in later versions.
-  patch -p1 < "$srcdir/mldonkey-gcc46.patch"
   ./configure --prefix=/usr --enable-gui=newgui2
   make
 }
@@ -43,8 +40,7 @@ package() {
   install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey"
   install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
 }
-md5sums=('162b78fc4e20335a8fe31d91e1656db2'
-         'c2bd99420ba5d48629b6823aae6bf127'
+md5sums=('072726d158ba1e936c554be341e7ceff'
          '75e4b6c7fb282f7de15a8d5478f3bd70'
          '1f86d92db51c62cded0e6f3833057dee'
          '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index dfc1442a0..b1c34b3d1 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54341 2011-08-17 07:30:50Z andrea $
+# $Id: PKGBUILD 54809 2011-08-26 11:01:00Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
@@ -6,18 +6,22 @@
 
 pkgname=obconf
 pkgver=2.0.3.git20100309
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64')
 url="http://openbox.org/wiki/ObConf:About"
 license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d45a1eab18aa25c18280821118368b97')
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'config-file.patch')
+md5sums=('d45a1eab18aa25c18280821118368b97'
+         '51f5f110f8bc4a89dfb460c3dd4a3be8')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/config-file.patch
+
   ./bootstrap
   ./configure --prefix=/usr
   make
diff --git a/community/obconf/config-file.patch b/community/obconf/config-file.patch
new file mode 100644
index 000000000..ce7973f3d
--- /dev/null
+++ b/community/obconf/config-file.patch
@@ -0,0 +1,28 @@
+From: Dana Jansens <danakj@orodu.net>
+Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400)
+Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ...
+X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889
+
+Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
+---
+
+diff --git a/src/main.c b/src/main.c
+index 9035e8d..a576253 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -233,11 +233,10 @@ int main(int argc, char **argv)
+     }
+ 
+     xmlIndentTreeOutput = 1;
+-    if (!obt_xml_load_config_file(parse_i,
+-                                  "openbox",
+-                                  (obc_config_file ?
+-                                   obc_config_file : "rc.xml"),
+-                                  "openbox_config"))
++    if (!((obc_config_file &&
++           obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) ||
++          obt_xml_load_config_file(parse_i, "openbox", "rc.xml",
++                                   "openbox_config")))
+     {
+         obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE);
+         exit_with_error = TRUE;
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index d445e72cf..e6b73c70e 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54346 2011-08-17 07:32:06Z stativ $
+# $Id: PKGBUILD 54803 2011-08-26 10:44:32Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 4a1f6e1cf..26b7d7617 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 54652 2011-08-22 13:48:57Z ttopper $
+# $Id: PKGBUILD 54833 2011-08-26 19:35:19Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64')
 url="http://roxterm.sourceforge.net/"
 license=('GPL3')
-depends=('libglade' 'dbus-glib' 'vte' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2')
+depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2')
 makedepends=('docbook-xsl' 'xmlto' 'po4a')
 install=roxterm.install
 source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz)
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 299b12a65..d1cb2bd19 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 54266 2011-08-16 00:37:12Z giovanni $
+# $Id: PKGBUILD 54816 2011-08-26 15:37:25Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-_pkgname=Sigil
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
@@ -13,14 +12,12 @@ license=('GPL3')
 depends=('qt')
 makedepends=('cmake')
 install=sigil.install
-source=(http://${pkgname}.googlecode.com/files/${_pkgname}-${pkgver}-Code.zip
+source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip
         ${pkgname}.desktop)
-md5sums=('b36b8178446647f7dd320a6b335a40ba'
+md5sums=('b0ae292aea366fe6eb3f3392232ba9a6'
          'fef6aa492af487ccccd6b133635cee5a')
 
 build() {
-  cd ${_pkgname}-${pkgver}-Code
-
   mkdir build
   cd build
   cmake -G "Unix Makefiles" \
@@ -28,14 +25,13 @@ build() {
     -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
     -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON .. || return 1
+    -DCMAKE_SKIP_RPATH=ON ..
 
-    make || return 1
+    make
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}-Code/build
-
+  cd build
   make install DESTDIR="${pkgdir}"
 
   install -d -m 0755 "${pkgdir}"/usr/share/applications
diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD
index e5c547b4e..3686c44c2 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -1,43 +1,59 @@
-# $Id: PKGBUILD 39442 2011-02-10 06:52:04Z svenstaro $
+# $Id: PKGBUILD 54835 2011-08-26 20:12:54Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
 # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
 pkgname=speed-dreams
-pkgver=1.4.0
-pkgver2=1.4.0-r2307 # For managing files and directories
-pkgrel=3
+pkgver=2.0.0a3
+_pkgver=2.0.0-a3-r3412
+pkgrel=2
 pkgdesc="A racing simulator with rich graphics and physics"
 arch=('i686' 'x86_64')
 url="http://speed-dreams.sourceforge.net/"
 license=('GPL2')
-depends=('freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
-source=("http://sourceforge.net/projects/${pkgname}/files/1.4.0/${pkgname}-${pkgver2}-src.tar.bz2/download"
-	"${pkgname}.desktop"
-	"${pkgname}.sh")
-md5sums=('92c324c2c47a598dea9278d9a66c5b78'
-         'f89654510f1b558054eb17e778f1af7f'
-         'dcfd31797bacb6b3e9dc27ddb59d29c3')
+depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
+makedepends=('cmake' 'p7zip')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
+        "${pkgname}.desktop")
+md5sums=('659837e8866c59c85279c31fcaba4144'
+         '6b45e9c40984ebb79a1dfaddbfabde92')
 
 build() {
-  cd "$srcdir/${pkgname}-${pkgver}-src"
-  
-  unset LDFLAGS MAKEFLAGS # How can a build system be this broken?
+  7z x ${pkgname}-${_pkgver}-src.tar.7z
+  tar xf ${pkgname}-${_pkgver}-src.tar
+
+  cd "${pkgname}-${_pkgver}-src"
+
+  cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSD_BINDIR=/usr/bin \
+    -DSD_DATADIR=/usr/share/speed-dreams-2 \
+    -DSD_LIBDIR=/usr/lib/speed-dreams-2
 
-  ./configure --prefix="/opt/${pkgname}" --x-includes=/usr/include --x-libraries=/usr/lib 
   make
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver}-src"
+  cd "$srcdir/${pkgname}-${_pkgver}-src"
   
-  make DESTDIR="${pkgdir}/" install datainstall
+  make DESTDIR="${pkgdir}/" install
+
+  rm -r "${pkgdir}/usr/share"
+
+  install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png"
+  install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop"
+
+  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r doc "${pkgdir}/usr/share/doc/${pkgname}/"
 
-  install -D -m644 "icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png" && \
-  install -D -m644 "../${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop" && \
-  install -D -m755 "../${pkgname}.sh" "${pkgdir}/bin/${pkgname}"
+  mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
+  rm doc/man/speed-dreams.es.6
+  cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}"
 
-  find "${pkgdir}/" -type d -exec chmod 755 {} \;
-  rm -r $pkgdir/opt/${pkgname}/share
+  # Symlink for backwards compatibility
+  cd "${pkgdir}/usr/bin"
+  ln -s speed-dreams-2 speed-dreams
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/speed-dreams/speed-dreams.desktop b/community/speed-dreams/speed-dreams.desktop
index fa39ed1e5..f04b71791 100644
--- a/community/speed-dreams/speed-dreams.desktop
+++ b/community/speed-dreams/speed-dreams.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Speed Dreams
 Comment=The Open Racing Car Simulator Fork
-Exec=/opt/speed-dreams/bin/speed-dreams
-Icon=speed-dreams.png
+Exec=speed-dreams-2
+Icon=speed-dreams.svg
 Terminal=false
 Type=Application
 Encoding=UTF-8
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 98f8bc5cc..0a988e352 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 51319 2011-07-07 10:51:58Z spupykin $
+# $Id: PKGBUILD 54798 2011-08-26 08:53:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=ushare
 pkgver=1.1a
-pkgrel=14
+pkgrel=15
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install
index ee677c849..c58209616 100644
--- a/community/ushare/ushare.install
+++ b/community/ushare/ushare.install
@@ -1,9 +1,9 @@
 post_install() {
     if [ -z "`grep '^ushare:' /etc/group`" ]; then
-        groupadd ushare
+        groupadd -r ushare
     fi
     if [ -z "`grep '^ushare:' /etc/passwd`" ]; then
-        useradd -d /var/empty -g ushare -s /sbin/nologin ushare
+        useradd -r -d /var/empty -g ushare -s /sbin/nologin ushare
     fi
 }