Sun Apr 10 04:43:11 UTC 2011

19 files changed, 379 insertions, 81 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 15d0d5ae2..6f63f350a 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113245 2011-03-08 11:01:22Z bisson $
+# $Id: PKGBUILD 118945 2011-04-09 14:35:19Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
@@ -15,11 +15,11 @@ license=('GPL')
 depends=('gnutls' 'glib2' 'libotr')
 optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-	'bitlbee.xinetd'
-	'bitlbee.rcd')
+	'xinetd'
+	'rc.d')
 sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '299776783902cc2e20be49e2fe729572ca656383')
+          'be09d29af3853825778331df451f16ca9e452d03')
 
 backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee')
 install=install
@@ -40,11 +40,9 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	install -dm755 "${pkgdir}"/var/{lib,run}
 	install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee
-	install -o65 -g65 -dm755 "${pkgdir}"/var/run/bitlbee
-	install -Dm644 "${srcdir}"/bitlbee.xinetd "${pkgdir}"/etc/xinetd.d/bitlbee
-	install -Dm755 "${srcdir}"/bitlbee.rcd "${pkgdir}"/etc/rc.d/bitlbee
+	install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee
+	install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee
 
 	make DESTDIR="${pkgdir}" install
 	make DESTDIR="${pkgdir}" install-etc
diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d
new file mode 100644
index 000000000..bd9248173
--- /dev/null
+++ b/extra/bitlbee/rc.d
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=bitlbee
+PID=$(pidof -o %PPID /usr/sbin/bitlbee)
+install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee
+
+case "$1" in
+start)
+	stat_busy "Starting $name daemon"
+	[[ -z "$PID" ]] && {
+		rm -f /var/run/bitlbee/bitlbee.pid
+		su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee
+	} && {
+		add_daemon $name
+		stat_done
+	} || { stat_fail; exit 1; }
+	;;
+stop)
+	stat_busy "Stopping $name daemon"
+	[[ -n "$PID" ]] && {
+		kill $PID &>/dev/null
+	} && {
+		rm -f /var/run/bitlbee/bitlbee.pid
+		rm_daemon $name
+		stat_done
+	} || { stat_fail; exit 1; }
+	;;
+restart)
+	$0 stop
+	sleep 3
+	$0 start
+	;;
+*)
+	echo "usage: $0 {start|stop|restart}"
+	exit 1
+	;;
+esac
diff --git a/extra/bitlbee/xinetd b/extra/bitlbee/xinetd
new file mode 100644
index 000000000..d671a8cfc
--- /dev/null
+++ b/extra/bitlbee/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/sbin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index b9468817f..6ae24ea26 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 102220 2010-12-06 21:41:49Z bisson $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
-# Contributor:  Partha Chowdhury <kira.laucas@gmail.com>
+# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=conky
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
 url='http://conky.sourceforge.net/'
 license=('custom')
 replaces=('torsmo')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 makedepends=('pkg-config')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'current-power.patch')
@@ -28,11 +29,14 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--enable-wlan \
-		--enable-rss \
 		--enable-ibm \
+		--enable-curl \
+		--enable-rss \
+		--enable-weather-xoap \
 		--enable-imlib2 \
-		--disable-lua
+		--disable-lua \
+		--enable-wlan \
+
 	make
 }
 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 5eaa97b02..592a9b246 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,30 +1,41 @@
-# $Id: PKGBUILD 114396 2011-03-13 09:54:42Z andyrtr $
+# $Id: PKGBUILD 118880 2011-04-09 09:00:43Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.10.5
+pkgver=2.12.2
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
-options=('!libtool')
+options=('!libtool' '!zipman')
 depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1b032e07ccd22f71a5df78aa73bd91f2')
+md5sums=('ca6903d99b2aca2a6a326bc8df805b61')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # Nettle is the default crypto back end. Use --with-libgcrypt to use the libgcrypt back end.
+  # we stay with libgcrypt for now. nettle would need to be moved from AUR to extra.
   ./configure --prefix=/usr \
 	--with-zlib \
+	 --with-libgcrypt \
 	--disable-static \
 	--disable-guile
   make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make check # passes all  || /bin/true
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
 }
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index 62a20d6e4..ff62d9b6e 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 89600 2010-09-02 12:51:01Z tpowa $
+# $Id: PKGBUILD 118974 2011-04-09 21:02:09Z tpowa $
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kaffeine
-pkgver=1.1
+pkgver=1.2.1
 pkgrel=1
 pkgdesc='KDE media player'
 license=('GPL')
@@ -23,4 +23,4 @@ build() {
 	make
 	make DESTDIR=$pkgdir install
 }
-md5sums=('72284197b1c90adf75149311e4422efe')
+md5sums=('e65a8558836f0aa0d173d76e51ad065f')
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index d72800913..2239619e9 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118455 2011-04-07 06:55:14Z jgc $
+# $Id: PKGBUILD 118889 2011-04-09 09:47:57Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index f8c7e2b44..d713582b6 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115072 2011-03-16 17:59:33Z pierre $
+# $Id: PKGBUILD 118904 2011-04-09 11:33:06Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.28
-pkgrel=4
+pkgrel=5
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
 md5sums=('586eb535d31ac299652495b058dd87c4'
-         'f110637c56d360ecaecb3bf6f7918229'
+         'eadffcda24d0d996032f8555ce9623c2'
          '913e2157fa78d990c32146f387d44c2b'
          '2803a9ee7f20409c69f1566d2d90720e')
 
@@ -43,6 +43,11 @@ build() {
 	make
 }
 
+check() {
+	cd $srcdir/$pkgname-$pkgver
+	make check
+}
+
 package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR=$pkgdir install
@@ -50,7 +55,7 @@ package() {
 	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
-	install -d -m755 -o http -g http $pkgdir/var/{run,log,cache}/lighttpd/
+	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
 
 	pushd doc/config >/dev/null
 	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
index 5f851d63e..32fdd0d08 100644
--- a/extra/lighttpd/lighttpd.rc.d
+++ b/extra/lighttpd/lighttpd.rc.d
@@ -5,7 +5,7 @@
 
 
 get_pid_file() {
-	/usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | cut -d= -f2
+	/usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | sed -E 's/.*"(.+)"/\1/'
 }
 
 get_pid() {
@@ -37,20 +37,17 @@ test_config() {
 		stat_die
 	fi
 
-	local d
-	for d in /var/{run,log,cache}/lighttpd; do
-		if [ ! -d $d ]; then
-			stat_append "(directory $d not found)"
-			stat_die
-		fi
-	done
-
 	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
 	if [ $? -gt 0 ]; then
 		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
 		stat_die
 	fi
 
+	local piddir=$(dirname "$(get_pid_file)")
+	if [ ! -d "{$piddir}" ]; then
+		install -d -m755 -o http -g http "${piddir}"
+	fi
+
 	stat_done
 }
 
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 5c2531f8d..ee8e0a17c 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115705 2011-03-19 15:53:37Z pierre $
+# $Id: PKGBUILD 118966 2011-04-09 20:51:34Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -24,7 +24,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.3.6
-pkgrel=1
+pkgrel=2
 _suhosinver=${pkgver}-0.9.10
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -41,7 +41,7 @@ md5sums=('2286f5a82a6e8397955a0025c1c2ad98'
          'fff1a38877142f3ae6036dbe5a85d0a6'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
          '96ca078be6729b665be8a865535a97bf'
-         'b136a184dd055c559a03eb8bac562a3c'
+         'b01be5f816988fcee7e78225836e5e27'
          'd50ff349da08110a7cc8c691ce2d0423'
          '07c4e412909ac65a44ec90e7a2c4bade')
 
@@ -261,7 +261,6 @@ package_php-fpm() {
 	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
 	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
 	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/var/run/php-fpm
 	install -d -m755 ${pkgdir}/etc/php/fpm.d
 }
 
diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm
index 35cf35652..54bcf4d5b 100644
--- a/extra/php/rc.d.php-fpm
+++ b/extra/php/rc.d.php-fpm
@@ -6,9 +6,7 @@
 
 wait_for_pid () {
 	try=0
-
 	while test $try -lt 35 ; do
-
 		case "$1" in
 			'created')
 			if [ -f "$2" ] ; then
@@ -16,7 +14,6 @@ wait_for_pid () {
 				break
 			fi
 			;;
-
 			'removed')
 			if [ ! -f "$2" ] ; then
 				try=''
@@ -28,15 +25,38 @@ wait_for_pid () {
 		stat_append '.'
 		try=`expr $try + 1`
 		sleep 1
-
 	done
-
 }
 
-[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
+test_config() {
+	stat_busy 'Checking configuration'
+	if [ $(id -u) -ne 0 ]; then
+		stat_append '(This script must be run as root)'
+		stat_die
+	fi
+
+	if [ ! -r /etc/php/php-fpm.conf ]; then
+		stat_append '(/etc/php/php-fpm.conf not found)'
+		stat_die
+	fi
+
+	local test=$(/usr/sbin/php-fpm -t 2>&1)
+	if [ $? -gt 0 ]; then
+		stat_append '(error in /etc/php/php-fpm.conf)'
+		stat_die
+	elif echo $test | grep -qi 'error'; then
+		stat_append '(error in /etc/php/php.ini)'
+		stat_die
+	fi
+
+	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
+
+	stat_done
+}
 
 case "$1" in
 	start)
+		test_config
 		stat_busy 'Starting php-fpm'
 
 		/usr/sbin/php-fpm
@@ -58,6 +78,7 @@ case "$1" in
 	;;
 
 	stop)
+		test_config
 		stat_busy 'Gracefully shutting down php-fpm'
 
 		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
@@ -105,6 +126,7 @@ case "$1" in
 	;;
 
 	reload)
+		test_config
 		stat_busy 'Reload service php-fpm'
 
 		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
index 22fff627f..d4cd6d896 100644
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ b/extra/qtcurve-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115505 2011-03-18 09:05:13Z andrea $
+# $Id: PKGBUILD 118935 2011-04-09 13:48:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-gtk2
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,7 +14,7 @@ depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-md5sums=('da80db7f6a0b60e37ce14b918bc5e682')
+md5sums=('2146fda49c8e078c985725db30228b9a')
 
 build() {
 	cd $srcdir
diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD
index afec99259..9aeadda41 100644
--- a/extra/qtcurve-kde3/PKGBUILD
+++ b/extra/qtcurve-kde3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.43 2008/07/14 01:06:07 Pierre Exp $
+# $Id: PKGBUILD 118940 2011-04-09 13:49:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-kde3
-pkgver=1.8.3
+pkgver=1.8.5
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'kdelibs')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2"
 	'kdeglobals'
 	'bypass-kde-config.patch')
-md5sums=('ef0d682cafc2f1ada4939d3b43e2dc76'
+md5sums=('d9cca99526079782f9fc7bd7ba432582'
          '05a6294c7f0e239e698e7e5224fc8e7f'
          'e1ab2c0995e412b2cbfe804fba75517e')
 
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
index 267f40eae..c9cd7c910 100644
--- a/extra/qtcurve-kde4/PKGBUILD
+++ b/extra/qtcurve-kde4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115510 2011-03-18 09:08:27Z andrea $
+# $Id: PKGBUILD 118930 2011-04-09 13:46:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-kde4
-pkgver=1.8.6
+pkgver=1.8.7
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,7 +14,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
         'bypass-kde-config.patch')
-md5sums=('2c7a9ab5d71da48a3118c6859b2b38e6'
+md5sums=('a874fade6bf67ee052dc656dd76ffe37'
          '3f6681147cc361bd2bfd4d7477f2a8d0')
 
 build() {
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index c1732f1aa..8bc4d8721 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79406 2010-05-04 00:23:40Z andrea $
+# $Id: PKGBUILD 118894 2011-04-09 10:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=taglib
-pkgver=1.6.3
+pkgver=1.7
 pkgrel=1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('sh' 'zlib' 'gcc-libs')
 makedepends=('cmake' 'pkgconfig')
 source=(http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
-md5sums=('ddf02f4e1d2dc30f76734df806e613eb')
+md5sums=('6a7e312668f153fa905a81714aebc257')
 
 build() {
   cd ${srcdir}
@@ -24,10 +24,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_MP4=ON \
     -DWITH_ASF=ON
-  make VERBOSE=1 || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index 98097f557..6e8cf2d01 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 104516 2011-01-03 20:59:12Z tpowa $
+# $Id: PKGBUILD 118950 2011-04-09 15:28:29Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.530
+pkgver=1.540
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -87,6 +87,7 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t
 	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
 	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
 	webmin.rc) 
+options=(!strip)
 
 build() {
   # NOTE: USE --asroot build option to avoid fakeroot error!
@@ -209,7 +210,7 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('acf531f248bd575a0617472faa5013d3'
+md5sums=('8086fc60419937c4b2844796cfd2aea1'
          'da6bea412a5be8cf82a813078fec5847'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd')
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index 4c5471ffa..9cc134600 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,41 +1,43 @@
-# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 118860 2011-04-09 04:40:36Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.xine-project.org"
 depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft'
 	'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
-	'lirc-utils')
+	'desktop-file-utils' 'lirc-utils')
 makedepends=('libxt')
 options=('!emptydirs' '!strip')
-install=${pkgname}.install
+install=xine-ui.install
 source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
-	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff)
+	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch 
+        fix_lirc.diff xine-ui-xdg.diff)
 md5sums=('d468b4e7fe39ff19888261e1da9be914'
          '4f06f63f5fd55b08a648e5d63f881898'
          '9f5acaf14f3945aa2ce428631d09cd47'
-         '0174bd096756b9c6f47e9b8b5ff6e145')
+         '0174bd096756b9c6f47e9b8b5ff6e145'
+         '5972b4061acf3b553760de9ae2178d38')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1
-  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1
-  patch -p1 < "${srcdir}/fix_lirc.diff" || return 1
-  autoconf || return 1
-
+  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch"
+  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
+  patch -p1 < "${srcdir}/fix_lirc.diff"
+  patch -p1 < "${srcdir}/xine-ui-xdg.diff"
+  autoconf
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug || return 1
-  make || return 1
+    --with-x --enable-lirc --without-aalib --enable-debug
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}/usr/share/applications"
   mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
 }
diff --git a/extra/xine-ui/xine-ui-xdg.diff b/extra/xine-ui/xine-ui-xdg.diff
new file mode 100644
index 000000000..959d674b2
--- /dev/null
+++ b/extra/xine-ui/xine-ui-xdg.diff
@@ -0,0 +1,206 @@
+--- xine-ui-0.99.6.orig/src/xitk/common.h
++++ xine-ui-0.99.6/src/xitk/common.h
+@@ -331,6 +331,5 @@ typedef struct {
+   int                       use_root_window;
+ 
+   int                       ssaver_enabled;
+-  int                       ssaver_timeout;
+ 
+   int                       skip_by_chapter;
+--- xine-ui-0.99.6.orig/src/xitk/main.c
++++ xine-ui-0.99.6/src/xitk/main.c
+@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
+   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
+     fprintf (stderr, "sigprocmask() failed.\n");
+ 
++  signal(SIGCHLD, SIG_IGN);
++
+   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
+   
+   gGui->stream                 = NULL;
+--- xine-ui-0.99.6.orig/src/xitk/panel.c
++++ xine-ui-0.99.6/src/xitk/panel.c
+@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
+  * Update slider thread.
+  */
+ static void *slider_loop(void *dummy) {
+-  int screensaver_timer = 0;
+   int status, speed;
+   int pos, secs;
+   int i = 0;
+@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
+ 	else
+ 	  video_window_set_mrl((char *)gGui->mmk.mrl);
+ 	
+-	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
+-	  
+-	  if(gGui->ssaver_timeout) {
+-	    
+-	    if(!(i % 2))
+-	      screensaver_timer++;
+-	    
+-	    if(screensaver_timer >= gGui->ssaver_timeout) {
+-	      screensaver_timer = 0;
+-	      video_window_reset_ssaver();
+-	      
+-	    }
+-	  }  
+-	}
++       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
+ 
+ 	if(gGui->logo_mode == 0) {
+ 	  
+@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
+ 	    stream_infos_update_infos();
+ 
+ 	}
++      } else {
++       video_window_suspend_ssaver(0);
+       }
+     }
+     
+--- xine-ui-0.99.6.orig/src/xitk/videowin.c
++++ xine-ui-0.99.6/src/xitk/videowin.c
+@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
+ 
+   /* The old window should be destroyed now */
+   if(old_video_window != None) {
++    /* Screensaver control is tied to our window id */
++    video_window_suspend_ssaver(0);
++
+     XDestroyWindow(gGui->video_display, old_video_window);
+      
+     if(gGui->cursor_grabbed)
+@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
+ 
+ }
+ 
+-void video_window_reset_ssaver(void) {
++void video_window_suspend_ssaver(int do_suspend) {
++  static int was_suspended;
+ 
+-  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
++  do_suspend = do_suspend && gGui->ssaver_enabled;
+ 
+-#ifdef HAVE_XTESTEXTENSION
+-    if(gVw.have_xtest == True) {
+-      
+-      gVw.fake_key_cur++;
+-      
+-      if(gVw.fake_key_cur >= 2)
+-	gVw.fake_key_cur = 0;
+-
+-      XLockDisplay(gGui->video_display);
+-      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
+-      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
+-      XSync(gGui->video_display, False);
+-      XUnlockDisplay(gGui->video_display);
++  if(was_suspended != do_suspend) {
++    if(fork() == 0) {
++      char window_id[30];
++      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
++      int fd;
++
++      for(fd = 3; fd < 256; fd++)
++	close(fd);
++
++      args[1] = do_suspend ? "suspend" : "resume";
++      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
++      execvp(args[0], args);
++      _exit(0);
+     }
+-    else 
+-#endif
+-    {
+-      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
+-      /* assuming its location and permission will not change during run time of xine-ui. */
+-      {
+-	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
+-	static char *gssaver_path   = NULL;
+-
+-	if(!gssaver_path) {
+-	  char *path = getenv("PATH");
+-
+-	  if(!path)
+-	    path = "/usr/local/bin:/usr/bin";
+-	  do {
+-	    char *p, *pbuf;
+-	    int   plen;
+-
+-	    for(p = path; *path && *path != ':'; path++)
+-	      ;
+-	    if(p == path)
+-	      plen = 1, p = ".";
+-	    else
+-	      plen = path - p;
+-	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
+-	    if ( access(pbuf, X_OK) ) {
+-	      free(pbuf);
+-	      gssaver_path = "";
+-	    } else
+-	      gssaver_path = pbuf;
+-	  } while(!gssaver_path[0] && *path++);
+-	}
+-	if(gssaver_path[0] && (fork() == 0)) {
+-	  execv(gssaver_path, gssaver_args);
+-	  exit(0);
+-	}
+-      }
+ 
+-      XLockDisplay(gGui->video_display);
+-      XResetScreenSaver(gGui->video_display);
+-      XUnlockDisplay(gGui->video_display);
+-    }
++    was_suspended = do_suspend;
+   }
+ }
+ 
++void video_window_reset_ssaver(void) {
++  video_window_suspend_ssaver(1);
++}
++
+ void video_window_get_frame_size(int *w, int *h) {
+   if(w)
+     *w = gVw.frame_width;
+--- xine-ui-0.99.6.orig/src/xitk/videowin.h
++++ xine-ui-0.99.6/src/xitk/videowin.h
+@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
+ void video_window_update_logo(void);
+ void video_window_change_skins(int);
+ 
++void video_window_suspend_ssaver(int do_suspend);
+ void video_window_reset_ssaver(void);
+ 
+ void video_window_get_frame_size(int *w, int *h);
+--- xine-ui-0.99.6.orig/src/xitk/event.c
++++ xine-ui-0.99.6/src/xitk/event.c
+@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
+   gGui->skip_by_chapter = cfg->num_value;
+   panel_update_nextprev_tips();
+ }
+-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
+-  gGui->ssaver_timeout = cfg->num_value;
+-}
+ 
+ static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
+   
+@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
+ 					 snapshot_loc_cb,
+ 					 CONFIG_NO_DATA);
+   
+-  gGui->ssaver_timeout =
+-    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
+-			      _("Screensaver reset interval (s)"),
+-			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
+-			      CONFIG_LEVEL_ADV,
+-			      ssaver_timeout_cb,
+-			      CONFIG_NO_DATA);
+-  
+   gGui->skip_by_chapter = 
+     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
+ 			       _("Chapter hopping"),
+
+
+
+
+ 
diff --git a/extra/xine-ui/xine-ui.install b/extra/xine-ui/xine-ui.install
index 8afc56658..3b3aff7d9 100644
--- a/extra/xine-ui/xine-ui.install
+++ b/extra/xine-ui/xine-ui.install
@@ -1,6 +1,7 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {