Merge branch 'master' of gparabola:abslibre-mips64el

636 files changed, 3777 insertions, 8196 deletions

diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 6b4ab3159..0b3ff7969 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $
+# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.18
-pkgrel=2
+pkgver=2.0.19
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://tedfelix.com/linux/acpid-netlink.html'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/acpid2/'
 license=('GPL')
 depends=('bash')
 optdepends=('perl: use perl based examples')
@@ -20,15 +20,15 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('7c4ff315ae960c54eea303c71c49f152'
+md5sums=('0b07a982e3e28cf37645f2c6269af72e'
          'd11700eb136e0489835ddaf977a7905b'
-         '10290f69491206cd104654e5b900b661'
+         '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
@@ -46,7 +46,7 @@ package() {
   install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
 
   # fix acpid rights
-  chmod 755 "$pkgdir/usr/sbin/acpid"
+  chmod 755 "$pkgdir/usr/bin/acpid"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service
index e4ddacdbe..022f72a71 100644
--- a/community/acpid/acpid.service
+++ b/community/acpid/acpid.service
@@ -3,7 +3,7 @@ Description=ACPI event daemon
 Requires=acpid.socket
 
 [Service]
-ExecStart=/usr/sbin/acpid -f
+ExecStart=/usr/bin/acpid -f
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index 17692b130..5b24b552b 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64237 2012-02-11 00:32:23Z arodseth $
+# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor:  Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,30 +7,30 @@
 pkgbase=aircrack-ng
 pkgname=(aircrack-ng aircrack-ng-scripts)
 pkgver=1.1
-pkgrel=8.1
+pkgrel=9
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
 source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz")
 md5sums=('f7a24ed8fad122c4187d06bfd6f998b4')
-depends=('openssl' 'sqlite3' 'iw' 'net-tools')
+depends=('openssl' 'sqlite' 'iw' 'net-tools')
 
 build() {
-  	cd ${srcdir}/${pkgbase}-${pkgver}
-  	make SQLITE=true unstable=true
+	cd ${srcdir}/${pkgbase}-${pkgver}
+	make SQLITE=true unstable=true
 }
 
 package_aircrack-ng() {
 	pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
 
-  	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}
 	make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin  \
-		mandir=/usr/share/man/man1 sbindir=/usr/sbin install
+		mandir=/usr/share/man/man1 sbindir=/usr/bin install
 
 	### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ###
 	# Scripts
-	rm ${pkgdir}/usr/sbin/airdriver-ng
-	rm ${pkgdir}/usr/sbin/airodump-ng-oui-update
+	rm ${pkgdir}/usr/bin/airdriver-ng
+	rm ${pkgdir}/usr/bin/airodump-ng-oui-update
 	# Man pages
 	mkdir -p ${srcdir}/tmp/
 	mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/
@@ -38,15 +38,15 @@ package_aircrack-ng() {
 
 package_aircrack-ng-scripts() {
 	pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols"
-        depends=('python2' 'graphviz' 'python2-pylorcon')	
+    depends=('python2' 'graphviz' 'python2-pylorcon')
 
 	cd ${srcdir}/aircrack-ng-${pkgver}/scripts
 	mkdir -p ${pkgdir}/usr/share/man/man1/ \
-		${pkgdir}/usr/sbin
+		${pkgdir}/usr/bin
 
 	### AIRDRIVER-NG ###
 	# Script
-	install -Dm644 airdriver-ng ${pkgdir}/usr/sbin/
+	install -Dm644 airdriver-ng ${pkgdir}/usr/bin/
 	# Libs
 	mkdir -p ${pkgdir}/usr/lib/airdrop-ng/
 	install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \
@@ -54,14 +54,14 @@ package_aircrack-ng-scripts() {
 	# Man page
 	mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/
 
-	### AIRDROP-NG ### 
+	### AIRDROP-NG ###
 	# Man page
 	install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ 
 	# Script
 	sed s/python/python2/ -i airdrop-ng/airdrop-ng.py
-	install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/sbin/airdrop-ng
-	chmod +x ${pkgdir}/usr/sbin/airdrop-ng
-	
+	install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng
+	chmod +x ${pkgdir}/usr/bin/airdrop-ng
+
 	### AIRGRAPH-NG ###
 	# Libs
 	mkdir -p ${pkgdir}/usr/lib/airgraph-ng/
@@ -72,20 +72,20 @@ package_aircrack-ng-scripts() {
 	# Script
 	sed s/python/python2/ -i airgraph-ng/airgraph-ng.py
 	sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py
-	install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/sbin/airgraph-ng
-	chmod +x ${pkgdir}/usr/sbin/airgraph-ng
+	install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng
+	chmod +x ${pkgdir}/usr/bin/airgraph-ng
 
 	### DUMP-JOIN.PY ###
 	# Man page
 	install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/
 	# Script
 	sed s/python/python2/ -i airgraph-ng/dump-join.py
-	install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/sbin/dump-join.py
-	chmod +x ${pkgdir}/usr/sbin/dump-join.py
-	
+	install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py
+	chmod +x ${pkgdir}/usr/bin/dump-join.py
+
 	### AIRODUMP-NG-OUI-UPDATE ###
 	# Script
-	install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/sbin/
-	chmod +x ${pkgdir}/usr/sbin/airodump-ng-oui-update
+	install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/
+	chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update
 
 }
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index c817624ef..e47861ba1 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88674 2013-04-21 22:16:40Z heftig $
+# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
 pkgver=0.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Almanah_Diary"
diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD
index b96198172..9cfb60279 100644
--- a/community/anyfs-tools/PKGBUILD
+++ b/community/anyfs-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $
+# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=anyfs-tools
 pkgver=0.85.1c
-pkgrel=3
+pkgrel=4
 pkgdesc="unix-way toolset for recovering and converting filesystems"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://anyfs-tools.sourceforge.net/"
@@ -17,6 +17,11 @@ source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pk
 md5sums=('d3da0004cd0f037ec3e926acd3f520c2'
          '5ea91297b605d51b03243adda1efed27')
 
+prepare() {
+  cd $srcdir/$pkgname-${pkgver}
+  find . -name Makefile.in -exec sed -i 's|$(INSTALLPATH)/sbin|$(INSTALLPATH)/bin|g' {} \;
+}
+
 build() {
   cd $srcdir/$pkgname-${pkgver}
 
@@ -25,8 +30,13 @@ build() {
   patch -p1 <$srcdir/disable-build-ext2fs.patch
 
   #Dirty Arch64 fix which doesn't affect i686
-  CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" ./configure --prefix=/usr --build=i686-linux-gnu
+  CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" \
+    ./configure --prefix=/usr --build=i686-linux-gnu
   make -j1
   sed -i 's|ldconfig||' src/anysurrect/Makefile
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make INSTALLPATH=$pkgdir/usr install
 }
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 129a0263a..e47e1b16f 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75815 2012-09-01 11:15:13Z mtorromeo $
+# $Id: PKGBUILD 91912 2013-05-29 10:15:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Todd Musall <tmusall@comcast.net>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=apcupsd
 pkgver=3.14.10
-pkgrel=3
+pkgrel=5
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64 mips64el)
 url="http://www.apcupsd.org"
@@ -14,21 +14,20 @@ depends=('gcc-libs')
 optdepends=('gd: for CGI'
             'gconf: for frontend'
             'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat')
 backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
         etc/apcupsd/multimon.conf)
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
-        apcupsd
         apcupsd.service
         apcupsd-tmpfiles.conf)
 sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
-            'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
-            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
             'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr --build=$CHOST  --libexecdir=/usr/lib/$pkgname \
+		--sbindir=/usr/bin \
 		--enable-cgi --enable-usb --enable-net \
 		--with-upstype=usb --with-upscable=usb \
 		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
@@ -39,10 +38,9 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd"
 	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
 	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
-	chmod 755 "$pkgdir"/sbin/*
+	chmod 755 "$pkgdir"/usr/bin/*
 	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
 	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
 }
diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd
deleted file mode 100644
index 8a96e9b07..000000000
--- a/community/apcupsd/apcupsd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/apcupsd`
-case "$1" in
-  start)
-    stat_busy "Starting APCUPSD Daemon"
-    [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping APCUPSD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  status)
-    /sbin/apcaccess status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0
diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service
index 9cec6e441..b8dfb9b4a 100644
--- a/community/apcupsd/apcupsd.service
+++ b/community/apcupsd/apcupsd.service
@@ -2,7 +2,7 @@
 Description=APC UPS Monitor
 
 [Service]
-ExecStart=/sbin/apcupsd -b
+ExecStart=/usr/bin/apcupsd -b
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 2b521e3f1..60e5462fd 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $
+# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.17.0
+pkgver=1.17.1
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
-sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c')
+sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD
index 03485a112..bcd5a98c7 100644
--- a/community/arptables/PKGBUILD
+++ b/community/arptables/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82774 2013-01-24 11:14:44Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 90489 2013-05-12 22:21:54Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Michal Soltys <soltys@ziu.info>
 
 pkgname=arptables
 pkgver=0.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='ARP filtering utility'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ebtables.sourceforge.net/'
@@ -30,7 +30,7 @@ package() {
     DESTDIR="$pkgdir" \
     PREFIX=/usr \
     LIBDIR=/usr/lib/arptables \
-    BINDIR=/usr/sbin \
+    BINDIR=/usr/bin \
     MANDIR=/usr/share/man \
     INITDIR=/etc/rc.d \
     SYSCONFIGDIR=/etc
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index a5d2f0975..108c360e6 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $
+# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=10
+pkgrel=11
 pkgdesc='Ethernet/FDDI station activity monitor'
 arch=('i686' 'x86_64' 'mips64el')
 url='ftp://ftp.ee.lbl.gov/'
@@ -16,7 +16,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 md5sums=('cebfeb99c4a7c2a6cee2564770415fe7'
          '9359518c500562281e76cdb0b2fa9062'
-         '2324a202222303daa1a41d8abd7a7e4a')
+         '43e2358ba0532da38e5296250a7fcfd8')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -28,13 +28,13 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make SENDMAIL=/usr/sbin/sendmail
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
+  make SENDMAIL=`which sendmail`
 }
 
 package() {
   cd $pkgname-$pkgver
-  install -d -m 0755 "$pkgdir"/usr/{sbin,share/man}
+  install -d -m 0755 "$pkgdir"/usr/{bin,share/man}
   make DESTDIR="$pkgdir" install install-man
   # install ether prefix database
   install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service
index 570f93852..ede31f3f7 100644
--- a/community/arpwatch/arpwatch.service
+++ b/community/arpwatch/arpwatch.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat
-ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
+ExecStart=/usr/bin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD
index b0f8ccfde..627051703 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79031 2012-10-29 09:19:40Z spupykin $
+# $Id: PKGBUILD 90647 2013-05-13 14:18:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: John Gerritse <john.gerritse@gmail.com>
 
 pkgname=atop
 pkgver=2.0_1
-pkgrel=1
+pkgrel=2
 pkgdesc="A system and process level monitor."
 arch=(i686 x86_64 'mips64el')
 url="http://www.atoptool.nl/"
@@ -25,6 +25,6 @@ package() {
   rm -f $pkgdir/etc/cron.d/atop
   install -dm0755 $pkgdir/etc/cron.daily
   mv $pkgdir/etc/atop/atop.daily $pkgdir/etc/cron.daily/atop
-  sed -i 's|/etc/atop/atop.daily|/etc/cron.daily/atop|g' $pkgdir/etc/rc.d/atop
   install -Dm0644 atop.service $pkgdir/usr/lib/systemd/system/atop.service
+  rm -rf $pkgdir/etc/rc.d
 }
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index 69c6234ab..2b07c46b2 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $
+# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,13 +6,13 @@
 
 pkgname=autofs
 pkgver=5.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A kernel-based automounter for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://freshmeat.net/projects/autofs'
 license=('GPL2')
 depends=('libxml2')
-makedepends=('libldap' 'krb5')
+makedepends=('libldap' 'krb5' 'kmod')
 optdepends=('krb5: for LDAP support')
 backup=('etc/autofs/auto.master'
         'etc/autofs/auto.misc'
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index 39e47c3db..d36c8b1c2 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 87805 2013-04-06 19:56:39Z jelle $
+# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=avrdude
 pkgver=5.11.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/avrdude/"
 license=('GPL')
-depends=('libusb-compat' 'readline' 'libftdi')
+depends=('libusbx' 'readline' 'libftdi')
 source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('3a43e288cb32916703b6945e3f260df9'
                  '0c23b005d4090aef4e081476aabc1958')
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD
index fe96c58ce..3dae21e26 100644
--- a/community/balsa/PKGBUILD
+++ b/community/balsa/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 88630 2013-04-20 17:58:41Z jlichtblau $
+# $Id: PKGBUILD 91059 2013-05-18 15:38:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=balsa
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="An e-mail client for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pawsa.fedorapeople.org/balsa/'
 license=('GPL')
 depends=('gmime' 'webkitgtk3' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview3' 'gtkspell3' 'gnome-icon-theme' 'desktop-file-utils')
-makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
+makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool')
 install=$pkgname.install
+changelog=$pkgname.changelog
 source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('67eaddbc33a079a74b65bf5f71ef163573f7d4a6f29ed6dca2ad6811d95519b4')
+sha256sums=('52ce445dca86eb42e2e402a5b76616a1a522b89acbb631215079022ef80a7a10')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/balsa/balsa.changelog b/community/balsa/balsa.changelog
new file mode 100644
index 000000000..8fa27a1bf
--- /dev/null
+++ b/community/balsa/balsa.changelog
@@ -0,0 +1,2 @@
+2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* balsa 2.5.1-1
diff --git a/community/bind/01-remove-tools.patch b/community/bind/01-remove-tools.patch
deleted file mode 100644
index 29b4c9c5f..000000000
--- a/community/bind/01-remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 55857058c..1d4b89dc4 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $
+# $Id: PKGBUILD 91985 2013-05-30 17:41:01Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.2-P2
+_pkgver=9.9.3
 pkgver=${_pkgver//-/.}
-pkgrel=3
+pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -25,20 +25,19 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone'
-        '01-remove-tools.patch')
-sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+        '127.0.0.zone')
+sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
 prepare() {
-  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+  # remove dig to avoid conflict with dnsutils
+  sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
 }
 
 build() {
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 5103e34e7..f7fa72f0a 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90166 2013-05-07 19:14:15Z seblu $
+# $Id: PKGBUILD 90843 2013-05-14 17:50:10Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.10
-pkgrel=1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
 md5sums=('553c331b32bca9e926519cb2f67d68be'
-         'ccd12c994501e28a7256a6a2a17154b2'
-         '631eea3de9be2f259aaf91f281d2d39a')
+         '01360e3b71ff2ed2223e87a3176e0659'
+         'b895b473cbc98cfd54751f737536eb1e')
 
 build() {
   cd $pkgbase-$pkgver
@@ -24,12 +24,23 @@ build() {
 
   # build ipv4 bird
   cd _build4
-  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var
+  ../configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --docdir=/usr/share/doc/$pkgname
   make
 
   # build ipv6 bird
   cd ../_build6
-  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var --enable-ipv6
+  ../configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --docdir=/usr/share/doc/$pkgname \
+    --enable-ipv6
   make
 }
 
@@ -38,8 +49,14 @@ package_bird () {
   backup=('etc/bird.conf')
 
   cd $pkgbase-$pkgver/_build4
-  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
-  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
+  make \
+    prefix="$pkgdir/usr" \
+    sysconfdir="$pkgdir/etc" \
+    sbindir="$pkgdir/usr/bin" \
+    localstatedir="$pkgdir/var" \
+    docdir="$pkgdir/usr/share/doc/$pkgname" \
+    install
+  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"
@@ -53,8 +70,14 @@ package_bird6 () {
   backup=('etc/bird6.conf')
 
   cd $pkgbase-$pkgver/_build6
-  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
-  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
+  make \
+    prefix="$pkgdir/usr" \
+    sysconfdir="$pkgdir/etc" \
+    sbindir="$pkgdir/usr/bin" \
+    localstatedir="$pkgdir/var" \
+    docdir="$pkgdir/usr/share/doc/$pkgname" \
+    install
+  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"
diff --git a/community/bird/bird.service b/community/bird/bird.service
index f40068646..faee0d845 100644
--- a/community/bird/bird.service
+++ b/community/bird/bird.service
@@ -3,9 +3,9 @@ Description=BIRD routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/bird -d
-ExecReload=/usr/sbin/birdc configure
-ExecStop=/usr/sbin/birdc down
+ExecStart=/usr/bin/bird -d
+ExecReload=/usr/bin/birdc configure
+ExecStop=/usr/bin/birdc down
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/bird/bird6.service b/community/bird/bird6.service
index 284c75842..d852fb52c 100644
--- a/community/bird/bird6.service
+++ b/community/bird/bird6.service
@@ -3,9 +3,9 @@ Description=BIRD IPv6 routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/bird6 -d
-ExecReload=/usr/sbin/bird6c configure
-ExecStop=/usr/sbin/bird6c down
+ExecStart=/usr/bin/bird6 -d
+ExecReload=/usr/bin/birdc6 configure
+ExecStop=/usr/bin/birdc6 down
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD
deleted file mode 100644
index b5637201c..000000000
--- a/community/bmp-musepack/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 83122 2013-01-27 16:08:38Z pierre $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Nikos Kouremenos <nk@ebox.gr>
-
-pkgname=bmp-musepack
-pkgver=1.2
-pkgrel=4.1
-pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://musepack.net/"
-license=('BSD')
-depends=('bmp' 'libmpcdec' 'taglib')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=('!libtool')
-source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5fe0c9d341ca37d05c780a478f829a5f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/bmp-wma/PKGBUILD b/community/bmp-wma/PKGBUILD
deleted file mode 100644
index 62dfc89ef..000000000
--- a/community/bmp-wma/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 83124 2013-01-27 16:09:09Z pierre $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com>
-
-pkgname=bmp-wma
-pkgver=0.1.1
-pkgrel=4.1
-pkgdesc="WMA plugin for Beep Media Player"
-url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
-license=('GPL')
-arch=('x86_64' 'i686' 'mips64el')
-depends=('bmp')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=('!libtool' '!emptydirs')
-source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz"
-        'bmp-wma-gcc4.patch')
-md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
-         '730eba8f41e989dd8b56c18bcc826cc4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
-  if [ "${CARCH}" != "i686" ]; then
-    export CFLAGS="${CFLAGS} -fPIC"
-  fi
-  ./configure --prefix=/usr --disable-static
-  echo '#define HAVE_LRINTF 1' >> config.h
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/bmp-wma/bmp-wma-gcc4.patch b/community/bmp-wma/bmp-wma-gcc4.patch
deleted file mode 100644
index 9d773e89e..000000000
--- a/community/bmp-wma/bmp-wma-gcc4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/libffwma/avcodec.h.orig	2005-10-07 11:49:36.000000000 -0400
-+++ src/libffwma/avcodec.h	2005-10-07 11:51:09.000000000 -0400
-@@ -11,6 +11,43 @@
- extern "C" {
- #endif
- 
-+
-+/**
-+ * AVOption.
-+ */
-+typedef struct AVOption {
-+    /** options' name */
-+    const char *name; /* if name is NULL, it indicates a link to next */
-+    /** short English text help or const struct AVOption* subpointer */
-+    const char *help; //	const struct AVOption* sub;
-+    /** offset to context structure where the parsed value should be stored */
-+    int offset;
-+    /** options' type */
-+    int type;
-+#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
-+#define FF_OPT_TYPE_DOUBLE 2    ///< double
-+#define FF_OPT_TYPE_INT 3       ///< integer
-+#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
-+#define FF_OPT_TYPE_MASK 0x1f	///< mask for types - upper bits are various flags
-+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
-+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
-+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-+    /** min value  (min == max   ->  no limits) */
-+    double min;
-+    /** maximum value for double/int */
-+    double max;
-+    /** default boo [0,1]l/double/int value */
-+    double defval;
-+    /**
-+     * default string value (with optional semicolon delimited extra option-list
-+     * i.e.   option1;option2;option3
-+     * defval might select other then first argument as default
-+     */
-+    const char *defstr;
-+#define FF_OPT_MAX_DEPTH 10
-+} AVOption;
-+
-+
- #include "common.h"
- #include <sys/types.h> /* size_t */
- 
-@@ -1396,41 +1433,6 @@
- 
- 
- /**
-- * AVOption.
-- */
--typedef struct AVOption {
--    /** options' name */
--    const char *name; /* if name is NULL, it indicates a link to next */
--    /** short English text help or const struct AVOption* subpointer */
--    const char *help; //	const struct AVOption* sub;
--    /** offset to context structure where the parsed value should be stored */
--    int offset;
--    /** options' type */
--    int type;
--#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
--#define FF_OPT_TYPE_DOUBLE 2    ///< double
--#define FF_OPT_TYPE_INT 3       ///< integer
--#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
--#define FF_OPT_TYPE_MASK 0x1f	///< mask for types - upper bits are various flags
--//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
--#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
--#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
--    /** min value  (min == max   ->  no limits) */
--    double min;
--    /** maximum value for double/int */
--    double max;
--    /** default boo [0,1]l/double/int value */
--    double defval;
--    /**
--     * default string value (with optional semicolon delimited extra option-list
--     * i.e.   option1;option2;option3
--     * defval might select other then first argument as default
--     */
--    const char *defstr;
--#define FF_OPT_MAX_DEPTH 10
--} AVOption;
--
--/**
-  * Parse option(s) and sets fields in passed structure
-  * @param strct	structure where the parsed results will be written
-  * @param list  list with AVOptions
---- src/libffwma/dsputil.h.orig	2005-10-07 11:51:59.000000000 -0400
-+++ src/libffwma/dsputil.h	2005-10-07 11:52:17.000000000 -0400
-@@ -28,7 +28,6 @@
- #ifndef DSPUTIL_H
- #define DSPUTIL_H
- 
--#include "common.h"
- #include "avcodec.h"
- 
- 
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD
index 28d4c6a9b..8836306f5 100644
--- a/community/bonnie++/PKGBUILD
+++ b/community/bonnie++/PKGBUILD
@@ -4,19 +4,20 @@
 
 pkgname=bonnie++
 pkgver=1.03e
-pkgrel=6.1
+pkgrel=7
 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.coker.com.au/bonnie++/"
 license=('GPL')
 depends=('perl')
-source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz)
-sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb')
+source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch)
+sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb'
+            'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr 
   sed -i "s:CFLAGS=-O2  -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile
   make
 }
@@ -24,6 +25,8 @@ build() {
 package() {
   cd $srcdir/${pkgname}-${pkgver}
 
+  # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/
+  patch -Np1 -i $srcdir/move_away_from_sbin.patch
   make prefix="${pkgdir}/usr" install
 
   install -d $pkgdir/usr/share/doc/bonnie++
diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch
new file mode 100644
index 000000000..18e99e976
--- /dev/null
+++ b/community/bonnie++/move_away_from_sbin.patch
@@ -0,0 +1,14 @@
+diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile
+--- bonnie++-1.03e/Makefile	2013-05-13 08:40:45.122959831 +0000
++++ bonnie++-1.03ef/Makefile	2013-05-13 08:43:20.365248937 +0000
+@@ -33,8 +33,8 @@
+ 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
+ 
+ install-bin: $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	${INSTALL} -s $(EXES) $(eprefix)/sbin
++	mkdir -p $(eprefix)/bin 
++	${INSTALL} -s $(EXES) $(eprefix)/bin
+ 	${INSTALL} $(SCRIPTS) $(eprefix)/bin
+ 
+ install: install-bin
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index f91561543..d95896ebd 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $
+# $Id: PKGBUILD 90951 2013-05-16 09:13:23Z lcarlier $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 
 pkgname=bsd-games
 pkgver=2.17
-pkgrel=13
+pkgrel=14
 pkgdesc="A linux port for a collection of BSD command line games."
 url="ftp://ftp.ibiblio.org/pub/Linux/games/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz
         number.c.diff bsd-games-2.17-64bit.patch
         bad-ntohl-cast.diff null-check.diff)
 md5sums=('238a38a3a017ca9b216fc42bde405639'
-         '9916baef5cb8aa09361f67de12ca7bef'
+         '2ea80281ee9993a9ee47323e78349a2a'
          '784f68c796b9e099ac008aecef1af998'
          '9c0fa6e2345bd0a7945c9a41d5ba68aa'
          '5356bd6999ae53dd27cb2a0f837a3e70'
@@ -27,8 +27,9 @@ md5sums=('238a38a3a017ca9b216fc42bde405639'
          '3d21a9dad2e603ddf3842972e4ff85a1'
          'a43ca0b4b9ebc4eec26372c52014ac0a')
 
-build() {
+prepare() {
   cd "${srcdir}/$pkgname-$pkgver"
+
   [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch"
   cp "${srcdir}/config.params" .
 
@@ -63,8 +64,11 @@ build() {
   # Prior to release 2.17-10 of the ArchLinux package, wargames was
   # broken, since binaries are in /usr/bin instead.
   sed -i -e 's|/usr/games|/usr/bin|g' wargames/wargames
+}
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
 
-# Build.
   ./configure
   make
 }
diff --git a/community/bsd-games/config.params b/community/bsd-games/config.params
index 6afa0e43f..f061d8f26 100644
--- a/community/bsd-games/config.params
+++ b/community/bsd-games/config.params
@@ -2,7 +2,7 @@ bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=PKGDIR
 bsd_games_cfg_no_build_dirs='banner fortune wtf factor monop'
 bsd_games_cfg_gamesdir=/usr/bin
-bsd_games_cfg_sbindir=/usr/sbin
+bsd_games_cfg_sbindir=/usr/bin
 bsd_games_cfg_man6dir=/usr/share/man/man6
 bsd_games_cfg_man5dir=/usr/share/man/man5
 bsd_games_cfg_man8dir=/usr/share/man/man8
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 1c696163b..f7ee72159 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $
+# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
 
 pkgname=busybox
 pkgver=1.20.2
-pkgrel=2
+pkgrel=5
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.busybox.net"
@@ -27,5 +27,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 busybox $pkgdir/bin/busybox
+  install -Dm755 busybox $pkgdir/usr/bin/busybox
 }
diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install
index ecbeec39a..7bf2a83ac 100644
--- a/community/busybox/busybox.install
+++ b/community/busybox/busybox.install
@@ -1,13 +1,14 @@
 post_install() {
-  echo "You may want to do setuid on /bin/busybox"
-  echo "  chmod 4555 /bin/busybox"
+  echo "You may want to do setuid on /usr/bin/busybox"
+  echo "  chmod 4555 /usr/bin/busybox"
 }
 
 pre_upgrade() {
-  busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script
+  busybox stat -c %a usr/bin/busybox >tmp/busybox.upgrade.script
 }
 
 post_upgrade() {
-  [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox
+  [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox
   busybox rm -f tmp/busybox.upgrade.script
+  echo "busybox is un /usr/bin now. Readjust its mode if you modified it."
 }
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD
index cad086944..3de7f286e 100755
--- a/community/cairo-dock-plugins/PKGBUILD
+++ b/community/cairo-dock-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88927 2013-04-24 21:31:30Z alucryd $
+# $Id: PKGBUILD 90850 2013-05-14 21:40:35Z andrea $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Tofe <chris.chapuis@gmail.com>
 # Contributor: zhuqin <zhuqin83@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=cairo-dock-plugins
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugins for Cairo-Dock"
 url="https://launchpad.net/cairo-dock"
 license=('GPL')
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index 8eb49da90..29ca00f84 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 86462 2013-03-17 20:07:56Z cinelli $
+# $Id: PKGBUILD 92187 2013-06-02 15:36:24Z bpiotrowski $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mcder3 <mcder3[at]gmail[dot]com>
 # Contributor: MisterFred <mister.fred[at]free[dot]fr>
 
 pkgname=cantata
-pkgver=0.9.2
+pkgver=1.0.3
 pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
-depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp')
+depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusicbrainz5')
 makedepends=('cmake' 'automoc4')
 install="$pkgname.install"
 source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('882cec90eb01d190b899689675e990b0')
+md5sums=('fd942d25127a7936efaf1fe887d66189')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 636e4284c..c530f0575 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87406 2013-03-31 19:18:09Z stephane $
+# $Id: PKGBUILD 90790 2013-05-13 22:47:24Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -7,18 +7,18 @@
 pkgbase=cegui
 pkgname=('cegui' 'cegui-docs')
 pkgver=0.7.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
 #options=('!libtool')
 license=("MIT")
 depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly')
-makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz')
+makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht')
 optdepends=("python2: python bindings"
             "ogre: ogre module"
-            "gtk2: gtk2 module")
-            #"irrlicht: irrlicht module") maybe again at some point
+            "gtk2: gtk2 module"
+            "irrlicht: irrlicht module")
 options=(!libtool)
 source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
 md5sums=('a8b682daf82e383edc169c2e6eb2b321')
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index bdda0434f..b15cef97e 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $
+# $Id: PKGBUILD 91791 2013-05-27 21:33:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
 # Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
@@ -6,9 +6,9 @@
 # Development: http://closure.ath.cx/aur-dev
 
 pkgname=cgit
-pkgver=0.9.1
-_gitver=1.7.4
-pkgrel=2
+pkgver=0.9.2
+_gitver=1.8.3
+pkgrel=1
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hjemli.net/git/cgit"
@@ -19,8 +19,8 @@ install=cgit.install
 source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
 	"git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz"
 	"apache.example.conf")
-md5sums=('272ee8fec2d81ac1e65117578e64df1e'
-         'c63cc7ca8a4bbf97c8802f354511223e'
+md5sums=('fe11018eff8d79caad112f4fac64b90f'
+         '73224d3dc86c4999cc49484b49c9acc4'
          'bd5696bea0654bfcf98f249b1a36737d')
 
 build() {
diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD
index c0ed0cbbc..6cf08ad70 100644
--- a/community/checkinstall/PKGBUILD
+++ b/community/checkinstall/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65086 2012-02-20 03:34:38Z spupykin $
+# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=checkinstall
 pkgver=1.6.2
-pkgrel=2.1
+pkgrel=3
 pkgdesc="spy for 'make install' and build rpm or deb"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asic-linux.com.mx/~izto/checkinstall/"
@@ -13,11 +13,15 @@ backup=(etc/checkinstall/checkinstallrc)
 source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
 md5sums=('d7b43c92001e68243a93bcce8b1e5480'
-         '5c68cb7e29cf6da4b845ce57fb5ea080')
+         'eac0c843781c300e7bc15c55be262e51')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 <../build-fix.patch
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch
index 341b7dfca..9ab00cde5 100644
--- a/community/checkinstall/build-fix.patch
+++ b/community/checkinstall/build-fix.patch
@@ -134,7 +134,7 @@ diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
 -LCDIR=$(PREFIX)/lib/checkinstall/locale
 -CONFDIR=$(PREFIX)/lib/checkinstall
 +PREFIX=/usr
-+BINDIR=$(DESTDIR)/$(PREFIX)/sbin
++BINDIR=$(DESTDIR)/$(PREFIX)/bin
 +LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
 +CONFDIR=$(DESTDIR)/etc/checkinstall
  
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index c49379b51..083c66c2b 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 88085 2013-04-11 09:03:50Z lcarlier $
+# $Id: PKGBUILD 90845 2013-05-14 19:53:14Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
 pkgver=2.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>18.0' 'xulrunner<21.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>18.0' 'xulrunner<22.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
 #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
 #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip
@@ -25,7 +25,7 @@ build() {
 
   cp Makefile.arch Makefile
   sed -i -e 's/17.*/18.0/g' ../application.ini
-  sed -i -e 's/19.*/20.0/g' ../application.ini
+  sed -i -e 's/19.*/21.0/g' ../application.ini
 
   make -j1
 }
diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD
index e7c294cca..81b8728c0 100644
--- a/community/chromium-bsu/PKGBUILD
+++ b/community/chromium-bsu/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $
+# $Id: PKGBUILD 91634 2013-05-25 20:26:07Z jelle $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=chromium-bsu
-pkgver=0.9.15
-pkgrel=4
+pkgver=0.9.15.1
+pkgrel=1
 pkgdesc="A fast paced top scrolling shooter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chromium-bsu.sourceforge.net/"
 license=('custom:artistic')
-depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image')
+depends=('freeglut' 'glu' 'sdl_image' 'openal' 'freealut' 'ftgl' 'fontconfig')
 install=chromium-bsu.install
-source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('d57137a1ac2292363b35192724c7e3be')
+source=(http://downloads.sourceforge.net/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/chromium-bsu-$pkgver.tar.gz)
+md5sums=('bd332a890ae9e5115f2808198a51a92b')
 
 build(){
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD
index 8f907410c..70049c9c8 100644
--- a/community/chrootuid/PKGBUILD
+++ b/community/chrootuid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65090 2012-02-20 03:36:03Z spupykin $
+# $Id: PKGBUILD 91848 2013-05-28 17:25:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Frop Doe <mrmr@rizla.org>
 # Contributor: Guillermo A. Amaral <me@guillermoamaral.com> (thewonka)
@@ -6,7 +6,7 @@
 
 pkgname=chrootuid
 pkgver=1.3
-pkgrel=5.1
+pkgrel=6
 arch=(i686 x86_64 'mips64el')
 pkgdesc="Runs a command in a restricted environment."
 url="ftp://ftp.porcupine.org/pub/security/index.html"
@@ -20,7 +20,11 @@ md5sums=('15510abadf5de189e1c22a1544dc926a'
 build() {
   cd $srcdir/$pkgname$pkgver
   make
-  install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid
+}
+
+package() {
+  cd $srcdir/$pkgname$pkgver
+  install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/bin/chrootuid
   install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1
   install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license
 }
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 725fb6e40..3f91c7ad4 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90134 2013-05-06 22:58:48Z faidoc $
+# $Id: PKGBUILD 91472 2013-05-23 01:19:04Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,8 +19,8 @@ options=('!libtool' '!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
         "gnomerrlabeler.patch"
         "idle-delay.patch")
-sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9'
-            '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90'
+sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
+            'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
             '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
 
 build() {
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
index b263613c4..7160bc788 100644
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ b/community/cinnamon-control-center/gnomerrlabeler.patch
@@ -1,5 +1,6 @@
---- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c  2013-05-05 13:12:28.000000000 +0200
-+++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
 @@ -31,12 +31,13 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnome-desktop/gnome-rr.h>
@@ -33,7 +34,7 @@
    g_object_unref (self->priv->labeler);
  
    G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,14 +294,14 @@
+@@ -293,16 +294,16 @@
    self->priv->current_output = NULL;
  
    if (self->priv->labeler) {
@@ -42,26 +43,36 @@
      g_object_unref (self->priv->labeler);
    }
  
-   self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
+-  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
++  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
  
    if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
 -    gnome_rr_labeler_hide (self->priv->labeler);
 +    cc_rr_labeler_hide (self->priv->labeler);
    else
-     gnome_rr_labeler_show (self->priv->labeler);
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
  
-@@ -2596,7 +2597,7 @@
+   select_current_output_from_dialog_position (self);
+ 
+@@ -2594,9 +2595,9 @@
+   if (self->priv->labeler == NULL)
+     return;
    if (gtk_window_has_toplevel_focus (window))
-     gnome_rr_labeler_show (self->priv->labeler);
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
    else
 -    gnome_rr_labeler_hide (self->priv->labeler);
 +    cc_rr_labeler_hide (self->priv->labeler);
  }
  
  static void
-@@ -2608,7 +2609,7 @@
+@@ -2606,9 +2607,9 @@
+     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
+         return;
      if (gtk_widget_get_visible (widget)) {
-         gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+-        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
++        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
      } else {
 -        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
 +        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 950712169..753844d83 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90347 2013-05-11 17:08:40Z faidoc $
+# $Id: PKGBUILD 92190 2013-06-02 15:47:25Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.8
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
@@ -31,14 +31,16 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/
         "switch-applications.patch"
         "fallback-helpers.patch"
         "idle-dim.patch")
-sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91'
+sha256sums=('4b6495c0294283e649e9e3fc5ae630c9d63cd6e8177bc3dfc29170f8d32efbc0'
             'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271'
+            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
             '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
             'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
             'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
 
+
+
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
index 5af7c3a79..b79ea497a 100644
--- a/community/cinnamon/gnome-3.8.patch
+++ b/community/cinnamon/gnome-3.8.patch
@@ -1404,7 +1404,9 @@ index 50c4e1e..c8427ac 100644
          this._trackInfosTop.set_child(this.infos_top);
          this._trackInfosBottom.set_child(this.infos_bottom);
  
-@@ -414,90 +256,39 @@ Player.prototype = {
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -414,45 +414,20 @@
          this._trackControls.set_child(this.controls);
          this.addActor(this._trackControls);
  
@@ -1463,14 +1465,8 @@ index 50c4e1e..c8427ac 100644
 +    }
  
          /* this players don't support seek */
--        if (support_seek.indexOf(this._name) == -1) {
-+        if (support_seek.indexOf(this._name) == -1)
-             this._time.hide();
--            this.showPosition = false;
--            this._positionSlider.hide();
--        }
-         this._getStatus();
-         this._trackId = {};
+         if (support_seek.indexOf(this._name) == -1) {
+@@ -465,39 +440,23 @@
          this._getMetadata();
          this._currentTime = 0;
          this._getPosition();
@@ -1486,14 +1482,17 @@ index 50c4e1e..c8427ac 100644
 -                this._setMetadata(iface, value["Metadata"]);
 -            //qmmp
 -            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
--                if (value["playbackStatus"])
++                this._setMetadata(value["Metadata"]);
++            // qmmp
++            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
+                 if (value["playbackStatus"])
 -                    this._setStatus(iface, value["playbackStatus"]);
--                if (value["metadata"])
++                    this._setStatus(value["playbackStatus"]);
+                 if (value["metadata"])
 -                    this._setMetadata(sender, value["metadata"]);
 -            } 
-+                this._setMetadata(value["Metadata"]);
-         }));
- 
+-        }));
+-
 -        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
 -            if (value > 0) {
 -                this._setPosition(value);
@@ -1504,17 +1503,20 @@ index 50c4e1e..c8427ac 100644
 -                // when the track is seeked so we set the position at the
 -                // value we set on the slider
 -                this._setPosition(this._wantedSeekValue);
--            }
++                    this._setMetadata(value["metadata"]);
+             }
 -            // Seek value send by the player
 -            else
 -                this._setPosition(value);
--
++        }));
+ 
 -            this._wantedSeekValue = 0;
 +        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
 +            this._setPosition(sender, value);
          }));
  
          Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+
 @@ -512,45 +303,26 @@ Player.prototype = {
          this._playerInfo.setText(this._getName() + " - " + _(status));
      },
@@ -3923,20 +3925,7 @@ index c8427ac..a7b2e09 100644
  /* dummy vars for translation */
  let x = _("Playing");
  x = _("Paused");
-@@ -285,6 +285,13 @@ Player.prototype = {
-                 this._setStatus(value["PlaybackStatus"]);
-             if (value["Metadata"])
-                 this._setMetadata(value["Metadata"]);
-+            // qmmp
-+            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+                if (value["playbackStatus"])
-+                    this._setStatus(value["playbackStatus"]);
-+                if (value["metadata"])
-+                    this._setMetadata(value["metadata"]);
-+            }
-         }));
- 
-         this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+
 @@ -377,7 +384,8 @@ Player.prototype = {
                      cover.read_async(null, null, Lang.bind(this, this._onReadCover));
                  }
@@ -4181,3 +4170,17 @@ index 418fb60..773fb65 100644
  static void
 -- 
 1.8.1.6
+
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -801,7 +801,7 @@
+             this._players = {};
+             // watch players
+             for (var p=0; p<compatible_players.length; p++) {
+-                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+                     Lang.bind(this, this._addPlayer),
+                     Lang.bind(this, this._removePlayer)
+                 );
+-- 
+1.8.1.6
\ No newline at end of file
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index ec2720150..9f8449bbb 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $
+# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.3.0
-pkgrel=1
+pkgrel=3
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -40,12 +40,10 @@ depends=('libltdl' 'iptables')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libperl.patch'
-        'service'
-        'rc.d')
+        'service')
 sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
           '245c098d121a4a05594553583310953b3a2f6461'
-          'b56907f532b9174e1b6995aadb518228d7464d3b'
-          '0f441718d5519cb043b1130e5a1d0379078adbcc')
+          '04f676d0b76c34df0bbf94629813e035b1febe04')
 
 backup=('etc/collectd.conf')
 options=('!libtool')
@@ -64,7 +62,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
+		--sbindir=/usr/bin \
+		--disable-static \
 		--with-python=/usr/bin/python2
 	make all
 }
@@ -73,7 +72,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 	rmdir "${pkgdir}/var/run" # FS#30201
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
 	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
 }
diff --git a/community/collectd/rc.d b/community/collectd/rc.d
deleted file mode 100644
index 442f2324a..000000000
--- a/community/collectd/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && $prog \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-reload)
-	stat_busy "Sending SIGHUP to $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
diff --git a/community/collectd/service b/community/collectd/service
index 9581ec0c9..30540645a 100644
--- a/community/collectd/service
+++ b/community/collectd/service
@@ -5,7 +5,7 @@ After=local-fs.target network.target
 [Service]
 Type=forking
 PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
+ExecStart=/usr/bin/collectdmon
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD
deleted file mode 100644
index b4f3b7b5a..000000000
--- a/community/compiz-bcop/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-bcop
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz option code generator"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core>=0.8.8' 'libxslt')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compiz-bcop-git')
-source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD
deleted file mode 100644
index b006aea7b..000000000
--- a/community/compiz-fusion-plugins-extra/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-fusion-plugins-extra
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz Fusion Extra plugins"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify')
-makedepends=('intltool' 'pkg-config' 'gettext' 'gconf')
-groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde')
-conflicts=('compiz-fusion-plugins-extra-git')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2)
-sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e')
-
-build() {
-  cd "${srcdir}/compiz-plugins-extra-${pkgver}"
-
-  sed -i 's/if text "x$use/if test "x$use/' configure
-  sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/compiz-plugins-extra-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD
deleted file mode 100644
index 868d26369..000000000
--- a/community/compiz-fusion-plugins-main/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-fusion-plugins-main
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz Fusion Main plugins"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite'
-	'libxinerama' 'startup-notification')
-makedepends=('intltool' 'pkgconfig' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-conflicts=('compiz-fusion-plugins-main-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2)
-options=(!libtool)
-sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6')
-
-build() {
-  cd "${srcdir}/compiz-plugins-main-${pkgver}"
-
-  CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \
-        -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "${srcdir}/compiz-plugins-main-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch
deleted file mode 100644
index 3a9e4a21e..000000000
--- a/community/compiz-fusion-plugins-main/magiclamp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/animation/animation.c.orig	2007-12-01 02:22:12.008115484 +0100
-+++ src/animation/animation.c	2007-12-01 02:27:41.541651382 +0100
-@@ -1148,7 +1148,7 @@
-     { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 },
-     { "magic_lamp_moving_end", "bool", 0, 0, 0 },
-     { "magic_lamp_grid_res", "int", "<min>4</min>", 0, 0 },
--    { "magic_lamp_max_waves", "int", "<min>3</min>", 0, 0 },
-+    { "magic_lamp_max_waves", "int", "<min>0</min>", 0, 0 },
-     { "magic_lamp_amp_min", "float", "<min>200</min>", 0, 0 },
-     { "magic_lamp_amp_max", "float", "<min>200</min>", 0, 0 },
-     { "magic_lamp_open_start_width", "int", "<min>0</min>", 0, 0 },
---- metadata/animation.xml.in.orig	2007-12-01 02:25:24.011432269 +0100
-+++ metadata/animation.xml.in	2007-12-01 02:27:02.724750938 +0100
-@@ -1272,7 +1272,7 @@
- 	    <_short>Magic Lamp Max Waves</_short>
- 	    <_long>The maximum number of waves for Magic Lamp.</_long>
- 	    <default>3</default>
--	    <min>3</min>
-+	    <min>0</min>
- 	    <max>20</max>
- 	  </option>
- 	  <option name="magic_lamp_amp_min" type="float">
---- metadata/animation.xml.orig	2007-12-01 02:25:14.584765435 +0100
-+++ metadata/animation.xml	2007-12-01 02:35:07.068035601 +0100
-@@ -3962,7 +3962,7 @@
- 	    <long xml:lang="pt">Número máximo de ondas para Lâmpada Mágica.</long>
- 	    <long xml:lang="sv">Den Magiska Lampans maximala antal vågor</long>
- 	    <default>3</default>
--	    <min>3</min>
-+	    <min>0</min>
- 	    <max>20</max>
- 	  </option>
- 	  <option type="float" name="magic_lamp_amp_min">
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
deleted file mode 100644
index b69e9e0f5..000000000
--- a/community/compiz/PKGBUILD
+++ /dev/null
@@ -1,142 +0,0 @@
-# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Hussam Al-Tayeb ht990332@gmail.com
-# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
-# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-
-pkgbase=compiz
-pkgname=('compiz-core'
-	'compiz-decorator-kde'
-	'compiz-decorator-gtk')
-pkgver=0.8.8
-pkgrel=5
-pkgdesc="Composite manager for Aiglx and Xgl"
-url="http://www.compiz.org/"
-license=('GPL' 'LGPL' 'MIT')
-arch=('i686' 'x86_64' 'mips64el')
-groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
-makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace'
- 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity')
-options=(!libtool !emptydirs)
-conflicts=('compiz' 'compiz-core-git' 'compiz-git')
-replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz
-        compiz-kde-4.8.patch
-        compiz-kde-4.9.patch
-        compiz-kde-4.10.patch
-        compiz-gcc-4.7.patch)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
-          '148656352f8a20b3781ee185025c5c8d4b7d720f'
-          '2b6fa7398ccb96172a99f4d12990bbc0491e355c'
-          'f3c97cc9835643d48058682506eac98d6deceeb7'
-          '2138342ae9f253bae003e96e91fdd0bc9918291a')
-
-prepare()
-{
-  cd "$srcdir/compiz-$pkgver"
-
-  patch -p0 -i ../compiz-gcc-4.7.patch
-  patch -p1 -i ../compiz-kde-4.8.patch
-  patch -p1 -i ../compiz-kde-4.9.patch
-  patch -p0 -i ../compiz-kde-4.10.patch
-}
-
-build()
-{
-  cd "$srcdir/compiz-$pkgver"
-
-  ./configure   --prefix=/usr \
-	    --enable-gnome \
-	    --enable-gtk \
-	    --enable-metacity \
-	    --enable-gconf \
-            --with-gconf-schema-file-dir=/etc/gconf/schemas \
-	    --enable-dbus \
-	    --enable-librsvg \
-	    --disable-kde \
-	    --enable-kde4
-
-  make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4
-}
-
-package_compiz-core()
-{
-
-  pkgdesc="Composite manager for Aiglx and Xgl"
-  depends=('startup-notification' 'librsvg' \
-         'libgl' 'dbus' 'glu' 'libxslt' 'fuse')
-
-  cd "$srcdir/compiz-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the decorations
-   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf "${pkgdir}"/etc
-
-  # install MIT license
-  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
-	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
-}
-
-package_compiz-decorator-gtk()
-{
-  pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity')
-  install=compiz-decorator-gtk.install
-
-  cd "$srcdir/compiz-$pkgver"
-
-  pushd gtk
-  make DESTDIR="$pkgdir" install
-  install -Dm644 window-decorator/gwd.schemas \
-                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
-  popd
-
-  for i in dbus gconf ini inotify png regex svg glib kconfig
-  do
-    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
-  done
-
-  gconf-merge-schema \
-    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
-
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the other packages
-   rm -rf "${pkgdir}"/etc
-   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf "$pkgdir"/usr/include
-   cd "$pkgdir"/usr/lib
-   rm libdecoration*
-   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd "${pkgdir}"/usr/lib/compiz
-   rm $(ls --hide=*gconf*)
-   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
-   
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
-}
-
-package_compiz-decorator-kde()
-{
-  pkgdesc="Compiz decorator for KDE"
-  depends=('kdebase-workspace' 'compiz-core')
-
-  cd "$srcdir"/compiz-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf "$pkgdir"/usr/{include,lib}
-  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
-
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
-}
-
diff --git a/community/compiz/compiz-decorator-gtk.install b/community/compiz/compiz-decorator-gtk.install
deleted file mode 100644
index b3738fda9..000000000
--- a/community/compiz/compiz-decorator-gtk.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-}
-
-post_remove() {
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-}
-
diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch
deleted file mode 100644
index 28315baec..000000000
--- a/community/compiz/compiz-gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
-@@ -59,6 +59,9 @@
- 
- #include "paintredirector.h"
- 
-+// header for gcc-4.7 compatibility
-+#include "unistd.h"
-+
- KWD::Window::Window (WId  parentId,
- 		     WId  clientId,
- 		     WId  frame,
---- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
-+++ configure.ac	2012-09-12 23:40:37.253686000 +0400
-@@ -72,11 +72,6 @@
-   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
--
-   if test "x$enable_ansi" = "xyes"; then
-     case " $CFLAGS " in
-     *[[\ \	]]-ansi[[\ \	]]*) ;;
-@@ -95,11 +90,6 @@
-   *[[\ \	]]-Wall[[\ \	]]*) ;;
-   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
-   esac
--
--  case " $CXXFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
- fi
- 
- AC_C_BIGENDIAN
diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch
deleted file mode 100644
index a30d54b90..000000000
--- a/community/compiz/compiz-kde-4.10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2012-11-14 10:17:09 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-11-23 06:43:18 +0000
-@@ -554,6 +554,15 @@
-     showWindowMenu (pos.bottomLeft ());
- }
- 
-+void KWD::Window::showApplicationMenu (const QPoint &p)
-+{
-+}
-+
-+bool KWD::Window::menuAvailable () const
-+{
-+    return false;
-+}
-+
- KWD::Options::MouseCommand
- KWD::Window::buttonToCommand (Qt::MouseButtons button)
- {
-
---- kde/window-decorator-kde4/window.h	2012-09-03 07:19:30 +0000
-+++ kde/window-decorator-kde4/window.h	2012-11-23 06:43:18 +0000
-@@ -92,6 +92,8 @@
- 	virtual void processMousePressEvent (QMouseEvent *);
- 	virtual void showWindowMenu (const QRect &);
- 	virtual void showWindowMenu (const QPoint &);
-+	virtual void showApplicationMenu (const QPoint &);
-+	virtual bool menuAvailable () const;
- 	virtual void performWindowOperation (WindowOperation);
- 	virtual void setMask (const QRegion &, int);
- 	virtual bool isPreview (void) const;
diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch
deleted file mode 100644
index f22a3fa21..000000000
--- a/community/compiz/compiz-kde-4.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 
diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch
deleted file mode 100644
index 7b56da95c..000000000
--- a/community/compiz/compiz-kde-4.9.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001
-From: Dennis Kasprzyk <onestone@compiz.org>
-Date: Mon, 06 Aug 2012 18:23:17 +0000
-Subject: KDE 4.9 support.
-
-Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov
-
----
-diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
-index a65f99f..78d1a47 100644
---- a/kde/window-decorator-kde4/window.cpp
-+++ b/kde/window-decorator-kde4/window.cpp
-@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const
-     return QRect ();
- }
- 
-+KDecorationDefines::WindowOperation
-+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+{
-+    Options::MouseCommand com = buttonToCommand (button);
-+
-+    if (com == Options::MouseOperationsMenu)
-+	return KDecorationDefines::OperationsOp;
-+
-+    return KDecorationDefines::NoOp;
-+}
-+
-+
-+#endif
-+
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
-+
- bool
- KWD::Window::isClientGroupActive ()
- {
-@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos)
-     showWindowMenu (pos);
- }
- 
--KDecorationDefines::WindowOperation
--KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+#endif
-+
-+#if KDE_IS_VERSION(4,8,80)
-+QString 
-+KWD::Window::caption(int idx) const
- {
--    Options::MouseCommand com = buttonToCommand (button);
-+    return mName;
-+}
- 
--    if (com == Options::MouseOperationsMenu)
--	return KDecorationDefines::OperationsOp;
-+void
-+KWD::Window::closeTab(long id)
-+{
-+    closeWindow ();
-+}
- 
--    return KDecorationDefines::NoOp;
-+void
-+KWD::Window::closeTabGroup()
-+{
-+    closeWindow ();
-+}
-+
-+long
-+KWD::Window::currentTabId() const
-+{
-+     return (long) mClientId;
-+}
-+
-+QIcon
-+KWD::Window::icon(int idx) const
-+{
-+    QIcon icon (mIcon);
-+    icon.addPixmap (mMiniIcon);
-+    return icon;
-+}
-+
-+void
-+KWD::Window::setCurrentTab(long id)
-+{
-+}
-+
-+void
-+KWD::Window::showWindowMenu(const QPoint& pos, long id)
-+{
-+  showWindowMenu (pos);
-+}
-+
-+void
-+KWD::Window::tab_A_before_B(long A, long B)
-+{
-+}
-+
-+void
-+KWD::Window::tab_A_behind_B(long A, long B)
-+{
-+}
-+
-+int
-+KWD::Window::tabCount() const
-+{
-+    return 1;
-+}
-+
-+long
-+KWD::Window::tabId(int idx) const
-+{
-+    return (long) mClientId;
-+}
-+
-+void
-+KWD::Window::untab(long id, const QRect& newGeom)
-+{
- }
- 
- #endif
- 
-+
- void
- KWD::Window::createDecoration (void)
- {
-@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset,
- 				 int leftOffset,
- 				 int rightOffset)
- {
--    Atom    atom = Atoms::compizWindowBlurDecor;
--    QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    ::Region  topRegion = NULL;
--    ::Region  bottomRegion = NULL;
--    ::Region  leftRegion = NULL;
--    ::Region  rightRegion = NULL;
--    int     size = 0;
--    int     w, h;
-+    Atom      atom = Atoms::compizWindowBlurDecor;
-+    QRegion   topQRegion, bottomQRegion, leftQRegion, rightQRegion;
-+    _XRegion *topRegion = NULL;
-+    _XRegion *bottomRegion = NULL;
-+    _XRegion *leftRegion = NULL;
-+    _XRegion *rightRegion = NULL;
-+    int       size = 0;
-+    int       w, h;
- 
-     w = mGeometry.width () + mBorder.left + mBorder.right;
-     h = mGeometry.height () + mBorder.top + mBorder.bottom;
-diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
-index c2b274b..1ddfbd1 100644
---- a/kde/window-decorator-kde4/window.h
-+++ b/kde/window-decorator-kde4/window.h
-@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual bool compositingActive () const;
- #if KDE_IS_VERSION(4,3,90)
- 	virtual QRect transparentRect () const;
--
-+	virtual WindowOperation
-+	    buttonToWindowOperation(Qt::MouseButtons button);
-+#endif
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
- 	virtual bool isClientGroupActive ();
- 	virtual QList<ClientGroupItem> clientGroupItems () const;
- 	virtual long itemId (int index);
-@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual void closeClientGroupItem (int index);
- 	virtual void closeAllInClientGroup ();
- 	virtual void displayClientMenu (int index, const QPoint& pos);
--
--	virtual WindowOperation
--	    buttonToWindowOperation(Qt::MouseButtons button);
-+	
-+#endif
-+#if KDE_IS_VERSION(4,8,80)
-+	using KDecorationBridge::caption;
-+	virtual QString caption(int idx) const;
-+	virtual void closeTab(long id);
-+	virtual void closeTabGroup();
-+	virtual long currentTabId() const;
-+	using KDecorationBridge::icon;
-+	virtual QIcon icon(int idx) const;
-+	virtual void setCurrentTab(long id);
-+	using KDecorationBridge::showWindowMenu;
-+	virtual void showWindowMenu(const QPoint& pos, long id);
-+	virtual void tab_A_before_B(long A, long B);
-+	virtual void tab_A_behind_B(long A, long B);
-+	virtual int tabCount() const;
-+	virtual long tabId(int idx) const;
-+	virtual void untab(long id, const QRect& newGeom);
- #endif
-+	
-+
- 	virtual bool eventFilter (QObject* o, QEvent* e);
- 
- 	void handleActiveChange (void);
---
-cgit v0.8.3.1-30-gff3a
diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD
deleted file mode 100644
index 43c8e29b7..000000000
--- a/community/compizconfig-backend-gconf/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 68302 2012-03-21 10:36:50Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: kasa <biuta.jr@gmail.com>
-
-pkgname=compizconfig-backend-gconf
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compizconfig backend for gconf"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('libcompizconfig' 'gconf')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compizconfig-backend-gconf-git')
-groups=('compiz-fusion-gtk' 'compiz-fusion')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3869e83a50e82caa4bfda5474a3bf44095ee78dc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --infodir=/usr/share/info \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc
-                
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-                          
diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD
deleted file mode 100644
index 6ae0eea50..000000000
--- a/community/compizconfig-python/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compizconfig-python
-pkgver=0.8.4
-pkgrel=4
-pkgdesc="Compizconfig bindings for python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr')
-makedepends=('intltool' 'pkgconfig' 'pyrex')
-conflicts=('compizconfig-python-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('702f83f63ce5dc3c6c1d27e07fb62fc3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=python2 ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 53a011a4a..5d0dbf36c 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $
+# $Id: PKGBUILD 90503 2013-05-12 23:32:26Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=conntrack-tools
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/conntrack-tools'
@@ -22,7 +22,7 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b
         '01-config-file-path.patch')
 install=$pkgname.install
 sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f'
-          '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034'
+          'ab888d59b98b673709d2d89554c668e2bea0cb86'
           'e7607a9ac14dd839f3716ac68d46e19ab26ef112')
 
 build() {
@@ -30,7 +30,7 @@ build() {
   for i in "$srcdir"/*.patch; do
     patch -p1 -i "$i"
   done
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/community/conntrack-tools/conntrackd.service b/community/conntrack-tools/conntrackd.service
index 25a113785..250c558cc 100644
--- a/community/conntrack-tools/conntrackd.service
+++ b/community/conntrack-tools/conntrackd.service
@@ -2,7 +2,7 @@
 Description=Conntrack Daemon
 
 [Service]
-ExecStart=/usr/sbin/conntrackd
+ExecStart=/usr/bin/conntrackd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 8f93e8784..95aa5020c 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $
+# $Id: PKGBUILD 90750 2013-05-13 15:02:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://couchdb.apache.org"
 license=('APACHE')
-depends=('icu' 'erlang' 'js' 'openssl' 'curl')
+depends=('icu' 'erlang' 'js185' 'openssl' 'curl')
 install=couchdb.install
 options=('!libtool')
 backup=('etc/couchdb/local.ini'
 	'etc/conf.d/couchdb'
 	'etc/logrotate.d/couchdb')
-source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
+source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
 	"couchdb.service"
 	"couchdb.tmpfiles"
-	"couchdb.rc"
 	"build-fix.patch")
 md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203'
-         '1346a657d7552188f6cc9e0cdc231b05'
+         'SKIP'
          '8914a7ffc6745f94106d96206709acb4'
          '1e254ebe32eeb061be64193bafa35dbf'
-         'a75ee9b310a950eea13b07274b7a0669'
          '71afe48505dfc07ba2091786b4650fa2')
 
 build() {
@@ -44,8 +42,6 @@ package() {
   install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb
   sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb
 
-  install -Dm755 $srcdir/couchdb.rc $pkgdir/etc/rc.d/couchdb
-
   rm -rf $pkgdir/etc/default/ $pkgdir/var/run
 
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/couchdb/couchdb.rc b/community/couchdb/couchdb.rc
deleted file mode 100644
index af41c6460..000000000
--- a/community/couchdb/couchdb.rc
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-### BEGIN INIT INFO
-# Provides:          couchdb
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Apache CouchDB init script
-# Description:       Apache CouchDB init script for the database server.
-### END INIT INFO
-
-SCRIPT_OK=0
-SCRIPT_ERROR=1
-
-DESCRIPTION="database server"
-NAME=couchdb
-SCRIPT_NAME=`basename $0`
-COUCHDB=/usr/bin/couchdb
-CONFIGURATION_FILE=/etc/conf.d/couchdb
-RUN_DIR=/var/run/couchdb
-LSB_LIBRARY=/lib/lsb/init-functions
-
-if test ! -x $COUCHDB; then
-    exit $SCRIPT_ERROR
-fi
-
-if test -r $CONFIGURATION_FILE; then
-    . $CONFIGURATION_FILE
-fi
-
-log_daemon_msg () {
-    stat_busy $@
-}
-
-log_end_msg () {
-    if test "$1" != "0"; then
-      stat_fail
-    else
-      stat_done
-    fi
-    return $1
-}
-
-if test -r $LSB_LIBRARY; then
-    . $LSB_LIBRARY
-fi
-
-run_command () {
-    command="$1"
-    if test -n "$COUCHDB_OPTIONS"; then
-        command="$command $COUCHDB_OPTIONS"
-    fi
-    if test -n "$COUCHDB_USER"; then
-        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
-            return $SCRIPT_OK
-        else
-            return $SCRIPT_ERROR
-        fi
-    else
-        if $command; then
-            return $SCRIPT_OK
-        else
-            return $SCRIPT_ERROR
-        fi
-    fi
-}
-
-start_couchdb () {
-    # Start Apache CouchDB as a background process.
-
-    mkdir -p "$RUN_DIR"
-    chown -R $COUCHDB_USER "$RUN_DIR"
-    command="$COUCHDB -b"
-    if test -n "$COUCHDB_STDOUT_FILE"; then
-        command="$command -o $COUCHDB_STDOUT_FILE"
-    fi
-    if test -n "$COUCHDB_STDERR_FILE"; then
-        command="$command -e $COUCHDB_STDERR_FILE"
-    fi
-    if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
-        command="$command -r $COUCHDB_RESPAWN_TIMEOUT"
-    fi
-    run_command "$command" > /dev/null
-}
-
-stop_couchdb () {
-    # Stop the running Apache CouchDB process.
-
-    run_command "$COUCHDB -d" > /dev/null
-}
-
-display_status () {
-    # Display the status of the running Apache CouchDB process.
-
-    run_command "$COUCHDB -s"
-}
-
-parse_script_option_list () {
-    # Parse arguments passed to the script and take appropriate action.
-
-    case "$1" in
-        start)
-            log_daemon_msg "Starting $DESCRIPTION" $NAME
-            if start_couchdb; then
-                log_end_msg $SCRIPT_OK
-            else
-                log_end_msg $SCRIPT_ERROR
-            fi
-            ;;
-        stop)
-            log_daemon_msg "Stopping $DESCRIPTION" $NAME
-            if stop_couchdb; then
-                log_end_msg $SCRIPT_OK
-            else
-                log_end_msg $SCRIPT_ERROR
-            fi
-            ;;
-        restart)
-            log_daemon_msg "Restarting $DESCRIPTION" $NAME
-            if stop_couchdb; then
-                if start_couchdb; then
-                    log_end_msg $SCRIPT_OK
-                else
-                    log_end_msg $SCRIPT_ERROR
-                fi
-            else
-                log_end_msg $SCRIPT_ERROR
-            fi
-            ;;
-        status)
-            display_status
-            ;;
-        *)
-            cat << EOF >&2
-Usage: $SCRIPT_NAME {start|stop|restart|status}
-EOF
-            exit $SCRIPT_ERROR
-            ;;
-    esac
-}
-
-parse_script_option_list $@
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index ab4ef1bfd..1c1df987d 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $
+# $Id: PKGBUILD 91947 2013-05-30 09:41:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.19
+pkgver=0.19.1
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('76989337dee4cf7afdcb5cde514423f8')
+md5sums=('df4cfb2b8e3345272e3fc451b76bd630')
 
 build() {
   true
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index 0bc260b77..648c4df12 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $
+# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=dante
 pkgver=1.3.2
-pkgrel=3
+pkgrel=5
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
 arch=(i686 x86_64 'mips64el')
@@ -14,15 +14,14 @@ backup=('etc/socks.conf'
 	'etc/sockd.conf')
 options=('!libtool')
 source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
-	sockd.rc
 	sockd.service)
 md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd'
-         '5110dfd78a2b38fff27a886ee88b58a6'
-         'ceb86b5bd97f7e3ceff28c6e6172a25b')
+         '9bb18a0165764092bd01da0ff6303fbf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \
+	--sbindir=/usr/bin \
 	--disable-libwrap
   make
 }
@@ -30,13 +29,9 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  # Config files
   mkdir -p ${pkgdir}/etc/conf.d
   cp example/{socks,sockd}.conf ${pkgdir}/etc
-  # License
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  # rc-script
-  install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd
   echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf
   install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service
 }
diff --git a/community/dante/sockd.rc b/community/dante/sockd.rc
deleted file mode 100644
index 00ea5a7d4..000000000
--- a/community/dante/sockd.rc
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=sockd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sockd.conf
-
-get_pid() {
-	cat /var/run/sockd.pid 2>/dev/null
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $SOCKD_OPTS 1>/dev/null 2>/dev/null
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community/dante/sockd.service b/community/dante/sockd.service
index a2a964304..68201577a 100644
--- a/community/dante/sockd.service
+++ b/community/dante/sockd.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/sockd.conf
-PIDFile=/var/run/sockd.pid
-ExecStart=/usr/sbin/sockd $SOCKD_OPTS
+PIDFile=/run/sockd.pid
+ExecStart=/usr/bin/sockd $SOCKD_OPTS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index a1aba40ca..247f77f7e 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $
+# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=darkhttpd
 pkgver=1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A small, static webserver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dmr.ath.cx/net/darkhttpd/"
@@ -20,7 +20,7 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd
+  install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
   head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license
 }
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 1f504ae9e..43663d797 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $
+# $Id: PKGBUILD 91854 2013-05-28 17:26:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=8
+pkgrel=10
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -11,28 +11,23 @@ arch=(i686 x86_64 'mips64el')
 depends=('libpcap' 'zlib' 'gcc-libs')
 backup=('etc/conf.d/darkstat.conf')
 source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
-	darkstat
 	darkstat.service
 	darkstat.conf)
 install=darkstat.install
 md5sums=('5b7abc7538dcd8e30667dac150e81d77'
-         '1021f95fabe16cfab4c95f6264d535e5'
          '91dd1cf9d01c2b37896f01b4570b5521'
          'aa9a9effd1e8f08860afcd6439fc94c5')
 options=(!makeflags !distcc)
 
 build() {
   cd $srcdir/darkstat-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
 package() {
   cd $srcdir/darkstat-$pkgver
   make DESTDIR=$pkgdir install
-
-  # darkstat script
-  install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat
   install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/darkstat/darkstat b/community/darkstat/darkstat
deleted file mode 100755
index 26df1761a..000000000
--- a/community/darkstat/darkstat
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/sbin/darkstat"
-daemon_name=$(basename $daemon_bin)
-daemon_chroot=/var/$daemon_name
-daemon_database="$daemon_name.dat"
-daemon_output="$daemon_chroot/$daemon_name.out"
-PIDF="$daemon_chroot/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --user "$daemon_name" --chroot "$daemon_chroot" \
-          --import "$daemon_database" \
-          --export "$daemon_database" \
-          --pidfile "$(basename $PIDF)" \
-          -i "$DARKSTAT_IFACE" \
-          $DARKSTAT_ARGS \
-          2>&1 | tee "$daemon_output"
-      ret=$?
-      grep -q error "$daemon_output" 2>/dev/null
-      error_output=$?
-      rm -f "$daemon_output"
-      #
-      if [ $ret -gt 0 -o $error_output -eq 0 ] ; then
-        stat_fail
-        rm -f "$PIDF"
-        exit 1
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index a4f646cad..207228bfa 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $
+# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z 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=1.2
+pkgver=1.2.1
 _pkgver=1.2
-pkgrel=4
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
@@ -19,7 +19,7 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('31bfd13d4786aac4f99d5155a811602b')
+md5sums=('f970573777752b1b4447997d1f1f65fa')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 6b388b23b..ab4fadc71 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84536 2013-02-19 15:03:09Z spupykin $
+# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=9
+pkgrel=11
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
@@ -15,14 +15,11 @@ optdepends=('libldap: for LDAP authentication'
 url="http://www.dbmail.org"
 license=('GPL')
 options=('!libtool' 'zipman')
-backup=(etc/conf.d/dbmail
-	etc/xinetd.d/dbmail-imapd
+backup=(etc/xinetd.d/dbmail-imapd
 	etc/xinetd.d/dbmail-pop3d
 	etc/xinetd.d/dbmail-lmtpd
 	etc/xinetd.d/dbmail-timsieved)
 source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
-	dbmail.conf.d
-	dbmail.rc.d
 	dbmail.tmpfiles
 	dbmail-imapd.service
 	dbmail-lmtpd.service
@@ -33,22 +30,20 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail-pop3d.xinetd
 	dbmail-timsieved.xinetd)
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
-         'e7f72bc360decdb2475266391ad12329'
-         '30774513fb016b9da08e9cf6f2a0b8e7'
          'c4b5793c5422b62a675d4c66ff7e9300'
-         '84efa46eaac66057c4eb131d9bc27fa8'
-         '19560277f6a56d1f3f2fdb02315dcf0f'
-         '89a0f793737eaf36291409f8c840891e'
-         'dd1b5b2c542f55d9d934a58a36d0513d'
-         '8fa791f2e4d107ba461453c054359477'
-         '069cd4285c4b2ec95dfdcebc2cfee387'
-         '44f87ce81e786fcee501daa17e55412a'
-         'a66927cb94d4f26428211e3ad2d540c8')
+         '5a6297cb03c8d0b424f978ea1d7402de'
+         '070db88538af9833f003f4cb516d337b'
+         '422f0399f97a780b7cab84443e8f429a'
+         '15c7d367d4242aebac5f87649a2250aa'
+         '890de13361afbdf4fed12d6d7eb53e66'
+         '961593658cd596297d03d25eb9c9e98f'
+         '4cb764894abd3914802e90602bf90a0c'
+         'e78dc86355f9aaf24590bc7c6611162f')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
-
-  [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve
+  [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \
+    --with-ldap --with-sieve
   make
 }
 
@@ -59,8 +54,6 @@ package() {
 
   mkdir $pkgdir/etc
   install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
-  install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail
-  install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail
   mkdir $pkgdir/usr/share/dbmail
   cp -r sql/* $pkgdir/usr/share/dbmail/
   cp dbmail.schema $pkgdir/usr/share/dbmail/
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
index e67e0c4e8..bc3319fd0 100644
--- a/community/dbmail/dbmail-imapd.service
+++ b/community/dbmail/dbmail-imapd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-imapd.pid
-ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid
+PIDFile=/run/dbmail/dbmail-imapd.pid
+ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd
index eee3635df..20f7d607d 100644
--- a/community/dbmail/dbmail-imapd.xinetd
+++ b/community/dbmail/dbmail-imapd.xinetd
@@ -3,9 +3,11 @@ service imap
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-imapd
+      server          = /usr/bin/dbmail-imapd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
index 2a059a15c..570ba1ec7 100644
--- a/community/dbmail/dbmail-lmtpd.service
+++ b/community/dbmail/dbmail-lmtpd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-lmtpd.pid
-ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid
+PIDFile=/run/dbmail/dbmail-lmtpd.pid
+ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd
index 63365fee4..0a0e05620 100644
--- a/community/dbmail/dbmail-lmtpd.xinetd
+++ b/community/dbmail/dbmail-lmtpd.xinetd
@@ -5,7 +5,7 @@ service lmtp
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-lmtpd
+      server          = /usr/bin/dbmail-lmtpd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
index 907f43b2b..edfa2570a 100644
--- a/community/dbmail/dbmail-pop3d.service
+++ b/community/dbmail/dbmail-pop3d.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-pop3d.pid
-ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid
+PIDFile=/run/dbmail/dbmail-pop3d.pid
+ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd
index 6c5b06735..f073aca8b 100644
--- a/community/dbmail/dbmail-pop3d.xinetd
+++ b/community/dbmail/dbmail-pop3d.xinetd
@@ -3,9 +3,11 @@ service pop3
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-pop3d
+      server          = /usr/bin/dbmail-pop3d
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
index 7f34bacec..32623e038 100644
--- a/community/dbmail/dbmail-timsieved.service
+++ b/community/dbmail/dbmail-timsieved.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-timsieved.pid
-ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid
+PIDFile=/run/dbmail/dbmail-timsieved.pid
+ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd
index 77ed27c31..69f6dd66b 100644
--- a/community/dbmail/dbmail-timsieved.xinetd
+++ b/community/dbmail/dbmail-timsieved.xinetd
@@ -1,11 +1,15 @@
 service sieve
 {
+#      port            = 2000
+#      type            = UNLISTED
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-timsieved
+      server          = /usr/bin/dbmail-timsieved
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail.conf.d b/community/dbmail/dbmail.conf.d
deleted file mode 100644
index 73309a4a2..000000000
--- a/community/dbmail/dbmail.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Parameters to be passed to dbmail
-#
-#
-# Select the service you want started with dbmail
-#
-# Available options :
-# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved
-#
-DBMAIL_DAEMONS="dbmail-imapd"
diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d
deleted file mode 100644
index f849b1679..000000000
--- a/community/dbmail/dbmail.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-	mkdir -p /var/run/dbmail
-	chown -R nobody:nobody /var/run/dbmail
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Starting DbMail ${daemon}"
-	    /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid
-	    if [ $? -gt 0 ]; then
-		stat_fail
-	    else
-		stat_done
-	    fi
-	done
-	add_daemon dbmail
-	;;
-    stop)
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Stopping DbMail ${daemon}"
-	    pid=$(cat /var/run/dbmail/${daemon}.pid 2>/dev/null)
-	    kill $pid 2>/dev/null
-	    while kill -0 "$pid" 2>/dev/null; do
-	        sleep 0.2
-	    done
-	    stat_done
-	done
-	rm_daemon dbmail
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-
-exit 0
diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD
index 40a9833c3..ef8cb910c 100644
--- a/community/delegate/PKGBUILD
+++ b/community/delegate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65112 2012-02-20 04:49:31Z spupykin $
+# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=delegate
 pkgver=9.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.delegate.org/"
@@ -18,13 +18,17 @@ md5sums=('86c833e95cd16a54d54fa3c7e4ab7929')
 build() {
   cd $srcdir/$pkgname$pkgver
   make ADMIN="root@localhost"
+}
+
+package() {
+  cd $srcdir/$pkgname$pkgver
 
   install -D -m0755 src/delegated $pkgdir/usr/bin/delegated
 
-  install -D -m0755 subin/dgbind $pkgdir/usr/sbin/dgbind
-  install -D -m0755 subin/dgchroot $pkgdir/usr/sbin/dgchroot
-  install -D -m0755 subin/dgcpnod $pkgdir/usr/sbin/dgcpnod
-  install -D -m0755 subin/dgpam $pkgdir/usr/sbin/dgpam
+  install -D -m0755 subin/dgbind $pkgdir/usr/bin/dgbind
+  install -D -m0755 subin/dgchroot $pkgdir/usr/bin/dgchroot
+  install -D -m0755 subin/dgcpnod $pkgdir/usr/bin/dgcpnod
+  install -D -m0755 subin/dgpam $pkgdir/usr/bin/dgpam
 
   install -D -m0644 doc/Manual.htm $pkgdir/usr/share/delegate/manual.htm
   install -D -m0644 doc/tutor-en.htm $pkgdir/usr/share/delegate/tutor-en.htm
diff --git a/community/delegate/delegate.install b/community/delegate/delegate.install
index f7c7096b4..39883a261 100644
--- a/community/delegate/delegate.install
+++ b/community/delegate/delegate.install
@@ -1,11 +1,6 @@
-pre_install() {
-  /bin/true
-}
-
 post_install() {
   echo "--"
   echo "-- Delegate supports too many protocols, so I did not write any rc-script"
   echo "-- Please read documentation in /usr/share/delegate/"
   echo "--"
-  /bin/true
 }
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index 793d663e8..6b68492d5 100644
--- a/community/dictd/PKGBUILD
+++ b/community/dictd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79187 2012-10-31 09:43:20Z spupykin $
+# $Id: PKGBUILD 91830 2013-05-28 17:03:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=dictd
 pkgver=1.12.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Online dictionary client and server"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
@@ -20,7 +20,6 @@ backup=(etc/dict/dictd.conf
 	etc/dict/colorit.conf)
 options=('!emptydirs')
 source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
-	dictd
 	dict.conf
 	dictd.conf
 	dictd.confd
@@ -29,25 +28,23 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
 	dictd.xinetd
 	colorit.conf)
 md5sums=('62696491174c22079f664830d07c0623'
-         '6542df4fc585773fc03f1a088730126b'
          'fb72f7d8c55f84b1b37bbc8d33a8e55a'
          '64cd6ffdb40fb3367224f91ac44926ac'
          '838887fee38ae4cebd652d399b1f2266'
-         '574e316d1f08885882d7b3075e1ea522'
+         'd94fa6c43514c158c80e85f856c65365'
          'b8cabf913876e544d919c7f20ff8db9e'
-         'b7dbc9529df13ff895dae2b4abd080d6'
+         'bd3fd3f68625bad0c23754686ae2e99c'
          '978c9c079a0fc8d7d42a4cd4000190e7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
+  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict --sbindir=/usr/bin
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd
   install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
   install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf
   install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
diff --git a/community/dictd/dictd b/community/dictd/dictd
deleted file mode 100644
index 4f435d6f0..000000000
--- a/community/dictd/dictd
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/dictd
-. /etc/rc.conf
-
-. /etc/rc.d/functions
-
-preconfiguration() {
-	stat_busy "Check dictd configuration"
-	if [ ! -e ${DICTD_CONF} ];  then
-		echo "No configuration"
-		stat_fail 
-		exit 1
-	fi
-	stat_done
-
-	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	stat_busy "Scanning for dictionaries..."
-	if [ ! -d "${DICTD_DICTDIR}" ]; then
- 		echo "No dictionaries found"
-		stat_fail
-		exit 1
-	fi
-	stat_done
-	pushd ${DICTD_DICTDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
- 		echo "No dictionaries found"
-		stat_fail 
-		exit 1
-	fi
-
-	cat $DICTD_CONF | sed -e '/^#LASTLINE/,$d' > $DICTD_TMPCONF
-	echo "#LASTLINE" >> $DICTD_TMPCONF
-
-	CNT=0
-	for i in $INDEXFILES
-	do
-		DNAME=`echo $i | awk -F . '{print $1;}'`
-		#two possible names for a matching dictionary, check which is there.
-		if [ -f ${DNAME}.dict.dz ]; then
-			DICT=${DNAME}.dict.dz
-		elif [ -f ${DNAME}.dict ];then
-			DICT=${DNAME}.dict
-		else
-			echo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DICTD_DICTDIR}/${DICT}\"" >> $DICTD_TMPCONF
-		echo "         index \"${DICTD_DICTDIR}/$i\" }" >> $DICTD_TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${DICTD_TMPCONF} ${DICTD_CONF}
-	echo "$CNT dictionary indexes found."
-}
-
-PID=`pidof -o %PPID /usr/sbin/dictd`
-
-case "$1" in 
-  start)
-  	preconfiguration || exit 1
-	stat_busy "Start dictd daemon"
-	/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
-	if [  $? -gt 0 ]; then
-	      stat_fail
-	else
-	      add_daemon dictd
-  	      stat_done
-    	fi
-    ;;
-
-   stop)
-	stat_busy "Stop dictd daemon"
-	kill $PID 2>/dev/null 1>/dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm_daemon dictd
-	    stat_done
-	fi
-	;;
-  restart)
-	 $0 stop
-	sleep 1
-	$0 start
-	;;
-  *)
-	echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service
index fa219f72a..f62bf275f 100644
--- a/community/dictd/dictd.service
+++ b/community/dictd/dictd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=-/etc/conf.d/dictd
-ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
+ExecStart=/usr/bin/dictd $DICTD_ARGS -- $DICTD_EARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dictd/dictd.xinetd b/community/dictd/dictd.xinetd
index a3e3773dc..0ae5cb411 100644
--- a/community/dictd/dictd.xinetd
+++ b/community/dictd/dictd.xinetd
@@ -7,6 +7,6 @@ service dict
 	protocol = tcp
 	wait = no
 	user = daemon
-	server = /usr/sbin/dictd
+	server = /usr/bin/dictd
 	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
 }
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 741d4beef..765446bbe 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81575 2012-12-24 15:00:09Z spupykin $
+# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=distcc
 pkgver=3.1
-pkgrel=10
+pkgrel=11
 pkgdesc="A distributed C, C++, Obj C compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/distcc/"
@@ -17,11 +17,9 @@ optdepends=('gtk2: for distccmon-gnome'
 backup=('etc/conf.d/distccd'
 	'etc/distcc/hosts')
 source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-	distccd
 	distccd.conf.d
 	distccd.service)
 md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
-         '1c918474372c09304772c20c4de484fa'
          '239aae53250e3e35288cba566bc0bbf1'
          '09f0688da9c1840e518d2593bd5c3830')
 
@@ -46,7 +44,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
   install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
-  install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd
 
   install -d ${pkgdir}/usr/lib/${pkgname}/bin
   ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc
diff --git a/community/distcc/distccd b/community/distcc/distccd
deleted file mode 100644
index 4702d6820..000000000
--- a/community/distcc/distccd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/distccd`
-case "$1" in
-  start)
-    stat_busy "Starting distcc Daemon"
-    [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon distccd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping distcc Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon distccd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index 9c3a09793..bb150a493 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $
+# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=drbd
 pkgver=8.4.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
@@ -13,16 +13,20 @@ source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('b081f1046adda1d51ba351c40a8b1107'
-         'afbb345094db49b0a474c0b4e51c0acd')
+         '7dc909b5895c0b5289d3ee0581d7d333')
+
+prepare() {
+  # fix hardcoded path in udev rules
+  sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
+}
 
 build() {
   cd $pkgname-$pkgver
-  # fix hardcoded path in udev rules
-  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --with-distro=generic \
     --with-utils \
     --with-bashcompletion \
@@ -41,7 +45,7 @@ package() {
   make DESTDIR="$pkgdir" install
   # move forced /sbin binaries
   cd "$pkgdir"
-  mv sbin/* usr/sbin
+  mv sbin/* usr/bin
   rmdir sbin
   # move udev files
   mv etc/udev usr/lib
diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service
index ddd6c62b7..a8053fb05 100644
--- a/community/drbd/drbd.service
+++ b/community/drbd/drbd.service
@@ -7,13 +7,13 @@ Type=oneshot
 RemainAfterExit=yes
 
 # load config
-ExecStart=/usr/sbin/drbdadm adjust all
+ExecStart=/usr/bin/drbdadm adjust all
 # user interruptible version of wait-connect all
-ExecStart=/usr/sbin/drbdadm wait-con-int
+ExecStart=/usr/bin/drbdadm wait-con-int
 # become primary if configured
-ExecStart=/usr/sbin/drbdadm sh-b-pri all
+ExecStart=/usr/bin/drbdadm sh-b-pri all
 # disconnect and detach all resources
-ExecStop=/usr/sbin/drbdadm down all
+ExecStop=/usr/bin/drbdadm down all
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index d7bcb0f4a..e0a357243 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61947 2012-01-11 15:21:36Z stephane $
+# $Id: PKGBUILD 91568 2013-05-24 09:42:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ViNS <gladiator@fastwebnet.it>
 
 pkgname=dsniff
 pkgver=2.4b1
-pkgrel=21
+pkgrel=22
 pkgdesc="Collection of tools for network auditing and penetration testing"
 url="http://www.monkey.org/~dugsong/dsniff/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,22 +15,26 @@ source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
 md5sums=('2f761fa3475682a7512b0b43568ee7d6'
          'fbc9f62f9ab2f98f24f53ad497c1ce5d')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-2.4
   patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
   for i in *.dpatch; do
     patch -N < "$i"
   done
+  sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure
+}
 
-  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
-  make
+build() {
+  cd $srcdir/$pkgname-2.4
+  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure \
+    --prefix=/usr --sbindir=/usr/bin
+  make -j1
 }
 
 package() {
   cd "$srcdir"/$pkgname-2.4
-  make prefix="$pkgdir"/usr install
+  make install_prefix="$pkgdir" install
   install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-
   install -d "$pkgdir"/usr/share
   mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
 }
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 58ef6d167..004e16c46 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $
+# $Id: PKGBUILD 90661 2013-05-13 14:22:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=dspam
 pkgver=3.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dspam.nuclearelephant.com/"
@@ -24,13 +24,11 @@ options=('zipman' 'docs' '!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
 	dspam.logrotated
-	dspam
 	dspam.service
 	dspam.tmpfiles
 	dspam_maintenance.cron)
 md5sums=('0e0e405d3284485b2a43f47eaf6b09bb'
          'cec7e3df4cbc6feca387fb516a5b3490'
-         'bb2300eff5b2a6eb987750c71a2c2169'
          '1581a94598cec370b66f37b118970676'
          '933643f2204ccbd7e451a439f83db1ea'
          'ebfb0fec16a56f6e1a3a61ced2d5015d')
@@ -58,10 +56,8 @@ package() {
   find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \;
 
   install -d $pkgdir/etc/logrotate.d \
-	     $pkgdir/etc/rc.d \
 	     $pkgdir/usr/share/dspam/{mysql,pgsql}
   install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam
-  install -m755 ../dspam $pkgdir/etc/rc.d
 
   sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf
 
diff --git a/community/dspam/dspam b/community/dspam/dspam
deleted file mode 100644
index be533ba5f..000000000
--- a/community/dspam/dspam
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/dspam`
-case "$1" in
-  start)
-    stat_busy "Starting DSPAM Daemon"
-    [ -d /var/run/dspam ] || mkdir -p /var/run/dspam
-    [ -z "$PID" ] && /usr/bin/dspam --daemon &> /dev/null &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dspam
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DSPAM Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dspam
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/dvdrtools/PKGBUILD b/community/dvdrtools/PKGBUILD
index 3ce4f7354..6371ae6fc 100644
--- a/community/dvdrtools/PKGBUILD
+++ b/community/dvdrtools/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=dvdrtools
 pkgver=0.3.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/dvdrtools/"
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 812a0255c..961e9d00e 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $
+# $Id: PKGBUILD 91490 2013-05-23 10:12:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.12
-pkgrel=1
+pkgrel=4
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.ejabberd.im/"
@@ -17,11 +17,9 @@ backup=('etc/ejabberd/ejabberd.cfg'
 install=$pkgname.install
 source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
 	"$pkgname.logrotate"
-	"$pkgname"
 	"ejabberd.service")
 md5sums=('7d49242cf04282f3c4cebfafa2cc2f46'
          'f97c8a96160f30e0aecc9526c12e6606'
-         '2338a6230ce5f9f60be6dddcfa39bc7e'
          'df32aa17e40a7bc5d9946d3ba6fe5e16')
 
 build() {
@@ -34,12 +32,13 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver/src"
   make DESTDIR="$pkgdir" install
-  install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
   install -d "$pkgdir/var/lib/$pkgname"
   install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
   chmod ug+r "$pkgdir/etc/$pkgname/"*
-  chmod a+rx "$pkgdir/usr/sbin/ejabberdctl"
-  rm -rf "$pkgdir/var/lock"
+  mkdir -p $pkgdir/usr/bin
+  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
   install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
 }
 
diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd
deleted file mode 100644
index c73be811c..000000000
--- a/community/ejabberd/ejabberd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-cd /var/log/ejabberd/
-
-get_pid() {
-    pidof epmd >/dev/null || { echo '' ; return 0; }
-    # get port from 'epmd -names', then get pid from 'ss -tlnp'
-    PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
-    [ -z "$PORT" ] && { echo '' ; return 0; }
-    PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
-    [ -z "$PID" ] && { echo '' ; return 0; }
-    echo ${PID%/}
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ejabber daemon"
-
-    [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
-    [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ejabberd.pid
-        add_daemon ejabberd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ejabber daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ejabberd.pid &> /dev/null
-      rm_daemon ejabberd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index 0e4cbcba9..236515763 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72899 2012-06-24 16:20:06Z bpiotrowski $
+# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=5.1
+pkgrel=6
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ekg2.org/"
diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD
deleted file mode 100644
index a664796a1..000000000
--- a/community/emerald/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=emerald
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Emerald window decorator"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
-         'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkg-config' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-options=(!libtool)
-conflicts=('emerald-git')
-install=emerald.install
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  LIBS+="-lm -ldl" ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/emerald/deprecated_symbols.patch b/community/emerald/deprecated_symbols.patch
deleted file mode 100644
index b32ce154a..000000000
--- a/community/emerald/deprecated_symbols.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001
-From: ShadowKyogre <shadowkyogre@aim.com>
-Date: Fri, 05 Nov 2010 01:53:24 +0000
-Subject: Fix deprecated symbols and incorrect decoration property setting
-
----
-diff --git a/src/main.c b/src/main.c
-index 5f0ec35..150da99 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -27,8 +27,8 @@
- #include <emerald.h>
- #include <engine.h>
- 
--#define BASE_PROP_SIZE 12
--#define QUAD_PROP_SIZE 9
-+//#define BASE_PROP_SIZE 12
-+//#define QUAD_PROP_SIZE 9
- 
- #ifndef DECOR_INTERFACE_VERSION
- #define DECOR_INTERFACE_VERSION 0
-@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val)
-     gdk_error_trap_push();
- 
-     type = None;
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow,
- 				atom,
- 				0, G_MAXLONG,
-@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push();
--    XSetTransientForHint(gdk_display,
-+    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			 GDK_WINDOW_XID(dialog->window),
- 			 wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow)
-     int format, result;
-     char *retval;
- 
--    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push();
- 
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow, atom,
- 				0, G_MAXLONG,
- 				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win)
-     }
- 
-     gdk_error_trap_push();
--    XKillClient(gdk_display, wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius,
- 
- static int update_shadow(frame_settings * fs)
- {
--    Display *xdisplay = gdk_display;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     XRenderPictFormat *format;
-     GdkPixmap *pixmap;
-     Picture src, dst, tmp;
---
-cgit v0.8.3.1-30-gff3a
-
---- a/src/main.c.old	2010-12-07 19:56:08.633333370 +0100
-+++ a/src/main.c	2010-12-07 19:56:39.273333379 +0100
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 
-01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
-
diff --git a/community/emerald/emerald.install b/community/emerald/emerald.install
deleted file mode 100644
index c2fa624ae..000000000
--- a/community/emerald/emerald.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD
index a0901da0d..ee8c6f4c3 100644
--- a/community/etherape/PKGBUILD
+++ b/community/etherape/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $
+# $Id: PKGBUILD 90898 2013-05-15 12:17:39Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=etherape
-pkgver=0.9.12
-pkgrel=2
-pkgdesc="A graphical network monitor for various OSI layers and protocols"
+pkgver=0.9.13
+pkgrel=1
+pkgdesc='A graphical network monitor for various OSI layers and protocols'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://etherape.sourceforge.net/"
 license=('GPL2')
 depends=('libgnomeui' 'libpcap')
 makedepends=('rarian' 'gnome-doc-utils')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8e9cc85e73e44eccb236f488111e02f418ab095d')
+sha1sums=('87c387b0929071581bcb6515b15ab849ea8c77fb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD
index 6577de78a..08b259e8d 100644
--- a/community/etl/PKGBUILD
+++ b/community/etl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $
+# $Id: PKGBUILD 90600 2013-05-13 10:14:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=etl
-pkgver=0.04.15
+pkgver=0.04.16
 pkgrel=1
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ conflicts=('synfig-etl')
 replaces=('synfig-etl')
 #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz)
 source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz)
-md5sums=('aac5038cdb4067100e57fb52337b0cfd')
+md5sums=('e330d2045e980d424beb054423c73797')
 
 build() {
   cd $srcdir/ETL-$pkgver
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 17ec70929..cf7f2798d 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90378 2013-05-12 06:05:15Z bpiotrowski $
+# $Id: PKGBUILD 90949 2013-05-16 06:57:01Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
 pkgver=4.80.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Message Transfer Agent"
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.exim.org/'
@@ -13,8 +13,8 @@ license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
 install=exim.install
 depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
 options=('!makeflags')
 source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
         aliases
@@ -65,10 +65,13 @@ package() {
 
   cp "$srcdir/aliases" "$pkgdir/etc/mail"
 
+  install -d "$pkgdir/usr/sbin"
   cd "$pkgdir/usr/bin"
   for i in mailq rmail rsmtp runq sendmail; do
     ln -s exim "$i"
+    ln -s ../bin/exim ../sbin/"$i"
   done
+
   # fhs compliancy
   ln -s ../bin/exim ../lib/sendmail
 
diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD
index 81efb41eb..c156a0e4b 100644
--- a/community/ext4magic/PKGBUILD
+++ b/community/ext4magic/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 90509 2013-05-12 23:37:59Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=ext4magic
 pkgver=0.3.1
-pkgrel=1
-pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems'
+pkgrel=2
+pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://developer.berlios.de/projects/ext4magic/'
 license=('GPL2')
 depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
-source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") 
+source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('59c194b71e33aa6bd098b91f802e67d5')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --build=$CHOST
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST
   make
 }
 
@@ -23,4 +23,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD
deleted file mode 100644
index a089b0e35..000000000
--- a/community/f2fs-tools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Christian Hesse <mail@eworm.de>
-
-pkgname=f2fs-tools
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="Tools for Flash-Friendly File System (F2FS)"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/f2fs-tools/"
-depends=('util-linux')
-license=('GPL')
-source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
-sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867')
-
-build() {
-	cd "${pkgname}-${pkgver}"
-
-	autoreconf -fi
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}/" install
-}
-
diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD
index 8501ab67f..b202cd172 100644
--- a/community/fbgetty/PKGBUILD
+++ b/community/fbgetty/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $
+# $Id: PKGBUILD 91856 2013-05-28 17:26:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fbgetty
 pkgver=0.1.698
-pkgrel=4
+pkgrel=5
 license=("GPL")
 pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ build()
 {
   cd $srcdir/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --build=$CHOST
 
   patch src/options.c <<EOF
 33a34
@@ -23,6 +23,10 @@ build()
 EOF
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   mv ${pkgdir}/usr/info ${pkgdir}/usr/share/
 }
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index dd461bd70..0e862671f 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $
+# $Id: PKGBUILD 92086 2013-05-31 10:35:32Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com>
 # Contributor: Ron Huang <ronhuang+aur at gmail dot com>
 
 pkgname=fcgiwrap
 pkgver=1.1.0
-pkgrel=1
+pkgrel=3
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
@@ -20,7 +20,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   autoreconf --install
-  ./configure --prefix=/usr --mandir=/share/man
+  # Here --sbindir is implicitly prefixed by /usr
+  ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin
   make
 }
 
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 0bb255058..cf512694c 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,91 +1,80 @@
-# $Id: PKGBUILD 83238 2013-01-28 15:29:15Z ttoepper $
+# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
+# Contributor: Sébastien Luttringer
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=fcron
-pkgver=3.1.1
-pkgrel=1
+pkgver=3.1.2
+pkgrel=7
 pkgdesc='Feature-rich cron implementation'
 arch=(i686 x86_64 mips64el)
-url="http://fcron.free.fr"
+url='http://fcron.free.fr'
 license=('GPL')
-depends=('pam')
-makedepends=('smtp-server')
-optdepends=('smtp-server: to receive mails from cron jobs')
+depends=('pam' 'run-parts')
+makedepends=('smtp-forwarder' 'vi')
+optdepends=('smtp-forwarder: to send mails from cron jobs'
+            'vi: default editor for fcrontab')
 provides=('cron')
 conflicts=('dcron')
-backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
-        var/spool/fcron/systab var/spool/fcron/systab.orig)
+backup=('etc/fcron/fcron.conf'
+        'etc/fcron/fcron.allow'
+        'etc/fcron/fcron.deny')
 options=('emptydirs' '!makeflags')
-source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
-        systab systab.orig run-cron fcron.service)
-md5sums=('230b91f308e6012957a3a71a94f03838'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327'
-         '973e440ba6d9ea5aa00b45377140fae4')
+install=$pkgname.install
+source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
+        'systab.orig')
+md5sums=('36bf213e15f3a480f2274f8e46cced0a'
+         'afecbfd98caa49e8e4aa239fa1b19255')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --sysconfdir=/etc/fcron \
               --with-answer-all=no \
               --with-boot-install=no \
               --with-username=root \
               --with-groupname=root \
               --datarootdir=/usr/share \
-	            --datadir=/usr/share \
+              --datadir=/usr/share \
               --with-docdir=/usr/share/doc \
               --localstatedir=/var \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
               --with-piddir=/run \
-	            --with-editor=/usr/bin/vi \
+              --with-editor=/usr/bin/vi \
               --with-sendmail=/usr/sbin/sendmail
   make
-
-  # Temporary bugfix make install expects the file in the files directory.
-  cp script/fcron.init.systemd files
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
+  cd $pkgname-$pkgver
+
   make DESTDIR="$pkgdir/" install
-  install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
-  
+
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
-  # Install default fcrontab so that fcron can completely replace dcron
-  
-  install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
-  # In order to preserve the systab crontab in any case it is better to have
-  # it in non-binary form too
-  install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
+
+  # Install a default fcrontab so that fcron can completely replace dcron
+  # We doesn't use binary format which is incompatible between arch and may cause crash
+  # We regenerate the binary format at each update
+  install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
 
   # Add cron.* directories
   install -d -m755 "$pkgdir/etc/cron.daily"
   install -d -m755 "$pkgdir/etc/cron.hourly"
   install -d -m755 "$pkgdir/etc/cron.monthly"
   install -d -m755 "$pkgdir/etc/cron.weekly"
-  
-  # Install run-cron script to make fcron run without dcron
-  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
-
-  # Install systemd service
-  #install -D -m644 "$srcdir/fcron.service" \
-  #  "$pkgdir/usr/lib/systemd/system/fcron.service"
 
   # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run"
+  rmdir "$pkgdir"/{var/,}run
 
   # avoid conflict with libbsd - #31259
   rm "$pkgdir/usr/share/man/man3/bitstring.3" \
     "$pkgdir/usr/share/man/fr/man3/bitstring.3"
   rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \
-    "$pkgdir/usr/share/man/fr/man3" || true
+    "$pkgdir/usr/share/man/fr/man3"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install
new file mode 100644
index 000000000..f7b0abddf
--- /dev/null
+++ b/community/fcron/fcron.install
@@ -0,0 +1,13 @@
+# arg 1:  the new package version
+post_install() {
+  # Generate binary format which is incompatible between arch
+  fcrontab -z -u systab &>/dev/null
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fcron/fcron.rc b/community/fcron/fcron.rc
deleted file mode 100644
index 880439a1d..000000000
--- a/community/fcron/fcron.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/fcron`
-case "$1" in
-  start)
-    stat_busy "Starting Fcron Daemon"
-    [ -z "$PID" ] && /usr/sbin/fcron -b
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fcron
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Fcron Daemon"
-    [ -n "$PID" ]  && kill $PID >/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fcron
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/fcron/fcron.service b/community/fcron/fcron.service
deleted file mode 100644
index c54e8d9e9..000000000
--- a/community/fcron/fcron.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Cron Daemon
-
-[Service]
-ExecStart=/usr/sbin/fcron --foreground --nosyslog
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/fcron/run-cron b/community/fcron/run-cron
deleted file mode 100644
index 51007a15a..000000000
--- a/community/fcron/run-cron
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-
-if [ -z $1 ]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in $1/* ; do
-  if [ -x $cron ]; then
-     $cron
-  fi
-done
-unset cron
diff --git a/community/fcron/systab b/community/fcron/systab
deleted file mode 100644
index 11c7e2fd0..000000000
--- a/community/fcron/systab
+++ /dev/null
diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig
new file mode 100644
index 000000000..00af327bc
--- /dev/null
+++ b/community/fcron/systab.orig
@@ -0,0 +1,4 @@
+&bootrun 01 * * * *  /usr/bin/run-parts /etc/cron.hourly
+&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily
+&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly
+&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 54f9011b7..ddc99181f 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $
+# $Id: PKGBUILD 91731 2013-05-26 17:21:25Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
-pkgver=3.7.0.1
+pkgver=3.7.0.2
 pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,4 +31,4 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('cb07cf02ee4cc767e10e8a022ad0ce0d')
+md5sums=('04a6a6aea31a01feda78e509246ae10a')
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index bca39bdd2..94b9c58b4 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84315 2013-02-16 11:41:49Z bpiotrowski $
+# $Id: PKGBUILD 92181 2013-06-02 13:25:12Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -6,20 +6,21 @@
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgname=fish
-pkgver=2.0b2
-pkgrel=4
+pkgver=2.0.0
+pkgrel=2
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://ridiculousfish.com/shell/'
+url='http://fishshell.com/'
 license=('GPL2')
-depends=('python2')
+depends=('python2' 'inetutils')
 makedepends=('doxygen' 'python')
 install=fish.install
-source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz)
-md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1')
+source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz)
+md5sums=('fe5907e6af61607d4128ce891a1f6501')
 
 build() {
-  cd "$srcdir"/fishfish
+  set -x
+  cd fish
   autoconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
@@ -28,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/fishfish
+  cd fish
   make DESTDIR="$pkgdir" install
 
   # use python2
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 4e7399c63..57b4a7e96 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74911 2012-08-09 12:06:08Z giovanni $
+# $Id: PKGBUILD 91099 2013-05-19 13:18:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Cilyan Olowen <gaknar@gmail.com>
 # Contributor: fill <mailbox@fillo.ru>
@@ -6,7 +6,7 @@
 
 pkgname=flashrom
 pkgver=0.9.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
 url="http://www.flashrom.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,6 +19,7 @@ md5sums=('407e836c0a2b17ec76583cb6809f65e5')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  sed -i "s:sbin:bin:g" Makefile
   make
 }
 
diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index 069ad5eab..b51e173d9 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74096 2012-07-20 19:52:13Z spupykin $
+# $Id: PKGBUILD 91878 2013-05-28 18:07:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=flumotion
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A streaming media server"
 url="http://www.flumotion.net"
@@ -29,10 +29,14 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
 
-  install -d "$pkgdir/etc/$pkgname"
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir/etc/$pkgname"
   make DESTDIR="$pkgdir" install
   cp -R conf/workers "$pkgdir/etc/$pkgname"
   cp -R conf/managers "$pkgdir/etc/$pkgname"
diff --git a/community/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD
index cf1c5310d..5d3cbc654 100644
--- a/community/fortune-mod/PKGBUILD
+++ b/community/fortune-mod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75721 2012-08-29 11:10:03Z bisson $
+# $Id: PKGBUILD 92041 2013-05-31 00:16:32Z seblu $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Dale Blount <archlinux@dale.us>
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=5.2
+pkgrel=6
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.redellipse.net/code/fortune"
@@ -27,7 +27,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make FORTDIR="$pkgdir"/usr/bin \
        COOKIEDIR="$pkgdir"/usr/share/fortune \
-       BINDIR="$pkgdir"/usr/sbin \
+       BINDIR="$pkgdir"/usr/bin \
        BINMANDIR="$pkgdir"/usr/share/man/man1 \
        FORTMANDIR="$pkgdir"/usr/share/man/man6 install
   rm "$pkgdir"/usr/share/fortune/*.u8
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index 2452bc9ed..ecac54b00 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $
+# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kalidarn
 
 pkgname=freeradius-client
 pkgver=1.1.6
-pkgrel=4
+pkgrel=5
 pkgdesc="FreeRADIUS Client Software"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.freeradius.org/Radiusclient"
@@ -16,8 +16,12 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license
   mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index d4ac8dcc1..164d97d3b 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $
+# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
 pkgver=2.2.0
-pkgrel=5
+pkgrel=8
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
@@ -15,15 +15,13 @@ optdepends=('libpcap' 'unixodbc' 'python2')
 options=('!libtool' '!makeflags')
 install=$pkgname.install
 source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
-	radiusd
 	freeradius.tmpfiles
 	freeradius.service
 	krb5-build-fix.patch)
 md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119'
-         '5dd57af81ba075102581fec45316ba7b'
-         'f1a6530b1b69d2fa793aa45b2de379bb'
+         'SKIP'
          'f959e89812bedfc9f8308076f78cd74e'
-         '39eba6d34f8249781e9e917646465632'
+         'e3f18e3a25df3b692e59f60605354708'
          'c6a61de7576933f59154a53bfc12a2d2')
 
 build() {
@@ -35,6 +33,7 @@ build() {
 	      --prefix=/usr --enable-heimdal-krb5 \
 	      --localstatedir=/var \
 	      --sysconfdir=/etc \
+	      --sbindir=/usr/bin \
 	      --libdir=/usr/lib/freeradius \
 	      --with-udpfromto
   make
@@ -43,7 +42,6 @@ build() {
 package() {
   cd $srcdir/freeradius-server-$pkgver
   make install R=$pkgdir
-  install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd
   chmod o+r $pkgdir/etc/raddb/*
   mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
   rm -rf $pkgdir/var/run
diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service
index 635b6d6f8..220d352af 100644
--- a/community/freeradius/freeradius.service
+++ b/community/freeradius/freeradius.service
@@ -4,11 +4,11 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/radiusd/radiusd.pid
-ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
-ExecStartPre=/usr/sbin/radiusd -C
-ExecStart=/usr/sbin/radiusd -d /etc/raddb
-ExecReload=/usr/sbin/radiusd -C
+PIDFile=/run/radiusd/radiusd.pid
+ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd
+ExecStartPre=/usr/bin/radiusd -C
+ExecStart=/usr/bin/radiusd -d /etc/raddb
+ExecReload=/usr/bin/radiusd -C
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/freeradius/radiusd b/community/freeradius/radiusd
deleted file mode 100644
index bf872b6f2..000000000
--- a/community/freeradius/radiusd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radiusd`
-case "$1" in
-  start)
-    stat_busy "Starting radiusd Server"
-
-    [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd
-    [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid
-    chown -R radiusd.radiusd /var/run/radiusd
-
-    [ -z "$PID" ] && /usr/sbin/radiusd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/radiusd.pid
-      add_daemon radiusd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping radiusd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/radiusd.pid
-      rm_daemon radiusd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD
index 22c2c43e3..537141a1c 100644
--- a/community/fssos-nsvs/PKGBUILD
+++ b/community/fssos-nsvs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $
+# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $
 # Maintainer: Dale Blount <dale@archlinux.org>
 
 pkgname=fssos-nsvs
 pkgver=0.5
-pkgrel=10
+pkgrel=11
 pkgdesc="NSVS for FSSOS"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fssos.sourceforge.net/"
@@ -13,21 +13,18 @@ backup=('etc/nsvsd.conf')
 options=('!libtool' '!makeflags')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd'
-	'nsvsd.service')
+        'nsvsd.service')
+md5sums=('3f17c2f6339f1a322b712b467023d825'
+         '9c791d2086e13f774548d9d6ba2cf9d5')
 
 build() {
-  cd $srcdir/nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd nsvs-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
 }
 
 package() {
-  cd $srcdir/nsvs-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd"
+  cd nsvs-$pkgver
+  make DESTDIR="$pkgdir" install
   install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
 }
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '4dfd9dc0d69b375587e39ab2621d9ea9'
-         '61e970d0704875b1da83cb4e9fc0eef5')
diff --git a/community/fssos-nsvs/nsvsd b/community/fssos-nsvs/nsvsd
deleted file mode 100755
index f9b4845ab..000000000
--- a/community/fssos-nsvs/nsvsd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting nsvsd"
-	/usr/sbin/nsvsd -f /etc/nsvsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nsvsd"
-    kill `cat /var/run/nsvsd.pid` &>/dev/null
-    rm -f /var/run/nsvsd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service
index 0df5444ab..8c3d12b67 100644
--- a/community/fssos-nsvs/nsvsd.service
+++ b/community/fssos-nsvs/nsvsd.service
@@ -2,7 +2,7 @@
 Description=Name Service Via Sockets Daemon
 
 [Service]
-ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf
+ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 9aa8036d7..b216c0877 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90031 2013-05-06 19:37:10Z foutrelis $
+# $Id: PKGBUILD 91592 2013-05-25 02:56:17Z foutrelis $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
 pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 32bf2ed50..015ddde27 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90032 2013-05-06 19:37:11Z foutrelis $
+# $Id: PKGBUILD 91067 2013-05-18 16:29:28Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
-pkgver=1.9.2
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gdal.org/"
@@ -18,15 +18,15 @@ optdepends=('postgresql: postgresql database support'
             'swig:  perl binding support')
 options=('!libtool')
 changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch)
-md5sums=('3f39db89f4710269b3a8bf94178e07aa'
-         '81afc1c26d29cee84aadb6924fe33861')
+sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487'
+            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 build() {
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
 
-  # bug 23654
+# bug 23654
   export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
 
   cd "${srcdir}/$pkgname-$pkgver"
@@ -60,7 +60,7 @@ package () {
 #FS15477 clean up junks
   rm -f "${pkgdir}"/usr/bin/*.dox
 
-  # Remove RPATH
+# Remove RPATH
   chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
   chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
   chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 9ad14990e..adeb1a88e 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $
+# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
@@ -6,12 +6,12 @@
 
 pkgname=geany-plugins
 pkgver=1.23
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://plugins.geany.org/'
 license=('GPL')
-depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
+depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
          'desktop-file-utils' 'gtk-update-icon-cache' 'lua51')
 makedepends=('intltool' 'vala' 'gdb' 'cppcheck')
 optdepends=('hspell: hebrew spell checker')
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index 516ee77b2..302f92ba2 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $
+# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -6,7 +6,7 @@
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 
 pkgname=geany
-pkgver=1.23
+pkgver=1.23.1
 pkgrel=1
 pkgdesc='Fast and lightweight IDE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,17 @@ optdepends=('vte: for terminal support'
 install="$pkgname.install"
 options=('!libtool')
 source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
-sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0')
+sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Python2 fix
+	sed -i '0,/on/s//on2/' data/templates/files/main.py
+
+  # Syntax highlighting for PKGBUILD files
+  sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,14 +38,8 @@ build() {
   ./configure --prefix=/usr
   make
 
-  # Python2 fix
-	sed -i '0,/on/s//on2/' data/templates/files/main.py
-
   # Fix for FS#10318
   setconf geany.desktop MimeType ''
-
-  # Syntax highlighting for PKGBUILD files
-  sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
 }
 
 package() {
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
index b9b769daa..7b8b90f54 100755
--- a/community/geary/PKGBUILD
+++ b/community/geary/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=geary
 pkgver=0.3.1
 pkgrel=4
 pkgdesc="A lightweight email client for the GNOME desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.yorba.org/projects/geary/"
 license=('GPL3')
 depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3')
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD
index 6da1e9d1a..f80ecebe9 100644
--- a/community/gecko-mediaplayer/PKGBUILD
+++ b/community/gecko-mediaplayer/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 79363 2012-11-03 16:29:50Z lfleischer $
+# $Id: PKGBUILD 92203 2013-06-02 18:37:52Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: fancris3 <fancris3 at aol.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gecko-mediaplayer
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/gecko-mediaplayer/'
 license=('GPL')
-depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk')
+depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk' 'curl')
 makedepends=('xulrunner' 'pkgconfig')
 replaces=('mplayer-plugin')
 source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d35e3307126f874afba93bd896d605dc')
+md5sums=('d13303664fcbb7f3b1273be4b1aa1b1e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index ab057abec..65595c3d0 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $
+# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=('x86_64' 'i686' 'mips64el')
@@ -19,7 +19,7 @@ optdepends=('gucharmap: for charmap plugin'
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141')
+sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD
index 2361b6076..ecf2a1f56 100644
--- a/community/gemrb/PKGBUILD
+++ b/community/gemrb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 90034 2013-05-06 19:37:17Z foutrelis $
+# $Id: PKGBUILD 91754 2013-05-27 08:10:59Z bpiotrowski $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=gemrb
-pkgver=0.8.0
-pkgrel=2
+pkgver=0.8.0.1
+pkgrel=1
 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gemrb.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake')
 install=gemrb.install
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz")
-md5sums=('dc0306d4d301726ac449225313285ea1')
+md5sums=('fdb97cc031cf969938952ce2c79b25fc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index d0379a3ef..e6796db56 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86465 2013-03-17 20:20:40Z cinelli $
+# $Id: PKGBUILD 91621 2013-05-25 12:05:10Z bpiotrowski $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=gen2shp
 pkgver=0.3.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Converts ArcInfo generate format to shapefile format'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.intevation.de/~jan/gen2shp/'
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index cbea9fbae..52fe0bf3f 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $
+# $Id: PKGBUILD 90958 2013-05-16 14:50:52Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
-# Thanks to Moonprincessluna at DeviantArt for the default icon:
-# http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a
-
 pkgname=gendesk
-pkgver=0.4.4
+pkgver=0.5.2
 pkgrel=1
-pkgdesc="Utility to generate .desktop files and download icons"
+pkgdesc='Utility to generate .desktop files and download icons'
 arch=('x86_64' 'i686')
-url="http://roboticoverlords.org/gendesk/"
+url='http://roboticoverlords.org/gendesk/'
 license=('MIT')
-depends=('glibc')
 makedepends=('go')
+depends=('glibc')
 source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://roboticoverlords.org/images/default.png")
-sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334'
+        'http://roboticoverlords.org/images/default.png')
+sha256sums=('33a989aa7603d2cb15711137f653a8985143297a2ab7532dfad1c15aa649fe17'
             '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
 
 build() {
diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD
index b924e7489..dcb5e73de 100644
--- a/community/girara/PKGBUILD
+++ b/community/girara/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82561 2013-01-20 23:41:34Z dwallace $
+# $Id: PKGBUILD 90573 2013-05-13 09:52:42Z spupykin $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mlq <mlq@pwmt.org>
 
 pkgbase=girara
 pkgname=(girara-common girara-gtk2 girara-gtk3)
-pkgver=0.1.5
+pkgver=0.1.6
 pkgrel=1
 pkgdesc="user interface library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://pwmt.org/projects/girara"
 license=('custom')
 makedepends=('gtk3' 'gtk2')
 source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz)
-md5sums=('fe725fd935c85657008c18bb07c671d4')
+md5sums=('1f213274fc710a5f9693d0d61f9ea66d')
 
 build() {
   true
diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD
index f1293632c..1a3a9ec5f 100644
--- a/community/gkrellm/PKGBUILD
+++ b/community/gkrellm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79153 2012-10-31 05:24:09Z ebelanger $
+# $Id: PKGBUILD 92097 2013-05-31 14:27:10Z foutrelis $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=gkrellm
 pkgver=2.3.5
-pkgrel=3
+pkgrel=4
 pkgdesc="System monitor package for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
@@ -15,9 +15,8 @@ depends=('gtk2' 'libsm' 'lm_sensors')
 makedepends=('gettext')
 backup=('etc/gkrellmd.conf')
 source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "gkrellmd" "gkrellm.service")
+        "gkrellm.service")
 sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b'
-            'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360'
             '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376')
 
 build() {
@@ -31,7 +30,6 @@ package() {
 
   make DESTDIR="$pkgdir" PREFIX=/usr install
   install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf"
-  install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd"
   install -Dm644 "../gkrellm.service" "$pkgdir/usr/lib/systemd/system/gkrellm.service"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/community/gkrellm/gkrellmd b/community/gkrellm/gkrellmd
deleted file mode 100644
index 1f255e755..000000000
--- a/community/gkrellm/gkrellmd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-GKRELLMD_ARGS='-d'
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/gkrellmd)
-case "$1" in
-  start)
-    stat_busy "Starting GKrellM Daemon"
-    [ -z "$PID" ] && /usr/bin/gkrellmd ${GKRELLMD_ARGS}
-    PID=$(pidof -o %PPID /usr/bin/gkrellmd)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      add_daemon gkrellmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GKrellM Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gkrellmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 29bdf76b6..9aac29fc0 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 87414 2013-03-31 19:18:18Z stephane $
+# $Id: PKGBUILD 91057 2013-05-18 15:35:53Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=glom
-pkgver=1.22.0
-pkgrel=5
+pkgver=1.24.0
+pkgrel=1
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
@@ -15,8 +15,8 @@ depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc'
 makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
 options=('!libtool')
 install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz)
+sha256sums=('83ff79610ffdede48536c0d07d5288ad84ec26c86aa2aa1db98b46abdebbdcc2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gloobus-preview/PKGBUILD b/community/gloobus-preview/PKGBUILD
new file mode 100644
index 000000000..175945c38
--- /dev/null
+++ b/community/gloobus-preview/PKGBUILD
@@ -0,0 +1,85 @@
+# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gloobus-preview
+pkgver=0.4.5.290
+_pkgver=0.4.5-ubuntu11~ppa290
+pkgrel=1
+pkgdesc="Gnome application designed to enable a full screen preview of any kind of file"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://gloobus.net/"
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+optdepends=('djvulibre: Preview DjVu documents'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'libspectre: Preview PostScript documents'
+            'p7zip: View content of 7z archives'
+            'unoconv: Preview LibreOffice compatible documents'
+            'unrar: View content of RAR archives'
+            'unzip: View content of .ZIP archives')
+options=('!libtool')
+install=$pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz
+        gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
+        fix-gtksource-include.patch
+        fix-unoconv.patch
+        use-xdg-open.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+         'SKIP'
+         'ca15a3e31cec01d3d4fc5a4e1720f692'
+         '03379c173e67ad1b6804bc609336451d'
+         'd6d9e2b3e001f0ea8440cccdf90480af')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_pkgver"
+
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+  sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+  # Fix unoconv support
+  patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+  # Use xdg-open
+  patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+  ### Prepare gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  # Python2 fix
+  sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+  cd "$srcdir/$pkgname-$_pkgver"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static
+  make
+
+  ### Build gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$_pkgver"
+  make DESTDIR="$pkgdir" install
+
+  ### Install gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+  make DESTDIR="$pkgdir" install
+
+  # Rename service file to avoid conflict with sushi
+  mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/community/gloobus-preview/fix-gtksource-include.patch b/community/gloobus-preview/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/community/gloobus-preview/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h	2013-05-17 06:27:37.833360264 +0200
+@@ -1,8 +1,7 @@
+ #ifndef _ITEXT_
+ #define _ITEXT_
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
+ 
+ #include "gloobus-preview-interface-main.h"
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp	2013-05-17 06:28:19.300984059 +0200
+@@ -1,6 +1,6 @@
+ #include "gloobus-preview-plugin-manager.h"
+ #include <dlfcn.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ 
+ vector<gp_plugin_container*> PluginManager::plugins;
+ map<string, int> PluginManager::filetypes;
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h	2013-05-17 06:26:26.788384315 +0200
+@@ -3,10 +3,7 @@
+ 
+ #ifndef PLUGIN_LOADER
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourcestylescheme.h>
+-#include <gtksourceview/gtksourcestyleschememanager.h>
++#include <gtksourceview/gtksource.h>
+ #include <gio/gio.h>
+ 
+ #include "../gloobus-preview-config.h"
diff --git a/community/gloobus-preview/fix-unoconv.patch b/community/gloobus-preview/fix-unoconv.patch
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/community/gloobus-preview/fix-unoconv.patch
@@ -0,0 +1,46 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp	2013-05-18 10:24:33.558221788 +0200
+@@ -87,7 +87,7 @@
+ 
+     if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
+         gchar *path = g_file_get_path(file);
+-        gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
++        gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
+ 
+         if( system(cmd) == 0) {
+             uri = pathToUri(tmp);
+@@ -123,4 +123,4 @@
+ {
+     path = "file://" + path;
+     return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
+-}
+\ No newline at end of file
++}
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h	2013-05-18 10:33:02.352806550 +0200
+@@ -6,15 +6,21 @@
+ PluginManager::register_plugin("office");
+ 
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
+ PluginManager::register_filetype("application/msword", 1);
+ PluginManager::register_filetype("application/rtf", 1);
+ PluginManager::register_filetype("application/vnd.ms-excel", 1);
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
+ PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
+ PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
++
+ 
+ // TODO: add more filetypes supported by abiword and/or OpenOffice
+ 
+ #endif
+ 
+-#endif /* OFFICE_PLUGIN_H */
+\ No newline at end of file
++#endif /* OFFICE_PLUGIN_H */
diff --git a/community/gloobus-preview/gloobus-preview.install b/community/gloobus-preview/gloobus-preview.install
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/community/gloobus-preview/gloobus-preview.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate
+  gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/gloobus-preview/use-xdg-open.patch b/community/gloobus-preview/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/community/gloobus-preview/use-xdg-open.patch
@@ -0,0 +1,20 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp	2013-05-18 09:49:24.833574800 +0200
+@@ -560,12 +560,12 @@
+     string label(gtk_menu_item_get_label(item));
+     if(label ==  _("Settings"))
+         cmd = "gloobus-preview-configuration";
+-    else if(label ==  _("Report a Bug"))
+-        cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
++    else if(label ==  _("Report a Problem"))
++        cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+     else if(label == _("Blog"))
+-        cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
++        cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
+     else if(label == _("Donate"))
+-        cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
++        cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+     else if(label == _("About"))
+         ui->create_about();
+     else if(label == _("Quit"))
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index f2dc1ea9d..e20d459d2 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 80469 2012-11-22 12:21:36Z spupykin $
+# $Id: PKGBUILD 92113 2013-05-31 16:29:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors:
 #   Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
 #   henning mueller <henning@orgizm.net>
 
 pkgname=glusterfs
-_basever=3.3
-pkgver=$_basever.1
-pkgrel=1
+pkgver=3.3.1
+_basever=`echo $pkgver | cut -f1-2 -d.`
+pkgrel=4
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(i686 x86_64 mips64el)
 url='http://www.gluster.org/'
@@ -16,20 +16,18 @@ depends=(fuse python2 libxml2)
 makedepends=(flex bison)
 options=(!libtool)
 source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz
-	glusterd.rc
 	glusterd.service)
 sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519'
-            'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4'
             'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7')
 sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519'
-            'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4'
-            'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7')
+            '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/share/man \
@@ -56,10 +54,6 @@ package() {
     $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \
     $pkgdir/usr/share/doc/glusterfs/
 
-  install -D -m 755 \
-    $srcdir/glusterd.rc \
-    $pkgdir/etc/rc.d/glusterd
-
   install -D -m 644 \
     $srcdir/glusterd.service \
     $pkgdir/usr/lib/systemd/system/glusterd.service
diff --git a/community/glusterfs/glusterd.rc b/community/glusterfs/glusterd.rc
deleted file mode 100644
index 61cc26476..000000000
--- a/community/glusterfs/glusterd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Thanks to igor
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="/var/run/glusterd.pid"
-
-case "$1" in
-    start)
-        stat_busy "Starting glusterd"
-        /usr/sbin/glusterd -p $PID &>/dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon glusterd
-            stat_done
-        fi
-    ;;
-    stop)
-        stat_busy "Stopping glusterd"
-        kill -QUIT `cat "$PID"` &>/dev/null
-        if [ $? -ne 0 ]; then
-            stat_fail
-        else
-            rm_daemon glusterd
-            stat_done
-        fi
-    ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}" 
-esac
-
-exit 0
diff --git a/community/glusterfs/glusterd.service b/community/glusterfs/glusterd.service
index c44024317..b1dd5c18d 100644
--- a/community/glusterfs/glusterd.service
+++ b/community/glusterfs/glusterd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/glusterd
+ExecStart=/usr/bin/glusterd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 2793070d7..2342b1ded 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90038 2013-05-06 19:37:29Z foutrelis $
+# $Id: PKGBUILD 91613 2013-05-25 11:46:26Z bpiotrowski $
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=gmerlin
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD
index 1a826e993..ecb19458b 100644
--- a/community/gmtk/PKGBUILD
+++ b/community/gmtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79359 2012-11-03 16:28:22Z lfleischer $
+# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=gmtk
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
-pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.'
+pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gmtk.googlecode.com/'
 license=('GPL')
@@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf')
 makedepends=('intltool' 'pkg-config')
 options=(!libtool)
 source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('919ea155b755a33ab052dacbbc6e7f03')
+md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD
new file mode 100644
index 000000000..83d8d9f4e
--- /dev/null
+++ b/community/gnokii/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 90848 2013-05-14 21:40:33Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=gnokii
+pkgver=0.6.31
+pkgrel=4
+pkgdesc="Tools and user space driver for use with mobile phones"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnokii.org/"
+license=('GPL')
+depends=('libusb-compat' 'libxpm' 'bluez' 'libical')
+makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb')
+optdepends=('gtk2: xgnokii GUI'
+            'libmariadbclient: smsd mysql backend'
+            'postgresql-libs: smsd postgresql backend')
+backup=('etc/gnokiirc')
+options=('!libtool' '!makeflags')
+source=("http://www.gnokii.org/download/$pkgname/$pkgname-${pkgver}.tar.bz2"
+        'gnokii.patch')
+md5sums=('d9627f4a1152d3ea7806df4532850d5f'
+         'fd1c448114c2e0de8e05981030f0e69f')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  # FS#13249
+  sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
+
+  patch -Np1 -i "${srcdir}/gnokii.patch"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --enable-security \
+    --disable-unix98test
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc"
+}
diff --git a/community/gnokii/gnokii.patch b/community/gnokii/gnokii.patch
new file mode 100644
index 000000000..db593cdf4
--- /dev/null
+++ b/community/gnokii/gnokii.patch
@@ -0,0 +1,12 @@
+diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc
+--- gnokii-0.6.31.orig/Docs/sample/gnokiirc	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/Docs/sample/gnokiirc	2012-02-18 12:49:26.957557504 +0100
+@@ -238,7 +238,7 @@
+ # In particular ensure that mgnokiidev is in this location, with
+ # permissions 4750, owned by root, group gnokii.  Ensure you
+ # are in the gnokii group and that the group exists...
+-bindir = /usr/local/sbin/
++bindir = /usr/sbin/
+ 
+ # Any entries in the following two sections will be set as environment
+ # variables when running the scripts.
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index 2dad1ed2c..d6522c2db 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80171 2012-11-17 12:43:41Z lfleischer $
+# $Id: PKGBUILD 92201 2013-06-02 18:25:47Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gnome-mplayer
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc='A simple MPlayer GUI.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gnome-mplayer.googlecode.com/'
@@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'gnome-icon-theme' 'hicolor-icon-them
 makedepends=('gnome-power-manager' 'nautilus')
 install="${pkgname}.install"
 source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d0cdabdf1b3eaa25d5c007b5cbd2d9ce')
+md5sums=('9225dc0645d050ee31dd877559d7c16b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 9e8fa4811..dd666071e 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $
+# $Id: PKGBUILD 91084 2013-05-19 01:47:07Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a')
+sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 616751ca6..46b671006 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88932 2013-04-24 22:25:52Z bgyorgy $
+# $Id: PKGBUILD 90851 2013-05-14 21:40:37Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.6.2
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index ed35c77b5..8d528344a 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $
+# $Id: PKGBUILD 91086 2013-05-19 01:51:02Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,14 +15,14 @@ install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
 	'arch.patch')
-sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee'
+sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be'
 	    '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   patch -Np1 -i "$srcdir/arch.patch"
-
+  autoreconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index bbd4c1c58..365205720 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $
+# $Id: PKGBUILD 90671 2013-05-13 14:25:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
 pkgver=0.9.5_a
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
@@ -16,14 +16,10 @@ backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
 install=gnunet.install
 source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
-	gnunet.rc
 	gnunet.service
-	gnunet.conf.d
 	defaults.conf)
 md5sums=('b0e204cf9711f9799baaeb477992e66a'
-         '5baf691913b007fb33e365239e3f7217'
          '54cce3d2415d95b2e5bd1bd88db3a0ea'
-         'f161b46915736e4017e77ad735521453'
          '0fe23b2ca5b3fc47a0b5645e04406da0')
 
 build() {
@@ -36,8 +32,6 @@ build() {
 package() {
   cd $srcdir/gnunet-${pkgver/_/}
   make DESTDIR=$pkgdir install
-  install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd
-  install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd
   install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf
   rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/gnunet/gnunet.conf.d b/community/gnunet/gnunet.conf.d
deleted file mode 100644
index f10a322ce..000000000
--- a/community/gnunet/gnunet.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-GNUNETD_USER=nobody
diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc
deleted file mode 100644
index 30ac4d2ad..000000000
--- a/community/gnunet/gnunet.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-GNUNETD_USER=nobody
-
-. /etc/conf.d/gnunetd
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/gnunet-arm)
-case "$1" in
-    start)
-	stat_busy "Starting gnunet services"
-	[ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null &
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    add_daemon gnunetd
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping gnunet services"
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm_daemon gnunetd
-	    stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD
index c8b5c5d40..4afbd0cc9 100644
--- a/community/gnustep-make/PKGBUILD
+++ b/community/gnustep-make/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-make
-pkgver=2.6.2
-pkgrel=2.1
+pkgver=2.6.4
+pkgrel=1.1
 pkgdesc="The GNUstep make package"
 arch=('mips64el')
 url="http://www.gnustep.org/"
@@ -13,7 +13,7 @@ depends=()
 conflicts=('gnustep-make-svn')
 groups=('gnustep-core')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('b926d142debc9f38d75b11019c31889f')
+md5sums=('c5617da024add87ce9b09726bb9328a6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 45d62ed28..7f0ade8e5 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90230 2013-05-09 17:13:58Z arodseth $
+# $Id: PKGBUILD 92197 2013-06-02 17:23:53Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -8,13 +8,13 @@
 # Contributor: Mike Rosset <mike.rosset@gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
-# TODO: Create split packages for the crosscompilation versions as well
+# TODO: Create split packages for the crosscompilation versions? (maybe)
 
 pkgname=go
-pkgver=1.1rc3
-pkgrel=1
+pkgver=1.1
+pkgrel=4
 epoch=2
-pkgdesc='Google Go compiler and tools'
+pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
 url='http://golang.org/'
 license=('custom')
@@ -23,17 +23,18 @@ makedepends=('inetutils')
 options=('!strip')
 install="$pkgname.install"
 backup=('usr/lib/go/bin')
-#if [ "$CARCH" == 'x86_64' ]; then
-#  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
-#          "$pkgname.sh")
-#  sha256sums=('ed631dd172418488ee24f79b1aa64474b8eb959f8035c5f2ee77e6d2e467e61a'
-#            'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
-#else
+
+if [ "$CARCH" == 'x86_64' ]; then
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
+          "$pkgname.sh")
+  sha256sums=('2ed0548bc9f9071c24d253f945dd8354bdaa8a9925e48ad5eef586afbf6cfe8a'
+           'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
+else
   source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
           "$pkgname.sh")
-  sha256sums=('c81fd6503ab49ad92a270a740581ad744062c195bec4df94ae9973a9f4001da9'
+  sha256sums=('fd6c951cbd5329f192430fe579dbe594d380c80651bf660c1b3d4e9a86370383'
             'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
-#fi
+fi
 
 build() {
   cd "$srcdir/$pkgname/src"
@@ -76,65 +77,68 @@ package() {
   cd "$srcdir/$pkgname"
 
   install -Dm644 LICENSE \
-    $pkgdir/usr/share/licenses/go/LICENSE
+    "$pkgdir/usr/share/licenses/go/LICENSE"
   install -Dm644 misc/bash/go \
-    $pkgdir/usr/share/bash-completion/completions/go
+    "$pkgdir/usr/share/bash-completion/completions/go"
   install -Dm644 misc/emacs/go-mode-load.el \
-    $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el
+    "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el"
   install -Dm644 misc/emacs/go-mode.el \
-    $pkgdir/usr/share/emacs/site-lisp/go-mode.el
+    "$pkgdir/usr/share/emacs/site-lisp/go-mode.el"
   install -Dm644 misc/zsh/go \
-    $pkgdir/usr/share/zsh/site-functions/_go
+    "$pkgdir/usr/share/zsh/site-functions/_go"
 
   for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \
     ftplugin/go/fmt.vim ftplugin/go/import.vim syntax/go.vim syntax/godoc.vim \
     plugin/godoc.vim;
   do
-    install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f
+    install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f"
   done
 
-  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}}
+  mkdir -p \
+    "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}}
 
-  cp -r doc misc -t $pkgdir/usr/share/go
-  ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
-  cp -a bin $pkgdir/usr
-  cp -a pkg $pkgdir/usr/lib/go
-  cp -a $GOROOT/src/pkg $pkgdir/usr/lib/go/src/
-  cp -a $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
-  cp -a $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/
-  cp -a $GOROOT/lib $pkgdir/usr/lib/go/
-  cp -a $GOROOT/include $pkgdir/usr/lib/go/
+  cp -r doc misc -t "$pkgdir/usr/share/go"
+  ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
+  cp -a bin "$pkgdir/usr"
+  cp -a pkg "$pkgdir/usr/lib/go"
+  cp -a "$GOROOT/src/pkg" "$pkgdir/usr/lib/go/src/"
+  cp -a "$GOROOT/src/cmd" "$pkgdir/usr/lib/go/src/cmd"
+  cp -a "$GOROOT/src/lib9" "$pkgdir/usr/lib/go/src/"
+  cp -a "$GOROOT/lib" "$pkgdir/usr/lib/go/"
+  cp -a "$GOROOT/include" "$pkgdir/usr/lib/go/"
 
-  install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
+  install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
   # Remove object files from target src dir
-  find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
+  find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete
 
   # Fix for FS#32813
-  find $pkgdir -type f -name sql.go -exec chmod -x {} \;
+  find "$pkgdir" -type f -name sql.go -exec chmod -x {} \;
   
   # Remove all executable source files
-  find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete
+  find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete
 
   # Headers for C modules
   install -Dm644 src/pkg/runtime/runtime.h \
-    $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
+    "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h"
   install -Dm644 src/pkg/runtime/cgocall.h \
-    $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
+    "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
   # For packages that source /etc/profile.d/go.sh
-  install -Dm755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
-  ln -sf /usr/bin $pkgdir/usr/lib/go/bin
+  ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
 
   # For godoc
-  install -Dm644 favicon.ico $pkgdir/usr/lib/go/favicon.ico
+  install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico"
+
+  rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
 
-  rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin
+  install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
-  install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION
+  find "$pkgdir/usr/"{lib/go/pkg,bin} -type f -exec touch '{}' +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD
index 6b896a69d..f3d84a587 100644
--- a/community/golangide/PKGBUILD
+++ b/community/golangide/PKGBUILD
@@ -1,11 +1,11 @@
-#$Id: PKGBUILD 90350 2013-05-11 18:38:52Z arodseth $
+#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=golangide
 pkgver=18.1
-pkgrel=1
+pkgrel=3
 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)'
 license=('LGPL')
 arch=('x86_64' 'i686')
@@ -13,25 +13,19 @@ url='https://github.com/visualfc/liteide'
 depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit')
 makedepends=('gendesk')
 options=('!strip')
-source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip"
+source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip"
         'golangide.png'
         'golangide.sh')
-sha256sums=('4ca6438099314789f4cd8fd3acc8016d8e32594634a6d0f130f5666dcb0a3d6c'
+sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
             '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04')
-_name=('Golang IDE')
 
 prepare() {
   cd "$srcdir"
 
-  gendesk -n
-
-  cd "$srcdir/liteide-x$pkgver/build"
-  head -n-3 build_linux.sh > build_linux_fixed.sh
-  mv build_linux_fixed.sh build_linux.sh
-  head -n-4 webkit_linux.sh > webkit_linux_fixed.sh
-  mv webkit_linux_fixed.sh webkit_linux.sh
-  chmod +x build_linux.sh webkit_linux.sh
+  gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+  cd "liteide-x$pkgver/build"
+  chmod +x build_linux.sh
 }
 
 build() {
@@ -39,7 +33,6 @@ build() {
 
   msg2 'Compiling...'
   QTDIR=/usr ./build_linux.sh
-  QTDIR=/usr ./webkit_linux.sh
 
   # Fixing insecure RPATH, need to test if this is still needed
   msg2 'Fixing...'
@@ -50,9 +43,10 @@ build() {
 
 package() {
   msg2 'Creating directories...'
-  mkdir -p "$pkgdir/usr/lib/liteide"
-  mkdir -p "$pkgdir/usr/share/liteide"
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  mkdir -p \
+    "$pkgdir/usr/lib/liteide" \
+    "$pkgdir/usr/share/liteide" \
+    "$pkgdir/usr/share/doc/$pkgname"
 
   cd "$srcdir/liteide-x$pkgver/build/liteide"
 
@@ -65,8 +59,7 @@ package() {
   cd "$srcdir/liteide-x$pkgver/liteidex"
 
   msg2 'Packaging resources...'
-  cp -r deploy/* "$pkgdir/usr/share/liteide"
-  cp -r os_deploy/* "$pkgdir/usr/share/liteide"
+  cp -r deploy/* os_deploy/* "$pkgdir/usr/share/liteide"
 
   msg2 'Packaging libraries and plugins...'
   cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide"
diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD
index aa8f02b51..8cc59a4ab 100644
--- a/community/goobox/PKGBUILD
+++ b/community/goobox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 87383 2013-03-30 13:01:13Z bgyorgy $
+# $Id: PKGBUILD 90865 2013-05-15 04:00:47Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=goobox
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="CD player and ripper for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool')
 optdepends=('gst-plugins-good: rip CDs into flac and wav formats')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0bd5c31d53635588f46ad4d254866ff74356caee5edb45c1a3bce9c754cc6cb6')
+sha256sums=('c2dba51881902cad3593fc3b3dafd3c12038173a27c623350f1771a1bfbf09a7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD
index 5fd36fbb9..5b71fd746 100644
--- a/community/goocanvasmm/PKGBUILD
+++ b/community/goocanvasmm/PKGBUILD
@@ -1,9 +1,11 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 91035 2013-05-18 13:20:54Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Laurent Meunier <laurent@deltalima.net>
 
 pkgname=goocanvasmm
-pkgver=1.90.8
+pkgver=1.90.9
 pkgrel=1
 pkgdesc='C++ wrappers for goocanvas'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +14,7 @@ license=('GPL')
 depends=('goocanvas' 'gtkmm3')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz)
-sha256sums=('721649be4f8bbbb4589800c0b973522d2104a95172f9eefd7b93e3bf59ae8721')
+sha256sums=('a2f52fbff4f753602bb55ac8588201efd5f193c890df6dfc72004eaaf5daae92')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD
index 942b55e23..404255f32 100644
--- a/community/gputils/PKGBUILD
+++ b/community/gputils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88505 2013-04-19 06:14:12Z cinelli $
+# $Id: PKGBUILD 91611 2013-05-25 11:39:42Z bpiotrowski $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Johannes Martin <honzor@gmx.net>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=gputils
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PIC Programming Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gputils.sourceforge.net/"
diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD
index 6f8310913..a31f95cb8 100644
--- a/community/haskell-pandoc/PKGBUILD
+++ b/community/haskell-pandoc/PKGBUILD
@@ -5,7 +5,7 @@
 _hkgname=pandoc
 pkgname=haskell-pandoc
 pkgver=1.11.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Conversion between markup formats"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('GPL')
@@ -15,6 +15,9 @@ depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup'
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=$pkgname.install
 md5sums=('e895b22745affba37c0ba5e6e6d0f17c')
+provides=(pandoc)
+conflicts=(pandoc)
+replaces=(pandoc)
 
 build() {
   cd $_hkgname-$pkgver
@@ -22,7 +25,7 @@ build() {
     --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
+  runhaskell Setup register --gen-script
   runhaskell Setup unregister --gen-script
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD
index 7d8b4922f..5fcb53a3d 100644
--- a/community/hdapsd/PKGBUILD
+++ b/community/hdapsd/PKGBUILD
@@ -4,28 +4,21 @@
 
 pkgname=hdapsd
 pkgver=20090401
-pkgrel=5
+pkgrel=7
 pkgdesc='HDAPS userspace hard drive protection daemon'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/hdaps/'
 license=('GPL')
-depends=('glibc')
-backup=('etc/conf.d/hdapsd')
+depends=('glibc' 'bash')
 source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz"
-        'hdapsd.conf.d'
-        'hdapsd.rc.d'
-        'hdapsd.systemd'
-        'hdapsd.wrapper')
+        'hdapsd.systemd')
 md5sums=('897cee8b0192febd127470f3e9506aeb'
-         '07fc036c8717bf5a38bbc269ed38ad19'
-         '9ab70348da9751810a2bbac51e18ac75'
-         '4b1378d43dc9431982f6605265c24f3b'
-         '11270661f3a543268786a68bbe74a6bb')
+         '61ac40d4d77e57863da68d9fd94c58e7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make ${MAKEFLAGS}
 }
 
@@ -34,9 +27,5 @@ package() {
 
   make DESTDIR="${pkgdir}/" install
 
-  # install rc script and its configuration file
-  install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd"
-  install -Dm0755 "${srcdir}/hdapsd.rc.d" "${pkgdir}/etc/rc.d/hdapsd"
   install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service"
-  install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper"
 }
diff --git a/community/hdapsd/hdapsd.conf.d b/community/hdapsd/hdapsd.conf.d
deleted file mode 100644
index eb99fdc2c..000000000
--- a/community/hdapsd/hdapsd.conf.d
+++ /dev/null
@@ -1,22 +0,0 @@
-# DEVICE specifies the device to monitor, defaults to "sda".
-#DEVICE='sda'
-
-# If an ultrabay hard drive is inserted, the following can be used:
-#DEVICE=('sda' 'sdb')
-
-# SENSITIVITY is self explanatory, defaults to "15".
-#SENSITIVITY='15'
-
-# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase
-# when the built-in keyboard/mouse is used).
-#ADAPTIVE='yes'
-
-# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of
-# stderr/stdout).
-SYSLOG='yes'
-
-# Set FORCE to "yes" to force the kernel to use the unload heads feature on
-# some old hard drives for which support cannot be autodetected (don't use this
-# unless you're absolutely sure your hard drive really supports unloading
-# heads).
-#FORCE='yes'
diff --git a/community/hdapsd/hdapsd.rc.d b/community/hdapsd/hdapsd.rc.d
deleted file mode 100644
index f4e8a6b99..000000000
--- a/community/hdapsd/hdapsd.rc.d
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/hdapsd ] && . /etc/conf.d/hdapsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/var/run/hdapsd.pid
-PID=`cat ${PIDFILE} 2> /dev/null`
-	
-case "$1" in
-  start)
-    stat_busy "Starting hdapsd"
-
-    ## The daemon will try to autoload the kernel module
-    #if [ ! -d /sys/devices/platform/hdaps ]; then
-    #    stat_fail
-    #    echo "You need to load the hdaps kernel module."
-    #    exit 1
-    #fi
-
-    ## Set up options to the hdapsd daemon
-    HDAPSD_OPTS="-bp"
-    if [ -z "${DEVICE}" ]; then
-      HDAPSD_OPTS="${HDAPSD_OPTS} -d sda"
-    else
-      for i in ${DEVICE[@]}; do
-        HDAPSD_OPTS="${HDAPSD_OPTS} -d ${i}"
-      done
-    fi
-    [ ! -z "${SENSITIVITY}" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -s ${SENSITIVITY}"
-    [ "${ADAPTIVE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -a"
-    [ "${SYSLOG}" = "yes" ]   && HDAPSD_OPTS="${HDAPSD_OPTS} -l"
-    [ "${FORCE}" = "yes" ]    && HDAPSD_OPTS="${HDAPSD_OPTS} -f"
-    [ -z "${PID}" ] && /usr/sbin/hdapsd ${HDAPSD_OPTS}
-    if [ ${?} -gt 0 ]; then
-      stat_fail 
-    else
-      add_daemon hdapsd 
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping hdapsd"
-    [ ! -z "${PID}" ] && kill $PID &> /dev/null
-    if [ ${?} -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon hdapsd 
-      stat_done
-    fi
-    ;;
-  restart)
-    ${0} stop
-    sleep 1
-    ${0} start
-    ;;
-  *)
-    echo "usage: ${0} {start|stop|restart}"  
-esac
diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd
index 328699bc7..d3927d61e 100644
--- a/community/hdapsd/hdapsd.systemd
+++ b/community/hdapsd/hdapsd.systemd
@@ -5,7 +5,7 @@ After=syslog.target
 [Service]
 Type=forking
 PIDFile=/var/run/hdapsd.pid
-ExecStart=/usr/sbin/hdapsd-wrapper
+ExecStart=/usr/bin/hdapsd-wrapper
 ExecReload=/bin/kill -HUP ${MAINPID}
 
 [Install]
diff --git a/community/hdapsd/hdapsd.wrapper b/community/hdapsd/hdapsd.wrapper
deleted file mode 100644
index d74fd272d..000000000
--- a/community/hdapsd/hdapsd.wrapper
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd
-
-OPTS="-bp"
-
-if [ -z "${DEVICE}" ]; then
-  OPTS="${OPTS} -d sda"
-else
-  for i in ${DEVICE[@]}; do
-    OPTS="${OPTS} -d ${i}"
-  done
-fi
-
-[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}"
-[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a"
-[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l"
-[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f"
-
-/usr/sbin/hdapsd ${OPTS}
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 5c00b8aac..a85b6d751 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $
+# $Id: PKGBUILD 90673 2013-05-13 14:26:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
 pkgver=2.0
-pkgrel=3
+pkgrel=6
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://w1.fi/hostapd/"
@@ -23,13 +23,9 @@ backup=('etc/hostapd/hostapd.conf'
 install=hostapd.install
 source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	config
-	hostapd
-	hostapd.conf.d
 	hostapd.service)
 md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee'
          '5d7ee10b04e33f22c37be56a4c33dddb'
-         'd570327c385f34a4af24d3a0d61cea19'
-         'f169534b0f59b341f6df1a21e0344511'
          'a0a16879eed5e4e41ae6b225a4809955')
 
 build() {
@@ -41,10 +37,6 @@ build() {
 }
 
 package() {
-  # RC script
-  install -D hostapd "$pkgdir/etc/rc.d/hostapd"
-  install -Dm644 hostapd.conf.d "$pkgdir/etc/conf.d/hostapd"
-
   # Systemd unit
   install -Dm644 hostapd.service "$pkgdir/usr/lib/systemd/system/hostapd.service"
 
diff --git a/community/hostapd/hostapd b/community/hostapd/hostapd
deleted file mode 100644
index b4709d7bf..000000000
--- a/community/hostapd/hostapd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/hostapd
-
-case "$1" in
-  start)
-    stat_busy "Starting hostapd"
-    /usr/bin/hostapd -B -P ${HOSTAPD_PID} ${HOSTAPD_CONF} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon hostapd
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping hostapd"
-    [ -f ${HOSTAPD_PID} ] && kill `cat ${HOSTAPD_PID}` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon hostapd
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/hostapd/hostapd.conf.d b/community/hostapd/hostapd.conf.d
deleted file mode 100644
index 7a7bbc806..000000000
--- a/community/hostapd/hostapd.conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-HOSTAPD_PID="/var/run/hostapd.pid"
-HOSTAPD_CONF="/etc/hostapd/hostapd.conf"
diff --git a/community/hping/Makefile.patch b/community/hping/Makefile.patch
index dd53dd0a6..d1d4221f4 100644
--- a/community/hping/Makefile.patch
+++ b/community/hping/Makefile.patch
@@ -12,11 +12,11 @@ diff -Naur hping3-20051105/Makefile hping3-20051105-new/Makefile
 -	@if [ -d ${INSTALL_MANPATH}/man8 ]; then \
 -		cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \
 -		chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \
-+	@[ ! -d ${DESTDIR}/usr/sbin ] && install -d ${DESTDIR}/usr/sbin
-+	cp -f hping3 ${DESTDIR}/usr/sbin/
-+	chmod 755 ${DESTDIR}/usr/sbin/hping3
-+	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping
-+	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping2
++	@[ ! -d ${DESTDIR}/usr/bin ] && install -d ${DESTDIR}/usr/bin
++	cp -f hping3 ${DESTDIR}/usr/bin/
++	chmod 755 ${DESTDIR}/usr/bin/hping3
++	ln -s hping3 ${DESTDIR}/usr/bin/hping
++	ln -s hping3 ${DESTDIR}/usr/bin/hping2
 +	@[ ! -d ${DESTDIR}${INSTALL_MANPATH}/man8 ] && install -d ${DESTDIR}${INSTALL_MANPATH}/man8
 +	@if [ -d ${DESTDIR}${INSTALL_MANPATH}/man8 ]; then \
 +		cp ./docs/hping3.8 ${DESTDIR}${INSTALL_MANPATH}/man8; \
diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD
index f312479fb..d75938dec 100644
--- a/community/hping/PKGBUILD
+++ b/community/hping/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57877 2011-11-04 07:45:07Z lfleischer $
+# $Id: PKGBUILD 92024 2013-05-30 23:36:53Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=hping
 pkgver=3.0.0
-pkgrel=2.2
+pkgrel=3
 pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.hping.org'
@@ -14,7 +14,7 @@ source=("http://www.hping.org/hping3-20051105.tar.gz"
         'Makefile.patch'
         'bytesex.h.patch')
 md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747'
-         '3c6f920201fc980d377408917a28df93'
+         '339a38f86169d1b9344287a85201afbe'
          '8af8e336819df1447b0c1b879a704be9')
 
 build() {
diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 42cb74bb0..07c280b4b 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89408 2013-04-29 10:54:52Z arodseth $
+# $Id: PKGBUILD 90497 2013-05-12 23:11:39Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
@@ -10,7 +10,7 @@
 pkgname=hwinfo
 pkgver=20.1
 _subver=3.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Hardware detection tool from openSUSE'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://download.opensuse.org/source/factory/repo/oss/suse/src/'
@@ -41,6 +41,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make LIBDIR=/usr/lib DESTDIR="$pkgdir" install
+  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
   rmdir "$pkgdir/sbin"
 }
 
diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD
index 58e4491d7..858749946 100644
--- a/community/i2c-tools/PKGBUILD
+++ b/community/i2c-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $
+# $Id: PKGBUILD 92028 2013-05-30 23:36:57Z seblu $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=i2c-tools
 pkgver=3.1.0
-pkgrel=3
+pkgrel=5
 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/wiki/I2CTools"
@@ -15,7 +15,7 @@ source=(http://dl.lm-sensors.org/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz
 md5sums=('f15019e559e378c6e9d5d6299a00df21')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make
   make -C eepromer CFLAGS="$CFLAGS -I../include"
   cd py-smbus
@@ -24,8 +24,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
-  install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin"
+  make prefix="${pkgdir}/usr" sbindir="$pkgdir/usr/bin" install
+  install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin"
   cd py-smbus
   python2 setup.py install --prefix "${pkgdir}/usr"
   rm -rf "${pkgdir}/usr/include"
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index d8eb2f017..58f13bcc5 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87689 2013-04-05 09:27:30Z lcarlier $
+# $Id: PKGBUILD 91015 2013-05-17 22:04:55Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20130328
+pkgver=20130517
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -41,3 +41,5 @@ package() {
 
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+md5sums=('7846a62551352d7dae6f93f8255e9d99'
+         '8615526144f69ea4e870d9bc37df9b29')
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index e77b1f51d..4521e4873 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90320 2013-05-11 14:52:54Z fyan $
+# $Id: PKGBUILD 90641 2013-05-13 13:18:31Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-anthy
-pkgver=1.5.1
+pkgver=1.5.3
 pkgrel=1
 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache')
 makedepends=('swig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -34,4 +34,4 @@ package() {
   make DESTDIR=$pkgdir/ install
 }
 
-sha512sums=('ba5456d4b16c168ff90945c948109bd3bb9d64c145ae746a471789ef74a1e657a9f891e198ecf64b733c03880f81a28cc9cd2c1fa82ad006eb0ac6e7e5c2c3a5')
+sha512sums=('490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3')
diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD
index 39466d76c..f4a06dff8 100644
--- a/community/icecast/PKGBUILD
+++ b/community/icecast/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84031 2013-02-08 17:31:49Z lfleischer $
+# $Id: PKGBUILD 90559 2013-05-13 07:47:15Z lfleischer $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=icecast
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Streaming audio over the Internet'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,12 +15,10 @@ depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora')
 backup=('etc/icecast.xml'
         'etc/logrotate.d/icecast')
 source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'icecastd'
         'icecast.logrotate'
         'start-by-nobody.patch'
         'icecast.service')
 md5sums=('2b5d1b40778922e5f6431b7758c359ad'
-         'e823c1fdb080aae3d0c54ef8be95f7cb'
          '59c6552bcb1dd9fb542af8670dfabd3c'
          'd8e929d2214123a1954da4383bf16583'
          '1468e59f76de194579b615889e20198f')
@@ -43,8 +41,7 @@ package() {
   sed -i -e 's/icecast2/icecast/g' debian/icecast2.1
   install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1"
 
-  # install rc.d script and logrotate config (taken from Fedora)
-  install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast"
+  # install logrotate config (taken from Fedora)
   install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast"
 
   # create log directory
diff --git a/community/icecast/icecastd b/community/icecast/icecastd
deleted file mode 100644
index e6c91b08c..000000000
--- a/community/icecast/icecastd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-timeo=30
-
-getPID() {
-   pgrep -u nobody icecast 2>/dev/null
-}
-
-case $1 in
-  start)
-    stat_busy "Starting Icecast Server"
-    if getPID >/dev/null; then
-      # already running
-      stat_fail
-      exit 1
-    else
-      /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null
-      while (( timeo > 0 )); do
-        if getPID >/dev/null; then
-          add_daemon icecast
-          stat_done
-          exit 0
-        fi
-        sleep 1
-        (( timeo-- ))
-      done
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Icecast Server"
-    if ! getPID >/dev/null; then
-      # not running
-      stat_done
-      exit 1
-    fi
-    if ! kill $(getPID) &> /dev/null; then
-      stat_fail
-      exit 1
-    fi
-    while (( timeo > 0 )); do
-      if getPID >/dev/null; then
-        rm_daemon icecast
-        stat_done
-        exit 0
-      fi
-      sleep 1
-      (( timeo-- ))
-    done
-    stat_fail
-    exit 1
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD
index b84f8768b..abbb694e7 100644
--- a/community/idesk/PKGBUILD
+++ b/community/idesk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65602 2012-02-21 09:26:32Z spupykin $
+# $Id: PKGBUILD 90753 2013-05-13 15:08:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Claudio Sabattoli <gasherbrum3@alice.it>
 
@@ -16,14 +16,18 @@ md5sums=('beb48c97815c7b085e3b3d601297fbb8')
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  ./configure --prefix=/usr
-
-  sed -i '1,1i#include <unistd.h>' src/DesktopConfig.cpp
-  sed -i '1,1i#include <sys/stat.h>' src/DesktopConfig.cpp
-  sed -i '1,1i#include <sys/types.h>' src/DesktopConfig.cpp
+  sed -i \
+    -e '1,1i#include <unistd.h>' \
+    -e '1,1i#include <sys/stat.h>' \
+    -e '1,1i#include <sys/types.h>' \
+    src/DesktopConfig.cpp
+  sed -i 's#usr/local#usr#' examples/default.lnk
 
+  ./configure --prefix=/usr
   make
-  make DESTDIR=$pkgdir install
+}
 
-  sed -i 's#usr/local#usr#' $pkgdir/usr/share/idesk/default.lnk
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD
index 8ed1225fb..508beb19d 100644
--- a/community/iftop/PKGBUILD
+++ b/community/iftop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67935 2012-03-16 10:23:32Z giovanni $
+# $Id: PKGBUILD 92025 2013-05-30 23:36:54Z seblu $
 # Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
@@ -6,22 +6,20 @@
 
 pkgname=iftop
 pkgver=0.17
-pkgrel=10
+pkgrel=11
 pkgdesc="iftop does for network usage what top(1) does for CPU usage"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ex-parrot.com/~pdw/iftop/"
 license=('GPL')
 depends=('libpcap' 'ncurses')
 options=('!makeflags')
-source=(http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz)
+source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz")
 md5sums=('062bc8fb3856580319857326e0b8752d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --build=$CHOST
+  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD
index 6bebc58ed..00e4855c3 100644
--- a/community/igmpproxy/PKGBUILD
+++ b/community/igmpproxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80944 2012-12-07 13:00:49Z spupykin $
+# $Id: PKGBUILD 91494 2013-05-23 10:13:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: sda <sda00@himki.net>
 
 pkgname=igmpproxy
 pkgver=0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="a simple multicast router for Linux only using the IGMP protocol"
 arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/igmpproxy"
@@ -13,21 +13,18 @@ license=('GPL')
 depends=()
 backup=("etc/igmpproxy.conf")
 source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz"
-	"igmpproxy.rc.d"
 	"igmpproxy.service")
 md5sums=('c56f41ec195bc1fe016369bf74efc5a1'
-         '642054dd586e5b0e7f660863e8131f57'
-         '2ff8500f8a59cdfaf910e48cd54ab659')
+         '2a4387442ce00297d97371f729f8b21e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -Dm755 $srcdir/$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/igmpproxy/igmpproxy.rc.d b/community/igmpproxy/igmpproxy.rc.d
deleted file mode 100644
index 5b88e94f1..000000000
--- a/community/igmpproxy/igmpproxy.rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/igmpproxy`
-case "$1" in
-  start)
-    stat_busy "Starting igmpproxy routing daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/igmpproxy /etc/igmpproxy.conf &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      disown
-      add_daemon igmpproxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping igmpproxy routing daemon"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon igmpproxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/igmpproxy/igmpproxy.service b/community/igmpproxy/igmpproxy.service
index c10ec63b1..734d600ab 100644
--- a/community/igmpproxy/igmpproxy.service
+++ b/community/igmpproxy/igmpproxy.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf
+ExecStart=/usr/bin/igmpproxy /etc/igmpproxy.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index 6f526c274..a24c78732 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $
+# $Id: PKGBUILD 91949 2013-05-30 09:42:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=3
+pkgrel=6
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
@@ -14,17 +14,20 @@ depends=('gcc-libs' 'bash')
 install=incron.install
 options=('emptydirs')
 source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
-	'incron.init'
 	'incrond.service')
 md5sums=('67f8b671db8169edccc8ef11c7d2c8be'
-         '648e1ca1a4b1e624401d9d71aa3756b3'
-         '859a90af9e4efe40db381ea07167a66a')
+         '4be206ba6ecacd9d2006cdc72b4604db')
 
-build() {
+prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp
   sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp
   sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp
+  sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
   make
 }
 
@@ -39,6 +42,6 @@ package() {
     CFGDIR="${pkgdir}"/etc \
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
-  install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond
   install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/incron/incron.init b/community/incron/incron.init
deleted file mode 100644
index 337c0fa0b..000000000
--- a/community/incron/incron.init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting Incrond"
-        /usr/sbin/incrond
-        add_daemon incrond
-        stat_done
-        ;;
-    stop)
-        stat_busy "Stopping Incrond"
-        PID=`pidof -o %PPID /usr/sbin/incrond`
-	[ -z "$PID" ] || kill $PID
-        if [ $? -gt 0 ]; then
-            stat_fail        	
-        else
-            rm_daemon incrond
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/incron/incron.install b/community/incron/incron.install
index fa42d9cdc..9cb53bbe6 100644
--- a/community/incron/incron.install
+++ b/community/incron/incron.install
@@ -8,7 +8,6 @@ post_install () {
 
 pre_remove() {
   [ -h /var/service/incron ] && rm /var/service/incron
-  /etc/rc.d/incron stop
-  usr/sbin/userdel incron >& /dev/null
-  usr/sbin/groupdel incron >& /dev/null
+  userdel incron >& /dev/null
+  groupdel incron >& /dev/null
 }
diff --git a/community/incron/incrond.service b/community/incron/incrond.service
index 54fcfa9d2..d46814bf3 100644
--- a/community/incron/incrond.service
+++ b/community/incron/incrond.service
@@ -4,7 +4,7 @@ Description=Inotify System Scheduler
 [Service]
 Type=forking
 PIDFile=/run/incrond.pid
-ExecStart=/usr/sbin/incrond
+ExecStart=/usr/bin/incrond
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index 9ec3784ca..7ce438422 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82923 2013-01-25 21:39:24Z spupykin $
+# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Edward Tjörnhammar <xhemi@cube2.se>
 # Contributor: Edward Tjörnhammar <xhemi@cube2.se>
 
 pkgname=inn
 pkgver=2.5.3
-pkgrel=2
+pkgrel=6
 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
 url="http://www.isc.org/software/inn/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -47,18 +47,10 @@ backup=(etc/inn/newsfeeds
 	var/db/inn/history.index
 	var/db/inn/newsgroups)
 source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
-	innd.rc
-	nnrpd.rc
-	innd.conf
-	nnrpd.conf
 	innd.service
 	inn.tmpfiles
 	site.make.patch)
 md5sums=('353fe95232828ddbc80debff86c240bc'
-         'a243d9498568f1beee20da5684b5fbfc'
-         'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
-         'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
-         'bb4bbe86ae52fbbf08b0f6f370dea052'
          '9da925a486fcf0cd67fdf462cbb9c0b4'
          '050b7bffff3361c673a118739e42349e'
          '960c800026ed6e03901cf0bafdfd53d8')
@@ -96,7 +88,6 @@ build() {
 EOF
   sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global
   [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch
-  export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH
 
   make
 }
@@ -107,13 +98,6 @@ package() {
 
   make DESTDIR=$pkgdir install
 
-  mkdir -p $pkgdir/etc/{conf,rc}.d
-  install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd
-  install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd
-
-  install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd
-  install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd
-
   cd $pkgdir/usr/lib
   for i in lib*.a; do
 	gcc -shared -o ${i%%.a}.so.2.0.0 $i
diff --git a/community/inn/innd.conf b/community/inn/innd.conf
deleted file mode 100644
index 48f96ba5e..000000000
--- a/community/inn/innd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS_USER=news
-NEWS_GROUP=news
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
deleted file mode 100644
index 5e36aec0d..000000000
--- a/community/inn/innd.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd
-[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1;
-[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1;
-
-case "$1" in
-	start)
-		stat_busy "Starting InterNetNews"
-		[ -d /var/run/inn ] || {
-			mkdir -p /var/run/inn
-			chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn
-		}
-		su $NEWS_USER -c /usr/bin/rc.news 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			echo $! > /var/run/innd.pid
-			add_daemon innd
-			stat_done
-		fi
-
-	;;
-	stop)
-		stat_busy "Stopping InterNetNews"
-		ctlinnd throttle "shutting down" 2>&- >&-
-		su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&-
-			rm /var/run/innd.pid
-			rm_daemon innd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf
deleted file mode 100644
index 689a289ce..000000000
--- a/community/inn/nnrpd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-USE_SSL=1
-LISTEN_PORT=563
-NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf"
diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc
deleted file mode 100644
index d7c902832..000000000
--- a/community/inn/nnrpd.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd
-[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1;
-
-PID=`pidof -o %PPID nnrpd`
-case "$1" in
-	start)
-		stat_busy "Starting InterNetNews Readers Daemon"
-		if [ ! -f /var/run/nnrpd.pid ]; then
-			stat_append ":: InterNetNews (innd) is not running"
-			stat_fail
-			exit 1
-		fi
-		
-		[ -d /var/run/inn ] || mkdir -p /var/run/inn
-		[ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			PID=`pidof -o %PPID nnrpd`
-			echo $PID > /var/run/nnrpd.pid
-			add_daemon nnrpd
-			stat_done
-		fi
-
-	;;
-	stop)
-		stat_busy "Stopping InterNetNews Readers Daemon"
-		[ ! -z "$PID" ] && kill $PID >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm /var/run/nnrpd.pid
-			rm_daemon nnrpd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
index e084af3bc..1e66de54b 100644
--- a/community/inputattach/PKGBUILD
+++ b/community/inputattach/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $
+# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=inputattach
 pkgver=1.24
-pkgrel=6
+pkgrel=10
 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxconsole.sourceforge.net/"
@@ -12,13 +12,9 @@ license=('GPL')
 depends=('bash')
 makedepends=('gcc')
 backup=(etc/conf.d/inputattach)
-install=inputattach.install
-#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c'
-#	'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h'
 source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
 	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
 	'inputattach.conf.d'
-	'inputattach.rc.d'
 	'inputattach.service'
 	'inputattachctl'
 	'0001-Add-w8001-flag.patch'
@@ -26,9 +22,8 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
 md5sums=('eb595a766ca363edb3b14c25404596ce'
          '93d34d96cd3ad19ea1aeca7f68a66b4a'
          '7ca903e54829764c8241233af5069216'
-         'aa2e404fc113abdd2ab14e2a6352c331'
          'c19b9ed38b243191cf5378b87a42a4cc'
-         '84c6463660c10bd34c0390102da087d5'
+         '7dd0690a9d2fe5e1052900650906e273'
          'f1b3ddae308351357f557cbd5c6cda81'
          '8f76908449cae24a95adbf0bc0a17721')
 
@@ -48,9 +43,8 @@ build() {
 
 package() {
   cd "$srcdir/src"
-  install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
-  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
-  install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach"
+  install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
   install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
   install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
 }
diff --git a/community/inputattach/inputattach.install b/community/inputattach/inputattach.install
deleted file mode 100644
index d705bceaf..000000000
--- a/community/inputattach/inputattach.install
+++ /dev/null
@@ -1,16 +0,0 @@
-## arg 1:  the new package version
-
-post_upgrade() {
-  (( $(vercmp 1.24-3 $2) > 0 )) && cat <<EOF
-ATTENTION:
-  /etc/conf.d/inputattach.conf has been replaced by /etc/conf.d/inputattach
-  Make sure you adjust the new config file, which has a new format.
-EOF
-}
-
-post_install() {
-  cat << EOF
-The correct device mode and /dev device file will need to be set in
-/etc/conf.d/inputattach before starting /etc/rc.d/inputattach
-EOF
-}
diff --git a/community/inputattach/inputattach.rc.d b/community/inputattach/inputattach.rc.d
deleted file mode 100644
index eb626e199..000000000
--- a/community/inputattach/inputattach.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/inputattach
-
-case "$1" in
-  start)
-    stat_busy "Starting inputattach"
-    for param in "${IAPARAMS[@]}"; do
-      if ! /usr/sbin/inputattach --daemon $param; then
-        stat_fail
-        exit 1
-      fi
-    done
-
-    add_daemon inputattach
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping inputattach"
-    PID=`pidof -o %PPID /usr/sbin/inputattach`
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inputattach
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl
index 291c531ae..05dfa4af5 100755
--- a/community/inputattach/inputattachctl
+++ b/community/inputattach/inputattachctl
@@ -5,7 +5,7 @@
 case "$1" in
 	start)
 		for i in "${IAPARAMS[@]}"; do
-			/usr/sbin/inputattach --daemon $i || exit 1
+			/usr/bin/inputattach --daemon $i || exit 1
 		done
 		;;
 	stop)
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 126f175f5..9a9e81baa 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $
+# $Id: PKGBUILD 90936 2013-05-15 15:48:29Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.1.2
-_pkgver=129.354
+pkgver=12.1.3
+_pkgver=129.451
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('apache')
 depends=('glibc')
 options=(!strip)
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed')
+md5sums=('03aea501b9e1dc87a63a8c30399c4304')
 
 package() {
   cd "$srcdir"
diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD
index d7c799816..b9bc5b333 100644
--- a/community/ipguard/PKGBUILD
+++ b/community/ipguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65572 2012-02-21 09:01:48Z spupykin $
+# $Id: PKGBUILD 91832 2013-05-28 17:04:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ipguard
 pkgver=1.04
-pkgrel=2
+pkgrel=3
 pkgdesc="ipguard - arp<->ip relation checking tool"
 arch=(i686 x86_64 'mips64el')
 url="http://ipguard.deep.perm.ru/"
@@ -15,14 +15,20 @@ source=(http://ipguard.deep.perm.ru/files/$pkgname-$pkgver.tar.gz
 md5sums=('7f44f7c31876f0d68792f02047e25409'
          'b27cfc9e8ad4ef9459d7274a2e624831')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
-
   patch -Np1 <../build-fix-le.patch
+  sed -i 's|$(PREFIX)/sbin|$(PREFIX)/bin|g' Makefile
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
   CFLAGS="-DLIBNET_LIL_ENDIAN" make
-  make PREFIX=$pkgdir/usr install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make PREFIX=$pkgdir/usr install
   mkdir -p $pkgdir/usr/share
   mv $pkgdir/usr/man $pkgdir/usr/share/
 }
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index 9e89943fe..e953aaebc 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $
+# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
 
 pkgname=ipsec-tools
 pkgver=0.8.1
-pkgrel=1
+pkgrel=4
 pkgdesc="KAME IPSec tools ported to Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
@@ -13,16 +13,12 @@ makedepends=('linux-headers')
 license=('GPL')
 options=('!makeflags' '!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
-	racoon.rc
-	ipsec.rc
 	racoon.service
 	ipsec.service
 	ipsec-tools-linux-3.7-compat.patch)
 md5sums=('d38b39f291ba2962387c3232e7335dd8'
-         '416b8e362d86987b8c55f7153cdafbeb'
-         '90d0810267cbd847383ae3101699b192'
-         '1632fce55ba5592dea1f8bf661106e7d'
-         '5bf7478590c751b465617681a31619fe'
+         '3a64a9e3b498c6da90450ffb0b758aea'
+         '387a0b0c4f10e42b2bb62282885cdc9c'
          'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
@@ -32,17 +28,16 @@ build() {
   sed -i 's#-Werror##' configure.ac
 
   ./bootstrap
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
-	--enable-adminport --enable-gssapi
+	--enable-adminport --enable-gssapi \
+	--with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
-  install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
   install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service
   install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service
 }
diff --git a/community/ipsec-tools/ipsec.rc b/community/ipsec-tools/ipsec.rc
deleted file mode 100644
index cff472c59..000000000
--- a/community/ipsec-tools/ipsec.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Loading IPSec Security Policy Database..."
-    /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ipsec
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Unloading IPSec Security Policy Database..."
-    /usr/sbin/setkey -F -P
-    /usr/sbin/setkey -F
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ipsec
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service
index 3a6dea38b..483a5b58d 100644
--- a/community/ipsec-tools/ipsec.service
+++ b/community/ipsec-tools/ipsec.service
@@ -5,8 +5,8 @@ After=syslog.target network.target
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
-ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc
deleted file mode 100644
index 1a67dcac5..000000000
--- a/community/ipsec-tools/racoon.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/racoon`
-case "$1" in
-  start)
-    stat_busy "Starting Racoon IPSec daemon"
-    [ -z "$PID" ] && /usr/sbin/racoon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon racoon
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Racoon IPSec daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon racoon
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service
index 792cfd395..95324bd5d 100644
--- a/community/ipsec-tools/racoon.service
+++ b/community/ipsec-tools/racoon.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/racoon
+ExecStart=/usr/bin/racoon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 148ec1a7d..75d272a46 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90287 2013-05-10 23:18:07Z seblu $
+# $Id: PKGBUILD 90514 2013-05-12 23:45:55Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
 pkgver=6.19
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
@@ -14,11 +14,11 @@ options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.service")
 md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
-         'f74642f7bb88056103c63a62a91c782c')
+         '6be6a2b34c1f38fc8ad60828403e2077')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-kmod=no
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
   make
 }
 
diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service
index 1af453668..39183c7d7 100644
--- a/community/ipset/ipset.service
+++ b/community/ipset/ipset.service
@@ -5,8 +5,8 @@ Before=iptables.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/sbin/ipset destroy
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD
index 4b4450916..117243f2c 100644
--- a/community/iptstate/PKGBUILD
+++ b/community/iptstate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71896 2012-06-03 00:25:44Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 90516 2013-05-12 23:47:26Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=iptstate
 pkgver=2.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='top-like interface to netfilter connection-tracking table'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.phildev.net/iptstate/'
@@ -20,8 +20,8 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  install -D -m755 $pkgname "$pkgdir/usr/sbin/$pkgname"
+  install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname"
   install -D -m644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8"
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD
index 7e78d5906..7a3279978 100644
--- a/community/ipvsadm/PKGBUILD
+++ b/community/ipvsadm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83590 2013-02-03 14:26:41Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 90518 2013-05-12 23:51:34Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=ipvsadm
 pkgver=1.26
-pkgrel=7
+pkgrel=8
 pkgdesc='The IP Virtual Server administration utility'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxvirtualserver.org/software/ipvs.html'
@@ -22,9 +22,12 @@ md5sums=('eac3ba3f62cd4dea2da353aeddd353a8'
          'dc87684064f85b64c1e79c1eac336303'
          'e9fb77d2fbe2d3f41d60257316338543')
 
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch
+}
+
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../01-fix-not-showing-all-server.patch
   make
 }
 
@@ -33,7 +36,7 @@ package() {
   make \
     BUILD_ROOT="$pkgdir" \
     MANDIR=usr/share/man \
-    SBIN="$pkgdir/usr/sbin" \
+    SBIN="$pkgdir/usr/bin" \
     INIT="$pkgdir/etc/rc.d" \
     install
   popd
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index f03152b49..4bd49a92a 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $
+# $Id: PKGBUILD 92144 2013-06-01 12:22:16Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -9,12 +9,12 @@ pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
 pkgver=1.9.9.5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'celt' 'libsamplerate')
+makedepends=('python2' 'celt' 'opus' 'libsamplerate')
 [ "$CARCH" != "mips64el" ] && makedepends+=('libffado')
 source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
@@ -23,6 +23,10 @@ md5sums=('6c9de6b89db9d7076fa2ce222816cf4c'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
+_isbuild() {
+  printf "%s\n" ${pkgname[@]} | grep -qx $1
+}
+
 _pyfix() {
   sed -i 's:bin/env python:bin/env python2:' \
     "$pkgdir/usr/bin/jack_control"
@@ -42,24 +46,24 @@ _wafconf() {
   # see https://github.com/jackaudio/jack2/issues/22
 }
 
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-build() {
+prepare() {
   cd "$srcdir"
 
   # Some optimisation bug exists for current GCC
   # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
-  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
-  export CXXFLAGS="$CFLAGS"
+  #export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
+  #export CXXFLAGS="$CFLAGS"
 
   # fix doxygen building
-  # TODO: report upstream, but redundant until gihub issue 22 resolves
+  # TODO: report upstream, but redundant until github issue 22 resolves
   #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
 
   # we may do 2 different builds
   cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
+}
+
+build() {
+  cd "$srcdir"
 
   # mixed dbus/classic build
   if _isbuild jack2; then
@@ -84,7 +88,7 @@ package_jack2() {
   ! _isbuild jack2 && return 0
 
   pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate' 'celt')
+  depends=('libsamplerate' 'celt' 'opus')
   optdepends=('python2: jack_control')
   [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   conflicts=('jack')
@@ -110,7 +114,7 @@ package_jack2-dbus() {
   ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'celt')
+  depends=('libsamplerate' 'celt' 'opus')
   [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   optdepends=('python2: jack_control')
   conflicts=('jack' 'jack2')
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 880e6aaf6..54c750779 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83710 2013-02-04 14:57:08Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 90520 2013-05-12 23:55:17Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepalived.org/'
@@ -14,11 +14,11 @@ depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.service')
 md5sums=('8551a34ee048895dbe5350a031ff29c1'
-         'edbeda8c8777cf36110c1623e49bc5c9')
+         '0a5171f4298528315e8a8004b55befb7')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
@@ -31,10 +31,8 @@ package() {
   install -d -m 755 "$pkgdir/usr/share/$pkgname"
   mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples"
   # systemd
-  cd "$srcdir"
-  install -D -m 644 $pkgname.service \
+  install -D -m 644 "$srcdir/$pkgname.service" \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service
index b96a8f474..a1bbeabb3 100644
--- a/community/keepalived/keepalived.service
+++ b/community/keepalived/keepalived.service
@@ -3,7 +3,7 @@ Description=Keepalive Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/keepalived --dont-fork
+ExecStart=/usr/bin/keepalived --dont-fork
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index 7574d167c..7405e80dc 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,22 +1,29 @@
-# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $
+# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $
 # Maintainer:
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kmess.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'optipng')
 optdepends=('cabextract: provides winks support')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
 md5sums=('a2e57911713308bef81b9347135cc5dd')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix invalid PNG images to work with libpng 1.6
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
 build() {
   cd "${srcdir}"
   mkdir build
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index ae0c29e01..c452c7218 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76043 2012-09-09 20:57:42Z jlichtblau $
+# $Id: PKGBUILD 90852 2013-05-14 21:40:38Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vamp898 <vamp898@web.de>
@@ -8,7 +8,7 @@
 
 pkgname=kmymoney
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
@@ -19,8 +19,16 @@ replaces=('kmymoney2')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e')
+source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2
+        git-fixes.diff)
+sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e'
+            'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../git-fixes.diff
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff
new file mode 100644
index 000000000..21b0e2330
--- /dev/null
+++ b/community/kmymoney/git-fixes.diff
@@ -0,0 +1,43 @@
+commit 77209f84a85360e98d2e805d412956a8f2a77db3
+Author: Alex Merry <kde@randomguy3.me.uk>
+Date:   Fri Feb 1 15:31:54 2013 +0000
+
+    Fix build with GMP 5.1.0
+    
+    GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class
+    or mpf_class.  So we have to have an explicit conversion.
+    
+    BUG: 312481
+
+diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp
+index aeed135..5de7fa9 100644
+--- a/kmymoney/mymoney/mymoneymoney.cpp
++++ b/kmymoney/mymoney/mymoneymoney.cpp
+@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool
+   // be much better than using KGlobal::locale()->formatMoney.
+   bool bNegative = false;
+   mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
+-  mpz_class right = (valueRef() - mpq_class(left)) * denom;
++  mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
+ 
+   if (right < 0) {
+     right = -right;
+commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Mar 23 23:05:19 2012 +0100
+
+    Fix includes
+
+diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
+index ff217e3..d31bb02 100644
+--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
++++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "mymoneydatabasemgrtest.h"
+ #include <pwd.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ #include <QtTest/QtTest>
+
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index d5b2fd11f..5cfdaa45a 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $
+# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
 pkgver=4.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
 depends=('python2' 'libxss' 'qtwebkit')
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index 382994257..8f65fc769 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89963 2013-05-06 10:41:26Z spupykin $
+# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Danial Olsen <do@meyl.fo>
 
 pkgname=kvpnc
 pkgver=0.9.6a
-pkgrel=3
+pkgrel=4
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
 arch=(i686 x86_64 'mips64el')
 url="http://home.gna.org/kvpnc/"
@@ -13,15 +13,20 @@ depends=('kdelibs' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4' 'optipng')
 install=kvpnc.install
 source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2
-	kvpnc-0.9.6a-scriptsec.patch
-	kvpnc-0.9.6a-gcc47.patch)
+        "vpnc-paths.patch")
 md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7'
-	 'a0ee8caabf56732b8481a426e02f881b'
-	 '9725f5a005dca1e3d1cba86a8e52360a')
+         '4bf6a10c7be84656723183b876cbaf9d')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-kde4"
+
+  patch -Np0 <"$srcdir/vpnc-paths.patch"
+
+  sed -i '1,1i#include <unistd.h>' src/kvpnc.cpp
+}
 
 build() {
   cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
 
   export LDFLAGS=-lX11
   mkdir build
diff --git a/community/kvpnc/vpnc-paths.patch b/community/kvpnc/vpnc-paths.patch
new file mode 100644
index 000000000..5dc66638d
--- /dev/null
+++ b/community/kvpnc/vpnc-paths.patch
@@ -0,0 +1,20 @@
+--- src/kvpncconfig.cpp.orig	2013-05-19 14:37:11.867517045 -0400
++++ src/kvpncconfig.cpp	2013-05-19 14:37:31.702107829 -0400
+@@ -865,7 +865,7 @@
+     enableDebugXl2tpdtunnel = QVariant(configgroup.readEntry("EnableDebugXl2tpdtunnel", false)).toBool();
+ 
+ 
+-    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/sbin/vpnc");
++    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/bin/vpnc");
+     pathToCiscoVpnc = configgroup.readEntry("Path to vpnclient", "/usr/local/bin/vpnclient");
+     pathToSetkey = configgroup.readEntry("Path to setkey", "/usr/sbin/setkey");
+     pathToRacoon = configgroup.readEntry("Path to racoon", "/usr/sbin/racoon");
+@@ -1489,7 +1489,7 @@
+ void KVpncConfig::checkStandardPathValues()
+ {
+     if (pathToVpnc.isEmpty())
+-        pathToVpnc = "/usr/sbin/vpnc";
++        pathToVpnc = "/usr/bin/vpnc";
+ 
+     if (pathToCiscoVpnc.isEmpty())
+         pathToCiscoVpnc = "/usr/local/bin/vpnclient";
diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index 6e2ce806d..58a1a1858 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $
+# $Id: PKGBUILD 91512 2013-05-23 11:13:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=leafnode
 pkgver=1.11.8
-pkgrel=5.1
+pkgrel=6
 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://leafnode.sourceforge.net/"
@@ -15,11 +15,11 @@ backup=('etc/xinetd.d/leafnode')
 source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	leafnode.xinetd)
 md5sums=('a3edafeb854efaa3fbb0f7951d02160f'
-         'db3c6ad1ff9fc03442949456d1d21304')
+         '08cd0a81d6efe0803b5d0747ab31903f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode --sbindir=/usr/bin \
 	--with-user=9 \
 	--with-group=13
   sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h
diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install
index 5f8a74c04..8c5f10484 100644
--- a/community/leafnode/leafnode.install
+++ b/community/leafnode/leafnode.install
@@ -1,7 +1,7 @@
 post_install() {
   echo "-- Adding user 'news' and group 'news', chowning /var/spool/news"
-  grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
-  grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
+  grep -e "^news:" etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
+  grep -e "^news:" etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
   chown -R root:news etc/leafnode
   # create dir if necessary
   if [ ! -d var/spool/news ]; then
diff --git a/community/leafnode/leafnode.xinetd b/community/leafnode/leafnode.xinetd
index 94c7c6ca7..98b5c24e0 100644
--- a/community/leafnode/leafnode.xinetd
+++ b/community/leafnode/leafnode.xinetd
@@ -7,7 +7,7 @@ service nntp
 	socket_type		= stream
 	wait			= no
 	user			= news
-	server			= /usr/sbin/leafnode
+	server			= /usr/bin/leafnode
 	log_type		= SYSLOG news
 	log_on_success		+= USERID
 	log_on_failure		+= USERID
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
index 1e372f88d..ebdf1db17 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/community/libaccounts-qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $
+# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
 _pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
-pkgver=1.6
-pkgrel=2
+pkgver=1.7
+pkgrel=1
 pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
@@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 options=('!emptydirs')
 source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
-sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5')
+sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d')
 
 build() {
   cd "$srcdir/$_pkgbase-$pkgver"
@@ -22,7 +22,7 @@ build() {
   # Do not install tests
   echo 'INSTALLS =' >>tests/accountstest.pro
 
-  qmake PREFIX=/usr LIBDIR=/usr/lib
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
diff --git a/community/libaio/PKGBUILD b/community/libaio/PKGBUILD
deleted file mode 100644
index 5d4dfa04c..000000000
--- a/community/libaio/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Thomas S Hatch <thatch45 at gmail dot com>
-
-pkgname=libaio
-pkgver=0.3.109
-_patchver=${pkgver}-2
-pkgrel=6
-pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://lse.sourceforge.net/io/aio.html"
-license=('LGPL')
-source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
-http://ftp.de.debian.org/debian/pool/main/liba/${pkgname}/${pkgname}_${_patchver}.debian.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Debian patches for extra arches
-  patch -Np1 -i ../debian/patches/00_arches.patch
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir/usr" install
-}
-
-md5sums=('435a5b16ca6198eaf01155263d855756'
-         'f942fe72127b612b93636387de47001b')
diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD
deleted file mode 100644
index be6488340..000000000
--- a/community/libcompizconfig/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 68306 2012-03-21 10:40:24Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=libcompizconfig
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz configuration system library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification'
-	'libxml++')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('libcompizconfig-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!emptydirs' '!libtool')
-sha1sums=('8ea1f15fd9e1e2eb37a9814646659a31a8018fd8')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \
-	-I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc 
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index 2ba06e4b6..2b2493659 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $
+# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: James Fryman <jfryman@gmail.com>
 
 pkgname=libdnet
 pkgver=1.12
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A simplified, portable interface to several low-level networking routines"
 arch=(i686 x86_64 'mips64el')
 makedepends=(python2)
@@ -19,7 +19,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in
   autoreconf -I config --force --install
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index 133b11128..a46834697 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $
+# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libee
 pkgver=0.4.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ md5sums=('7bbf4160876c12db6193c06e2badedb2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make -j1
 }
 
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index 8c8a70e8f..36de8c0e7 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 87026 2013-03-25 19:19:10Z bpiotrowski $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 91044 2013-05-18 13:45:43Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jan@jgc.homeip.net>
 
 pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
-pkgver=4.99.6
-pkgrel=2
+pkgver=4.99.7
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
 url="http://www.gtkmm.org/"
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d1b7e5101c192695e1fad96f6371d4c2362adb3e8f452f2cb2c89e4380d4f492')
+sha256sums=('5b864ddc7d5555c6c2d7fb5c6a3856c690911d12837148511a7b9f85100ca06c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD
index 8567024bb..0729a7e0f 100644
--- a/community/libident/PKGBUILD
+++ b/community/libident/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 67228 2012-03-05 13:41:53Z arodseth $
+# $Id: PKGBUILD 90500 2013-05-12 23:26:42Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
-#
-# TODO: Write a pkg-conf file
 
 pkgname=libident
 pkgver=0.32
-pkgrel=3
-pkgdesc="New libident C library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.remlab.net/libident/"
+pkgrel=5
+pkgdesc='Library for querying IDENT servers'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.remlab.net/libident/'
 license=('custom')
-options=('!libtool')
-source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz")
-sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b')
+depends=('glibc')
+options=('!emptydirs' '!libtool')
+source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz"
+        'libident.pc')
+sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b'
+            '81907cda4fe9c925e78bf58bc9c61d1af439784e4f01da4bd6fc7e4d87750f5c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man
   make
@@ -29,6 +31,7 @@ package() {
 
   make DESTDIR="$pkgdir" install
   install -Dm755 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 "$srcdir/libident.pc" "$pkgdir/usr/lib/pkgconfig/libident.pc"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libident/libident.pc b/community/libident/libident.pc
new file mode 100644
index 000000000..835504e9a
--- /dev/null
+++ b/community/libident/libident.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libident
+Description: IDENT query library
+Version: 0.32
+Libs: -L${libdir} -lident 
+Cflags: -I${includedir}
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 81d516f9f..61ddcef5d 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $
+# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  hydro <hydro@freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.62
+pkgver=0.7.63
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
 	libmediainfo-0.7.50-libmms.patch)
-md5sums=('df890b982250711055f5cb6d948251bb'
+md5sums=('7a50881744a29dac6f93a8f6cbaebc0c'
          '2f4b21cc250f663d52b497dedb963e3b')
 
 build() {
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index f50a9ff4c..f25d774f7 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83452 2013-02-01 11:36:01Z foutrelis $
+# $Id: PKGBUILD 90890 2013-05-15 08:03:49Z bpiotrowski $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
 pkgver=1.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libmemcached.org/"
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
index 7c2a9b61f..c8dd1ff0b 100644
--- a/community/libpaper/PKGBUILD
+++ b/community/libpaper/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83644 2013-02-04 09:47:51Z arodseth $
+# $Id: PKGBUILD 90780 2013-05-13 21:25:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: royrocks <royrocks13@gmail.com>
 
 pkgname=libpaper
 pkgver=1.1.24
-pkgrel=4
+pkgrel=5
 pkgdesc='Library for handling paper characteristics'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://packages.debian.org/unstable/source/libpaper'
@@ -17,13 +17,18 @@ sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver+nmu2"
-  ./configure --prefix=/usr --sysconfdir=/etc
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver+nmu2"
-  make prefix="$pkgdir/usr" install
+
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libseccomp/PKGBUILD b/community/libseccomp/PKGBUILD
deleted file mode 100644
index 9bdaee4fc..000000000
--- a/community/libseccomp/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws>
-
-pkgname=libseccomp
-pkgver=2.0.0
-pkgrel=2
-pkgdesc='Enhanced seccomp library'
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://sourceforge.net/projects/libseccomp/"
-depends=('glibc')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f988feac6a3425f2c918f32b28df1caa')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD
index 69383dcda..6684a6e83 100644
--- a/community/libtorrent/PKGBUILD
+++ b/community/libtorrent/PKGBUILD
@@ -1,19 +1,21 @@
+# $Id: PKGBUILD 90569 2013-05-13 09:41:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: sh__
 
 pkgname=libtorrent
-pkgver=0.13.2
+pkgver=0.13.3
 pkgrel=2
 pkgdesc='BitTorrent library with a focus on high performance and good code'
 url='http://libtorrent.rakshasa.no/'
-license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libsigc++2.0' 'openssl')
-options=('!libtool')
+license=('GPL')
+depends=('openssl')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('4f34a744fbe10c54aaf53d34681fabc1a49d7257')
+sha1sums=('e65a20b9e6d5c04b4e0849543d58befb60d948b7')
+
+options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD
index 0419da5e8..375d6aa79 100644
--- a/community/libtxc_dxtn/PKGBUILD
+++ b/community/libtxc_dxtn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $
+# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=libtxc_dxtn
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64 mips64el)
-pkgdesc="Texture compression library for Mesa"
+pkgdesc="S3 Texture Compression (S3TC) library for Mesa"
 url="http://dri.freedesktop.org/wiki/S3TC"
 license=(custom:BSD)
 depends=(mesa)
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
index ff1143354..03f8fe40b 100644
--- a/community/libuser/PKGBUILD
+++ b/community/libuser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $
+# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=libuser
 pkgver=0.59
-pkgrel=1
+pkgrel=2
 pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -21,6 +21,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --disable-gtk-doc-html \
     --disable-rpath
   sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 1619b5b1e..b44eabbc9 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89909 2013-05-05 14:49:00Z spupykin $
+# $Id: PKGBUILD 92095 2013-05-31 13:59:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.0.5
-pkgrel=1
+pkgrel=7
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -31,15 +31,11 @@ backup=('etc/conf.d/libvirtd'
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
 source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
-	libvirtd.rc.d
 	libvirtd.conf.d
-	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
 md5sums=('91c4145f49bcf92e89470fa3fb28fff6'
-         'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
-         '0ee5b6c58590ff392a266f20f7928d1f'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '020971887442ebbf1b6949e031c8dd3f')
 
@@ -54,21 +50,18 @@ build() {
   done
 
   export LDFLAGS=-lX11
-  export RADVD=/usr/sbin/radvd
-  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
+  export RADVD=/usr/bin/radvd
+  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \
 	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
 	--with-init-script=systemd --with-audit \
 	--with-qemu-user=nobody --with-qemu-group=nobody \
-	--without-netcf --with-interface
+	--without-netcf --with-interface \
+	--with-dnsmasq-path=/usr/bin/dnsmasq \
+	--with-iptables-path=/usr/bin/iptables
   make
 
-  sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service
-  sed -i \
-    -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \
-    -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \
-    -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \
-    tools/libvirt-guests.service
-  sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service
+  sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service
+  sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service
   sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
 }
 
@@ -77,17 +70,13 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
   install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
-
-  install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests
   install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
 
   # systemd stuff
   install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
   mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
 
-
   rm -rf \
 	"$pkgdir"/var/run \
 	"$pkgdir"/etc/sysconfig \
diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d
deleted file mode 100644
index 3100b34fb..000000000
--- a/community/libvirt/libvirtd-guests.rc.d
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash
-
-source /etc/conf.d/libvirtd-guests
-[ -f /etc/rc.conf ] && source /etc/rc.conf
-
-if [ -f /etc/rc.d/functions ]; then
-    . /etc/rc.d/functions
-else
-    stat_busy() {
-        echo "$*"
-    }
-
-    stat_fail() {
-        echo "FAIL"
-    }
-
-    stat_done() {
-        echo "DONE"
-    }
-
-    add_daemon() {
-        true
-    }
-
-    rm_daemon() {
-        true
-    }
-fi
-
-
-LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list"
-
-# get guest state by name
-libvirt_get_guest_state()
-{
-	virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}'
-}
-
-# list IDs of running guests
-libvirt_list()
-{
-
-	list=$(virsh $LIBVIRTD_URI list)
-
-	if [ $? -ne 0 ]; then
-		RETVAL=1
-		return 1
-	fi
-
-	uuids=
-	for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do
-		uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}')
-		if [ -z "$uuid" ]; then
-			RETVAL=1
-			return 1
-		fi
-		uuids="$uuids $uuid"
-	done
-
-	echo $uuids
-
-}
-
-libvirt_domname()
-{
-	uuid=$1
-	name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}')
-
-	echo $name
-}
-
-# suspend guest by name
-libvirt_suspend()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" == "xshut" ] && return 0
-	done
-	return 1
-}
-
-# shutdown guest by name
-libvirt_shutdown()
-{
-	virsh $LIBVIRTD_URI shutdown "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" == "xshut" ] && return 0
-	done
-	return 1
-}
-
-# start guest by name
-libvirt_start()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null
-}
-
-# stop all guests
-libvirt_stop_all()
-{
-	mkdir -p `dirname $LIBVIRTD_LISTFILE`
-	echo -n >$LIBVIRTD_LISTFILE
-
-	for i in `libvirt_list`; do
-		name=`libvirt_domname $i`
-		if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then
-			stat_busy "Suspending libvirtd/$name guest"
-			libvirt_suspend "$i"
-		else
-			stat_busy "Shutting libvirtd/$i guest down"
-			libvirt_shutdown "$i"
-		fi
-		[ $? -eq 0 ] && stat_done || stat_fail
-		echo $i >>$LIBVIRTD_LISTFILE
-	done
-}
-
-# start all guests
-libvirt_start_all()
-{
-	if [ -f $LIBVIRTD_LISTFILE ]; then
-		for i in `cat $LIBVIRTD_LISTFILE`; do
-			name=`libvirt_domname $i`
-			stat_busy "Starting/resuming libvirtd/$name guest"
-			libvirt_start "$i"
-			[ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail
-		done
-	fi
-	rm -f $LIBVIRTD_LISTFILE
-}
-
-# main
-LC_ALL=C
-LANG=C
-case "$1" in
-    start)
-		libvirt_start_all
-		add_daemon libvirtd-guests
-	;;
-    stop)
-		libvirt_stop_all
-		rm_daemon libvirtd-guests
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-	echo $"Usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d
deleted file mode 100644
index 193bffa9c..000000000
--- a/community/libvirt/libvirtd.rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/libvirtd
-. /etc/rc.d/functions
-
-LIBVIRTD_CONFIG_ARGS=
-if [ -n "$LIBVIRTD_CONFIG" ]
-then
-	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-fi
-
-PID=`pidof -o %PPID /usr/sbin/libvirtd`
-case "$1" in
-    start)
-	stat_busy "Starting libvirtd"
-	export RADVD=/usr/sbin/radvd
-	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
-		[ -d $i ] || mkdir -p $i
-	done
-	[ -z "$PID" ] && (
-		mkdir -p /var/{cache,run}/libvirt
-		rm -rf /var/cache/libvirt/*
-		KRB5_KTNAME=$KRB5_KTNAME \
-			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon libvirtd
-		stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping libvirtd"
-	[ ! -z "$PID" ]  && (
-		kill $PID &> /dev/null
-		rm -rf /var/cache/libvirt/*
-		rm -f /var/run/libvirtd.pid
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon libvirtd
-		stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    reload)
-	stat_busy "Reloading libvirtd configuration"
-	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		stat_done
-	fi
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 322ca3466..4290c6d99 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74891 2012-08-09 07:50:09Z spupykin $
+# $Id: PKGBUILD 90922 2013-05-15 13:46:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: hydro <hydro@freenet.de>
 
 pkgname=libzen
-pkgver=0.4.28
+pkgver=0.4.29
 pkgrel=1
 pkgdesc="shared library for libmediainfo and mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('gcc-libs')
 makedepends=('libtool' 'automake' 'autoconf')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('f09e519b71e61a7226ffefe55d00eadf')
+md5sums=('a103218d3438c63fe246cda71ad0ca88')
 
 build() {
   cd $srcdir/ZenLib/Project/GNU/Library
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index 9830537de..e678e2998 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 90483 2013-05-12 21:57:46Z alucryd $
+# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk2-greeter
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/lightdm-gtk-greeter"
 license=('GPL3' 'LGPL3')
 depends=('gtk2' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/2/}")
+conflicts=("${pkgname/2/3}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
 source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
-sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621')
+sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc')
 
 build() {
   cd "${srcdir}"/${pkgname/2/}-${pkgver}
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index caf7451c8..deab1db66 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90482 2013-05-12 21:57:34Z alucryd $
+# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk3-greeter
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
@@ -13,9 +13,10 @@ license=('GPL3' 'LGPL3')
 depends=('gtk3' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/3/}")
+conflicts=("${pkgname/3/2}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
 source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
-sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621')
+sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc')
 
 build() {
   cd "${srcdir}"/${pkgname/3/}-${pkgver}
diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/community/llvm-amdgpu-snapshot/PKGBUILD
deleted file mode 100644
index 65dd5a138..000000000
--- a/community/llvm-amdgpu-snapshot/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 87738 2013-04-05 20:58:51Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Anders Bergh <anders@archlinuxppc.org>
-# Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com>
-
-pkgname=llvm-amdgpu-snapshot
-pkgver=20130403
-pkgrel=1
-pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support'
-arch=('i686' 'x86_64')
-url="http://llvm.org"
-license=('custom:University of Illinois/NCSA Open Source License')
-depends=('libffi' 'python2' 'ocaml')
-conflicts=('llvm')
-source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz)
-md5sums=('4baa7b8da9eff4811952b6f855c141ca')
-
-build() {
-  cd "$srcdir"/llvm-c*
-
-  sed -i 's/python$/python2/' utils/llvm-build/llvm-build
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  # Force the use of GCC instead of clang
-  PYTHON=python2 CC=gcc CXX=g++ \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --enable-experimental-targets=R600 \
-    --disable-expensive-checks \
-    --with-binutils-include=/usr/include \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package() {
-  cd "$srcdir"/llvm-c*
-
-  make DESTDIR="$pkgdir" install
-
-  # Remove useless files
-  rm -r "$pkgdir"/usr/{docs,lib/ocaml}
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/lib*.a
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 1d511ce1b..fd8973a58 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $
+# $Id: PKGBUILD 91516 2013-05-23 11:14:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 # Contributor: Chuck Yang <Chuck.Yang@gmail.com>
 
 pkgname=lshw
 pkgver=B.02.16
-pkgrel=4
+pkgrel=5
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
 license=('GPL')
@@ -19,14 +19,14 @@ md5sums=('67479167add605e8f001097c30e96d0d')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop
-  make
-  make gui
+  make SBINDIR=/usr/bin
+  make SBINDIR=/usr/bin gui
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-  make DESTDIR=$pkgdir/ install-gui
+  make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install
+  make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install-gui
   install -Dm0644 src/gui/integration/gtk-lshw.desktop $pkgdir/usr/share/applications/gtk-lshw.desktop
   install -Dm0644 src/gui/integration/gtk-lshw.pam $pkgdir/usr/share/doc/$pkgname/gtk-lshw.pam
   install -Dm0644 src/gui/integration/console.apps $pkgdir/usr/share/doc/$pkgname/console.apps
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index d480fae5f..4dc3c6229 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $
+# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,25 +8,32 @@
 pkgname=lxc
 pkgver=0.9.0
 epoch=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl' 'libseccomp')
+makedepends=('docbook2x')
+optdepends=('arch-install-scripts: for archlinux template')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
 md5sums=('8552a4479090616f4bc04d8473765fc9')
 
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac
+}
+
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./autogen.sh
   ./configure \
-	--prefix=/usr \
-	--localstatedir=/var \
-	--libexecdir=/usr/bin \
-	--sysconfdir=/etc \
-	--disable-apparmor \
-	--disable-doc \
-        --enable-seccomp
+    --prefix=/usr \
+    --localstatedir=/var \
+    --libexecdir=/usr/bin \
+    --sysconfdir=/etc \
+    --disable-apparmor \
+    --enable-seccomp
   make
 }
 
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index da8dd8dc9..e79668599 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $
+# $Id: PKGBUILD 91463 2013-05-23 00:34:07Z dwallace $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=21
+pkgrel=22
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
@@ -13,6 +13,7 @@ license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'xorg-server')
 makedepends=('intltool')
+optdepends=('librsvg: display the default background')
 install=${pkgname}.install
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
@@ -25,13 +26,27 @@ source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
 		lxdm-0.4.1-industrial-greeter-ui.patch
 		lxdm-0.4.1-modern-systems.patch
 		lxdm-0.4.1-nolang-show-sessions.patch
-		lxdm-0.4.1-pam-env-vars.patch)
+		lxdm-0.4.1-pam-env-vars.patch
+        lxdm-0.4.1-kill_user_processes.patch
+        )
+md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         '9cc734228696a3c6f06d91bba61b03c1'
+         'b86317143ae44d7ed38c150fe4f25502'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         'c50dd01b715b0a236407d48066191601'
+         'a1e3c46a8bef691bc544028f5b6cfe22'
+         '2c4afdbe3532be4f90d8f6240d352766'
+         'baed9055e8825a5511712bc095197519'
+         '28475239d0c8b4fd778ec49f5ec72962'
+         '4c1d43e81e9a256e8d1ea7686c24b3d3'
+         '3ac63085f9df9296dfa645fa623af0e2')
 
 prepare(){
     cd $srcdir/$pkgname-$pkgver
     patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch
     patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch
     patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch
 }
 
 build() {
@@ -65,14 +80,3 @@ package() {
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
 }
-
-md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'b86317143ae44d7ed38c150fe4f25502'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         'c50dd01b715b0a236407d48066191601'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         'baed9055e8825a5511712bc095197519'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3')
diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
new file mode 100644
index 000000000..f267b105a
--- /dev/null
+++ b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
@@ -0,0 +1,35 @@
+diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c
+--- lxdm/src/xconn.c	2012-12-23 19:27:04.512531088 -0800
++++ lxdm/src/xconn.c	2012-12-23 19:28:31.659227448 -0800
+@@ -172,7 +172,7 @@
+ 	free(c);
+ }
+ 
+-#if 0
++//#if 0
+ static xcb_window_t xconn_get_root(xconn_t c)
+ {
+ 	const xcb_setup_t *setup;
+@@ -181,11 +181,11 @@
+ 	xcb_screen_t *screen = iter.data;
+ 	return screen->root;
+ }
+-#endif
++//#endif
+ 
+ void xconn_clean(xconn_t c)
+ {
+-#if 0
++//#if 0
+ 	xcb_query_tree_cookie_t wintree;
+ 	xcb_query_tree_reply_t *rep;
+ 	xcb_window_t *children;
+@@ -202,7 +202,7 @@
+ 		xcb_kill_client(c->c,children[i]);
+ 	free(rep);
+ 	xcb_flush(c->c);
+-#endif
++//#endif
+ }
+ 
+ #endif
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 4d1285dc5..875dc59e3 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -1,18 +1,21 @@
 post_install() {
-    if ! getent group lxdm > /dev/null ; then
-        groupadd --system lxdm
-        chgrp -R lxdm /var/lib/lxdm
-        chgrp lxdm /etc/lxdm/lxdm.conf
-        chmod +r /etc/lxdm/lxdm.conf
-    fi
+  getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm
+  getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm
+  chown -R 121:121 /var/lib/lxdm
+  chgrp 121 /etc/lxdm/lxdm.conf
+  chmod +r /etc/lxdm/lxdm.conf
 }
 
 post_upgrade() {
-    post_install $1
+  post_install $1
+  if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then
+    groupmod -g 121 lxdm
+    usermod -g 121 -u 121 lxdm
+  fi
 }
 
 post_remove() {
-    if ! getent group lxdm > /dev/null ; then
-        groupdel lxdm
-    fi
+  userdel -f lxdm
+  groupdel lxdm
+  true
 }
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 30889c09c..ef87348b4 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $
+# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=mailutils
 pkgver=2.2
-pkgrel=4
+pkgrel=5
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/mailutils/"
 license=('GPL')
 depends=('libldap' 'pam' 'gnutls' 'guile')
-makedepends=('python2' 'emacs')
-optdepends=('python2')
+makedepends=('emacs')
 conflicts=('libsieve')
 install=mailutils.install
 options=(zipman !emptydirs)
-source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
-md5sums=('834d2f616b922856127ecfe6c2de7d1a')
+source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2
+	build-fix.patch)
+md5sums=('834d2f616b922856127ecfe6c2de7d1a'
+         'e83709ffdcdb257dfab443ef77c89574')
 
-build() {
+prepare() {
   cd "$srcdir/mailutils-$pkgver"
+  patch -p1 <$srcdir/build-fix.patch
+}
 
-  py2=`pacman -Q python2 | cut -d\  -f2 | cut -d. -f1-2`
-  py3=`pacman -Q python | cut -d\  -f2 | cut -d. -f1-2`
-
-  export PYTHON=/usr/bin/python2
-  export PYTHON_CONFIG=/usr/bin/python2-config
-  export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
-
+build() {
+  cd "$srcdir/mailutils-$pkgver"
   [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
 	--libexecdir=/usr/lib/$pkgname --without-fribidi \
-	--without-tcp-wrappers
-#  [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
+	--without-tcp-wrappers --sbindir=/usr/bin
   make -j1
 }
 
diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch
new file mode 100644
index 000000000..ec4afd5e3
--- /dev/null
+++ b/community/mailutils/build-fix.patch
@@ -0,0 +1,13 @@
+diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in
+--- mailutils-2.2/lib/Makefile.in	2010-09-08 13:58:58.000000000 +0400
++++ mailutils-2.2.q/lib/Makefile.in	2013-05-29 14:51:14.064888989 +0400
+@@ -1861,7 +1861,8 @@
+ 	      -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+ 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
++	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
++	      -e 's|_GL_WARN_ON_USE (gets.*||'; \
+ 	} > $@-t && \
+ 	mv $@-t $@
+ 
diff --git a/community/makedev/PKGBUILD b/community/makedev/PKGBUILD
index d6cf65b99..03d6bff3d 100644
--- a/community/makedev/PKGBUILD
+++ b/community/makedev/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 90528 2013-05-13 00:22:02Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Jonathan Liu <net147@gmail.com>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=makedev
 pkgver=3.23_1
-pkgrel=1.1
+pkgrel=2
 pkgdesc='The ubiquitous script to create static device nodes'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -21,7 +21,9 @@ build() {
 
 package() {
   cd ${pkgname^^*}-${pkgver/_*}
-  make DESTDIR="${pkgdir}" devdir=/usr/sbin makedevdir=/usr/sbin install
+  # We make devdir == makedevdir to avoid install script to symlink into /dev
+  # As previous make doesn't have a bad devdir, everything goes well
+  make DESTDIR="$pkgdir" devdir=/usr/bin makedevdir=/usr/bin sbindir=/usr/bin install
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 9e0adc01d..4e959e0fa 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $
+# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130411
+pkgver=20130530
 pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
@@ -14,11 +14,14 @@ makedepends=('git')
 options=('docs')
 backup=('etc/mcelog/mcelog.conf')
 source=("git://github.com/andikleen/mcelog.git"
-	"${pkgname}.rc"
 	"mcelog.service")
 md5sums=('SKIP'
-         'f039a77d7bde3518d3d695b144816e8a'
-         'b71eb82e532aed3918ebf6b30e158e7f')
+         'afd7fc2b7a2f92a75e040b23d6b15958')
+
+prepare() {
+  cd "${srcdir}/mcelog"
+  sed -i 's|sbin|bin|g' Makefile mcelog.cron
+}
 
 build() {
   cd "${srcdir}/mcelog"
@@ -29,8 +32,7 @@ package() {
   cd "${srcdir}/mcelog"
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
-  install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
-  install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog"
+  install -Dm0755 mcelog.cron "${pkgdir}/usr/bin/mcelog.cron"
   install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate"
   install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README"
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/mcelog/mcelog.rc b/community/mcelog/mcelog.rc
deleted file mode 100644
index fb73743c7..000000000
--- a/community/mcelog/mcelog.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/mcelog`
-case "$1" in
-  start)
-    stat_busy "Starting mcelog"
-    if [ -z "$PID" ]; then
-       /usr/sbin/mcelog --daemon --pidfile /var/run/mcelog.pid
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mcelog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mcelog"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mcelog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
index 35c18bc6f..9d6c84f40 100644
--- a/community/mcelog/mcelog.service
+++ b/community/mcelog/mcelog.service
@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 PIDFile=/run/mcelog.pid
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
+ExecStart=/usr/bin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
 StandardOutput=syslog
 
 [Install]
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index 2d3c2de1e..d32b982d7 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $
+# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
-pkgver=0.7.62
+pkgver=0.7.63
 pkgrel=1
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk')
 makedepends=('libtool' 'automake' 'autoconf')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('a9a8bc398cc5d2ca8723fae024f6e891')
+md5sums=('bd794e4066b6bb197af23cb7b8ba832b')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index fd9740384..bcb786f3e 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $
+# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo
-pkgver=0.7.62
+pkgver=0.7.63
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libmediainfo')
 makedepends=('libtool' 'automake' 'autoconf')
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('a9a8bc398cc5d2ca8723fae024f6e891')
+md5sums=('bd794e4066b6bb197af23cb7b8ba832b')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD
index 4b7cb8f4f..773e3890c 100644
--- a/community/mediaproxy/PKGBUILD
+++ b/community/mediaproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80024 2012-11-15 14:41:33Z spupykin $
+# $Id: PKGBUILD 90685 2013-05-13 14:28:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=mediaproxy
 pkgver=2.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Open-source media proxy for OpenSER"
 url="http://mediaproxy.ag-projects.com/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,24 +13,24 @@ depends=('python2' 'libnetfilter_conntrack' 'iptables'
 	 'python2-application' 'python2-cjson' 'python2-gnutls')
 #backup=('opt/mediaproxy/config.ini')
 source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz"
-	"mediaproxy.init"
 	"mediaproxy-dispatcher.service"
 	"mediaproxy-relay.service"
 	"mediaproxy.tmpfiles")
 md5sums=('840de8f52e656991be728c15ec30bb5e'
-         '66f4417f40dda0dfa31569ee4ccc32c7'
          '4a1fa0b6ce0a8bd44bf0f1d9d36a6154'
          '23c1a584835de00a958ef963cdd40040'
          '60a25f2cb6429a0a7d62d45d0c75a0ea')
 
 build() {
   cd $srcdir/mediaproxy-$pkgver
-
   sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py
+}
+
+package() {
+  cd $srcdir/mediaproxy-$pkgver
 
   python2 setup.py install --root=$pkgdir
 
-  install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy
   install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service
   install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service
   install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init
deleted file mode 100644
index ba9fe90b2..000000000
--- a/community/mediaproxy/mediaproxy.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# mediaproxy starts and stops the SER MediaProxy server
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-	stat_busy "Starting mediaproxy"
-	media-dispatcher && media-relay
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping mediaproxy"
-	kill `cat /var/run/mediaproxy/relay.pid`
-	kill `cat /var/run/mediaproxy/dispatcher.pid`
-	stat_done
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 2f4cc6259..6c81af3a3 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $
+# $Id: PKGBUILD 91092 2013-05-19 10:48:50Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.2
+pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
@@ -20,7 +20,7 @@ optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
 options=('!emptydirs')
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD
index b96561236..f4a55802b 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75192 2012-08-15 19:32:50Z lfleischer $
+# $Id: PKGBUILD 90561 2013-05-13 08:02:43Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: AkiraYB <brunoyb!yahoo,com,br>
 
 pkgname=minbif
 pkgver=1.0.5
-pkgrel=2.1
+pkgrel=3
 pkgdesc='An IRC gateway to IM networks that uses libpurple.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://minbif.im/'
@@ -17,12 +17,10 @@ backup=('etc/minbif/minbif.conf'
 install='minbif.install'
 source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz"
         'minbif-gcc-4.7.patch'
-        'minbif'
         'minbif.service'
         'minbif.tmpfiles.conf')
 md5sums=('00c5c1abbe2b8a9d900961832c7909a8'
          '2235c45d5bdb01e9ef4b11d2a41d49bb'
-         '307a6fab42bcaeed11a55b5fb4589778'
          'b34876e339a37dfb1dc6cd0b9d8edf9d'
          '3360f5d1bf9bc69fd9b7c9326f321dc3')
 
@@ -42,7 +40,6 @@ package() {
   install -dm0755 "${pkgdir}/var/lib"
   install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif"
   install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users"
-  install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/community/minbif/minbif b/community/minbif/minbif
deleted file mode 100644
index 47888d169..000000000
--- a/community/minbif/minbif
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/minbif`
-case "$1" in
-  start)
-    stat_busy "Starting minbif daemon"
-    if [ -z "$PID" ]; then
-      if [ ! -d /var/run/minbif ]; then
-        mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif
-      fi
-      [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid
-      CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \
-                           /etc/minbif/minbif.conf'
-      su -s /bin/sh -c "$CMD" minbif
-
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon minbif
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping minbif daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/minbif/minbif.pid
-      rm_daemon minbif
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD
new file mode 100644
index 000000000..2fb9f0c74
--- /dev/null
+++ b/community/minetest/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 92174 2013-06-02 12:00:30Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Konsta Kokkinen <kray@tsundere.fi>
+
+pkgname=minetest
+pkgver=0.4.6
+pkgrel=1
+pkgdesc='An Infiniminer/Minecraft inspired game'
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('GPL')
+depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme')
+makedepends=('cmake' 'irrlicht' 'mesa' 'libpng' 'zlib')
+install=minetest.install
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
+	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
+        ${pkgname}_common-${pkgver}.tar.gz::https://github.com/minetest/common/tarball/${pkgver})
+md5sums=('a8cacba57659c397fb8098881eb0c5f9'
+         '1023ac25a83d1431c861d7947e962675'
+         '54a805066c509478f6983b359f2e91fc')
+
+build() {
+  cd "$srcdir"/minetest-minetest-*
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/minetest-minetest-*
+
+  make DESTDIR="$pkgdir" install
+
+  mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
+  mv -v "$srcdir"/minetest-common-* "$pkgdir"/usr/share/minetest/games/common
+  
+  # small cleanup
+  rm "$pkgdir"/usr/share/minetest/games/{minetest,common}/.gitignore
+}
diff --git a/community/minetest/minetest.install b/community/minetest/minetest.install
new file mode 100644
index 000000000..85b22a1c5
--- /dev/null
+++ b/community/minetest/minetest.install
@@ -0,0 +1,17 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+  update-desktop-database > /dev/null 2>&1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  update-desktop-database > /dev/null 2>&1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
+  update-desktop-database > /dev/null 2>&1
+}
diff --git a/community/mingetty/PKGBUILD b/community/mingetty/PKGBUILD
deleted file mode 100644
index 494728ee0..000000000
--- a/community/mingetty/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer:   Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: stonecrest <stonecrestATgmailDOTcom>
-
-pkgname=mingetty
-pkgver=1.08
-pkgrel=3
-pkgdesc="A minimal getty which allows automatic logins."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/mingetty"
-license=('GPL')
-depends=('glibc')
-md5sums=('2a75ad6487ff271424ffc00a64420990'
-         'b1bcb0668c34d4981e3acddc3990dfdb')
-source=(http://downloads.sourceforge.net/sourceforge/mingetty/$pkgname-$pkgver.tar.gz
-        $pkgname-utf8.patch)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch $pkgname.c ../$pkgname-utf8.patch
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 $pkgname "$pkgdir/sbin/$pkgname"
-  install -Dm644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8"
-}
diff --git a/community/mingetty/mingetty-utf8.patch b/community/mingetty/mingetty-utf8.patch
deleted file mode 100644
index c269039ac..000000000
--- a/community/mingetty/mingetty-utf8.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Nru mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c
---- mingetty-1.07.orig/mingetty.c	2004-01-03 15:15:56.000000000 +0200
-+++ mingetty-1.07/mingetty.c	2006-11-22 22:13:26.967910100 +0200
-@@ -16,10 +16,15 @@
-  * - autologin only at first login
-  * - /etc/mingetty.conf that can be used instead of /etc/inittab for
-  *   command line options
-- * - Can UTF-8 setup be done within mingetty?
-+ * - Can UTF-8 setup be done within mingetty? Let's try now :-) (VinzC)
-  * - Also add /bin/login-type functionality in here?
-  */
- 
-+/* Additional comments: Vincent Cadet <vcadet@hotmail.com> (2006-11-21)
-+ * - Attempt to make mingetty support UTF-8. Modifications were imported
-+ *   from Suse migetty.c 0.9.6s.
-+ */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -39,6 +44,19 @@
- #include <syslog.h>
- #include <sys/utsname.h>
- #include <time.h>
-+#include <locale.h>
-+#include <iconv.h>
-+#include <wctype.h>
-+#include <sys/kd.h>
-+#include <sys/ttydefaults.h>
-+
-+#ifndef IUTF8
-+# ifndef ASM_IUTF8
-+#  error ASM_IUTF8 input flag not defined - Cannot define IUTF8
-+# else
-+#  define IUTF8	ASM_IUTF8
-+# endif
-+#endif
- 
- /* name of this program (argv[0]) */
- static char *progname;
-@@ -74,6 +92,8 @@
- static char *autologin = NULL;
- /* try to read a char before dropping to login prompt */
- static int loginpause = 0;
-+/* terminal mode */
-+static int mode = K_RAW;
- 
- /* error() - output error messages */
- static void error (const char *fmt, ...)
-@@ -187,10 +207,21 @@
- 	if (fd > 2)
- 		close (fd);
- 
-+	/* Detect mode of current keyboard setup, e.g. for UTF-8 */
-+	if (ioctl(0, KDGKBMODE, &mode) < 0)
-+		mode = K_RAW;
-+
- 	/* Write a reset string to the terminal. This is very linux-specific
- 	   and should be checked for other systems. */
- 	if (noclear == 0)
--		write (0, "\033c", 2);
-+		/* don't write a full reset (ESC c) because this leaves the 
-+		   unicode mode again if the terminal was in unicode mode
-+		   and also undos the ESC sequences in CONSOLE_MAGIC which
-+		   are needed for some languages/console-fonts.
-+		   Just put the cursor to the home position (ESC [ H),
-+		   erase everything below the cursor (ESC [ J), and set the
-+		   scrolling region to the full window (ESC [ r) */
-+		write (0, "\033[r\033[H\033[J", 9);
- 
- 	sigaction (SIGHUP, &sa_old, NULL);
- }
-@@ -292,32 +323,75 @@
- 
- static char *get_logname (void)
- {
--	static char logname[40];
-+	static char logname[4*UT_NAMESIZE];
- 	char *bp;
- 	unsigned char c;
-+	int ascii;
-+	iconv_t ic;
- 
- 	tcflush (0, TCIFLUSH);		/* flush pending input */
-+
-+	/* Check for UTF-8 mode */
-+	switch(mode) {
-+		case K_UNICODE:
-+			ascii = 0;
-+			setlocale(LC_CTYPE, "en_US.UTF-8");
-+			break;
-+		case K_RAW:
-+		case K_MEDIUMRAW:
-+		case K_XLATE:
-+		default:
-+			ascii = 1;
-+			setlocale(LC_CTYPE, "POSIX");
-+			break;
-+	}
-+
- 	for (*logname = 0; *logname == 0;) {
- 		do_prompt (1);
- 		for (bp = logname;;) {
- 			if (read (0, &c, 1) < 1) {
--				if (errno == EINTR || errno == EIO
--					|| errno == ENOENT)
-+				if (errno == EINTR || errno == EAGAIN) {
-+					usleep(1000);
-+					continue;
-+				}
-+				if (errno == EIO || errno == ENOENT)
- 					exit (EXIT_SUCCESS);
- 				error ("%s: read: %s", tty, strerror (errno));
- 			}
- 			if (c == '\n' || c == '\r') {
- 				*bp = 0;
- 				break;
--			} else if (!isprint (c))
--				error ("%s: invalid character 0x%x in login"
--					" name", tty, c);
-+			}
-+
-+			if (ascii && !isprint (c))
-+				error ("%s: invalid character 0x%x in login name", tty, c);
- 			else if ((size_t)(bp - logname) >= sizeof (logname) - 1)
- 				error ("%s: too long login name", tty);
--			else
--				*bp++ = c;
-+
-+			*bp++ = c;
- 		}
- 	}
-+
-+	if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) {
-+		char tmpbuf[4*sizeof(logname)], *op, *lp;
-+		size_t len = bp - logname;
-+		size_t out = sizeof(tmpbuf) - 1;
-+		size_t wcl;
-+		wint_t *wcp;
-+
-+		op = tmpbuf;
-+		lp = logname;
-+		if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1)
-+			error ("%s: invalid character conversion for login name", tty);
-+		iconv_close(ic);
-+
-+		wcp = (wint_t*)tmpbuf;
-+		wcp[wcl] = (wint_t)0;
-+		while (*wcp) {
-+			if (!iswprint(*wcp++))
-+				error ("%s: invalid character for login name found", tty);
-+ 		}
-+ 	}
- 	return logname;
- }
- 
-
-
diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD
index 7db59a6c3..2e29dbaa5 100644
--- a/community/mingw32-binutils/PKGBUILD
+++ b/community/mingw32-binutils/PKGBUILD
@@ -15,7 +15,7 @@ license=(GPL)
 source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma"
 	"260cd952.patch::http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841")
 md5sums=('5d76604f545b151230d1c86e1b8cfab3'
-         '9226501a8258a12c81956252ba3b4ba1')
+         'ad86b2b889424fd1a3b07e7c54ecf646')
 
 build() {
   [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 67fb86bd4..2643d6ed4 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84354 2013-02-16 22:50:32Z ioni $
+# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Kamil Kaminski <kyle@kkaminsk.com>
 
 pkgname=minidlna
-pkgver=1.0.25
-pkgrel=5
+pkgver=1.1.0
+pkgrel=2
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
@@ -17,19 +17,16 @@ backup=('etc/minidlna.conf'
 	'etc/conf.d/minidlna')
 install=minidlna.install
 changelog=changelog
-source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
-	minidlna.rc
+source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz
 	minidlna.service
 	minidlna.tmpfiles)
-md5sums=('d966256baf2f9b068b9de871ab5dade5'
-         '1b92f88905abe8f719585d48f4b25a49'
-         '1903ed9ceee43b8bb86146b9ad8eb50c'
+md5sums=('26484a84af3fceafdee26595aae097f7'
+         '7e3890ee50aa4dfa4d1754261e6cc965'
          '26de27b12d6a37c47d9714107d07aac9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
-  find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \;
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
@@ -37,13 +34,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   DESTDIR=$pkgdir make install
   install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf
-
-  install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
-  mkdir -p $pkgdir/etc/conf.d
-  echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna
-  echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna
-
-  # systemd files
   install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf
   install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service
 }
diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc
deleted file mode 100644
index dd5910544..000000000
--- a/community/minidlna/minidlna.rc
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/minidlna
-. /etc/minidlna.conf
-
-daemon_name=minidlna
-
-get_pid() {
-    pidof -o %PPID /usr/sbin/minidlna
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting minidlna"
-    PID=$(get_pid)
-    if [[ -z "$PID" ]]; then
-      rm -f /var/run/$daemon_name.pid
-      touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid
-      mkdir -p /var/cache/minidlna
-      chown -R $MINIDLNA_USER /var/cache/minidlna
-      su -s /bin/sh -l -c "/usr/sbin/minidlna ${MINIDLNA_OPTS} $2" - $MINIDLNA_USER
-      if [[ $? -gt 0 ]]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping minidlna"
-    PID=$(get_pid)
-    [[ -n $PID ]] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon minidlna
-      stat_done
-    fi
-    ;;
-
-  clean)
-    $0 stop
-    sleep 1
-    stat_busy "Cleaning minidlna cache"
-    [ -z $db_dir ] || rm -r $db_dir/*
-    stat_done
-    sleep 1
-    $0 start
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  rescan)
-    $0 stop
-    sleep 1
-    $0 start -R
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|clean}"
-esac
-exit 0
diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service
index 6c9a40152..bc79e96ef 100644
--- a/community/minidlna/minidlna.service
+++ b/community/minidlna/minidlna.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 User=nobody
-ExecStart=/usr/sbin/minidlna -P /var/run/minidlna/minidlna.pid
-PIDFile=/var/run/minidlna/minidlna.pid
+ExecStart=/usr/bin/minidlnad -P /run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index f346ed2ac..38cddc0e5 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $
+# $Id: PKGBUILD 91953 2013-05-30 09:43:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
-pkgver=1.2.5
-pkgrel=3
+pkgver=1.2.6
+pkgrel=1
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
@@ -13,17 +13,11 @@ backup=('etc/miredo/miredo.conf'
         'etc/miredo/client-hook')
 options=('!libtool')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	isatapd.rc.d
 	miredo.install
-	miredo.rc.d
-	miredo-server.rc.d
 	miredo.service)
-md5sums=('5114debbf9fcab5d292176e4548f8cd1'
-         '51ab6d091192605ee9206944869cb2ab'
+md5sums=('5bcdbaced54f40b6cb1e9c9a8dbac411'
          'd1b655d7a851cdb46c91c3418ed1962f'
-         'c5a9be5c3175fecec387f1710bfd2788'
-         '319aba1ae06349b76cb25fda0dba60a9'
-         'abd7d8831cab7f3ea6d0d4e51b8f8f6a')
+         'fd6d5b355b2356426eeefd6047f6bb7c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -33,13 +27,16 @@ build() {
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--libexecdir=/usr/lib \
+	--sbindir=/usr/bin \
 	--with-Judy
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 
-  install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo
-  install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server
-  install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd
   sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
 
   # avoid conflict with filesystem>=2012.06
diff --git a/community/miredo/isatapd.rc.d b/community/miredo/isatapd.rc.d
deleted file mode 100644
index fa7bbd708..000000000
--- a/community/miredo/isatapd.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/isatapd`
-case "$1" in
-  start)
-    stat_busy "Starting userspace ISATAP client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/isatapd
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon isatapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping userspace ISATAP client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon isatapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/miredo/miredo-server.rc.d b/community/miredo/miredo-server.rc.d
deleted file mode 100644
index d05513b23..000000000
--- a/community/miredo/miredo-server.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo-server`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol server"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo-server
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol server"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/miredo/miredo.rc.d b/community/miredo/miredo.rc.d
deleted file mode 100644
index 500374b12..000000000
--- a/community/miredo/miredo.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service
index d28803efd..e824f99e1 100644
--- a/community/miredo/miredo.service
+++ b/community/miredo/miredo.service
@@ -3,7 +3,7 @@ Description=Teredo IPv6 Tunneling Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/miredo -f
+ExecStart=/usr/bin/miredo -f
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/misdnuser/PKGBUILD b/community/misdnuser/PKGBUILD
deleted file mode 100644
index dde4a06f8..000000000
--- a/community/misdnuser/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 83164 2013-01-27 16:21:34Z pierre $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=misdnuser
-pkgver=2.0.17_20120917
-pkgrel=1
-pkgdesc="Tools and library for mISDN"
-arch=('i686' 'x86_64')
-url="http://www.misdn.org"
-license=('GPL')
-depends=('isdn4k-utils' 'spandsp')
-backup=('etc/capi20.conf') 
-options=('!makeflags' '!libtool' '!strip')
-source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
-        misdncapid.rc
-        mISDNcapid.service
-        c2faxrecv-mISDNcapid.service
-        mISDNcapid.conf)
-
-build() {
-  # only enable for debugging!
-  #export CFLAGS+=" -g -O0"
-  #export CXXFLAGS+=" -g -O0"
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid
-  # fix udev rule
-  mkdir -p ${pkgdir}/usr/lib/udev/rules.d
-  mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d
-  rm -r ${pkgdir}/etc/udev/
-  # add systemd files
-  install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
-  # mISDNcapid:
-  # tends to crash on avmfritz card, add an extra systemd file for
-  # restarting the services until segfaults are fixed!
-  install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service
-  install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
-}
-md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8'
-         '2009563b144de037ecb20f8d727a772e'
-         '8f305ee6e35fa12a8bec0632bfe7a076'
-         '32ead7f063e007c784aa883d441f33c2'
-         '42c3b46880a68c3883ee1ed00af34b45')
diff --git a/community/misdnuser/c2faxrecv-mISDNcapid.service b/community/misdnuser/c2faxrecv-mISDNcapid.service
deleted file mode 100644
index 7a98ca435..000000000
--- a/community/misdnuser/c2faxrecv-mISDNcapid.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=mISDN CAPI to fax receive
-Requires=faxq.service mISDNcapid.service
-After=faxq.service mISDNcapid.service
-
-[Service]
-ExecStart=/usr/bin/c2faxrecv
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/misdnuser/mISDNcapid.conf b/community/misdnuser/mISDNcapid.conf
deleted file mode 100644
index 7607e262d..000000000
--- a/community/misdnuser/mISDNcapid.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/mISDNcapid 0755 root root -
diff --git a/community/misdnuser/mISDNcapid.service b/community/misdnuser/mISDNcapid.service
deleted file mode 100644
index 94f38478a..000000000
--- a/community/misdnuser/mISDNcapid.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=mISDN CAPI daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/mISDNcapid
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/misdnuser/misdncapid.rc b/community/misdnuser/misdncapid.rc
deleted file mode 100755
index 5c47ca0a9..000000000
--- a/community/misdnuser/misdncapid.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)"
-case "$1" in
-    start)
-        stat_busy "Starting misdncapid"
-	if [ ! -x /var/run/mISDNcapid ] ; then
-	    install -m755 -d /var/run/mISDNcapid
-	fi
-
-	[ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            PID=$(pidof -o %PPID /usr/sbin/mISDNcapid)
-            echo $PID > /var/run/misdncapid.pid
-            add_daemon misdncapid
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping misdncapid"
-	[ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/misdncapid.pid
-            rm_daemon misdncapid
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index c10219857..318e5e1b9 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79004 2012-10-28 18:41:19Z jlichtblau $
+# $Id: PKGBUILD 92063 2013-05-31 02:32:07Z seblu $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
 pkgver=5.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mmonit.com/monit/"
@@ -14,9 +14,8 @@ depends=('openssl')
 backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
-        monitd monit.service)
+        monit.service)
 sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53'
-            'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496'
             'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4')
 
 build() {
@@ -32,8 +31,7 @@ package() {
 
   make DESTDIR=${pkgdir} install
 
-  install -D -m755 ${srcdir}/monitd  ${pkgdir}/etc/rc.d/monitd
   install -D -m700 monitrc ${pkgdir}/etc/monitrc
-  
+
   install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/monit/monitd b/community/monit/monitd
deleted file mode 100644
index 61a359702..000000000
--- a/community/monit/monitd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start() {
-  stat_busy "Starting Monit"
-  /usr/bin/monit &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon monitd
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Monit"
-  /usr/bin/monit quit &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon monitd
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD
index 77ec7bf24..4387558e4 100644
--- a/community/moreutils/PKGBUILD
+++ b/community/moreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $
+# $Id: PKGBUILD 90575 2013-05-13 09:53:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=moreutils
-pkgver=0.47
-pkgrel=2
+pkgver=0.48
+pkgrel=1
 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://joeyh.name/code/moreutils/"
@@ -14,11 +14,16 @@ depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration')
 options=('!emptydirs' 'zipman')
 replaces=(moreutils-svn)
 source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz)
-md5sums=('4cd3b41a90d07166632942e173ac5ce2')
+md5sums=('c6f1eb13132a88ce053be709aa2625d2')
 
 build() {
-  cd $srcdir/moreutils
+  cd $srcdir/$pkgname
+  sed -i 's|schema/dtd/4.4|xml-dtd-4.5|g' *.docbook
   make DOCBOOK2XMAN=docbook2man
+}
+
+package() {
+  cd $srcdir/$pkgname
   make PREFIX=$pkgdir/usr install
   chmod 0644 $pkgdir/usr/share/man/man1/*
 
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index e5778de03..4bcbe2eb6 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84356 2013-02-16 22:50:34Z ioni $
+# $Id: PKGBUILD 90689 2013-05-13 14:29:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=8
+pkgrel=9
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,14 +12,12 @@ depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	rc.motion
 	motion.service
 	motion.tmpfiles
 	ffmpeg-0.8.patch
 	linux-headers.patch
 	ffmpeg-compat.patch)
 md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '2e8c53c4980edddd420f08fdd572c9be'
          'b5b589f8f39939b7a1802cbd9dbe2e1a'
          'f863f8c025f7f025b2178def8418decd'
          'd36687710837d69fbce4608b1345fa34'
@@ -45,7 +43,6 @@ package(){
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
-  install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
   install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service"
   install -Dm644 "${srcdir}/motion.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/motion.conf"
 }
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index d16cb9972..8d71d1522 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $
+# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch"
-        "fix-dnd.patch")
-sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96'
-            '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939')
+        "switch-applications.patch")
+sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049'
+            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -28,8 +26,6 @@ build() {
   # Fix windows switcher keybinding with default settings in GNOME 3.8
   patch -Np1 -i ../switch-applications.patch
 
-  # Fix unresponsive panel on DND
-  patch -RNp1 -i ../fix-dnd.patch
 
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch
deleted file mode 100644
index f30e22521..000000000
--- a/community/muffin/fix-dnd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001
-From: luyikei <luyikei.qmltu@gmail.com>
-Date: Wed, 16 Jan 2013 14:09:39 +0900
-Subject: [PATCH] Put the rest of  redirect window types into the top window
- group
-
----
- src/compositor/meta-window-actor.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index 4113e72..66ba3c4 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self)
-   
-   if (window->type == META_WINDOW_DROPDOWN_MENU ||
-       window->type == META_WINDOW_POPUP_MENU ||
--      window->type == META_WINDOW_COMBO){
-+      window->type == META_WINDOW_COMBO ||
-+      window->type == META_WINDOW_NOTIFICATION ||
-+      window->type == META_WINDOW_DND ||
-+      window->type == META_WINDOW_OVERRIDE_OTHER){
-     clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
- 			       CLUTTER_ACTOR (self));
-   }
--- 
-1.8.1.6
-
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 5247c9d2c..2ffe5b53d 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85446 2013-03-01 18:21:21Z svenstaro $
+# $Id: PKGBUILD 92166 2013-06-02 06:17:34Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -8,8 +8,8 @@
 # to the depends and delete "no-g15" in the configure line below
 
 pkgname=mumble
-pkgver=1.2.3
-pkgrel=7
+pkgver=1.2.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('BSD')
@@ -20,13 +20,13 @@ options=('!libtool')
 install=mumble.install
 url="http://mumble.sourceforge.net/"
 source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz")
-md5sums=('55804e3dfe98b16eeb40abca6c254625')
+md5sums=('49bc6abea78f9c54298934c2c28a7c7c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # Building mumble
-  qmake main.pro \
+  qmake-qt4 main.pro \
     CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \
     no-embed-qt-translations no-update packaged" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index 367f52bbc..c6a901b1c 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $
+# $Id: PKGBUILD 92168 2013-06-02 06:18:50Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
-pkgver=1.2.3
-pkgrel=13
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mumble.sourceforge.net"
@@ -17,9 +17,9 @@ install="murmur.install"
 source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
         "murmur.dbus.conf"
         "murmur.service")
-md5sums=('55804e3dfe98b16eeb40abca6c254625'
+md5sums=('49bc6abea78f9c54298934c2c28a7c7c'
          'eddea4cdbd0bde4b960a67e16b5d5478'
-         '4ce52d399ba2d95705e997146e0e2544')
+         'd27a9adcd7561859e7b033046729bc0e')
 
 build() {
   cd ${srcdir}/mumble-$pkgver
@@ -38,7 +38,7 @@ package() {
     -i scripts/murmur.ini
 
   install -dm755 ${pkgdir}/var/lib/murmur
-  install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd
+  install -Dm755 release/murmurd ${pkgdir}/usr/bin/murmurd
   install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini
   install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf
   install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service
index 9d58077ab..685b84d13 100644
--- a/community/murmur/murmur.service
+++ b/community/murmur/murmur.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg
+ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg
 Restart=always
 
 [Install]
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index ed01dd9fa..bf8a4471c 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88083 2013-04-11 08:51:54Z svenstaro $
+# $Id: PKGBUILD 90984 2013-05-16 23:49:59Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,25 +6,24 @@
 
 pkgname=nbd
 pkgver=3.3
-pkgrel=1
+pkgrel=3
 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
 license=('GPL')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	config nbd nbd.service)
+	config nbd.service)
 backup=('etc/nbd-server/config')
 depends=('glib2')
 install=nbd.install
 md5sums=('cde8fe6e870b8a7459f12e5dcf572d86'
          '2d05d426b8c2708d5f8a0d028fcbae05'
-         'e7b13a8b3369e11927d9917664557efa'
          '5d1acc143018117174f79eff15afa038')
 
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog --sbindir=/usr/bin
 
   make
 }
@@ -35,7 +34,6 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config
-  install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd
   install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service
 
   install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README
diff --git a/community/nbd/nbd b/community/nbd/nbd
deleted file mode 100644
index 76d16c779..000000000
--- a/community/nbd/nbd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE="/var/run/nbd-server.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting Network Block Device Server"
-    if [ "$PID" = "" ]; then 
-       /usr/bin/nbd-server
-    fi
-    if [ "$PID" != "" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nbd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Network Block Device Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    rm -f $PIDFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nbd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index f7f2b94d5..74420d0a1 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $
+# $Id: PKGBUILD 90526 2013-05-13 00:18:50Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Chris Brannon <chris@the-brannons.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Collection of IPv6 networking utilities'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.remlab.net/ndisc6/'
@@ -13,17 +13,25 @@ license=('GPL')
 depends=('glibc' 'perl')
 makedepends=('glibc' 'gcc')
 options=(!emptydirs)
-install=ndisc6.install
+install=$pkgname.install
 source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2"
 	      'rdnssd.service')
 md5sums=('50cb4c19606cf6ff2b7388e71832f579'
-         'beeb4f033e9eb951e2de962f609c7c2a')
+         '88a290cbcf51ac5e10ed5f995a8ba4b9')
+
+prepare() {
+  # patch invalid path
+  sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
+    $pkgname-$pkgver/rdnssd/merge-hook.in
+}
 
 build() {
   cd $pkgname-$pkgver
-  # patch invalid path
-  sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' rdnssd/merge-hook.in
-  ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --sysconfdir=/etc
   make
 }
 
diff --git a/community/ndisc6/rdnssd.service b/community/ndisc6/rdnssd.service
index dcaf73331..6fdf91f2d 100644
--- a/community/ndisc6/rdnssd.service
+++ b/community/ndisc6/rdnssd.service
@@ -6,7 +6,7 @@ Requires=network.target
 [Service]
 Type=forking
 PIDFile=/run/rdnssd.pid
-ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook
+ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index f839ec21d..4771c0852 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90132 2013-05-06 22:22:04Z faidoc $
+# $Id: PKGBUILD 92161 2013-06-01 22:17:04Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.0
+pkgver=1.8.3
 pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
         "tracker-0.16.patch"
         "remove-desktop-background.patch")
-sha256sums=('4812381bd2e926fa3cd4efcddc79585bab3ff1c226d1db69e7ce3802c783d18a'
+sha256sums=('1d3404dc66d3f8ec686dfc1b02523331e66d3e942e2a57d6b29e9f2ae998945a'
             '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
             '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
 
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index 4bc67a275..aebdc4f3d 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88327 2013-04-16 13:30:25Z spupykin $
+# $Id: PKGBUILD 90691 2013-05-13 14:30:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -30,5 +30,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/etc/rc.d/init.d
+  rm -rf $pkgdir/etc/rc.d
 }
diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD
index bcf2cc63e..e6e58955d 100644
--- a/community/nfacct/PKGBUILD
+++ b/community/nfacct/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $
+# $Id: PKGBUILD 90530 2013-05-13 00:24:07Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 
 pkgname=nfacct
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Command line tool to create/retrieve/delete accounting objects'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/nfacct/'
@@ -16,7 +16,7 @@ md5sums=('992e863409d144350dbc8f0554a0f478')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index db780e77d..dda512b6a 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $
+# $Id: PKGBUILD 90996 2013-05-17 06:59:15Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index 36a37689f..28db8b57e 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $
+# $Id: PKGBUILD 92045 2013-05-31 00:26:55Z seblu $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
 pkgver=20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation IRC Daemon"
 arch=('i686' 'x86_64' 'mips64el')
 backup=(etc/ngircd.conf)
@@ -13,17 +13,16 @@ url="http://ngircd.barton.de/"
 license=('GPL')
 depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
-        ngircd.sh
         ngircd.service)
 sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d'
-            'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
-            '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
+            'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
+  	--sbindir=/usr/bin \
   	--mandir=/usr/share/man \
   	--with-ident \
   	--with-openssl \
@@ -35,7 +34,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -Dm 755 ../ngircd.sh "$pkgdir/etc/rc.d/ngircd"
   install -Dm 755 ../ngircd.service "$pkgdir/usr/lib/systemd/system/ngircd.service"
 }
 
diff --git a/community/ngircd/ngircd.service b/community/ngircd/ngircd.service
index b5bab060b..b75382ea9 100644
--- a/community/ngircd/ngircd.service
+++ b/community/ngircd/ngircd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 # don't daemonize to simplify stuff
-ExecStart=/usr/sbin/ngircd -n
+ExecStart=/usr/bin/ngircd -n
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/ngircd/ngircd.sh b/community/ngircd/ngircd.sh
deleted file mode 100644
index 3947f527e..000000000
--- a/community/ngircd/ngircd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy "Starting ngircd IRC daemon"
-		/usr/sbin/ngircd
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-			add_daemon ngircd
-		fi
-		;;
-	stop)
-		stat_busy "Stopping ngircd IRC daemon"
-		PID=`pidof -o %PPID /usr/sbin/ngircd`
-		kill $PID > /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon ngircd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 25c23becd..230ec8f05 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $
+# $Id: PKGBUILD 92185 2013-06-02 15:29:37Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,20 +8,21 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.10.5
-pkgrel=1
+pkgver=0.10.9
+pkgrel=2
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nodejs.org/'
 license=('MIT')
-depends=('openssl' 'python2')
+depends=('openssl')
+makedepends=('python2')
 checkdepends=('curl')
 options=('!emptydirs')
-source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd')
+source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz)
+sha256sums=('25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30')
 
-build() {
-  cd node-v${pkgver}
+prepare() {
+  cd node-v$pkgver
 
   msg 'Fixing for python2 name'
   find -type f -exec sed \
@@ -30,8 +31,12 @@ build() {
     -e 's_^#!/usr/bin/python$_&2_' \
     -e "s_'python'_'python2'_" -i {} \;
   find test/ -type f -exec sed 's_python _python2 _' -i {} \;
-  export PYTHON=python2
+}
 
+build() {
+  cd node-v$pkgver
+
+  export PYTHON=python2
   ./configure \
     --prefix=/usr \
     --shared-openssl
@@ -40,18 +45,18 @@ build() {
 }
 
 check() {
-  cd node-v${pkgver}
+  cd node-v$pkgver
   make test || true
 }
 
 package() {
-  cd node-v${pkgver}
+  cd node-v$pkgver
 
   make DESTDIR="$pkgdir" install
 
   # install docs as per user request
   install -d "$pkgdir"/usr/share/doc/nodejs
-  cp -r doc/api/*.html \
+  cp -r doc/api/{*.html,assets} \
     "$pkgdir"/usr/share/doc/nodejs
 
   install -D -m644 LICENSE \
diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD
index 66a10d0c0..75c40a7eb 100644
--- a/community/noip/PKGBUILD
+++ b/community/noip/PKGBUILD
@@ -1,40 +1,42 @@
-# $Id: PKGBUILD 79265 2012-11-02 00:34:36Z arodseth $
+# $Id: PKGBUILD 90507 2013-05-12 23:35:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth
 # Contributor: Lyle Putnam <lcputnam@amerytel.net>
 
 pkgname=noip
 pkgver=2.1.9
-pkgrel=4
+pkgrel=5
 pkgdesc='Dynamic DNS Client Updater for no-ip.com services'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.no-ip.com/downloads.php?page=linux'
 license=('GPL')
-depends=('bash')
-#backup=('etc/no-ip2.conf')
-install=noip.install
+install="$pkgname.install"
+depends=('glibc')
 source=('http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz'
-        'noip-rc.d'
-        'noip2.service')
+        'noip.service')
 sha256sums=('82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593'
-            '95bbebf584e0bc33186fb95f76a85bbd103fcea8ca073c7e4d36a811c3ac5d5d'
             '624553d92d69bb76cb457a056a7722dc051b5bbd17ea0e622b5cc08909019ea5')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver-1
 
-  # Their Makefile is fucking horrid, do it by hand instead
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-1"
+
   sed -i '/^#define CONFIG_FILEPATH/s/PREFIX//' noip2.c
   sed -i '/^#define CONFIG_FILENAME/s/PREFIX//' noip2.c
-  cc -Wall $CFLAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver-1"
+
+  cc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 -Wno-unused-but-set-variable
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver-1
+  cd "$srcdir/$pkgname-$pkgver-1"
 
-  install -Dm755 noip2 $pkgdir/usr/bin/noip2
-  install -Dm755 ../noip-rc.d $pkgdir/etc/rc.d/noip
-  install -Dm644 ../noip2.service $pkgdir/usr/lib/systemd/system/noip2.service
+  install -Dm755 noip2 "$pkgdir/usr/bin/noip2"
+  install -Dm644 "$srcdir/$pkgname.service" \
+    "$pkgdir/usr/lib/systemd/system/noip2.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/noip/noip-rc.d b/community/noip/noip-rc.d
deleted file mode 100644
index c40b9d12a..000000000
--- a/community/noip/noip-rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-_DAEMON=noip
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/${_DAEMON}2`
-case "$1" in
-  start)
-    stat_busy "Starting $_DAEMON"
-    [ -z "$PID" ] && /usr/bin/${_DAEMON}2
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo `pidof -o %PPID /usr/bin/${_DAEMON}2` > /var/run/$_DAEMON.pid
-      add_daemon $_DAEMON
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $_DAEMON"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/$_DAEMON.pid
-      rm_daemon $_DAEMON
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/noip/noip2.service b/community/noip/noip.service
index 2ad0ba867..2ad0ba867 100644
--- a/community/noip/noip2.service
+++ b/community/noip/noip.service
diff --git a/community/normalize/PKGBUILD b/community/normalize/PKGBUILD
index 17af4046b..4a0018ba8 100644
--- a/community/normalize/PKGBUILD
+++ b/community/normalize/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=normalize
 pkgver=0.7.7
 pkgrel=6.1
 pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://normalize.nongnu.org"
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
diff --git a/community/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD
index ae78b32cc..7c2530761 100644
--- a/community/notification-daemon/PKGBUILD
+++ b/community/notification-daemon/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=notification-daemon
 pkgver=0.7.6
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Notification daemon for the desktop notifications framework"
 arch=(i686 x86_64 'mips64el')
 license=(GPL)
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 23a5ba397..b41bcf521 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $
+# $Id: PKGBUILD 92216 2013-06-02 21:17:12Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgbase=notmuch
-pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
+pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
 pkgver=0.15.2
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
 license=('GPL3')
@@ -16,47 +16,55 @@ options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
+prepare(){
+    #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
+    cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
+
+    find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+    find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
+}
 build() {
     cd "$srcdir/${pkgname}-$pkgver"
 
     ./configure --prefix=/usr --sysconfdir=/etc \
-		--includedir=/usr/include
-    make 
-    (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
-    make ${pkgname}-mutt.1)
+		--includedir=/usr/include \
+		--without-zsh-completion
 
-    cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
+    make 
+    ( pushd "contrib/$pkgbase-deliver"
+    export CPPFLAGS="-I ../../lib"
+    ./autogen.sh
+    ./configure --prefix=/usr --sysconfdir=/etc \
+		--includedir=/usr/include \
+        LDFLAGS="-L$srcdir/$pkgname-$pkgver/lib" \
+        CPPFLAGS="-I$srcdir/$pkgname-$pkgver/lib"
+    make)
+    make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1"
 
     cd bindings/ruby
     ruby extconf.rb
 
-    cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
-
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    #env LD_LIBRARY_PATH="." python setup.py build
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py build
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
-    #env LD_LIBRARY_PATH="." python2 setup.py build
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
 	python2 setup.py build
 }
 
 package_notmuch-runtime(){
     pkgdesc="Runtime for notmuch and notmuch-mutt"
     depends=('xapian-core' 'gmime' 'talloc')
-    cd "$srcdir/${pkgname}-$pkgver"
+    cd "$srcdir/${pkgbase}-$pkgver"
     make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
+	install -Dm755 notmuch $pkgdir/usr/bin/notmuch
+}
 
-    install -Dm644 notmuch "$pkgdir/usr/bin/notmuch"
 
+package_notmuch-vim(){
+	pkgdesc="Vim plugins for notmuch"
+	depends=('notmuch-runtime')
     mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax}
-
-    make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install
-
-    # Remove conflicting zsh completion
-    rm -r ${pkgdir}/usr/share/zsh
+    make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install
 }
 
 
@@ -70,30 +78,28 @@ package_notmuch(){
                 'gnupg: for email encryption')
 
     cd "$srcdir/${pkgname}-$pkgver"
+    # Install ruby bindings
+    sed -i -e 's,/site_ruby,,g' bindings/ruby/Makefile
+    make -C bindings/ruby exec_prefix=$pkgdir/usr prefix=/usr install
+
+    # Install notmuch-deliver
+    make -C "contrib/${pkgbase}-deliver" DESTDIR="$pkgdir" install
 
     # Install python bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
 	python2 setup.py install --prefix=/usr --root="$pkgdir"
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
 	python setup.py install --prefix=/usr --root="$pkgdir"
-
-    # Install ruby bindings
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
-    sed -i -e 's,/site_ruby,,g' Makefile
-    make exec_prefix=$pkgdir/usr prefix=/usr install
-
 }
 
 package_notmuch-mutt(){
     pkgdesc="The mail indexer"
     depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which')
-    cd "$srcdir/$pkgbase-runtime-$pkgver"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
-    install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
+    install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }
 
 #vim: set filetype=PKGBUILD sw=4 ts=4 et
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index e6e18a19c..b8d257e9d 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $
+# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
 pkgver=3.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -15,32 +15,25 @@ arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
 sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664'
-          '1cfa2d7254139be50f11753d4e07281ed2af36eb')
+          'f35ecb887e86ae0a54ac70aef5a7577fc8761877')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/ \
-		--exec-prefix=/usr \
+		--sbindir=/usr/bin \
 		--datarootdir=/usr/share \
 		--with-pidfile=/run/nsd.pid \
-		--enable-ratelimit \
-
+		--enable-ratelimit
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -d "${pkgdir}"/etc/rc.d
-	ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service
-
 	rm doc/differences.pdf
 	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
 	install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}"
diff --git a/community/nsd/service b/community/nsd/service
index 28bb1c5b7..ca423c29c 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/nsd.pid
-ExecStart=/usr/sbin/nsdc start
-ExecReload=/usr/sbin/nsdc reload
-ExecStop=/usr/sbin/nsdc stop
+ExecStart=/usr/bin/nsdc start
+ExecReload=/usr/bin/nsdc reload
+ExecStop=/usr/bin/nsdc stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
index 19cacfa2f..f4cec348c 100644
--- a/community/nss-pam-ldapd/PKGBUILD
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=nss-pam-ldapd
-pkgver=0.8.12
-pkgrel=3
+pkgver=0.8.13
+pkgrel=2
 pkgdesc='LDAP module for NSS and PAM'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://arthurdejong.org/$pkgname/"
@@ -16,17 +16,18 @@ install=nss-pam-ldapd.install
 backup=('etc/nslcd.conf')
 source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz"
         "nslcd.service")
-sha1sums=('9c320172df0cdd4eca6cd97ad4c2438e6552ffe0'
-          '40afa421f05c2128a5219504fea45b2e76830973')
-          
+sha1sums=('0567cfea104defabeacd88a3a3200b311b8071ec'
+          'b564fa5738963a67a9240bf4ce63b2fa494cafb7')
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --with-pam-seclib-dir=/usr/lib/security;
- 
+
   make
 }
 
diff --git a/community/nss-pam-ldapd/nslcd.service b/community/nss-pam-ldapd/nslcd.service
index 41fcb8966..73a9b5272 100644
--- a/community/nss-pam-ldapd/nslcd.service
+++ b/community/nss-pam-ldapd/nslcd.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nslcd/nslcd.pid
-ExecStart=/usr/sbin/nslcd
+ExecStart=/usr/bin/nslcd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index cd2b88464..c30bc8a73 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81126 2012-12-12 00:49:38Z eric $
+# $Id: PKGBUILD 92109 2013-05-31 15:39:41Z foutrelis $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
 pkgver=5.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ntop.org/'
@@ -14,12 +14,8 @@ makedepends=('subversion' 'wget' 'ca-certificates')
 options=('!libtool' '!makeflags')
 install='ntop.install'
 source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
-        'ntop'
-        'ntop.conf.d'
         'ntop.service')
 md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
-         '7b0d7bb57432e768ff387e9f7236f87c'
-         '6a9371de1dcf31d8ef13a4cf349c02b3'
          '0e149d20f881600e8387d850ac268483')
 
 build() {
@@ -37,9 +33,6 @@ package() {
   install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop"
   install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd"
 
-  install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop"
-  install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop"
-
   for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do
     _plug="$(basename ${_f})"
     ln -sf "../../lib${_plug}" "${_f}"
diff --git a/community/ntop/ntop b/community/ntop/ntop
deleted file mode 100644
index 2f0dbcbdd..000000000
--- a/community/ntop/ntop
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop
-
-case "$1" in
-  start)
-    stat_busy "Starting ntop daemon"
-    /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ntop
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ntop daemon"
-    killall /usr/bin/ntop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ntop
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/ntop/ntop.conf.d b/community/ntop/ntop.conf.d
deleted file mode 100644
index 28e2a3166..000000000
--- a/community/ntop/ntop.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Parameters to be passed to ntop.
-NTOP_ARGS="-i eth0 -w 3000"
-
-# Location of the log file.
-NTOP_LOG="/var/log/ntop.log"
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index e1df72a0e..5030c8173 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88583 2013-04-20 15:33:34Z jlichtblau $
+# $Id: PKGBUILD 92051 2013-05-31 00:48:23Z seblu $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
 pkgver=10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://nzbget.sourceforge.net/"
@@ -18,7 +18,7 @@ sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2')
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-parcheck
+  ./configure --prefix=/usr --sbindir=/usr/bin --enable-parcheck
   make CXXFLAGS="-lsigc-2.0"
 }
 
diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index 5c3872a0f..65670d32b 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $
+# $Id: PKGBUILD 90524 2013-05-13 00:06:48Z eric $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,33 +6,30 @@
 
 pkgname=oidentd
 pkgver=2.0.8
-pkgrel=7
+pkgrel=8
 pkgdesc='An RFC1413 compliant ident daemon'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('glibc' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz
-        rc.d conf.d service socket)
+source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc}
+        service socket)
 md5sums=('c3d9a56255819ef8904b867284386911'
-         '93cbf742cdd0b053f67482273d715f25'
-         '603307525771724b0f55a2c34fbc3f3e'
-         'b215bee5764cdecb0939f44d5d2dccbe'
+         'SKIP'
+         'f54c5ed2a532a559c837af18735a28f1'
          '4442fb9fc10754914568e6ffc3d5fc42')
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr
+	cd $pkgname-$pkgver
+	./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
 	make
 }
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
-	make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
 
-    install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd
-	install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd
-	install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service
-	install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket
+	install -D -m644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/oidentd@.service"
+	install -D -m644 "$srcdir/socket" "$pkgdir/usr/lib/systemd/system/oidentd.socket"
 }
 
diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d
deleted file mode 100644
index 5eefa80e2..000000000
--- a/community/oidentd/conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-USER=nobody
-GROUP=nobody
-OPTS=""
-# You will need this, when you want oidentd listen both on IPv4 and IPv6
-# OPTS="-a ::"
diff --git a/community/oidentd/rc.d b/community/oidentd/rc.d
deleted file mode 100644
index 8b3c04c45..000000000
--- a/community/oidentd/rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/oidentd
-
-# no daemon check needed for oidentd, and no pid nesecary.
-case "$1" in
-  start)
-    stat_busy "Starting oidentd Daemon..."
-    # oidentd is smart enough to only run one copy of
-    # itsself, no check nesecary, and no pidfile
-    /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon oidentd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping oidentd Daemon..."
-    # kill the process by it's full name, or the init script
-    # will terminate as well, wreaking havok.
-    killall /usr/sbin/oidentd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon oidentd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/oidentd/service b/community/oidentd/service
index 3688298c1..72ca7c244 100644
--- a/community/oidentd/service
+++ b/community/oidentd/service
@@ -2,7 +2,7 @@
 Description=Ident (RFC 1413) per-connection server
 
 [Service]
-ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody
+ExecStart=/usr/bin/oidentd -I -u nobody -g nobody
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
 StandardError=syslog
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index a6ddb975d..d88c3a5f1 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87200 2013-03-28 14:27:14Z spupykin $
+# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
-pkgver=2.8.2
-pkgrel=1
+pkgver=2.8.3
+pkgrel=3
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
 url="http://www.opendkim.org/"
@@ -16,16 +16,14 @@ backup=(etc/conf.d/opendkim)
 install=opendkim.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
 	opendkim.conf
-	opendkim.rc
 	opendkim.service)
-md5sums=('62d7b22f3b15049e3692caa28bcc801e'
+md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
-         '093f5c098a45cc68753f97e45a5b374c'
-         'bc1b73856bc1941faaa4842e00437cb5')
+         '85010750a21954e2d3cf5d57fe210d3f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-db
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-db
   make
 }
 
@@ -44,10 +42,7 @@ package() {
   mv "$pkgdir/usr/share/doc/opendkim/opendkim.conf.sample" "$pkgdir/etc/opendkim/opendkim.conf.sample"
   chmod 0700 "$pkgdir/etc/opendkim"
   chmod 0600 "$pkgdir/etc/opendkim/opendkim.conf.sample"
-
-  # Init script
   install -Dm644 "$srcdir/opendkim.conf" "$pkgdir/etc/conf.d/opendkim"
-  install -Dm755 "$srcdir/opendkim.rc" "$pkgdir/etc/rc.d/opendkim"
 
   # License
   mkdir -p "$pkgdir/usr/share/licenses/opendkim"
diff --git a/community/opendkim/opendkim.rc b/community/opendkim/opendkim.rc
deleted file mode 100644
index f87bfcfc9..000000000
--- a/community/opendkim/opendkim.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/opendkim
-
-PID=`pidof -o %PPID /usr/sbin/opendkim`
-case "$1" in
-    start)
-        stat_busy "Starting OpenDKIM filter"
-        if [ -z "$PID" ]; then
-            /usr/sbin/opendkim $OPENDKIM_FILTER > /dev/null &
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon dkim
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping OpenDKIM filter"
-        [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon dkim
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service
index d34c62960..7d2eb79aa 100644
--- a/community/opendkim/opendkim.service
+++ b/community/opendkim/opendkim.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/opendkim
-ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER
+ExecStart=/usr/bin/opendkim $OPENDKIM_FILTER
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 0f701c4a7..cd0412116 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $
+# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,32 +6,35 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=21
-pkgdesc="Free, easy to use implementation of the Network Time Protocol."
-url="http://www.openntpd.org/"
+pkgrel=22
+pkgdesc='Free, easy to use implementation of the Network Time Protocol.'
+url='http://www.openntpd.org/'
 arch=('x86_64' 'i686' 'mips64el')
 license=('BSD')
 depends=('openssl')
 conflicts=('ntp')
-backup=('etc/ntpd.conf' 'etc/conf.d/openntpd')
+backup=('etc/ntpd.conf')
 install=$pkgname.install
-source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz
-	'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz"
+	      'linux-adjtimex.patch'
+        'openntpd.tmpfiles'
+        'openntpd.service')
 sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49'
-            'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f'
-            '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96'
             '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2'
             'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5'
-            '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f')
+            '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  patch -Np1 -d $pkgname-$pkgver < linux-adjtimex.patch
+}
 
-  patch -Np1 -i ../linux-adjtimex.patch
+build() {
+  cd $pkgname-$pkgver
   autoreconf -fi
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --with-privsep-user=ntp \
     --with-privsep-path=/run/openntpd/ \
     --with-adjtimex
@@ -42,8 +45,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname"
   install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
   sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd
deleted file mode 100644
index 59fa8107d..000000000
--- a/community/openntpd/openntpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-CONF=/etc/conf.d/openntpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[[ -f $CONF ]] && . "$CONF"
-
-PID=$(pidof -o %PPID /usr/sbin/ntpd)
-case $1 in
-  start)
-    stat_busy "Starting OpenNTPD"
-    [[ -d /run/openntpd ]] || mkdir /run/openntpd
-    if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then
-      stat_fail
-    else
-      pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid
-      add_daemon openntpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenNTPD"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-    else
-      rm_daemon openntpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/openntpd/openntpd.conf b/community/openntpd/openntpd.conf
deleted file mode 100644
index a2af277f7..000000000
--- a/community/openntpd/openntpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#  -s Set the time immediately at startup if the local clock is off by more than#  180 seconds.
-PARAMS="-s"
-
-
diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service
index e419204d4..ebaf10540 100644
--- a/community/openntpd/openntpd.service
+++ b/community/openntpd/openntpd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ntpd -s
+ExecStart=/usr/bin/ntpd -s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index adcd0fd97..1fc2bfdd9 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88548 2013-04-19 16:08:52Z spupykin $
+# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=opensips
-pkgver=1.9.0
-pkgrel=1
+pkgver=1.9.1
+pkgrel=2
 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
 url="http://www.opensips.org"
 depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
@@ -24,14 +24,11 @@ license=('GPL')
 install=opensips.install
 options=('!emptydirs' 'zipman' '!makeflags' 'docs')
 source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
-	opensips.init
 	opensips.service)
-md5sums=('2d989e49c9f5f6bd6d0910937fd49802'
-         '685fbe00826df1285b410d4610dcbb0c'
-         '7b786d758fe3174af34e2ced44b549e7')
+md5sums=('0b7b93f4df29a96daedf12e490e7ec86'
+         '35cdcb3692f6925236fd5fe7e9484c58')
 
-build()
-{
+prepare() {
   cd $srcdir/$pkgname-$pkgver-tls/
 
   # python2 fix
@@ -40,6 +37,13 @@ build()
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  sed -i 's|sbin|bin|g' Makefile
+  sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver-tls/
+
   make \
 	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
 	TLS=1 LIBDIR=lib
@@ -57,11 +61,6 @@ package() {
   mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/
   sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg
 
-  # Install starting script
-  mkdir -p $pkgdir/etc/rc.d/
-  cp ../opensips.init $pkgdir/etc/rc.d/opensips
-  chmod 755 $pkgdir/etc/rc.d/opensips
-
   # fix bad paths
   cd $pkgdir/usr/share
   find -type f -exec sed -i "s#$pkgdir##" {} \;
@@ -69,7 +68,7 @@ package() {
   cd $pkgdir/usr/lib/opensips/opensipsctl
   find -type f -exec sed -i "s#$pkgdir##" {} \;
 
-  cd $pkgdir/usr/sbin
+  cd $pkgdir/usr/bin
   sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
 
   cd $pkgdir/etc
diff --git a/community/opensips/opensips.init b/community/opensips/opensips.init
deleted file mode 100644
index 1c883c4c2..000000000
--- a/community/opensips/opensips.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BINNAME=opensips
-OSRDIR=/usr/sbin
-OPENSIPS=$OSRDIR/$BINNAME
-
-TMPDIR=/var/tmp
-CORE=$TMPDIR/core
-
-ETC=/etc/opensips/opensips.cfg
-PIDFILE=/var/run/opensips.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenSIPS server"
-    cd $TMPDIR
-    $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon opensips
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenSIPS server"
-    if [ -r $PIDFILE ]
-    then
-	cat $PIDFILE | xargs kill
-	if [ $? -gt 0 ]; then
-	  stat_fail
-	else
-	  rm_daemon opensips
-	  stat_done
-	fi
-    else
-	stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/opensips/opensips.install b/community/opensips/opensips.install
index 9e8f2a47b..40973a77a 100644
--- a/community/opensips/opensips.install
+++ b/community/opensips/opensips.install
@@ -1,5 +1,3 @@
-post_install() 
-{
-  echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'"
-  /bin/true
+post_install() {
+  echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'"
 }
diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service
index 81f6fd93e..220a5d419 100644
--- a/community/opensips/opensips.service
+++ b/community/opensips/opensips.service
@@ -4,8 +4,8 @@ After=network.target remote-fs.target nss-lookup.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/opensips.pid
-ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid
+PIDFile=/run/opensips.pid
+ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
index 50d75be6e..a16cf7bbf 100644
--- a/community/opensmtpd/PKGBUILD
+++ b/community/opensmtpd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88532 2013-04-19 11:57:55Z seblu $
+# $Id: PKGBUILD 91076 2013-05-18 18:46:51Z bpiotrowski $
 # Maintainer: Sébastien Luttringer
 
 pkgname=opensmtpd
-pkgver=5.3.1p1
-pkgrel=2
+pkgver=5.3.2p1
+pkgrel=1
 pkgdesc='Free implementation of the server-side SMTP protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opensmtpd.org/'
 license=('custom')
 depends=('libevent')
@@ -16,7 +16,7 @@ install=opensmtpd.install
 source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
         'smtpd.service'
         'smtpd.socket')
-md5sums=('0ee036a473f19fe27012cda0068cd287'
+md5sums=('8fc513dd632461f70e433103d75dbf50'
          'a278f272d97a9fe5a8aac784a7c98d67'
          'c2c01e9ca78df3f65efe40a7c0e17ee0')
 
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index 952a2ba78..c2ab306fd 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90074 2013-05-06 19:38:57Z foutrelis $
+# $Id: PKGBUILD 92128 2013-06-01 08:22:38Z lcarlier $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.openttd.org'
@@ -13,7 +13,7 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('1a3525186f4486de8193992426690a1fd8c7e4d376a328056b0464a1a5d32080')
+sha256sums=('f6cb90e0773dc7bdf01161ded03e48661a65c3f1412b192ae954215aaf26eca2')
 
 package() {
   cd ${pkgname}-${pkgver} 
diff --git a/community/ophcrack/PKGBUILD b/community/ophcrack/PKGBUILD
index f89079136..d94e0a2b6 100644
--- a/community/ophcrack/PKGBUILD
+++ b/community/ophcrack/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ophcrack
 pkgver=3.5.0
 pkgrel=1
 pkgdesc="A free Windows password cracker based on rainbow tables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ophcrack.sourceforge.net"
 license=('GPL')
 depends=('qt4')
diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index 2c27c4d2e..6345b3475 100644
--- a/community/osiris/PKGBUILD
+++ b/community/osiris/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $
+# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: jlvsimoes
 
 pkgname=osiris
 pkgver=4.2.3
-pkgrel=5
+pkgrel=7
 pkgdesc="A file integrity management system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://osiris.shmoo.com/"
@@ -13,35 +13,36 @@ depends=('openssl' 'readline')
 install=$pkgname.install
 #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz
 source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz
-	osirismd.init
-	osirisd.init
 	osirismd.service
 	osirisd.service)
 md5sums=('1951c7dc0fe729af9ffaf58910340d12'
-         '96c1ba5433bd0ed7d9520583a07b9bdd'
-         'b6dde0a539ca798fa81489f717507f25'
-         '48644676b88b231803785b8e2da956e5'
-         'c0355b453770f6bbc6a58f5cd80766b4')
+         '8398d60bcbf0c90034473365abc3ece6'
+         '758d029a1ff53be11756330de595e77f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt
-  mkdir -p $pkgdir/etc/rc.d
 
-  ./configure --prefix=/usr --enable-fancy-cli  --with-md-root-dir=/usr/share/$pkgname --build=$CHOST
+  sed -i "s|/sbin|/bin|g" src/install/install.sh.in
+
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \
+    --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname
   make all
 
   # Arch-ify install locations
   sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh
   sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh
   sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
+  install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt
 
   make DESTDIR=$pkgdir install
 
-  install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd
-  install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd
-  rm -rf $pkgdir/usr/osiris
+  rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d
 
   install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service
   install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service
diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init
deleted file mode 100644
index 8262d902e..000000000
--- a/community/osiris/osirisd.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LOCKFILE=/var/run/osirisd.lock
-
-case "$1" in
-  start)
-    stat_busy "Starting Osiris Scanning Daemon"
-    [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && /usr/sbin/osirisd && touch $LOCKFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Osiris Scanning Daemon"
-    [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirisd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service
index 199737c9f..3b162160f 100644
--- a/community/osiris/osirisd.service
+++ b/community/osiris/osirisd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirisd
+ExecStart=/usr/bin/osirisd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init
deleted file mode 100644
index 0bdae5e10..000000000
--- a/community/osiris/osirismd.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LOCKFILE=/var/run/osirismd.lock
-
-case "$1" in
-  start)
-    stat_busy "Starting Osiris Management Daemon"
-    [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && touch $LOCKFILE && /usr/sbin/osirismd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Osiris Management Daemon"
-    [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirismd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service
index d51cef22c..ec4c40702 100644
--- a/community/osiris/osirismd.service
+++ b/community/osiris/osirismd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirismd
+ExecStart=/usr/bin/osirismd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD
index cf5854876..ba1f32ae5 100644
--- a/community/osmo/PKGBUILD
+++ b/community/osmo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68669 2012-03-31 08:29:38Z stativ $
+# $Id: PKGBUILD 90853 2013-05-14 21:40:39Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: Benzo <mb_benzo@yahoo.es>
 
 pkgname=osmo
 pkgver=0.2.10
-pkgrel=7
+pkgrel=8
 pkgdesc="A handy personal organizer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clayo.org/osmo/"
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index e4225e508..cd38e3956 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $
+# $Id: PKGBUILD 91884 2013-05-28 18:09:59Z spupykin $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=ozerocdoff
 pkgver=2
-pkgrel=7
+pkgrel=8
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/ozerocdoff.html"
@@ -15,10 +15,15 @@ source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;t
 md5sums=('88a78f9380d9591f8d20a657b72e3e5c'
          '28ed1afd16fdec92de3baf66b32b0b12')
 
+prepare() {
+  cd "${srcdir}/udev"
+  patch -p1 <$srcdir/remove-old-rules.patch
+  sed -i 's|usr/sbin|usr/bin|g' Makefile
+}
+
 build() {
   cd "${srcdir}/udev"
   make clean
-  patch -p1 <$srcdir/remove-old-rules.patch
   make
 }
 
diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD
index 8791c00f4..4900ee892 100644
--- a/community/p3scan/PKGBUILD
+++ b/community/p3scan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78346 2012-10-17 14:53:26Z spupykin $
+# $Id: PKGBUILD 91863 2013-05-28 17:37:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: v01d <phreakuencies@gmail.com>
 
 pkgname=p3scan
 pkgver=2.3.2
-pkgrel=7
+pkgrel=9
 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://p3scan.sourceforge.net/"
@@ -12,12 +12,10 @@ depends=('pcre' 'openssl')
 license=('GPL')
 install=p3scan.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-	"rc.p3scan"
 	"p3scan.service"
 	"p3scan.tmpfiles")
 md5sums=('9f8decc7d4701228788e3c8717096ca0'
-         '482a783e699b6532cbc478977f429eb5'
-         'dc724b50963d80be7924fc4d9d4856f0'
+         '74a3a5e52e6714ac5001985061248a34'
          '265a730e20e3d8aaf0cd7816dc98ca71')
 
 build() {
@@ -27,7 +25,7 @@ build() {
   unset CFLAGS
   sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile
   sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile
-  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile
+  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/bin/|' Makefile
   make
 }
 
@@ -35,14 +33,13 @@ package() {
   cd $srcdir/$pkgname-$pkgver
 
   # Create base dirs, the Makefile assumes they're there
-  install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8
+  install -d $pkgdir/usr/bin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d
 
   # install with root set on $pkgdir
   make DESTDIR=$pkgdir install
 
   # delete init script provided and use an arch compatible one
-  rm -f $pkgdir/etc/rc.d/rc.p3scan
-  install -D -m755 -g root -o root $srcdir/rc.p3scan $pkgdir/etc/rc.d/p3scan
+  rm -rf $pkgdir/etc/rc.d
 
   # BUG?: make absolute link a relative one
   (
diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service
index 0bab3e7ec..bdd34b75c 100644
--- a/community/p3scan/p3scan.service
+++ b/community/p3scan/p3scan.service
@@ -3,8 +3,8 @@ Description=p3scan proxy
 
 [Service]
 Type=forking
-PIDFile=/var/run/p3scan/p3scan.pid
-ExecStart=/usr/sbin/p3scan
+PIDFile=/run/p3scan/p3scan.pid
+ExecStart=/usr/bin/p3scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/p3scan/rc.p3scan b/community/p3scan/rc.p3scan
deleted file mode 100644
index fc8b79b22..000000000
--- a/community/p3scan/rc.p3scan
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting p3scan"
-    [ -d /var/run/p3scan ] || mkdir -p /var/run/p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-
-    # Start p3scan
-    /usr/sbin/p3scan    
-    if ! [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-    add_daemon p3scan
-    stat_done
-  ;;
-  stop)
-    stat_busy "Stopping p3scan"
-
-    # Stop p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then
-      kill `cat /var/run/p3scan/p3scan.pid` &>/dev/null || stat_die
-      rm -f /var/run/p3scan/p3scan.pid
-      rm_daemon p3scan
-      stat_done
-    else
-      stat_fail
-    fi
-  ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-  ;;
-  *)
-    echo "Usage: $0 { start | stop | restart }"
-esac
-exit 0
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 39bafce1c..a7f65a030 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $
+# $Id: PKGBUILD 90942 2013-05-16 02:47:08Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
 pkgver=0.7.6
-pkgrel=9
+pkgrel=10
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
@@ -18,7 +18,7 @@ source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
 	'libarchive.patch')
 sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
             'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
-	    'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415'
+	    'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23'
 	    '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
 
 build() {
@@ -31,6 +31,7 @@ build() {
   patch -Np1 -i "$srcdir/adopt.patch"
   patch -Np1 -i "$srcdir/alpm.patch"
   patch -Np1 -i "$srcdir/libarchive.patch"
+  sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am'
 
   export PYTHON=/usr/bin/python2
   ./autogen.sh --prefix=/usr \
@@ -52,7 +53,7 @@ build() {
               --disable-dummy \
               --enable-alpm \
               --with-default-backend=alpm
-  make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs'
+  make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-suggest-attribute=format'
 }
 
 package_packagekit() {
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
index 8b972b291..a15fafeb2 100644
--- a/community/packagekit/alpm.patch
+++ b/community/packagekit/alpm.patch
@@ -1080,7 +1080,7 @@ index d2f363b..80d5ae0 100644
  
  out:
 diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c
-index 76402f0..5e32151 100644
+index 76402f0..554f06d 100644
 --- a/backends/alpm/pk-backend-transaction.c
 +++ b/backends/alpm/pk-backend-transaction.c
 @@ -63,7 +63,7 @@ alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename)
@@ -1130,7 +1130,15 @@ index 76402f0..5e32151 100644
  			if (percent == recent) {
  				break;
  			}
-@@ -388,6 +393,17 @@ pk_backend_output (PkBackend *self, const gchar *output)
+@@ -316,7 +321,6 @@ pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1,
+ 		case ALPM_QUESTION_REPLACE_PKG:
+ 		case ALPM_QUESTION_CONFLICT_PKG:
+ 		case ALPM_QUESTION_CORRUPTED_PKG:
+-		case ALPM_QUESTION_LOCAL_NEWER:
+ 			/* these actions are mostly harmless */
+ 			g_debug ("safe question %d", question);
+ 			*result = 1;
+@@ -388,6 +392,17 @@ pk_backend_output (PkBackend *self, const gchar *output)
  }
  
  static void
@@ -1148,7 +1156,7 @@ index 76402f0..5e32151 100644
  pk_backend_transaction_dep_resolve (PkBackend *self)
  {
  	g_return_if_fail (self != NULL);
-@@ -427,7 +443,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
+@@ -427,7 +442,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
  	name = alpm_pkg_get_name (pkg);
  	version = alpm_pkg_get_version (pkg);
  
@@ -1158,7 +1166,7 @@ index 76402f0..5e32151 100644
  	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
  
  	optdepends = alpm_pkg_get_optdepends (pkg);
-@@ -435,8 +452,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
+@@ -435,8 +451,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
  		pk_backend_output (self, "Optional dependencies:\n");
  
  		for (i = optdepends; i != NULL; i = i->next) {
@@ -1170,7 +1178,7 @@ index 76402f0..5e32151 100644
  			pk_backend_output (self, output);
  			g_free (output);
  		}
-@@ -467,7 +486,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg)
+@@ -467,7 +485,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg)
  	name = alpm_pkg_get_name (pkg);
  	version = alpm_pkg_get_version (pkg);
  
@@ -1180,7 +1188,7 @@ index 76402f0..5e32151 100644
  	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
  	pk_backend_output_end (self);
  }
-@@ -498,45 +518,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg,
+@@ -498,45 +517,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg,
  	pk_backend_output_start (self, pkg);
  }
  
@@ -1307,7 +1315,7 @@ index 76402f0..5e32151 100644
  pk_backend_transaction_setup (PkBackend *self)
  {
  	g_return_if_fail (self != NULL);
-@@ -545,12 +626,46 @@ pk_backend_transaction_setup (PkBackend *self)
+@@ -545,12 +625,46 @@ pk_backend_transaction_setup (PkBackend *self)
  }
  
  static void
@@ -1355,7 +1363,7 @@ index 76402f0..5e32151 100644
  	switch (event) {
  		case ALPM_EVENT_CHECKDEPS_START:
  		case ALPM_EVENT_RESOLVEDEPS_START:
-@@ -559,7 +674,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
+@@ -559,7 +673,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
  
  		case ALPM_EVENT_FILECONFLICTS_START:
  		case ALPM_EVENT_INTERCONFLICTS_START:
@@ -1363,7 +1371,7 @@ index 76402f0..5e32151 100644
  		case ALPM_EVENT_DELTA_INTEGRITY_START:
  		case ALPM_EVENT_DISKSPACE_START:
  			pk_backend_transaction_test_commit (backend);
-@@ -582,23 +696,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
+@@ -582,23 +695,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
  			break;
  
  		case ALPM_EVENT_UPGRADE_START:
@@ -1438,7 +1446,7 @@ index 76402f0..5e32151 100644
  		default:
  			g_debug ("unhandled event %d", event);
  			break;
-@@ -623,7 +787,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags,
+@@ -623,7 +786,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags,
  	g_return_val_if_fail (cancellable != NULL, FALSE);
  
  	if (alpm_trans_init (alpm, flags) < 0) {
@@ -1447,7 +1455,7 @@ index 76402f0..5e32151 100644
  		g_set_error_literal (error, ALPM_ERROR, errno,
  				     alpm_strerror (errno));
  		return FALSE;
-@@ -692,6 +856,7 @@ alpm_depend_free (alpm_depend_t *depend)
+@@ -692,6 +855,7 @@ alpm_depend_free (alpm_depend_t *depend)
  {
  	free (depend->name);
  	free (depend->version);
@@ -1455,7 +1463,7 @@ index 76402f0..5e32151 100644
  	free (depend);
  }
  
-@@ -731,7 +896,7 @@ alpm_conflict_build_list (const alpm_list_t *i)
+@@ -731,7 +895,7 @@ alpm_conflict_build_list (const alpm_list_t *i)
  			g_string_append_printf (list, "%s <-> %s (%s), ",
  						conflict->package1,
  						conflict->package2, reason);
@@ -1464,7 +1472,7 @@ index 76402f0..5e32151 100644
  		}
  	}
  
-@@ -837,12 +1002,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
+@@ -837,12 +1001,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
  	}
  
  	if (prefix != NULL) {
@@ -1479,7 +1487,7 @@ index 76402f0..5e32151 100644
  		g_set_error_literal (error, ALPM_ERROR, errno,
  				     alpm_strerror (errno));
  	}
-@@ -959,12 +1124,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
+@@ -959,12 +1123,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
  	}
  
  	if (prefix != NULL) {
@@ -1494,7 +1502,7 @@ index 76402f0..5e32151 100644
  		g_set_error_literal (error, ALPM_ERROR, errno,
  				     alpm_strerror (errno));
  	}
-@@ -993,7 +1158,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error)
+@@ -993,7 +1157,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error)
  	}
  
  	if (alpm_trans_release (alpm) < 0) {
@@ -1597,7 +1605,7 @@ index 37ade1e..ff83b5e 100644
  		alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
  
 diff --git a/configure.ac b/configure.ac
-index 37e8a64..2e85f6f 100644
+index 37e8a64..4a33dbd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -707,9 +707,7 @@ if test x$enable_opkg = xyes; then
@@ -1607,7 +1615,7 @@ index 37e8a64..2e85f6f 100644
 -	AC_CHECK_HEADER([alpm.h],
 -			[],
 -			[AC_MSG_ERROR([No ALPM headers found])])
-+	PKG_CHECK_MODULES(ALPM, libalpm >= 4.1.0)
++	PKG_CHECK_MODULES(ALPM, libalpm >= 8.0.1)
  fi
  
  if test x$enable_poldek = xyes; then
diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD
index dc77371c8..bf243f18b 100644
--- a/community/pam_mount/PKGBUILD
+++ b/community/pam_mount/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $
+# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors: Sirius Bakke <sirius\at/nonline.org>
 
 pkgname=pam_mount
 pkgver=2.13
-pkgrel=4
+pkgrel=5
 pkgdesc="A PAM module that can mount volumes for a user session"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pam-mount.sourceforge.net/"
@@ -22,12 +22,13 @@ build() {
   cd -- "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/$pkgname-git.patch
   aclocal
-  automake --add-missing
   libtoolize
+  automake --add-missing
   autoreconf
   ./configure \
 	--prefix=/usr \
-	--with-ssbindir=/usr/sbin \
+	--with-ssbindir=/usr/bin \
+	--sbindir=/usr/bin \
 	--with-slibdir=/usr/lib \
 	--sysconfdir=/etc \
 	--localstatedir=/var
diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD
index 4ae03a936..deee1070c 100644
--- a/community/pam_pwcheck/PKGBUILD
+++ b/community/pam_pwcheck/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 70355 2012-05-04 23:55:13Z allan $
+# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pam_pwcheck
-pkgver=3.9
-pkgrel=4
+pkgver=3.12.1
+pkgrel=1
 pkgdesc="A password strength checking module for PAM-aware password changing programs"
 arch=(i686 x86_64 'mips64el')
 url="http://www.thkukuk.de/pam/pam_pwcheck/"
 depends=('pam')
 license=('GPL')
-source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2
-	pam_pwcheck-3.9-pthread.patch)
-md5sums=('27be63338af88d14610d182b6a161cd1'
-	 '0978c56f1321febb5b4fa584f1054773')
+source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2)
+md5sums=('85cd0d48500c160abcb0b9902e5594ce')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/pam_pwcheck-3.9-pthread.patch
   ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch b/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch
deleted file mode 100644
index ef007b469..000000000
--- a/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- pam_pwcheck-3.9.orig/src/read-files.c	2005-10-10 13:38:30.000000000 -0500
-+++ pam_pwcheck-3.9/src/read-files.c	2012-12-25 05:23:41.175269985 -0500
-@@ -30,8 +30,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <nss.h>
--#include <bits/libc-lock.h>
--#define __libc_lock_t pthread_mutex_t
-+#include <pthread.h>
- 
- #include "read-files.h"
- 
-@@ -341,11 +340,11 @@
- 		  char *buffer, size_t buflen, int *errnop)
- {
-   /* Locks the static variables in this file.  */
--  __libc_lock_define_initialized (static, lock);
-+  static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-   enum nss_status status;
-   FILE *stream = NULL;
- 
--  __libc_lock_lock (lock);
-+  pthread_mutex_lock (&lock);
- 
-   status = internal_setent (&stream, "/shadow");
-   if (status == NSS_STATUS_SUCCESS)
-@@ -361,7 +360,7 @@
-       internal_endent (&stream);
-     }
- 
--  __libc_lock_unlock (lock);
-+  pthread_mutex_unlock (&lock);
- 
-   return status;
- }
-@@ -371,11 +370,11 @@
- 		  char *buffer, size_t buflen, int *errnop)
- {
-   /* Locks the static variables in this file.  */
--  __libc_lock_define_initialized (static, lock);
-+  static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-   enum nss_status status;
-   FILE *stream = NULL;
- 
--  __libc_lock_lock (lock);
-+  pthread_mutex_lock (&lock);
- 
-   status = internal_setent (&stream, "/passwd");
-   if (status == NSS_STATUS_SUCCESS)
-@@ -391,7 +390,7 @@
-       internal_endent (&stream);
-     }
- 
--  __libc_lock_unlock (lock);
-+  pthread_mutex_unlock (&lock);
- 
-   return status;
- }
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index 13653dcd4..c61e08f6a 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $
+# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=pari
-pkgver=2.5.3
+pkgver=2.5.4
 pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
 url='http://pari.math.u-bordeaux.fr/'
@@ -11,12 +11,16 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'readline' 'libx11')
 makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail')
-source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522')
+source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/\$addlib64//g' -i config/get_libpth
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's/\$addlib64/ /' -i config/get_libpth
 	./Configure --prefix=/usr --with-gmp --with-readline
 	make all
 }
@@ -29,8 +33,5 @@ check() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-
-	# symlink pointing to a symlink that is going to be moved by zipman
-	rm "${pkgdir}"/usr/share/man/man1/pari.1
-	ln -s gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1.gz
+	ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
 }
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index a3caad52b..94a3bda89 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88524 2013-04-19 10:31:48Z spupykin $
+# $Id: PKGBUILD 92115 2013-05-31 16:30:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=5.3.0
+pkgver=5.4.0
 #_rel=stable
 _rel=devel
 pkgrel=1
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('4f9fd4994bffd7664901dcace9ab6c16')
+md5sums=('5f4603d4c4ee8d60826e56f9012d2e99')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD
index 7cc655b41..679a5bebe 100644
--- a/community/partimage/PKGBUILD
+++ b/community/partimage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77310 2012-10-08 15:54:38Z lfleischer $
+# $Id: PKGBUILD 92035 2013-05-31 00:06:34Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sven Kauber <celeon@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=partimage
 pkgver=0.6.9
-pkgrel=3
+pkgrel=4
 pkgdesc='Partition Image saves partitions in many formats to an image file.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.partimage.org/'
@@ -17,21 +17,19 @@ backup=('etc/partimaged/partimagedusers')
 install='partimage.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'partimage-0.6.9-zlib-1.2.6.patch'
-        'partimaged'
         'partimaged-gencrt'
         'partimaged.service')
 md5sums=('1bc046fd915c5debbafc85729464e513'
          '202c4334766041d98c5f67c9d62c3063'
-         'f3b517a62de5540f3b1a8b7edf65b7ec'
          '2316b116227b07efb48266e660ca1ba1'
-         '4102983fdf6e7af7cac73fdf9d37a6f6')
+         '5f8dae511cdfbf097409a45e9642a372')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
 
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-pam
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
   make
   make pamfile
 }
@@ -42,7 +40,6 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
-  install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged"
   install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
   chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
 
diff --git a/community/partimage/partimaged b/community/partimage/partimaged
deleted file mode 100644
index da810cbb1..000000000
--- a/community/partimage/partimaged
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# This file belongs in /etc/rc.d
-#
-###############################################################################
-
-#inserting certain functions (like stat_busy)
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARTIMAGE=/usr/sbin/
-
-# Check the file is there and is executable.
-[ -x $PARTIMAGE/partimaged ] || exit 0
-
-PID=`pidof -o %PPID /usr/sbin/partimaged`
-
-# See how we were called.
-case "$1" in
-  start)
-	stat_busy "Starting Partimage Daemon "
-	if [ -z "$PID" ]; then 
-	   /usr/sbin/partimaged -D &>/dev/null
-	   RETVAL=$? #storing the status of the last command to RETVAL
-	   if [ $? -gt 0 ]; then #if the status was other than 0, the command failed
-	      stat_fail
-	      exit 1
-           else			
-	      add_daemon partimaged
-	      stat_done
-	   fi
-	else
-	   stat_fail
-	   echo ":: Daemon already started as pid $PID"
-	   exit 1
-	fi			    
-	;;
-  stop)
-	stat_busy "Stopping Partimage Daemon "
-	if [ "$PID" != "" ]; then #if PID exists
-	   kill -KILL $PID &>/dev/null
-	   stat_done
-	   if [ $? -gt 0 ]; then
-	      stat_fail
-	      exit 1
-	   else		  
-	      RETVAL=$?
-	      rm_daemon partimaged
-      	   fi
-  	 else   
-	   stat_fail
-	   echo ":: Daemon already stopped"
-	   exit 1
-   	fi
-	;;
-  restart|reload)
-	$0 stop
-	$0 start
-	RETVAL=$?
-	;;
-  *)
-	echo "Usage: partimaged {start|stop|restart|reload}"
-	exit 1
-esac
-exit $RETVAL
diff --git a/community/partimage/partimaged.service b/community/partimage/partimaged.service
index 34eb87fd7..baa682981 100644
--- a/community/partimage/partimaged.service
+++ b/community/partimage/partimaged.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/partimaged --daemon
+ExecStart=/usr/bin/partimaged --daemon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 3c4679f2e..1fc3d2ad7 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88487 2013-04-18 14:09:48Z spupykin $
+# $Id: PKGBUILD 90992 2013-05-17 06:49:35Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=4.0.0.rc6
-pkgrel=2
+pkgver=4.0.2
+pkgrel=1
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
@@ -14,7 +14,7 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
-md5sums=('2cc01a611431f4f980b65b87dbbd9e5a')
+md5sums=('0b261a5a9a23858c3fe2999aecdbc552')
 
 build(){
   cd $srcdir/passenger-release-$pkgver
diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD
index f3562ada8..28de1def2 100644
--- a/community/pcsc-perl/PKGBUILD
+++ b/community/pcsc-perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $
+# $Id: PKGBUILD 91655 2013-05-26 09:24:45Z bluewind $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 # Contributor: marc0s <marc0s@fsfe.org>
 
 pkgname=pcsc-perl
 pkgver=1.4.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A Perl Module for PC/SC SmartCard access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 403257fa6..d21b66fae 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83602 2013-02-03 16:05:49Z giovanni $
+# $Id: PKGBUILD 91101 2013-05-19 13:42:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -21,6 +21,7 @@ build() {
   sed -i -e "s:python:python2:g" src/spy/pcsc-spy
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --enable-libudev \
               --sysconfdir=/etc \
               --enable-ipcdir=/run/pcscd \
diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD
index 142d55d81..f73b84a4b 100644
--- a/community/pd/PKGBUILD
+++ b/community/pd/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 74762 2012-08-03 14:09:42Z speps $
+# $Id: PKGBUILD 92207 2013-06-02 18:54:01Z bpiotrowski $
 # Maintainer : speps <speps at aur dot archlinux dot org>
-# Contributor:  TDY <tdy@gmx.com>
+# Contributor: TDY <tdy@gmx.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
 
 pkgname=pd
-pkgver=0.43.4
+pkgver=0.44.3
 _ver=${pkgver%.*}-${pkgver##*.}
 pkgrel=1
 pkgdesc="The Pure Data real-time music and multimedia environment"
@@ -15,10 +14,11 @@ license=('custom:BSD')
 depends=('jack' 'fftw' 'tk')
 provides=('puredata')
 source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz")
-md5sums=('9f174836ad5715ff3f65fd9b9f9a18ce')
+md5sums=('a3e8ca0eab039dc472a6533ef9344582')
 
 build() {
-  cd "$srcdir/pd-$_ver/src"
+  cd "$srcdir/pd-$_ver"
+  ./autogen.sh
   ./configure --prefix=/usr \
               --enable-alsa \
               --enable-jack \
@@ -27,10 +27,10 @@ build() {
 }
 
 package() {
-  cd "$srcdir/pd-$_ver/src"
+  cd "$srcdir/pd-$_ver"
   make DESTDIR="$pkgdir" install
 
   # license
-  install -Dm644 ../LICENSE.txt \
+  install -Dm644 LICENSE.txt \
     "$pkgdir/usr/share/licenses/pd/LICENSE"
 }
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index 26f1ff262..38a311ed0 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88656 2013-04-21 08:48:16Z jelle $
+# $Id: PKGBUILD 91593 2013-05-25 02:56:18Z foutrelis $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
 pkgver=0.7.16
-pkgrel=4
+pkgrel=6
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pdf2djvu.googlecode.com"
@@ -12,22 +12,26 @@ license=('GPL')
 depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick')
 makedepends=('pstreams' 'python2-nose' 'ttf-liberation')
 source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
+md5sums=('6ba1e576212e129111518a8c4afd1092')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
+
     ./configure --prefix=/usr
     make
 }
 
+check() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    sed -i 's/nosetests/nosetests2/' tests/Makefile
+    make test
+}
+
 package() {
     cd ${srcdir}/${pkgname}-${pkgver}
+
     make install DESTDIR=${pkgdir}
     install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
 }
-check() {
 
-    cd ${srcdir}/${pkgname}-${pkgver}
-    sed -i 's/nosetests/nosetests2/' tests/Makefile
-    make test
-}
-md5sums=('6ba1e576212e129111518a8c4afd1092')
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index f5a42a386..63479e96d 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89549 2013-04-29 23:06:17Z arodseth $
+# $Id: PKGBUILD 90965 2013-05-16 18:09:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Jan Steffens <heftig@archlinux.org>
 
 pkgname=pdns-recursor
-pkgver=3.5
+pkgver=3.5.1
 pkgrel=1
 pkgdesc='PowerDNS recursor'
 url='https://www.powerdns.com/'
@@ -15,8 +15,8 @@ makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
         'pdns-recursor.service')
-sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549'
-            'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875')
+sha256sums=('30655996d1963e259d4fc8648184031bf9cb83f64510d0b00539d3ce698b2824'
+            '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,8 +29,9 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf"
+  make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install
+  mv "$pkgdir/etc/powerdns/recursor.conf-dist" \
+    "$pkgdir/etc/powerdns/recursor.conf"
   rm -r "$pkgdir/etc/init.d"
   install -Dm644 "$srcdir/pdns-recursor.service" \
     "$pkgdir/usr/lib/systemd/system/pdns-recursor.service"
diff --git a/community/pdns-recursor/pdns-recursor.service b/community/pdns-recursor/pdns-recursor.service
index 8f4404e1d..e8d23ccd0 100644
--- a/community/pdns-recursor/pdns-recursor.service
+++ b/community/pdns-recursor/pdns-recursor.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/pdns_recursor --daemon
+ExecStart=/usr/bin/pdns_recursor --daemon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 8387ffd6f..9e679b81b 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90235 2013-05-09 18:41:57Z arodseth $
+# $Id: PKGBUILD 90788 2013-05-13 22:34:43Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=pdns
 pkgver=3.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.powerdns.com/'
@@ -22,7 +22,7 @@ source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
         'pdns.service'
         'pdns.conf')
 sha256sums=('d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572'
-            '2a60c4407bcfe19026ae77d3e3b7b477d5a0c6323c0bc78892e9d907003b442a'
+            'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040'
             'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e')
 
 prepare() {
@@ -40,10 +40,12 @@ build() {
     --libexecdir=/usr/lib \
     --libdir=/usr/lib/powerdns \
     --mandir=/usr/share/man \
-    --with-modules="" \
+    --with-modules='' \
     --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
     --disable-recursor \
-    --disable-static
+    --disable-static \
+    --sbindir=/usr/bin \
+    --bindir=/usr/bin
   make  
 }
 
diff --git a/community/pdns/pdns.service b/community/pdns/pdns.service
index 1005c9f64..b544ba73e 100644
--- a/community/pdns/pdns.service
+++ b/community/pdns/pdns.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes
+ExecStart=/usr/bin/pdns_server --daemon --guardian=yes
 ExecReload=/usr/bin/pdns_control cycle
 ExecStop=/usr/bin/pdns_control quit
 
diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD
index 593894619..62579bfaf 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 75512 2012-08-26 18:24:09Z bpiotrowski $
+# $Id: PKGBUILD 91500 2013-05-23 10:14:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrik Nymann Jensen <h@henriknj.dk>
 
 pkgname=pdnsd
 pkgver=1.2.9.a
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=4
 pkgdesc="Proxy DNS server with permanent caching"
 arch=(i686 x86_64 mips64el)
 url="http://members.home.nl/p.a.rombouts/pdnsd/"
 license=('GPL')
 depends=('glibc')
 source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz
-		rc.d
-		service)
+	service)
 md5sums=('2f3e705d59a0f9308ad9504b24400769'
-         '3670bd47c9303fbb655d9216715512de'
-         'fad5e518d126b29fc947941d57a0a494')
+         '4f86bdbd8495b53341070d5720491996')
 
 build() {
-	cd $srcdir/$pkgname-$_pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
+	cd $srcdir/$pkgname-${_pkgver}
+	./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6
 	make
 }
 
 package() {
-	cd $srcdir/$pkgname-$_pkgver
+	cd $srcdir/$pkgname-${_pkgver}
 	make DESTDIR=$pkgdir install
-
-	install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/pdnsd
 	install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service
 }
diff --git a/community/pdnsd/rc.d b/community/pdnsd/rc.d
deleted file mode 100644
index 34a541d18..000000000
--- a/community/pdnsd/rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pdnsd`
-case "$1" in
-  start)
-    stat_busy "Starting pdnsd Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/pdnsd -d
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping pdnsd Daemon"
-    [ ! -z "$PID" ]  && kill -TERM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/pdnsd/service b/community/pdnsd/service
index 5821dbcb2..d284cd933 100644
--- a/community/pdnsd/service
+++ b/community/pdnsd/service
@@ -3,7 +3,7 @@ Description=proxy name server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pdnsd
+ExecStart=/usr/bin/pdnsd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD
index cf4e7607d..1e0308158 100644
--- a/community/pekwm/PKGBUILD
+++ b/community/pekwm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90217 2013-05-09 09:13:19Z foutrelis $
+# $Id: PKGBUILD 92159 2013-06-01 21:53:18Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Eddie Lozon <almostlucky@attbi.com>
 
 pkgname=pekwm
-pkgver=0.1.16
-pkgrel=5
+pkgver=0.1.17
+pkgrel=1
 pkgdesc='Small, fast, functional, and flexible window manager'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
@@ -29,13 +29,13 @@ backup=(etc/pekwm/autoproperties
         etc/pekwm/vars)
 source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2"
         "${pkgname}_kdm.desktop")
-sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96'
+sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00'
             '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6')
 
 prepare() {
   cd "$srcdir"
 
-  gendesk
+  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 }
 
 build() {
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 3c8fe9edd..584d016a3 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88094 2013-04-11 13:45:38Z mtorromeo $
+# $Id: PKGBUILD 91599 2013-05-25 10:17:47Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.30_rel30.2
+pkgver=5.5.31_rel30.3
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -97,7 +97,7 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('d30876033cd5590f8e1d68aff6a2eaad677dbe59168d4610c580c4e4e2e923a7'
+sha256sums=('808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3'
             '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
             '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60')
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index a7032ac70..7dfa16a58 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90076 2013-05-06 19:39:02Z foutrelis $
+# $Id: PKGBUILD 91562 2013-05-23 19:50:14Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.7.0
-pkgrel=6
+pkgrel=7
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
@@ -13,15 +13,25 @@ depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'li
 makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
 optdepends=('performous-freesongs: free songs for performous')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
-        performous-0.7.0-cmake.patch)
+        performous-0.7.0-cmake.patch
+	fix-noisy-sound-output.patch)
 md5sums=('60f3f72b51a630a4aa996484aedb9526'
-         '7da8aef3f4dd28e19f95957ae9ac2bb1')
+         '7da8aef3f4dd28e19f95957ae9ac2bb1'
+         '820dc6d1a91c23f0ef56e2cd1759afb6')
 
-build() {
+prepare() {
   cd performous-${pkgver}
 
+  # patch from gentoo
   patch -Np0 -i ../performous-0.7.0-cmake.patch
 
+  # fix FS#33948 (merged upstream)
+  patch -Np1 -i ../fix-noisy-sound-output.patch
+}
+
+build() {
+  cd performous-${pkgver}
+
   mkdir -p build
   cd build
 
diff --git a/community/performous/fix-noisy-sound-output.patch b/community/performous/fix-noisy-sound-output.patch
new file mode 100644
index 000000000..e4ba0c246
--- /dev/null
+++ b/community/performous/fix-noisy-sound-output.patch
@@ -0,0 +1,440 @@
+diff -ur performous-0.7.0/game/audio.cc performous-0.7.0b/game/audio.cc
+--- performous-0.7.0/game/audio.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/audio.cc	2013-05-23 19:38:26.568498744 +0200
+@@ -140,7 +140,8 @@
+ 		FFmpeg mpeg;
+ 		float fadeLevel;
+ 		float pitchFactor;
+-		Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
++		//Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
++		Track(std::string const& filename, unsigned int sr): mpeg(filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
+ 	};
+ 	typedef boost::ptr_map<std::string, Track> Tracks;
+ 	Tracks tracks; ///< Audio decoders
+@@ -241,7 +242,8 @@
+ 	FFmpeg mpeg;
+ 	bool eof;
+   public:
+-	Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { }
++	//Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { }
++	Sample(std::string const& filename, unsigned sr) : m_pos(), mpeg(filename, sr), eof(true) { }
+ 	void operator()(float* begin, float* end) {
+ 		if(eof) {
+ 			// No more data to play in this sample
+diff -ur performous-0.7.0/game/ffmpeg.cc performous-0.7.0b/game/ffmpeg.cc
+--- performous-0.7.0/game/ffmpeg.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/ffmpeg.cc	2013-05-23 21:41:09.057986491 +0200
+@@ -3,6 +3,7 @@
+ #include "config.hh"
+ #include "util.hh"
+ #include "xtime.hh"
++#include <boost/smart_ptr/shared_ptr.hpp>
+ #include <iostream>
+ #include <stdexcept>
+ 
+@@ -20,15 +21,20 @@
+ 
+ /*static*/ boost::mutex FFmpeg::s_avcodec_mutex;
+ 
+-FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate):
+-  width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(),
+-  m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(),
+-  m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(),
++//FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate):
++//  width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(),
++// m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(),
++//  m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(),
++FFmpeg::FFmpeg(std::string const& _filename, unsigned int rate):
++  width(), height(), m_filename(_filename), m_rate(rate), m_quit(),
++  m_seekTarget(getNaN()), m_position(), m_duration(), m_streamId(-1),
++  m_mediaType(rate ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO),
++  m_formatContext(), m_codecContext(), m_resampleContext(), m_swsContext(),
+   m_thread(new boost::thread(boost::ref(*this)))
+ {
+-	if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO;
+-	else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO;
+-	else throw std::logic_error("Can only decode one track");
++//	if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO;
++//	else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO;
++//	else throw std::logic_error("Can only decode one track");
+ }
+ 
+ FFmpeg::~FFmpeg() {
+@@ -36,20 +42,20 @@
+ 	videoQueue.reset();
+ 	audioQueue.quit();
+ 	m_thread->join();
+-	// TODO: use RAII for freeing resources (to prevent memory leaks)
+-	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
+-	if (m_resampleContext) audio_resample_close(m_resampleContext);
+-	if (m_codecContext) avcodec_close(m_codecContext);
+-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
+-	if (m_formatContext) avformat_close_input(&m_formatContext);
+-#else
+-	if (m_formatContext) av_close_input_file(m_formatContext);
+-#endif
+-}
+-
+-double FFmpeg::duration() const {
+-	double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN();
+-	return d >= 0.0 ? d : getInf();
++// 	// TODO: use RAII for freeing resources (to prevent memory leaks)
++// 	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
++// 	if (m_resampleContext) audio_resample_close(m_resampleContext);
++// 	if (m_codecContext) avcodec_close(m_codecContext);
++// #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++// 	if (m_formatContext) avformat_close_input(&m_formatContext);
++// #else
++// 	if (m_formatContext) av_close_input_file(m_formatContext);
++// #endif
++// }
++// 
++// double FFmpeg::duration() const {
++// 	double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN();
++// 	return d >= 0.0 ? d : getInf();
+ }
+ 
+ void FFmpeg::open() {
+@@ -60,11 +66,14 @@
+ 	if (avformat_find_stream_info(m_formatContext, NULL) < 0) throw std::runtime_error("Cannot find stream information");
+ 	m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ 	// Find a track and open the codec
+-	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0);
++//	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0);
++	AVCodec* codec = NULL;
++	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &codec, 0);
+ 	if (m_streamId < 0) throw std::runtime_error("No suitable track found");
+ 
+ 	AVCodecContext* cc = m_formatContext->streams[m_streamId]->codec;
+-	if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec");
++//	if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec");
++	if (avcodec_open2(cc, codec, NULL) < 0) throw std::runtime_error("Cannot open codec");
+ 	cc->workaround_bugs = FF_BUG_AUTODETECT;
+ 	m_codecContext = cc;
+ 
+@@ -90,18 +99,20 @@
+ 
+ void FFmpeg::operator()() {
+ 	try { open(); } catch (std::exception const& e) { std::clog << "ffmpeg/error: Failed to open " << m_filename << ": " << e.what() << std::endl; m_quit = true; return; }
+-	m_running = true;
+-	audioQueue.setDuration(duration());
++//	m_running = true;
++//	audioQueue.setDuration(duration());
++	m_duration = m_formatContext->duration / double(AV_TIME_BASE);
++	audioQueue.setDuration(m_duration);
+ 	int errors = 0;
+ 	while (!m_quit) {
+ 		try {
+ 			if (audioQueue.wantSeek()) m_seekTarget = 0.0;
+ 			if (m_seekTarget == m_seekTarget) seek_internal();
+ 			decodePacket();
+-			m_eof = false;
++//			m_eof = false;
+ 			errors = 0;
+ 		} catch (eof_error&) {
+-			m_eof = true;
++//			m_eof = true;
+ 			videoQueue.push(new VideoFrame()); // EOF marker
+ 			boost::thread::sleep(now() + 0.1);
+ 		} catch (std::exception& e) {
+@@ -109,10 +120,19 @@
+ 			if (++errors > 2) { std::clog << "ffmpeg/error: FFMPEG terminating due to multiple errors" << std::endl; m_quit = true; }
+ 		}
+ 	}
+-	m_running = false;
+-	m_eof = true;
++//	m_running = false;
++//	m_eof = true;
+ 	audioQueue.setEof();
+ 	videoQueue.push(new VideoFrame()); // EOF marker
++	// TODO: use RAII for freeing resources (to prevent memory leaks)
++	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
++	if (m_resampleContext) audio_resample_close(m_resampleContext);
++	if (m_codecContext) avcodec_close(m_codecContext);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++	if (m_formatContext) avformat_close_input(&m_formatContext);
++#else
++	if (m_formatContext) av_close_input_file(m_formatContext);
++#endif
+ }
+ 
+ void FFmpeg::seek(double time, bool wait) {
+@@ -125,7 +145,8 @@
+ 	videoQueue.reset();
+ 	audioQueue.reset();
+ 	int flags = 0;
+-	if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD;
++//	if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD;
++	if (m_seekTarget < m_position) flags |= AVSEEK_FLAG_BACKWARD;
+ 	av_seek_frame(m_formatContext, -1, m_seekTarget * AV_TIME_BASE, flags);
+ 	m_seekTarget = getNaN(); // Signal that seeking is done
+ }
+@@ -139,16 +160,16 @@
+ 		~ReadFramePacket() { av_free_packet(this); }
+ 	};
+ 
+-	struct AVFrameWrapper {
+-		AVFrame* m_frame;
+-		AVFrameWrapper(): m_frame(avcodec_alloc_frame()) {
+-			if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame");
+-		}
+-		~AVFrameWrapper() { av_free(m_frame); }
+-		operator AVFrame*() { return m_frame; }
+-		AVFrame* operator->() { return m_frame; }
+-	};
+-
++// 	struct AVFrameWrapper {
++// 		AVFrame* m_frame;
++// 		AVFrameWrapper(): m_frame(avcodec_alloc_frame()) {
++// 			if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame");
++// 		}
++// 		~AVFrameWrapper() { av_free(m_frame); }
++// 		operator AVFrame*() { return m_frame; }
++// 		AVFrame* operator->() { return m_frame; }
++// 	};
++// 
+ 	// Read an AVPacket and decode it into AVFrames
+ 	ReadFramePacket packet(m_formatContext);
+ 	int packetSize = packet.size;
+@@ -156,19 +177,27 @@
+ 		if (packetSize < 0) throw std::logic_error("negative packet size?!");
+ 		if (m_quit || m_seekTarget == m_seekTarget) return;
+ 		if (packet.stream_index != m_streamId) return;
+-		AVFrameWrapper frame;
++//		AVFrameWrapper frame;
++		boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free);
+ 		int frameFinished = 0;
+ 		int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ?
+-		  avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) :
+-		  avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet));
+-		if (decodeSize < 0) throw std::runtime_error("cannot decode avframe");
++// 		  avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) :
++// 		  avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet));
++// 		if (decodeSize < 0) throw std::runtime_error("cannot decode avframe");
++		  avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) :
++		  avcodec_decode_audio4(m_codecContext, frame.get(), &frameFinished, &packet));
++		if (decodeSize < 0) return; // Packet didn't produce any output (could be waiting for B frames or something)
+ 		packetSize -= decodeSize; // Move forward within the packet
+ 		if (!frameFinished) continue;
+ 		// Update current position if timecode is available
+-		if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) {
+-			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base);
+-		}
+-		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame);
++//		if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) {
++		if (int64_t(frame->pkt_pts) != int64_t(AV_NOPTS_VALUE)) {
++//			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base);
++			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base)
++			  - double(m_formatContext->start_time) / AV_TIME_BASE;
++ 		}
++//		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame);
++		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame.get()); else processAudio(frame.get());
+ 	}
+ }
+ 
+@@ -189,9 +218,29 @@
+ }
+ 
+ void FFmpeg::processAudio(AVFrame* frame) {
++	void* data = frame->data[0];
++	// New FFmpeg versions use non-interleaved audio decoding and samples may be in float format.
++	// Do a conversion here, allowing us to use the old (deprecated) avcodec audio_resample().
++	std::vector<int16_t> input;
++	unsigned inFrames = frame->nb_samples;
++	if (frame->data[1]) {
++		unsigned channels = m_codecContext->channels;
++		input.reserve(channels * inFrames);
++		for (unsigned i = 0; i < inFrames; ++i) {
++			for (unsigned ch = 0; ch < channels; ++ch) {
++				data = frame->data[ch];
++				input.push_back(m_codecContext->sample_fmt == AV_SAMPLE_FMT_FLTP ?
++				  da::conv_to_s16(reinterpret_cast<float*>(data)[i]) :
++				  reinterpret_cast<int16_t*>(data)[i]
++				);
++			}
++		}
++		data = &input[0];
++	}
+ 	// Resample to output sample rate, then push to audio queue and increment timecode
+ 	std::vector<int16_t> resampled(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+-	int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples);
++//	int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples);
++	int frames = audio_resample(m_resampleContext, &resampled[0], reinterpret_cast<short*>(data), inFrames);
+ 	resampled.resize(frames * AUDIO_CHANNELS);
+ 	audioQueue.push(resampled, m_position);  // May block
+ 	m_position += double(frames)/m_formatContext->streams[m_streamId]->codec->sample_rate;
+diff -ur performous-0.7.0/game/ffmpeg.hh performous-0.7.0b/game/ffmpeg.hh
+--- performous-0.7.0/game/ffmpeg.hh	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/ffmpeg.hh	2013-05-23 20:42:22.868566247 +0200
+@@ -3,7 +3,8 @@
+ #include "util.hh"
+ #include "libda/sample.hpp"
+ #include <boost/circular_buffer.hpp>
+-#include <boost/ptr_container/ptr_set.hpp>
++//#include <boost/ptr_container/ptr_set.hpp>
++#include <boost/ptr_container/ptr_deque.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/thread/condition.hpp>
+ #include <boost/thread/mutex.hpp>
+@@ -47,25 +48,29 @@
+ 	}
+ };
+ 
+-static bool operator<(VideoFrame const& a, VideoFrame const& b) {
+-	return a.timestamp < b.timestamp;
+-}
++// static bool operator<(VideoFrame const& a, VideoFrame const& b) {
++// 	return a.timestamp < b.timestamp;
++// }
+ 
+ /// video queue: first in first out
+ class VideoFifo {
+   public:
+-	VideoFifo(): m_available(), m_timestamp(), m_eof() {}
++// 	VideoFifo(): m_available(), m_timestamp(), m_eof() {}
++	VideoFifo(): m_timestamp(), m_eof() {}
+ 	/// trys to pop a VideoFrame from queue
+ 	bool tryPop(VideoFrame& f) {
+ 		boost::mutex::scoped_lock l(m_mutex);
+-		if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; }
+-		statsUpdate();
+-		if (m_available == 0) return false; // Nothing to deliver
++// 		if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; }
++// 		statsUpdate();
++// 		if (m_available == 0) return false; // Nothing to deliver
++		if (m_queue.empty()) return false; // Nothing to deliver
++		if (m_queue.begin()->data.empty()) { m_eof = true; return false; }
+ 		f.swap(*m_queue.begin());
+-		m_queue.erase(m_queue.begin());
++// 		m_queue.erase(m_queue.begin());
++		m_queue.pop_front();
+ 		m_cond.notify_all();
+ 		m_timestamp = f.timestamp;
+-		statsUpdate();
++// 		statsUpdate();
+ 		return true;
+ 	}
+ 	/// pushes VideoFrames to queue
+@@ -73,38 +78,41 @@
+ 		boost::mutex::scoped_lock l(m_mutex);
+ 		while (m_queue.size() > m_max) m_cond.wait(l);
+ 		if (m_queue.empty()) m_timestamp = f->timestamp;
+-		m_queue.insert(f);
+-		statsUpdate();
+-	}
+-	/// updates stats
+-	void statsUpdate() {
+-		m_available = std::max(0, int(m_queue.size()) - int(m_min));
+-		if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1;
++// 		m_queue.insert(f);
++// 		statsUpdate();
++// 	}
++// 	/// updates stats
++// 	void statsUpdate() {
++// 		m_available = std::max(0, int(m_queue.size()) - int(m_min));
++// 		if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1;
++		m_queue.push_back(f);
+ 	}
+ 	/// resets video queue
+ 	void reset() {
+ 		boost::mutex::scoped_lock l(m_mutex);
+ 		m_queue.clear();
+ 		m_cond.notify_all();
+-		statsUpdate();
++// 		statsUpdate();
+ 		m_eof = false;
+ 	}
+ 	/// returns current position
+ 	double position() const { return m_timestamp; }
+-	/// returns m_available / m_max
+-	double percentage() const { return double(m_available) / m_max; }
++// 	/// returns m_available / m_max
++// 	double percentage() const { return double(m_available) / m_max; }
+ 	/// simple eof check
+ 	double eof() const { return m_eof; }
+ 
+   private:
+-	boost::ptr_set<VideoFrame> m_queue;
++// 	boost::ptr_set<VideoFrame> m_queue;
++	boost::ptr_deque<VideoFrame> m_queue;
+ 	mutable boost::mutex m_mutex;
+ 	boost::condition m_cond;
+-	volatile unsigned m_available;
++// 	volatile unsigned m_available;
+ 	double m_timestamp;
+ 	bool m_eof;
+-	static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames
+-	static const unsigned m_max = 50;
++// 	static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames
++// 	static const unsigned m_max = 50;
++	static const unsigned m_max = 20;
+ };
+ 
+ class AudioBuffer {
+@@ -195,7 +203,7 @@
+ 
+ // ffmpeg forward declarations
+ extern "C" {
+-  struct AVCodec;
++//   struct AVCodec;
+   struct AVCodecContext;
+   struct AVFormatContext;
+   struct AVFrame;
+@@ -206,8 +214,10 @@
+ /// ffmpeg class
+ class FFmpeg {
+   public:
+-	/// constructor
+-	FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000);
++// 	/// constructor
++// 	FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000);
++	/// Decode file; if no rate is specified, decode video, otherwise decode audio.
++	FFmpeg(std::string const& file, unsigned int rate = 0);
+ 	~FFmpeg();
+ 	void operator()(); ///< Thread runs here, don't call directly
+ 	unsigned width, ///< width of video
+@@ -220,8 +230,8 @@
+ 	void seek(double time, bool wait = true);
+ 	/// duration
+ 	double duration() const;
+-	/// return current position
+-	double position() { return videoQueue.position(); /* FIXME: remove */ }
++// 	/// return current position
++// 	double position() { return videoQueue.position(); /* FIXME: remove */ }
+ 	bool terminating() const { return m_quit; }
+ 
+ 	class eof_error: public std::exception {};
+@@ -234,16 +244,17 @@
+ 	std::string m_filename;
+ 	unsigned int m_rate;
+ 	volatile bool m_quit;
+-	volatile bool m_running;
+-	volatile bool m_eof;
++// 	volatile bool m_running;
++// 	volatile bool m_eof;
+ 	volatile double m_seekTarget;
+ 	double m_position;
++	double m_duration;
+ 	// libav-specific variables
+ 	int m_streamId;
+ 	int m_mediaType;  // enum AVMediaType
+ 	AVFormatContext* m_formatContext;
+ 	AVCodecContext* m_codecContext;
+-	AVCodec* m_codec;
++// 	AVCodec* m_codec;
+ 	ReSampleContext* m_resampleContext;
+ 	SwsContext* m_swsContext;
+ 	// Make sure the thread starts only after initializing everything else
+diff -ur performous-0.7.0/game/video.cc performous-0.7.0b/game/video.cc
+--- performous-0.7.0/game/video.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/video.cc	2013-05-23 20:33:30.612096870 +0200
+@@ -3,7 +3,8 @@
+ #include "util.hh"
+ #include <cmath>
+ 
+-Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
++// Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
++Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(_videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
+ 
+ void Video::prepare(double time) {
+ 	time += m_videoGap;
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 21f7f5f14..108c806d7 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73833 2012-07-16 05:37:51Z spupykin $
+# $Id: PKGBUILD 91656 2013-05-26 09:24:46Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
 pkgver=0.51
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/BerkeleyDB/"
diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD
index c2c0b292c..0bcf76cb3 100644
--- a/community/perl-class-methodmaker/PKGBUILD
+++ b/community/perl-class-methodmaker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71753 2012-06-02 10:29:34Z bluewind $
+# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-class-methodmaker
 pkgver=2.18
-pkgrel=6
+pkgrel=7
 pkgdesc="Create generic class methods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Class-MethodMaker"
@@ -18,6 +18,10 @@ build() {
   cd  $srcdir/Class-MethodMaker-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor 
   make
+}
+
+package() {
+  cd  $srcdir/Class-MethodMaker-$pkgver
   make install DESTDIR=$pkgdir
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index f07ed1629..4830160de 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=perl-clone
 pkgver=0.34
-pkgrel=1
+pkgrel=2
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://search.cpan.org/~RDF/Clone'
diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD
index 0edfcab11..39d303e26 100644
--- a/community/perl-crypt-blowfish/PKGBUILD
+++ b/community/perl-crypt-blowfish/PKGBUILD
@@ -1,21 +1,32 @@
-# $Id: PKGBUILD 71757 2012-06-02 10:29:42Z bluewind $
+# $Id: PKGBUILD 91659 2013-05-26 09:24:50Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-crypt-blowfish
 pkgver=2.12
-pkgrel=5
+pkgrel=6
 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Crypt-Blowfish"
 license=("GPL" "PerlArtistic")
-source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz")
-md5sums=('a0eca17addc8bdaf38c044c365a8800c')
+source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz"
+	"perl-5.18.patch")
+md5sums=('a0eca17addc8bdaf38c044c365a8800c'
+         '700129e690f239f9c1a318fffd3504c7')
+
+prepare() {
+  cd $srcdir/Crypt-Blowfish-$pkgver
+  patch -p1 <$srcdir/perl-5.18.patch
+}
 
 build() {
   cd $srcdir/Crypt-Blowfish-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor 
   make
+}
+
+package() {
+  cd $srcdir/Crypt-Blowfish-$pkgver
   make pure_install doc_install DESTDIR=$pkgdir
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-crypt-blowfish/perl-5.18.patch b/community/perl-crypt-blowfish/perl-5.18.patch
new file mode 100644
index 000000000..291733cb9
--- /dev/null
+++ b/community/perl-crypt-blowfish/perl-5.18.patch
@@ -0,0 +1,13 @@
+diff -wbBur Crypt-Blowfish-2.12.org/Blowfish.xs Crypt-Blowfish-2.12/Blowfish.xs
+--- Crypt-Blowfish-2.12.org/Blowfish.xs	2000-11-30 09:25:21.000000000 +0300
++++ Crypt-Blowfish-2.12/Blowfish.xs	2013-05-20 15:31:52.481940353 +0400
+@@ -63,8 +63,7 @@
+ 			output = sv_newmortal();
+ 		output_len = 8;
+ 
+-		if (!SvUPGRADE(output, SVt_PV))
+-			croak("cannot use output argument as lvalue");
++		SvUPGRADE(output, SVt_PV);
+ 
+ 		/* blowfish_crypt_8bytes(input, SvGROW(output, 8), ks, dir); */
+ 		/* HP-UX (HP cc) fix below, thanks Addi! */
diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD
index 1a8097f1c..19b7ed1cb 100644
--- a/community/perl-crypt-des/PKGBUILD
+++ b/community/perl-crypt-des/PKGBUILD
@@ -1,20 +1,32 @@
-# $Id: PKGBUILD 71759 2012-06-02 10:29:46Z bluewind $
+# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 #Contributor: Pete Morris <pete dot morris at gmail dot com>
 pkgname=perl-crypt-des
 pkgver=2.05
-pkgrel=5
+pkgrel=6
 pkgdesc="Perl DES encryption module"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~dparis/Crypt-DES"
 license=("GPL" "PerlArtistic")
 depends=('glibc')
-source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz")
-md5sums=('a8a0bea7064e11d2af434f3e468c17bb')
+source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz"
+	"perl-5.18.patch")
+md5sums=('a8a0bea7064e11d2af434f3e468c17bb'
+         '836d1a954281257efe00503d98b42dc8')
+
+prepare() {
+  cd $srcdir/Crypt-DES-$pkgver
+  patch -p1 <$srcdir/perl-5.18.patch
+}
+
 build() {
-  cd Crypt-DES-$pkgver
+  cd $srcdir/Crypt-DES-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd $srcdir/Crypt-DES-$pkgver
   make pure_install doc_install DESTDIR=${pkgdir}
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch
new file mode 100644
index 000000000..16e5aac85
--- /dev/null
+++ b/community/perl-crypt-des/perl-5.18.patch
@@ -0,0 +1,13 @@
+diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs
+--- Crypt-DES-2.05.org/DES.xs	2005-12-08 18:52:50.000000000 +0300
++++ Crypt-DES-2.05/DES.xs	2013-05-20 15:35:58.668612530 +0400
+@@ -64,8 +64,7 @@
+ 			output = sv_newmortal();
+ 		output_len = 8;
+ 
+-		if (!SvUPGRADE(output, SVt_PV))
+-			croak("cannot use output argument as lvalue");
++		SvUPGRADE(output, SVt_PV);
+ 
+ 		perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag);
+ 
diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD
index cd14d69d7..aed65a17d 100644
--- a/community/perl-curses/PKGBUILD
+++ b/community/perl-curses/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71761 2012-06-02 10:29:50Z bluewind $
+# $Id: PKGBUILD 91661 2013-05-26 09:24:52Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-curses
 pkgver=1.28
-pkgrel=5
+pkgrel=6
 pkgdesc="Character screen handling and windowing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Curses"
@@ -19,6 +19,10 @@ build() {
   cd  $srcdir/Curses-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd  $srcdir/Curses-$pkgver
   make pure_install doc_install DESTDIR=$pkgdir
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-data-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD
new file mode 100644
index 000000000..2f96b2588
--- /dev/null
+++ b/community/perl-data-dumper/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=perl-data-dumper
+pkgver=2.145
+pkgrel=2
+pkgdesc="stringified perl data structures, suitable for both printing and eval"
+arch=(i686 x86_64)
+license=('GPL' 'PerlArtistic')
+url="http://search.cpan.org/dist/Data-Dumper/"
+depends=('perl')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Data-Dumper-$pkgver.tar.gz)
+md5sums=('b773c875afcca866faf8481adc3464b0')
+
+build() {
+  cd $srcdir/Data-Dumper-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd $srcdir/Data-Dumper-${pkgver}
+  make install DESTDIR=$pkgdir
+  find $pkgdir -name perllocal.pod -delete
+  find $pkgdir -name .packlist -delete
+}
diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD
index 81cff6e8b..d34c8ab22 100644
--- a/community/perl-data-structure-util/PKGBUILD
+++ b/community/perl-data-structure-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71763 2012-06-02 10:29:54Z bluewind $
+# $Id: PKGBUILD 91662 2013-05-26 09:24:54Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-data-structure-util
 pkgver=0.15
-pkgrel=6
+pkgrel=7
 pkgdesc="Perl/CPAN Module Data::Structure::Util"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Data-Structure-Util"
@@ -16,6 +16,10 @@ build() {
   cd $srcdir/Data-Structure-Util-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd $srcdir/Data-Structure-Util-$pkgver
   make install DESTDIR=$pkgdir
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-datetime-format-builder/PKGBUILD b/community/perl-datetime-format-builder/PKGBUILD
index c385d6c93..bea356279 100644
--- a/community/perl-datetime-format-builder/PKGBUILD
+++ b/community/perl-datetime-format-builder/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65778 2012-02-22 12:27:49Z spupykin $
+# $Id: PKGBUILD 90637 2013-05-13 12:43:31Z spupykin $
 # Contributor: Caleb Cushing <xenoterracide@gmail.com>
 
 pkgname=perl-datetime-format-builder
-pkgver=0.8000
-pkgrel=6
+pkgver=0.8100
+pkgrel=1
 pkgdesc="Create DateTime parser classes and objects"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index 7fa2c4cb8..9f6a4e829 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85696 2013-03-05 09:22:28Z spupykin $
+# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=0.78
-pkgrel=1
+pkgver=1.03
+pkgrel=2
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime"
@@ -15,7 +15,7 @@ LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('9d71a13933e3afc55c2c54202d40ae13')
+md5sums=('ea0fc830410b9ce3baeef3525bc0acdd')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index 49097474e..186632e86 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $
+# $Id: PKGBUILD 91664 2013-05-26 09:24:58Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-odbc
 pkgver=1.43
-pkgrel=1
+pkgrel=2
 pkgdesc="ODBC Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-ODBC/"
diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD
index afdc17312..5bdb15d52 100644
--- a/community/perl-dbd-pg/PKGBUILD
+++ b/community/perl-dbd-pg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82880 2013-01-25 09:55:54Z spupykin $
+# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-pg
 pkgver=2.19.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Postgres Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Pg"
diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD
index 67ca8b084..5331e6fe4 100644
--- a/community/perl-dbd-sqlite2/PKGBUILD
+++ b/community/perl-dbd-sqlite2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $
+# $Id: PKGBUILD 91666 2013-05-26 09:25:02Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-dbd-sqlite2
 pkgver=0.36
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl/CPAN Module DBD::SQLite2"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/DBD-SQLite2"
diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD
index 5c5482b10..dca40f850 100644
--- a/community/perl-dbd-sybase/PKGBUILD
+++ b/community/perl-dbd-sybase/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $
+# $Id: PKGBUILD 91667 2013-05-26 09:25:03Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=perl-dbd-sybase
 pkgver=1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Sybase Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Sybase/"
diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD
index dadbb6fa4..ea915dfaf 100644
--- a/community/perl-device-serialport/PKGBUILD
+++ b/community/perl-device-serialport/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71775 2012-06-02 10:30:18Z bluewind $
+# $Id: PKGBUILD 91668 2013-05-26 09:25:04Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ross melin <rdmelin@gmail.com>
 
 pkgname=perl-device-serialport
 pkgver=1.04
-pkgrel=4
+pkgrel=5
 pkgdesc="POSIX clone of Win32::SerialPort"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Device-SerialPort"
@@ -19,6 +19,10 @@ build() {
   eval `perl -V:archname`
   PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd  $srcdir/Device-SerialPort-$pkgver
   make DESTDIR=$pkgdir install
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD
index f963baba7..45f512a49 100644
--- a/community/perl-file-rsyncp/PKGBUILD
+++ b/community/perl-file-rsyncp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71777 2012-06-02 10:30:22Z bluewind $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 91669 2013-05-26 09:25:06Z bluewind $
+# Maintainer: Sébastien Luttringer
 
 pkgname=perl-file-rsyncp
 pkgver=0.70
-pkgrel=2
+pkgrel=3
 pkgdesc='Perl interface to rsync file list encoding and decoding'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -28,4 +28,4 @@ package() {
   make install DESTDIR="$pkgdir/"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD
index ff5b42f56..dccb0d40a 100644
--- a/community/perl-fuse/PKGBUILD
+++ b/community/perl-fuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71779 2012-06-02 10:30:26Z bluewind $
+# $Id: PKGBUILD 91670 2013-05-26 09:25:07Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-fuse
 pkgver=0.14
-pkgrel=2
+pkgrel=3
 pkgdesc="write filesystems in Perl using FUSE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Fuse"
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index edb1da252..b51591150 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $
+# $Id: PKGBUILD 91671 2013-05-26 09:25:08Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com>
 
 pkgname=perl-gd
 pkgver=2.49
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to Gd Graphics Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD
index 56b07a88d..beac8756e 100644
--- a/community/perl-gnome2-wnck/PKGBUILD
+++ b/community/perl-gnome2-wnck/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $
+# $Id: PKGBUILD 91672 2013-05-26 09:25:09Z bluewind $
 # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=perl-gnome2-wnck
 pkgver=0.16
-pkgrel=7
+pkgrel=8
 pkgdesc="Perl interface to the Window Navigator Construction Kit"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL" "PerlArtistic")
diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD
index 095078f27..0a50fbdb8 100644
--- a/community/perl-gssapi/PKGBUILD
+++ b/community/perl-gssapi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71785 2012-06-02 10:30:38Z bluewind $
+# $Id: PKGBUILD 91673 2013-05-26 09:25:11Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-gssapi
 pkgver=0.28
-pkgrel=6
+pkgrel=7
 pkgdesc="Perl/CPAN Module GSSAPI"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/GSSAPI"
diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD
index 119ef1882..01dd3220b 100644
--- a/community/perl-gstreamer-interfaces/PKGBUILD
+++ b/community/perl-gstreamer-interfaces/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71789 2012-06-02 10:30:46Z bluewind $
+# $Id: PKGBUILD 91675 2013-05-26 09:25:18Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gstreamer-interfaces
 pkgver=0.06
-pkgrel=5
+pkgrel=6
 pkgdesc="GStreamer::Interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GStreamer-Interfaces"
diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD
index d5baa978c..744cbac3e 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $
+# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gstreamer
 pkgver=0.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to the GStreamer library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GStreamer"
diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD
index a9e2568d0..939abd262 100644
--- a/community/perl-gtk2-sexy/PKGBUILD
+++ b/community/perl-gtk2-sexy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71791 2012-06-02 10:30:50Z bluewind $
+# $Id: PKGBUILD 91676 2013-05-26 09:25:19Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Charles Mauch <cmauch@gmail.com>
 # Creator: Florian Ragwitz <http://search.cpan.org/~/>
 
 pkgname=perl-gtk2-sexy
 pkgver=0.05
-pkgrel=7
+pkgrel=8
 pkgdesc="Perl/CPAN Module Gtk2::Sexy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-Sexy"
diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD
index 30de9b127..6cac850f1 100644
--- a/community/perl-gtk2-trayicon/PKGBUILD
+++ b/community/perl-gtk2-trayicon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71793 2012-06-02 10:30:54Z bluewind $
+# $Id: PKGBUILD 91677 2013-05-26 09:25:21Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-gtk2-trayicon
 pkgver=0.06
-pkgrel=9
+pkgrel=10
 pkgdesc="Perl interface to the EggTrayIcon library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-TrayIcon/"
diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD
index 68833be68..a1a9b800c 100644
--- a/community/perl-gtk2-webkit/PKGBUILD
+++ b/community/perl-gtk2-webkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71795 2012-06-02 10:30:58Z bluewind $
+# $Id: PKGBUILD 91678 2013-05-26 09:25:22Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gtk2-webkit
 pkgver=0.09
-pkgrel=3
+pkgrel=4
 pkgdesc="Gtk2::WebKit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-WebKit"
diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD
index 820c36d81..66907cd50 100644
--- a/community/perl-html-strip/PKGBUILD
+++ b/community/perl-html-strip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71797 2012-06-02 10:31:02Z bluewind $
+# $Id: PKGBUILD 91679 2013-05-26 09:25:24Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-html-strip
 pkgver=1.06
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl/CPAN Module HTML::Strip"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~kilinrax/HTML-Strip/"
diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD
index f6042cbf6..40d874ee6 100644
--- a/community/perl-inline-java/PKGBUILD
+++ b/community/perl-inline-java/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71799 2012-06-02 10:31:06Z bluewind $
+# $Id: PKGBUILD 91680 2013-05-26 09:25:26Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgname=perl-inline-java
 pkgver=0.53
-pkgrel=4
+pkgrel=5
 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module."
 arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'perl-inline' 'java-runtime')
diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD
index d27c607e0..5ebf46b34 100644
--- a/community/perl-io-dirent/PKGBUILD
+++ b/community/perl-io-dirent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71801 2012-06-02 10:31:10Z bluewind $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 91681 2013-05-26 09:25:30Z bluewind $
+# Maintainer: Sébastien Luttringer
 
 pkgname=perl-io-dirent
 pkgver=0.05
-pkgrel=2
+pkgrel=3
 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -28,4 +28,4 @@ package() {
   make install DESTDIR="$pkgdir/"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD
index 33593d4f0..3899cd93f 100644
--- a/community/perl-io-tty/PKGBUILD
+++ b/community/perl-io-tty/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71803 2012-06-02 10:31:14Z bluewind $
+# $Id: PKGBUILD 91682 2013-05-26 09:25:34Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-io-tty
 pkgver=1.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Provide an interface to TTYs and PTYs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/IO-Tty/"
diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD
index 773cf0b9e..66b930adb 100644
--- a/community/perl-json-xs/PKGBUILD
+++ b/community/perl-json-xs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82882 2013-01-25 09:56:15Z spupykin $
+# $Id: PKGBUILD 91683 2013-05-26 09:25:38Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=perl-json-xs
 pkgver=2.33
-pkgrel=1
+pkgrel=2
 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 url="http://search.cpan.org/dist/JSON-XS/"
 license=("GPL")
diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD
index 1984b2eb9..c8ba16422 100644
--- a/community/perl-lchown/PKGBUILD
+++ b/community/perl-lchown/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=perl-lchown
 pkgver=1.01
-pkgrel=1
+pkgrel=2
 pkgdesc="use the lchown(2) system call from Perl"
 arch=(i686 x86_64 mips64el)
 license=(PerlArtistic GPL)
@@ -12,7 +12,6 @@ url=https://metacpan.org/release/Lchown
 source=("http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${pkgver}.tar.gz")
 md5sums=(e3db31be650437eb5d9bfc4da6252ee3)
 sha512sums=(f3b7bf7b3b71a7d92449d4ae8249d76b456869e48105db401a49f39f687ee5d97e079485fb2bbaae991a3a27d408959fc132b843c6f69487eeb2958c85f683a8)
-_distdir="${srcdir}/Lchown-${pkgver}"
 
 build()
 (
@@ -22,7 +21,7 @@ build()
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "${srcdir}/Lchown-${pkgver}"
     /usr/bin/perl Build.PL
     ./Build
 )
@@ -30,12 +29,12 @@ build()
 check()
 (
     export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
+    cd "${srcdir}/Lchown-${pkgver}"
     ./Build test
 )
 
 package() {
-    cd "$_distdir"
+    cd "${srcdir}/Lchown-${pkgver}"
     ./Build install
     find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD
index 44c6e2894..17808ec64 100644
--- a/community/perl-linux-pid/PKGBUILD
+++ b/community/perl-linux-pid/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 91685 2013-05-26 09:25:43Z bluewind $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Generator  : CPANPLUS::Dist::Arch 1.12
 
 pkgname='perl-linux-pid'
 pkgver='0.04'
-pkgrel='2'
+pkgrel='3'
 pkgdesc="Interface to Linux getpp?id functions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 depends=('perl')
 url='http://search.cpan.org/dist/Linux-Pid'
-source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz')
+source=(http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz)
 md5sums=('130c4d299f827abf1f2285fddf03fccb')
 
 build() {
diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD
index 3cbc720ce..a4299f106 100644
--- a/community/perl-mail-box-parser-c/PKGBUILD
+++ b/community/perl-mail-box-parser-c/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71811 2012-06-02 10:31:30Z bluewind $
+# $Id: PKGBUILD 91686 2013-05-26 09:25:45Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-mail-box-parser-c
 pkgver=3.006
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Mail-Box-Parser-C"
diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD
index 8742685cb..8cb763a47 100644
--- a/community/perl-mail-transport-dbx/PKGBUILD
+++ b/community/perl-mail-transport-dbx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71813 2012-06-02 10:31:34Z bluewind $
+# $Id: PKGBUILD 91687 2013-05-26 09:25:47Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-mail-transport-dbx
 pkgver=0.07
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Mail-Transport-Dbx"
diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD
index 8f90b6f76..1e2c3bbe7 100644
--- a/community/perl-net-dbus/PKGBUILD
+++ b/community/perl-net-dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71815 2012-06-02 10:31:38Z bluewind $
+# $Id: PKGBUILD 91688 2013-05-26 09:25:48Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-net-dbus
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Binding for DBus messaging protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Net-DBus"
diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD
index 33c45f4b2..a35d9245f 100644
--- a/community/perl-net-libidn/PKGBUILD
+++ b/community/perl-net-libidn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71817 2012-06-02 10:31:42Z bluewind $
+# $Id: PKGBUILD 91689 2013-05-26 09:25:49Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=perl-net-libidn
 pkgver=0.12
-pkgrel=6
+pkgrel=7
 pkgdesc="Perl/CPAN Module Net::LibIDN"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Net-LibIDN/"
diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD
index 43c93b42c..805749e53 100644
--- a/community/perl-package-stash-xs/PKGBUILD
+++ b/community/perl-package-stash-xs/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 86634 2013-03-20 19:09:56Z eric $
+# $Id: PKGBUILD 91690 2013-05-26 09:25:52Z bluewind $
+# Maintainer: Jonathan Steel <mail@jsteel.org>
+# Contributor: Justin Davis <jrcd83@gmail.com>
 
 pkgname=perl-package-stash-xs
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster and more correct implementation of the Package::Stash API"
 arch=(i686 x86_64 mips64el)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
+url="http://search.cpan.org/dist/Package-Stash-XS"
+license=('PerlArtistic' 'GPL')
 depends=('perl')
 makedepends=('perl-extutils-makemaker')
 checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires')
-url="http://search.cpan.org/dist/Package-Stash-XS"
+options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz")
 md5sums=('33b07af6344d4a16ecd4e9ae3fa48984')
 
diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD
index 7518329af..b349b490c 100644
--- a/community/perl-params-classify/PKGBUILD
+++ b/community/perl-params-classify/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $
+# $Id: PKGBUILD 91691 2013-05-26 09:25:54Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=perl-params-classify
 pkgver=0.013
-pkgrel=2
+pkgrel=3
 pkgdesc="argument type classification"
 arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
@@ -17,6 +17,10 @@ build() {
   cd $srcdir/Params-Classify-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd $srcdir/Params-Classify-$pkgver
   make install DESTDIR=${pkgdir}
   find ${pkgdir} -name perllocal.pod -delete
   find ${pkgdir} -name .packlist -delete
diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD
index 229eec160..d7a3cab2d 100644
--- a/community/perl-params-util/PKGBUILD
+++ b/community/perl-params-util/PKGBUILD
@@ -1,23 +1,22 @@
-# Maintainer: Justin Davis (juster) <jrcd83@gmail.com>
-# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $
+# $Id: PKGBUILD 91692 2013-05-26 09:25:55Z bluewind $
+# Maintainer: Jonathan Steel <mail@jsteel.org>
+# Contributor: Justin Davis (juster) <jrcd83@gmail.com>
 
 pkgname=perl-params-util
 pkgver=1.07
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple, compact and correct param-checking functions'
 arch=(i686 x86_64 mips64el)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
-depends=('perl>=5.5.30')
-url=https://metacpan.org/release/Params-Util
+url="https://metacpan.org/release/Params-Util"
+license=('PerlArtistic' 'GPL')
+depends=('perl')
+options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz")
-md5sums=(02db120c0eef87aae1830cc62bdec37b)
-sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56)
-_dir="$srcdir/Params-Util-$pkgver"
+sha256sums=('30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c')
 
 build()
 (
-  cd "$_dir"
+  cd "$srcdir/Params-Util-$pkgver"
   export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
   unset PERL5LIB PERL_MM_OPT
   /usr/bin/perl Makefile.PL
@@ -26,7 +25,7 @@ build()
 
 check()
 (
-  cd "$_dir"
+  cd "$srcdir/Params-Util-$pkgver"
   export PERL_MM_USE_DEFAULT=1
   unset PERL5LIB
   make test
@@ -34,7 +33,7 @@ check()
 
 package()
 (
-  cd "$_dir"
+  cd "$srcdir/Params-Util-$pkgver"
   make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 )
diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD
index acd7959e3..c868ca892 100644
--- a/community/perl-params-validate/PKGBUILD
+++ b/community/perl-params-validate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $
+# $Id: PKGBUILD 91693 2013-05-26 09:25:57Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-params-validate
 pkgver=1.07
-pkgrel=1
+pkgrel=2
 pkgdesc="Validate sub params against a spec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Params-Validate"
diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD
index 08bc5c316..45af750c0 100644
--- a/community/perl-string-crc32/PKGBUILD
+++ b/community/perl-string-crc32/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71827 2012-06-02 10:32:02Z bluewind $
+# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-string-crc32
 pkgver=1.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/String-CRC32"
diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD
index ea03ba7f4..579c2929b 100644
--- a/community/perl-term-readline-gnu/PKGBUILD
+++ b/community/perl-term-readline-gnu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83559 2013-02-03 00:44:54Z dwallace $
+# $Id: PKGBUILD 91695 2013-05-26 09:26:04Z bluewind $
 # CPAN Name  : Term-ReadLine-Gnu
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: jason ryan <jasonwryan@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=perl-term-readline-gnu
 pkgver=1.20
-pkgrel=5
+pkgrel=6
 pkgdesc="GNU Readline XS library wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
@@ -18,7 +18,6 @@ source=('http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1
   'termcap-bad-ncurses-good.patch')
 md5sums=('fa33510193b89a2ada74fcef00816322'
   'a000706b89792f822b5ec20baa370910')
-_distdir="${srcdir}/Term-ReadLine-Gnu-1.20"
 
 build() {
    export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -27,21 +26,20 @@ build() {
       PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "${srcdir}/Term-ReadLine-Gnu-1.20"
     patch --forward -p1 < "${srcdir}/termcap-bad-ncurses-good.patch"
     /usr/bin/perl Makefile.PL
     make
-  
 }
 
 check() {
-  cd "$_distdir"
+  cd "${srcdir}/Term-ReadLine-Gnu-1.20"
   export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
 }
 
 package() {
-  cd "$_distdir"
+  cd "${srcdir}/Term-ReadLine-Gnu-1.20"
   make pure_install PERL_INSTALL_ROOT="$pkgdir"
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD
index 1056ade3c..30e54d76c 100644
--- a/community/perl-text-charwidth/PKGBUILD
+++ b/community/perl-text-charwidth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71829 2012-06-02 10:32:06Z bluewind $
+# $Id: PKGBUILD 91696 2013-05-26 09:26:06Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-text-charwidth
 pkgver=0.04
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl/CPAN Module Text::CharWidth"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Text-CharWidth"
diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD
index 724ce4b8c..5f43e4479 100644
--- a/community/perl-text-kakasi/PKGBUILD
+++ b/community/perl-text-kakasi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71831 2012-06-02 10:32:12Z bluewind $
+# $Id: PKGBUILD 91697 2013-05-26 09:26:08Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-text-kakasi
 pkgver=2.04
-pkgrel=9
+pkgrel=10
 pkgdesc="Perl frontend to kakasi"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Text-Kakasi"
diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD
index 02446da64..746ad3c50 100644
--- a/community/perl-tie-hash-indexed/PKGBUILD
+++ b/community/perl-tie-hash-indexed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71833 2012-06-02 10:32:16Z bluewind $
+# $Id: PKGBUILD 91698 2013-05-26 09:26:10Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-tie-hash-indexed
 pkgver=0.05
-pkgrel=8
+pkgrel=9
 pkgdesc="Ordered hashes for Perl"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Tie-Hash-Indexed"
diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD
index a4add0047..509a84f54 100644
--- a/community/perl-tk-tablematrix/PKGBUILD
+++ b/community/perl-tk-tablematrix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71835 2012-06-02 10:32:20Z bluewind $
+# $Id: PKGBUILD 91699 2013-05-26 09:26:12Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-tk-tablematrix
 pkgver=1.23
-pkgrel=9
+pkgrel=10
 pkgdesc="Display data in TableSpreadsheet format"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Tk-TableMatrix"
diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD
index 2ee3f68a1..d6d030cbd 100644
--- a/community/perl-www-curl/PKGBUILD
+++ b/community/perl-www-curl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71837 2012-06-02 10:32:24Z bluewind $
+# $Id: PKGBUILD 91700 2013-05-26 09:26:14Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-www-curl
 pkgver=4.15
-pkgrel=3
+pkgrel=4
 pkgdesc="Perl/CPAN Module WWW::Curl"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/WWW-Curl/"
diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD
index e0f140e60..9388cb5b2 100644
--- a/community/perl-xml-fast/PKGBUILD
+++ b/community/perl-xml-fast/PKGBUILD
@@ -1,10 +1,10 @@
-$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $
+# $Id: PKGBUILD 91701 2013-05-26 09:26:15Z bluewind $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: trizen .= x@gmail.com
 
 pkgname=perl-xml-fast
 pkgver=0.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Simple and very fast XML to hash conversion."
 arch=('x86_64' 'i686' 'mips64el')
 url="http://search.cpan.org/dist/XML-Fast/"
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 040e569df..5ba9a9447 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $
+# $Id: PKGBUILD 91702 2013-05-26 09:26:18Z bluewind $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=2.0016
+pkgver=2.0018
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common')
 options=('!emptydirs')
 install=perl-xml-libxml.install
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
-md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a')
+md5sums=('c5db1c6ba5f588802a5e1a15b5b6d653')
 
 build() {
   cd XML-LibXML-$pkgver
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 09a6ce057..2379f6f5d 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $
+# $Id: PKGBUILD 91703 2013-05-26 09:26:22Z bluewind $
 # Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-xml-libxslt
 pkgver=1.80
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to the gnome libxslt library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/XML-LibXSLT"
diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD
index 2fbdc9113..1c2acdfd0 100644
--- a/community/perl-xmms/PKGBUILD
+++ b/community/perl-xmms/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71843 2012-06-02 10:32:38Z bluewind $
+# $Id: PKGBUILD 91704 2013-05-26 09:26:24Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=perl-xmms
 pkgver=0.12
-pkgrel=8
+pkgrel=9
 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~dougm/Xmms-Perl/"
diff --git a/community/pidgin-encryption/PKGBUILD b/community/pidgin-encryption/PKGBUILD
index 7969f2e8e..178d7d344 100644
--- a/community/pidgin-encryption/PKGBUILD
+++ b/community/pidgin-encryption/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=pidgin-encryption
 pkgver=3.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://pidgin-encrypt.sourceforge.net/"
 depends=('pidgin' 'nss')
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index 8041fd6fe..884b9e373 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pidgin-libnotify
 pkgver=0.14
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
 url="http://gaim-libnotify.sourceforge.net/"
@@ -14,22 +14,25 @@ makedepends=('intltool')
 optdepends=('notification-daemon')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch
-        pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch)
+        pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch pidgin-libnotify-getfocus.patch)
+md5sums=('bfb5368b69c02d429b2b17c00a6673c0'
+         'e9bdbb3c7faa61f062fc64277457b6c0'
+         '05538625f14d9f2c12adae5fa6a1fa26'
+         'efe1e86aa1e0bc9f7d20efe7f34ad4a7'
+         'e624998744d1c2fb8e2c6be94b04c38a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/language_fixes.patch"
   patch -Np0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch"
   patch -Np0 -i "$srcdir/pidgin-libnotify-showbutton.patch"
+  patch -Np0 -i "$srcdir/pidgin-libnotify-getfocus.patch"
 
   ./configure --prefix=/usr --disable-deprecated  --disable-static
   make
 }
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('bfb5368b69c02d429b2b17c00a6673c0'
-         'e9bdbb3c7faa61f062fc64277457b6c0'
-         '05538625f14d9f2c12adae5fa6a1fa26'
-         'efe1e86aa1e0bc9f7d20efe7f34ad4a7')
diff --git a/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch
new file mode 100644
index 000000000..db45829d9
--- /dev/null
+++ b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch
@@ -0,0 +1,69 @@
+--- src/pidgin-libnotify.c	2013-05-07 17:38:31.397261982 +0200
++++ src2/pidgin-libnotify.c	2013-05-07 17:43:43.787904584 +0200
+@@ -169,6 +169,49 @@ pixbuf_from_buddy_icon (PurpleBuddyIcon
+ 	return icon;
+ }
+ 
++/* Taken from pidgin-hotkeys to get focus on conversation window */
++static void
++hacky_active_window(GtkWidget *window)
++{
++    GdkScreen *screen;
++    GdkWindow *root;
++    GdkDisplay *display;
++    Display *xdisplay;
++    Window xroot;
++    XEvent xev;
++    static Atom _net_active_window = None;
++
++    screen = gtk_widget_get_screen(window);
++    root = gdk_screen_get_root_window(screen);
++    display = gdk_screen_get_display(screen);
++
++    xdisplay = GDK_DISPLAY_XDISPLAY(display);
++    xroot = GDK_WINDOW_XWINDOW(root);
++
++    if (_net_active_window == None)
++	_net_active_window = XInternAtom(xdisplay,
++					 "_NET_ACTIVE_WINDOW",
++					 False);
++
++    xev.xclient.type = ClientMessage;
++    xev.xclient.serial = 0;
++    xev.xclient.send_event = True;
++    xev.xclient.window = GDK_WINDOW_XWINDOW(window->window);
++    xev.xclient.message_type = _net_active_window;
++    xev.xclient.format = 32;
++    xev.xclient.data.l[0] = 1; /* requestor type; we're an app, I guess */
++    xev.xclient.data.l[1] = CurrentTime;
++    xev.xclient.data.l[2] = None; /* "currently active window", supposedly */
++    xev.xclient.data.l[3] = 0;
++    xev.xclient.data.l[4] = 0;
++
++    XSendEvent(xdisplay,
++	       xroot, False,
++	       SubstructureRedirectMask | SubstructureNotifyMask,
++	       &xev);
++}
++
++
+ static void
+ action_cb (NotifyNotification *notification,
+ 		   gchar *action, gpointer user_data)
+@@ -194,6 +237,16 @@ action_cb (NotifyNotification *notificat
+ 									  buddy->name);
+ 	}
+ 	conv->ui_ops->present (conv);
++	
++	/* get the focus on the new conversation window */
++	{
++	    GtkWindow *gtkwindow;
++
++	    gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION(conv))->window);
++	    /*gtk_window_present(gtkwindow);*/
++	    hacky_active_window(GTK_WIDGET(gtkwindow));
++	}
++
+ 
+ 	notify_notification_close (notification, NULL);
+ }
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 2df34ea5e..df79b2ffc 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $
+# $Id: PKGBUILD 90931 2013-05-15 14:52:30Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
 pkgver=0.1e
 _pkgver=0.1e
-pkgrel=1
+pkgrel=2
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/xiehuc/pidgin-lwqq"
@@ -30,4 +30,4 @@ package()
   make DESTDIR="${pkgdir}" install
 }
 
-sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b')
+sha512sums=('5a04c716cabaf09b863ab9eedae4d851741fc6d3977d81ff371d41b109b09e8fb020c8910fcaa0b2df82058ffaf82caff596acef9c8b4b216b0215a1212a7f29')
diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD
index 0f2291598..87c643a98 100644
--- a/community/pork/PKGBUILD
+++ b/community/pork/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71845 2012-06-02 10:32:42Z bluewind $
+# $Id: PKGBUILD 91705 2013-05-26 09:26:27Z bluewind $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=pork
 pkgver=0.99.8.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Console-based AOL Instant Messenger & IRC client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index a73a0b4d7..717203c27 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78356 2012-10-17 15:19:00Z spupykin $
+# $Id: PKGBUILD 91955 2013-05-30 09:43:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=pound
 pkgver=2.6
-pkgrel=3.1
+pkgrel=6
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
@@ -13,19 +13,17 @@ license=('GPL')
 depends=('pcre' 'openssl')
 backup=(etc/pound/pound.cfg)
 source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz
-	pound.init
 	pound.runit
 	pound.service
 	pound.cfg)
 md5sums=('8c913b527332694943c4c67c8f152071'
-         'bd3bddb6dc17fdcab824815a4705b055'
-         '4bd5e2a8d8e707eb900ae88929e00d4c'
-         '23c70776fcd1cf71572f90a8809f7408'
+         '2a555ee5871a849cb1f6e6ba2ff054df'
+         'c0d0726a96dfda0e83843362e401b3dc'
          '8937808acd22c6391ebe4340af8df854')
 
 build() {
   cd $srcdir/Pound-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc/pound
+  ./configure --prefix=/usr --sysconfdir=/etc/pound --sbindir=/usr/bin
   make
 }
 
@@ -34,11 +32,10 @@ package() {
   install -d $pkgdir/usr/sbin
   make DESTDIR=$pkgdir install 
   chown root.root -R $pkgdir/usr
-  install -d $pkgdir/etc/rc.d
-  install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound
   install -d $pkgdir/etc/sv
   install -d $pkgdir/etc/sv/pound
   install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run
   install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/pound/pound.init b/community/pound/pound.init
deleted file mode 100644
index b8187c81f..000000000
--- a/community/pound/pound.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-	stat_busy "Starting Pound"
-	/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    add_daemon pound
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping Pound"
-	[ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid`
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm -f /var/run/pound.pid
-	    rm_daemon pound
-	    stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/pound/pound.runit b/community/pound/pound.runit
index ed59ea046..ae904583c 100644
--- a/community/pound/pound.runit
+++ b/community/pound/pound.runit
@@ -4,7 +4,7 @@ exec 2>&1
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-BIN=/usr/sbin/pound
+BIN=/usr/bin/pound
 OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid"
 SVC=pound
 
diff --git a/community/pound/pound.service b/community/pound/pound.service
index 0a91f3424..5ec089c9a 100644
--- a/community/pound/pound.service
+++ b/community/pound/pound.service
@@ -3,8 +3,8 @@ Description=A reverse proxy, load balancer, and SSL wrapper
 
 [Service]
 Type=forking
-PIDFile=/var/run/pound.pid
-ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid
+PIDFile=/run/pound.pid
+ExecStart=/usr/bin/pound -f /etc/pound/pound.cfg -p /run/pound.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 9fbafcc11..5600762f0 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $
+# $Id: PKGBUILD 91995 2013-05-30 21:12:52Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
@@ -18,7 +18,7 @@ sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index ab5e4d45c..db5d84eea 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $
+# $Id: PKGBUILD 91528 2013-05-23 11:16:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=11
+pkgrel=13
 pkgdesc="Poptop server"
 arch=(i686 x86_64 'mips64el')
 url="http://poptop.sourceforge.net/"
@@ -11,12 +11,10 @@ license=('GPL')
 depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
-	pptpd
 	pptpd.service
 	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
-         'e09f81beb5d59a0fdfba94e3a60d992b'
-         '144c17c7d5c1b95cfb3450eb73aa2e50'
+         'f17df2a137282adbd04c75dd25784a9c'
          'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
@@ -26,8 +24,14 @@ build() {
 
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/unrecognized-opt.patch
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in
   autoreconf -i
-  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --sbindir=/usr/bin \
+    --exec-prefix=/usr \
+    --mandir=/usr/share/man
   sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h
   make
   sed -i 's|install -o root|install|g' plugins/Makefile
@@ -39,7 +43,6 @@ package() {
   make DESTDIR=$pkgdir install
   mkdir -p $pkgdir/etc/
   echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf
-  install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   mkdir -p $pkgdir/usr/share/doc/pptpd
   cp -a samples $pkgdir/usr/share/doc/pptpd/
diff --git a/community/pptpd/pptpd b/community/pptpd/pptpd
deleted file mode 100644
index 08c4de496..000000000
--- a/community/pptpd/pptpd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PPTP Daemon"
-    pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pptpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PPTP Daemon"
-    kill `cat /var/run/pptpd.pid`
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pptpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service
index 739508b60..c907c0b9f 100644
--- a/community/pptpd/pptpd.service
+++ b/community/pptpd/pptpd.service
@@ -3,7 +3,7 @@ Description=PPTP Server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+ExecStart=/usr/bin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
 StandardOutput=null
 
 [Install]
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index 7ea9fb4c5..e4d8c4188 100644
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82336 2013-01-15 11:35:08Z allan $
+# $Id: PKGBUILD 92211 2013-06-02 19:15:02Z bpiotrowski $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pragha.wikispaces.com/"
@@ -15,12 +15,13 @@ depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base'
          'dbus-glib' 'sqlite' 'desktop-file-utils'
          'libclastfm')
 optdepends=('notification-daemon: OSD notification')
+makedepends=('intltool')
 replaces=('dissonance')
 install=pragha.install
-source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2"
+source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2"
         cdio-includes.patch)
-sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9'
-          '05a2e007800dc5395a0bb7f026ec7e388cd9488c')
+sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5'
+          '83b366be516b4c09dbccbb25b473f2de545bdbe8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pragha/cdio-includes.patch b/community/pragha/cdio-includes.patch
index 9f93044d1..707734ad0 100644
--- a/community/pragha/cdio-includes.patch
+++ b/community/pragha/cdio-includes.patch
@@ -1,12 +1,11 @@
-diff -upr pragha-1.1.1.orig/src/cdda.h pragha-1.1.1/src/cdda.h
---- pragha-1.1.1.orig/src/cdda.h	2013-01-14 04:58:09.000000000 +0200
-+++ pragha-1.1.1/src/cdda.h	2013-01-14 04:58:52.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- #include <glib.h>
- 
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/cd_types.h>
- #ifdef __CDIO_CONFIG_H__
- #include <cdio/cdio_unconfig.h>
+--- a/src/cdda.h.orig	2013-02-16 23:13:47.000000000 +0100
++++ b/src/cdda.h	2013-06-02 21:07:50.473864563 +0200
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_PARANOIA_NEW_INCLUDES
+    #include <cdio/paranoia/cdda.h>
+ #else
+-   #include <cdio/cdda.h>
++   #include <cdio/paranoia/cdda.h>
+    #ifdef __CDIO_CONFIG_H__
+       #include <cdio/cdio_unconfig.h>
+    #endif
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index fe4735011..a302459ee 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,36 +1,37 @@
-# $Id: PKGBUILD 57791 2011-11-02 20:30:29Z lfleischer $
+# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
 pkgver=20111012
-pkgrel=1
+pkgrel=2
 pkgdesc='ELF prelinking utility to speed up dynamic linking.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
 backup=('etc/prelink.conf')
-md5sums=('f5aaf347432d677c293e5e3399ba4fdf'
-         '0793ed49e9b31c125cba4d936c333cf6'
-         'b347580536e078b34c547742d36a3e9d')
 source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2"
         'prelink.conf'
         'arch-x86_64-dynamic_linker.patch')
+md5sums=('f5aaf347432d677c293e5e3399ba4fdf'
+         '0793ed49e9b31c125cba4d936c333cf6'
+         'b347580536e078b34c547742d36a3e9d')
 
-build() {
-  cd "${srcdir}/${pkgname}"
-
+prepare() {
+  cd ${pkgname}
   patch -Np0 -i ../arch-x86_64-dynamic_linker.patch
+}
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
+build() {
+  cd ${pkgname}
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin --build=$CHOST
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-
+  cd ${pkgname}
   make DESTDIR="${pkgdir}" install
   install -Dm0644 "${srcdir}/prelink.conf" "${pkgdir}/etc/prelink.conf"
 }
diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD
index 106b1f7b3..90b88459f 100644
--- a/community/preload/PKGBUILD
+++ b/community/preload/PKGBUILD
@@ -1,50 +1,44 @@
-# $Id: PKGBUILD 74711 2012-08-02 09:27:00Z bpiotrowski $
+# $Id: PKGBUILD 90536 2013-05-13 00:33:46Z eric $
 # Maintainer:
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=preload
 pkgver=0.6.4
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Makes applications run faster by prefetching binaries and shared objects"
 url="http://sourceforge.net/projects/preload"
 license=('GPL2')
 depends=('glib2' 'bash')
-makedepends=('help2man' 'pkgconfig')
+makedepends=('help2man')
 backup=('etc/preload.conf')
 options=('!makeflags')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz"
-        rc.d service)
+        service)
 md5sums=('10786287b55afd3a2b433b4f898809f4'
-         'bde0dd7867c77e7c4d10b481b5cddcd3'
-         'db9350ab52fd643edbc88ebab2c8c1bb')
+         'b4871a6ade86968322b3bdf3fce88e99')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --mandir=/usr/share/man \
+              --sbindir=/usr/bin \
               --localstatedir=/var
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" sysconfigdir=/etc/conf.d install
   
-  install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/preload
   install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service
 
-  rm -rf "${pkgdir}"/etc/rc.d/init.d
-
+  rm -rf "${pkgdir}"/etc/rc.d
   rm -rf "${pkgdir}"/var/lib/preload/preload.state
   rm -rf "${pkgdir}"/var/log/preload.log
 
-  install -d "${pkgdir}"/etc/conf.d
-  mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d
-  rm -rf "${pkgdir}"/etc/sysconfig
-
   sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf
 }
diff --git a/community/preload/rc.d b/community/preload/rc.d
deleted file mode 100644
index a3cb01ba0..000000000
--- a/community/preload/rc.d
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-#
-#	/etc/rc.d/init.d/preload
-#
-# Starts the preload daemon
-#
-# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/preload`
-
-if [ -f /etc/conf.d/preload ]; then
-        . /etc/conf.d/preload
-fi
-
-MIN_MEMORY=${MIN_MEMORY:-256}
-# Check for > MIN_MEMORY MB
-free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
-
-RETVAL=0
-
-#
-# See how we were called.
-#
-
-start() {
-        if [ -z "$PID" ]; then
-                stat_busy "Starting preload daemon: "
-                /usr/sbin/preload $PRELOAD_OPTS
-                RETVAL=$?
-                if [ $RETVAL -eq 0 ]; then
-			if [ -n $IONICE_OPTS ]; then
-				/usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`"
-			fi
-                        add_daemon preload
-                        stat_done
-                else
-                        stat_fail
-                fi
-        fi
-        return $RETVAL
-}
-
-stop() {
-        stat_busy "Stopping preload daemon: "
-        kill $PID &>/dev/null
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then
-                rm_daemon preload
-                stat_done
-		PID=""
-        else
-                stat_fail
-        fi
-        return $RETVAL
-}
-
-
-restart() {
-        $0 stop
-	sleep 1
-        $0 start
-}	
-
-reload() {
-        trap "" SIGHUP
-        kill -HUP $PID
-}	
-
-case "$1" in
-        start)
-        start
-        ;;
-        stop)
-        stop
-        ;;
-        reload)
-        reload
-        ;;
-        restart)
-        restart
-        ;;
-        condrestart)
-        if [ ! -z $PID ]; then
-                restart
-        else
-                stat_fail
-        fi
-        ;;
-        *)
-        echo "Usage: $0 {start|stop|restart|condrestart|reload}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/community/preload/service b/community/preload/service
index e4202751f..a26e2d01b 100644
--- a/community/preload/service
+++ b/community/preload/service
@@ -5,7 +5,7 @@ Description=Adaptive readahead daemon
 Type=simple
 IOSchedulingClass=3
 EnvironmentFile=/etc/conf.d/preload
-ExecStart=/usr/sbin/preload --foreground $PRELOAD_OPTS
+ExecStart=/usr/bin/preload --foreground $PRELOAD_OPTS
      
 [Install]
 WantedBy=multi-user.target
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index ff82d567b..da2bb0532 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 80122 2012-11-16 17:01:01Z lfleischer $
+# $Id: PKGBUILD 92055 2013-05-31 01:13:33Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
-pkgver=3.0.19
-pkgrel=7
+pkgver=3.0.21
+pkgrel=1
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.privoxy.org'
 license=('GPL')
 depends=('pcre' 'zlib')
 makedepends=('autoconf')
-backup=('etc/conf.d/privoxy'
-        'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
+backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
         'etc/privoxy/'{match-all,user}.action
         'etc/logrotate.d/privoxy')
 install='privoxy.install'
 source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
-        'privoxy'
         'privoxy.logrotate.d'
-        'privoxy.conf.d'
         'privoxy.service')
-md5sums=('57acc79059565cc42eda67982842785d'
-         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
+md5sums=('79558f2545cfcf9731f7de611646d837'
          'fc3046377137003726a151ee27b142a2'
-         '27830ef79418e277b90c1c1fa933f876'
-         '4c154a126ec17b02c623e3d451e062d9')
+         '358e614190247fc1671bbcadddf500db')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
@@ -41,15 +36,14 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
 
-  make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
+  make prefix="${pkgdir}/usr" SBIN_DEST="${pkgdir}/usr/bin" \
+    MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
     CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
 
   # Don't overwrite existing log files!
   rm "${pkgdir}/var/log/privoxy/"*
 
-  install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
   install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
 
   # Fix config paths.
   sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy
deleted file mode 100644
index 754453de5..000000000
--- a/community/privoxy/privoxy
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
-  start)
-    stat_busy "Starting Privoxy"
-    # create missing logdir and logfile
-    [ -d "$prld" ] || mkdir -p "$prld"
-    if [ ! -f "$prlf" ]; then
-      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
-        chmod 0660 "$prld/$prlf"
-    fi
-    [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
-                                       ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon privoxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Privoxy"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon privoxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/privoxy/privoxy.conf.d b/community/privoxy/privoxy.conf.d
deleted file mode 100644
index 9aa11cd67..000000000
--- a/community/privoxy/privoxy.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service
index 59a8884f9..e8b04447b 100644
--- a/community/privoxy/privoxy.service
+++ b/community/privoxy/privoxy.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/privoxy.pid
-ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
+ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
 SuccessExitStatus=15
 
 [Install]
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index e4a8509ca..63ef3cdaa 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $
+# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.0b8
+pkgver=2.0b9
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Programming language and environment for creating images, animations and interactions'
@@ -15,19 +15,19 @@ options=(!strip)
 if [ "$CARCH" == "x86_64" ]; then
   source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e'
+  sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 else
   source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17'
+  sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
 
-build() {
+prepare() {
   cd "$srcdir"
 
-  gendesk
+  gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc"
 }
 
 package() {
diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD
index 35a4f35a7..846b045f8 100644
--- a/community/procstatd/PKGBUILD
+++ b/community/procstatd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66164 2012-02-23 02:23:03Z spupykin $
+# $Id: PKGBUILD 91870 2013-05-28 17:44:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jason Chu <jason@archlinux.org>
 
 pkgname=procstatd
 pkgver=1.4.2
-pkgrel=6.1
+pkgrel=8
 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
 arch=('i686 x86_64' 'mips64el')
 license=('GPL')
@@ -17,8 +17,12 @@ md5sums=('1fdeaf05ca6337f5c02e76a76c53c407')
 build() {
   cd $srcdir/$pkgname
   # Get rid of the funky make install forever bug
-  sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile
+  sed -i 's/make install/echo/;s/cd watchman/echo/;s@$(INSTDIR)/sbin@$(INSTDIR)/bin@' Makefile
   make
+}
+
+package() {
+  cd $srcdir/$pkgname
   make INSTDIR=$pkgdir/usr install
   mkdir ${pkgdir}/usr/share
   mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man
diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD
deleted file mode 100644
index 1b86c9638..000000000
--- a/community/proftpd/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4c
-pkgrel=2
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.proftpd.org/"
-license=('GPL')
-depends=('libmariadbclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-install=${pkgname}.install
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
-        'proftpd.tmpfiles')
-md5sums=('65f61e953bea249f8377e681594143a5'
-         '7f00fb7bf757b4bd795afdf0a3f5e556'
-         'c439a0a1dbc21b604d8382da87aa021b'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736'
-         '5709f27ebcbe906e52963ea75e4fde64'
-         '907b149a120b046f05647c73502e23c9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-pam \
-    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-    --sysconfdir=/etc \
-    --localstatedir=/run/proftpd \
-    --enable-ctrls \
-    --enable-ipv6 \
-    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls \
-    --with-systemd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
-  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -Dm644 "${srcdir}"/proftpd.tmpfiles \
-    "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
-
-  # /run is tmpfs
-  rmdir "${pkgdir}"/run/{proftpd,}
-}
diff --git a/community/proftpd/proftpd b/community/proftpd/proftpd
deleted file mode 100755
index 9ea1d47fc..000000000
--- a/community/proftpd/proftpd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ProFTPd Server"
-    /usr/sbin/proftpd ${PROFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon proftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd Server"
-    [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/proftpd/proftpd.pid
-      rm_daemon proftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/community/proftpd/proftpd.conf.d b/community/proftpd/proftpd.conf.d
deleted file mode 100644
index 1a5a8a201..000000000
--- a/community/proftpd/proftpd.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
diff --git a/community/proftpd/proftpd.install b/community/proftpd/proftpd.install
deleted file mode 100644
index 6d9888496..000000000
--- a/community/proftpd/proftpd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  systemd-tmpfiles --create proftpd.conf
-}
diff --git a/community/proftpd/proftpd.logrotate b/community/proftpd/proftpd.logrotate
deleted file mode 100644
index 7b6d7a87b..000000000
--- a/community/proftpd/proftpd.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xferlog {
-   postrotate
-      /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/community/proftpd/proftpd.service b/community/proftpd/proftpd.service
deleted file mode 100644
index a07d17f46..000000000
--- a/community/proftpd/proftpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=ProFTPD FTP Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/proftpd/proftpd.pid
-ExecStart=/usr/sbin/proftpd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
diff --git a/community/proftpd/proftpd.tmpfiles b/community/proftpd/proftpd.tmpfiles
deleted file mode 100644
index 241dc7cb1..000000000
--- a/community/proftpd/proftpd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/proftpd 0755 root root
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 61262e558..b968b4424 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81207 2012-12-13 02:54:35Z seblu $
+# $Id: PKGBUILD 90613 2013-05-13 10:55:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.0@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgname=prosody
 pkgver=0.8.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
@@ -16,15 +16,13 @@ install=prosody.install
 backup=('etc/logrotate.d/prosody'
 	'etc/prosody/prosody.cfg.lua')
 source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
-	'prosody.rcd'
 	'prosody.logrotated'
 	'fix-config.patch'
 	'prosody.tmpfile.d'
 	'prosody.service')
 md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
-         'd2b5f9c8e42bb31819e715eb1756ee53'
-         '26466fdbea87963a3ca6f48f76fe4a29'
-         '59a1bf2dfd0bd386cef6fa646e2a3752'
+         '5b44aee99f1fa9e7f055e067688cafbd'
+         'a4a5b968b5809037f83465c571eb9afe'
          'e2f5a1df410b05696a30dcb058841084'
          'e74045f27cb60908d535969906781f75')
 
@@ -46,19 +44,16 @@ package() {
 
     rm $pkgdir/etc/prosody/certs/*
 
-    install -d "$pkgdir/etc/rc.d"
     install -d "$pkgdir/etc/logrotate.d"
     install -d "$pkgdir/var/log/prosody"
     for i in tools/*.lua; do
       install -Dm0644 $i $pkgdir/usr/share/prosody/$i
     done
 
-    install -o root -g root -m 755 "$srcdir/prosody.rcd" \
-        "$pkgdir/etc/rc.d/prosody"
     install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
         "$pkgdir/etc/logrotate.d/prosody"
 
     install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf
+    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf
     install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service
 }
diff --git a/community/prosody/fix-config.patch b/community/prosody/fix-config.patch
index 8856bfb92..3d01fd88a 100644
--- a/community/prosody/fix-config.patch
+++ b/community/prosody/fix-config.patch
@@ -6,7 +6,7 @@ diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.
  -- Example: admins = { "user1@example.com", "user2@example.net" }
  admins = { }
 +daemonize = true
-+pidfile = "/var/run/prosody/prosody.pid"
++pidfile = "/run/prosody/prosody.pid"
  
  -- Enable use of libevent for better performance under high load
  -- For more information see: http://prosody.im/doc/libevent
diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install
index f935e3d63..792681038 100644
--- a/community/prosody/prosody.install
+++ b/community/prosody/prosody.install
@@ -10,6 +10,8 @@ post_install() {
     chown prosody:prosody var/log/prosody
 
     echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
+
+    systemd-tmpfiles --create prosody.conf
 }
 
 post_upgrade() {
diff --git a/community/prosody/prosody.logrotated b/community/prosody/prosody.logrotated
index 5659ba01f..13876230f 100644
--- a/community/prosody/prosody.logrotated
+++ b/community/prosody/prosody.logrotated
@@ -4,6 +4,6 @@
     sharedscripts
     missingok
     postrotate
-        /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true
+        /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }
diff --git a/community/prosody/prosody.rcd b/community/prosody/prosody.rcd
deleted file mode 100644
index afaf77903..000000000
--- a/community/prosody/prosody.rcd
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-daemon_name=prosody
-pid_file=/var/run/$daemon_name/$daemon_name.pid
-
-source /etc/rc.conf
-source /etc/rc.d/functions
-
-get_pid() {
-    if [ -f $pid_file ]; then
-        /bin/kill -0 $(cat $pid_file)
-        if [ $? == 0 ]; then
-            cat $pid_file
-        fi
-    fi
-}
-
-case "$1" in
-    start)
-        stat_busy "Starting $daemon_name daemon"
-
-        [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; }
-        PID=$(get_pid)
-        if [ -z "$PID" ]; then
-            [ -f $pid_file ] && rm -f $pid_file
-            mkdir -p `dirname $pid_file`
-            prosodyctl start 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                add_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is already running"
-            exit 1
-        fi
-        ;;
-
-    stop)
-        stat_busy "Stopping $daemon_name daemon"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            prosodyctl stop 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                rm -f $pid_file &> /dev/null
-                rm_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-            exit 1
-        fi
-        ;;
-
-    restart)
-        $0 stop
-        $0 start
-        ;;
-
-    reload)
-        stat_busy "Reloading $daemon_name"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            /bin/kill -HUP $PID 2> /dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-        fi
-        ;;
-
-    status)
-        stat_busy "Checking $daemon_name status";
-        ck_status $daemon_name
-        ;;
-
-    *)
-        echo "usage: $0 {start|stop|restart|reload|status}"
-    esac
-
-exit 0
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index cd822c75c..527e56025 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=puzzles
-pkgver=9838
+pkgver=9840
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/pwgen/PKGBUILD b/community/pwgen/PKGBUILD
index 06f091e56..4587955d6 100644
--- a/community/pwgen/PKGBUILD
+++ b/community/pwgen/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 67140 2012-03-04 23:54:53Z pschmitz $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor : Tobias Powalowski <t.powa@gmx.de>
+# $Id: PKGBUILD 92192 2013-06-02 15:55:52Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pwgen
 pkgver=2.06
-pkgrel=3
-pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
-arch=("i686" "x86_64" "mips64el")
-url="http://sourceforge.net/projects/pwgen/"
+pkgrel=4
+pkgdesc='Password generator for creating easily memorable passwords'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://sourceforge.net/projects/pwgen/'
 license=('GPL')
 depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz")
-md5sums=('935aebcbe610fbc9de8125e7b7d71297')
+source=("http://downloads.sourceforge.net/sourceforge/pwgen/$pkgname-$pkgver.tar.gz")
+sha256sums=('61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
+  autoconf
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pymad/PKGBUILD b/community/pymad/PKGBUILD
index ace77f357..9ab61d3f2 100644
--- a/community/pymad/PKGBUILD
+++ b/community/pymad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pymad
 pkgver=0.6
 pkgrel=4
 pkgdesc="Python interface to libmad."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.spacepants.org/src/pymad/"
 license=('LGPL')
 depends=('libmad' 'python2')
diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD
index 0b6bb965c..37d6b426a 100644
--- a/community/python-cchardet/PKGBUILD
+++ b/community/python-cchardet/PKGBUILD
@@ -1,27 +1,51 @@
-# $Id: PKGBUILD 80436 2012-11-21 15:45:04Z mtorromeo $
+# $Id: PKGBUILD 90632 2013-05-13 12:37:47Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=python-cchardet
-pkgver=0.3.2
+pkgname=(python-cchardet python2-cchardet)
+pkgver=0.3.3
 pkgrel=1
-_libname=${pkgname/python-/}
 pkgdesc="Universal encoding detector faster than chardet."
 url="http://pypi.python.org/pypi/cchardet/"
-depends=('python')
-makedepends=('cython' 'python-distribute')
+makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute')
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
-source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz)
+source=(http://pypi.python.org/packages/source/c/cchardet/cchardet-$pkgver.tar.gz)
 
 build() {
-    cd "$srcdir/$_libname-$pkgver"
-    python setup.py build
+    cd "$srcdir/cchardet-$pkgver"
+
+    rm -rf ../buildpy3; mkdir ../buildpy3
+    python setup.py build -b ../buildpy3
+
+    rm -rf ../buildpy2; mkdir ../buildpy2
+    python2 setup.py build -b ../buildpy2
+    find ../buildpy2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} +
 }
 
 package() {
-    cd "$srcdir/$_libname-$pkgver"
+    cd "$srcdir/cchardet-$pkgver"
     python setup.py install --root="$pkgdir"
 	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
 }
 
-sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23')
+package_python-cchardet() {
+    depends=(python)
+
+
+    cd "$srcdir/cchardet-$pkgver"
+    rm -rf build; ln -s ../buildpy3 build
+    python setup.py install --skip-build -O1 --root="$pkgdir"
+	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
+}
+
+package_python2-cchardet() {
+    depends=(python2)
+
+    cd "$srcdir/cchardet-$pkgver"
+    rm -rf build; ln -s ../buildpy2 build
+    python2 setup.py install --skip-build -O1 --root="$pkgdir"
+	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
+}
+
+sha256sums=('f326245fa9dc1541a3251cbae66ce2fa8d94969a6f6dfb2800e3beb3636cd2b8')
diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD
index ac6d8d3fa..c45780544 100644
--- a/community/python-numexpr/PKGBUILD
+++ b/community/python-numexpr/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1
 pkgrel=1
 pkgdesc="A JIT compiler for Python expressions"
 url="http://code.google.com/p/numexpr/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('python2-distribute' 'python-distribute' 'python-numpy' 'python2-numpy')
 source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz)
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 3f56285fe..f984d3f2d 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $
+# $Id: PKGBUILD 92176 2013-06-02 12:35:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgbase=python-pymongo
 pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.5
+pkgver=2.5.2
 pkgrel=1
 pkgdesc='Python driver for MongoDB'
 arch=('x86_64' 'i686' 'mips64el')
@@ -13,7 +13,7 @@ license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222')
+sha256sums=('84ac1da67d0dabc711fa8259324d4e94b26a85411bcf0c12dc80a427d9f93ecc')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD
index 7a211c735..2ca0d6529 100644
--- a/community/python-pyxattr/PKGBUILD
+++ b/community/python-pyxattr/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 78604 2012-10-21 22:13:35Z lfleischer $
+# $Id: PKGBUILD 92209 2013-06-02 18:57:49Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Jon Bergli Heier <snakebite@jvnv.net>
 
 pkgname=('python2-pyxattr' 'python-pyxattr')
 pkgbase=python-pyxattr
 _pkgname=pyxattr
-pkgver=0.5.1
+pkgver=0.5.2
 pkgrel=1
 pkgdesc='A python extension module that allows you to manipulate the extended attributes.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pyxattr.k1024.org/'
 license=('GPL')
 makedepends=('python2' 'python' 'python2-distribute' 'python-distribute')
-source=("https://github.com/downloads/iustin/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('bb9560510b17625015aa45f2fbc3b520')
+source=("http://pyxattr.k1024.org/downloads/pyxattr-$pkgver.tar.gz")
+md5sums=('9ff2e4218badc201b689b6d254290001')
 
 package_python2-pyxattr() {
   depends=('python2')
diff --git a/community/python2-cchardet/PKGBUILD b/community/python2-cchardet/PKGBUILD
deleted file mode 100644
index f24cbc0ac..000000000
--- a/community/python2-cchardet/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 80426 2012-11-21 14:15:53Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=python2-cchardet
-pkgver=0.3.2
-pkgrel=1
-_libname=${pkgname/python2-/}
-pkgdesc="Universal encoding detector faster than chardet."
-url="http://pypi.python.org/pypi/cchardet/"
-depends=('python2')
-makedepends=('cython2' 'python2-distribute')
-license=('MIT')
-arch=('i686' 'x86_64' 'mips64el')
-source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz)
-
-build() {
-    cd "$srcdir/$_libname-$pkgver"
-	find -type f -exec sed -i '1 s|python\s*$|python2|' {} +
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/$_libname-$pkgver"
-    python2 setup.py install --root="$pkgdir"
-	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
-}
-
-sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23')
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 8fae12b29..2bee7ef10 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,57 +1,68 @@
-# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $
+# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=qcad
-pkgver=2.0.5.0
-pkgrel=12
+pkgver=3.0.14.0
+pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ribbonsoft.com/qcad.html"
 license=('GPL2')
-depends=('qt3')
+depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
-        qcad.xpm
-        QCad.desktop
-        qcad-intptr.patch
-        qcad.patch)
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
-         'da32fec0d2fb85d96126bf28bb0ab9ff'
-         'b4d1eb6724b4b41f191f1ab6fd859c39'
-         '92f900fe1fd3a8f841232b587b49c7da'
-         '7e6779b1e3b10da1eb4daf36d93f8479')
-# http://ghost1227.com/files/misc/qm.tar.gz)
+source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip
+        QCad.desktop)
+md5sums=('2c460838235a95a4d969e508a75b8206'
+         '8c4288986b78b14a813b005e81b6ba53')
+
+prepare() {
+  cd ${srcdir}/qcad-$pkgver
+
+  sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
+  sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
-
-  [ "$CARCH" = "x86_64" ] && {
-    patch -p1 < ../qcad-intptr.patch;
-    sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp;
-  }
-  patch -p1 < ../qcad.patch
-  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
-
-  cd scripts
-  sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro
-  sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro
-  sed -i "s/qmake/qmake-qt3/" build_qcad.sh
-  sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|'  build_qcad.sh
-  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
+  cd ${srcdir}/qcad-$pkgver
+
+  qmake-qt4
+  make PREFIX=/usr CXX="g++ -fpermissive"
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
-
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -m644 ../../QCad.desktop \
-    ${pkgdir}/usr/share/applications/QCad.desktop
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
-  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
+  cd ${srcdir}/qcad-$pkgver
+
+  # remove project files
+  find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
+  find . \( -name 'Makefile' -name '.gitignore' \) -delete
+
+  install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications}
+  cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad
+  cp release/* ${pkgdir}/usr/share/qcad
+
+  install -m755 qcad ${pkgdir}/usr/share/qcad/qcad
+  install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt
+
+  # qtwebkit
+  ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so
+  # qt
+  for sofiles in /usr/lib/qt4/plugins/imageformats/*.so
+  do
+    ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/}
+  done
+  for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so
+  do
+    ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/}
+  done
+
+  install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png
+  install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
+
+  install -dm0755 $pkgdir/usr/bin
+  echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad
+  chmod 0755 $pkgdir/usr/bin/qcad
 }
diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop
index a55f5940f..5841b786e 100644
--- a/community/qcad/QCad.desktop
+++ b/community/qcad/QCad.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
+Exec=/usr/share/qcad/qcad
+Icon=/usr/share/pixmaps/qcad_icon.png
 Name=QCad
 StartupNotify=true
 Terminal=false
diff --git a/community/qcad/qcad-intptr.patch b/community/qcad/qcad-intptr.patch
deleted file mode 100644
index 6d8b6acca..000000000
--- a/community/qcad/qcad-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
-         os << " layer: NULL ";
-     } else {
-         os << " layer: " << e.layer->getName().latin1() << " ";
--        os << " layer address: " << (int)(e.layer) << " ";
-+        os << " layer address: " << (intptr_t)(e.layer) << " ";
-     }
- 
-     os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
-     os << " name: " << l.getName().latin1()
-     << " pen: " << l.getPen()
- 	<< " frozen: " << (int)l.isFrozen()
--	<< " address: " << (int)(&l)
-+	<< " address: " << (intptr_t)(&l)
-     << std::endl;
-     return os;
- }
diff --git a/community/qcad/qcad.patch b/community/qcad/qcad.patch
deleted file mode 100644
index f051f29af..000000000
--- a/community/qcad/qcad.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstring>
- 
- #include "dl_attributes.h"
- #include "dl_codes.h"
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
-@@ -23,7 +23,7 @@
- ** not clear to you.
- **
- **********************************************************************/
--
-+#include <cstdlib>
- #include "rs_actionzoompan.h"
- #include "rs_snapper.h"
- #include "rs_point.h"
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
-@@ -25,7 +25,7 @@
- **********************************************************************/
- 
- #include "rs_information.h"
--
-+#include <cstdlib>
- #include "rs_constructionline.h"
- 
- 
-diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
-@@ -16,9 +16,6 @@
- echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
- echo
- 
--echo "QTDIR is: $QTDIR"
--echo "QMAKESPEC is: $QMAKESPEC"
--
- # detect system:
- if [ "x$OS" == "xWindows_NT" ]
- then
diff --git a/community/qcad/qcad.xpm b/community/qcad/qcad.xpm
deleted file mode 100644
index e747fa984..000000000
--- a/community/qcad/qcad.xpm
+++ /dev/null
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-"32 32 97 2",
-"  	c None",
-". 	c #3F3F3F",
-"+ 	c #010180",
-"@ 	c #FFFFFF",
-"# 	c #E0E0EF",
-"$ 	c #41419F",
-"% 	c #4545A1",
-"& 	c #4949A3",
-"* 	c #4D4DA5",
-"= 	c #5151A7",
-"- 	c #5555A9",
-"; 	c #5959AB",
-"> 	c #4444A2",
-", 	c #3C3C9D",
-"' 	c #40409F",
-") 	c #4444A1",
-"! 	c #4848A3",
-"~ 	c #4C4CA5",
-"{ 	c #5050A7",
-"] 	c #5454A9",
-"^ 	c #5858AB",
-"/ 	c #5D5DAD",
-"( 	c #6161AF",
-"_ 	c #6565B1",
-": 	c #5C5CAD",
-"< 	c #6060AF",
-"[ 	c #6464B1",
-"} 	c #6868B3",
-"| 	c #6C6CB5",
-"1 	c #7070B7",
-"2 	c #7474B9",
-"3 	c #7878BB",
-"4 	c #3F3F9E",
-"5 	c #4343A0",
-"6 	c #4747A3",
-"7 	c #4B4BA5",
-"8 	c #000000",
-"9 	c #7C7CBD",
-"0 	c #8080BF",
-"a 	c #4747A2",
-"b 	c #4B4BA4",
-"c 	c #4F4FA6",
-"d 	c #7B7BBD",
-"e 	c #7F7FBF",
-"f 	c #8383C1",
-"g 	c #5353A8",
-"h 	c #8787C3",
-"i 	c #5757AA",
-"j 	c #8B8BC5",
-"k 	c #4E4EA6",
-"l 	c #5252A8",
-"m 	c #5656AA",
-"n 	c #5A5AAC",
-"o 	c #8787C2",
-"p 	c #8F8FC7",
-"q 	c #5E5EAE",
-"r 	c #8B8BC4",
-"s 	c #8F8FC6",
-"t 	c #9393C8",
-"u 	c #6262B0",
-"v 	c #8E8EC6",
-"w 	c #9292C8",
-"x 	c #9696CA",
-"y 	c #6666B2",
-"z 	c #9A9ACC",
-"A 	c #6A6AB4",
-"B 	c #9E9ECE",
-"C 	c #6565B2",
-"D 	c #6969B4",
-"E 	c #6D6DB6",
-"F 	c #7171B8",
-"G 	c #7575BA",
-"H 	c #9D9DCE",
-"I 	c #A1A1D0",
-"J 	c #7171B7",
-"K 	c #7575B9",
-"L 	c #7979BC",
-"M 	c #7D7DBE",
-"N 	c #8181C0",
-"O 	c #8585C2",
-"P 	c #8989C4",
-"Q 	c #8D8DC6",
-"R 	c #9191C8",
-"S 	c #9595CA",
-"T 	c #9999CC",
-"U 	c #A5A5D2",
-"V 	c #7979BB",
-"W 	c #7D7DBD",
-"X 	c #8181BF",
-"Y 	c #8585C1",
-"Z 	c #8989C3",
-"` 	c #A9A9D4",
-" .	c #8D8DC5",
-"..	c #9191C7",
-"+.	c #9595C9",
-"@.	c #9999CB",
-"#.	c #ADADD6",
-"                                                                ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"    .       .       .       .       .       .       .       .   ",
-"    .       .       .   + + + + + + +       .       .       .   ",
-"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
-"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
-"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
-"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
-"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
-"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
-"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
-"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
-"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
-"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
-"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
-"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
-"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
-"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
-"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
-"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
-"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
-"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
-"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
-"    .       .     + > > Y Z  ...+.@.H > U ` #.#.> + .       .   ",
-"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
-"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
-"    .       .       .       .       .     + > > +   .       .   ",
-"    .       .       .       .       .       + +     .       .   ",
-"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"                                                                ",
-"                                                                "};
diff --git a/community/qiv/PKGBUILD b/community/qiv/PKGBUILD
index 2e6c7c963..6c3350d74 100644
--- a/community/qiv/PKGBUILD
+++ b/community/qiv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qiv
 pkgver=2.2.4
 pkgrel=2
 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://spiegl.de/qiv/"
 license=('GPL2')
 depends=('file' 'gtk2' 'imlib2')
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 7bb4da70a..7a34262ed 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $
+# $Id: PKGBUILD 91840 2013-05-28 17:05:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
 pkgver=0.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qpxtool.sourceforge.net/"
@@ -24,7 +24,7 @@ build() {
     -e 's|lrelease|lrelease-qt4|' \
     configure
   patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 4ec09ea8e..b06e66b1d 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $
+# $Id: PKGBUILD 90973 2013-05-16 23:06:59Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=2.7.0
-_pkgver=2.7.0
+pkgver=2.7.1
+_pkgver=2.7.1
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
@@ -26,22 +26,16 @@ optdepends=('qt5-doc: for the integrated Qt documentation'
             'bzr: for bazaar support'
             'valgrind: for analyze support')
 install=qtcreator.install
-source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
-        'qtcreator.desktop'
-        'fix-build.patch')
-md5sums=('7bf25d211ff8babea47c2034f1b93d08'
-         '82888d4be900e7833d768050a135cd37'
-         '4087c00d853addf97ca329d304e9a0a5')
+source=("https://qt.gitorious.org/qt-creator/qt-creator/archive-tarball/v${_pkgver}"
+        'qtcreator.desktop')
+md5sums=('3f552e173918b2705c9dbb17725057b5'
+         '82888d4be900e7833d768050a135cd37')
 
 build() {
-  cd qt-creator-${_pkgver}-src
-  patch -p1 -i "${srcdir}"/fix-build.patch
-  cd ../
-
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  qmake ../qt-creator-${_pkgver}-src/qtcreator.pro
+  qmake ../qt-creator-qt-creator/qtcreator.pro
   make
   make docs -j1
 }
@@ -53,5 +47,5 @@ package() {
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
 
   install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
+  install -Dm644 ${srcdir}/qt-creator-qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
 }
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 3ad639a35..e235e817f 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $
+# $Id: PKGBUILD 90540 2013-05-13 00:51:44Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
 pkgver=0.99.22.1
-pkgrel=1
+pkgrel=2
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
@@ -21,14 +21,14 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ripngd.service'
         'zebra.service')
 md5sums=('d9ab848661720d6da2551c7a4a19c731'
-         '87bf4ae8aca3b3cf70e3986bc669aa78'
-         '9b14110bed4982baa801808db6ac9135'
-         'b685b5c12637cb963e1fb78ecd926e14'
-         '1fee8cdf03f87b9bb129948058246c88'
-         '4d95a4af1ddb4ae21b867bebbedc77d5'
-         '7e33c2a2e1c12309ba28d75a34294ed0'
-         '6c682c0cd06c109bc10d29c1d9af3e38'
-         '18964536b7ed012aa5b22f2fa9fb3e87')
+         '20a8e36ad851d4e06467aeb56a84b245'
+         'cc90c234aac9098c5132d653037d5269'
+         '67d0ada0f3000b9a86351798786c5256'
+         '6e2569ef339838aa41375e913a8e19ce'
+         '260f5fcf9b53ef201a8fb34e7ea90457'
+         'b6e3549d780355914ae8edd43e15630a'
+         '72dd63c49fdaea41729a4318d0fbac79'
+         '577f1e7caeea31d910f2dc29c28ada7d')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -43,6 +43,7 @@ build() {
   cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc/quagga \
     --localstatedir=/run/quagga \
     --enable-exampledir=/usr/share/doc/quagga/examples \
diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service
index aa107afca..7279f0336 100644
--- a/community/quagga/babeld.service
+++ b/community/quagga/babeld.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/babeld.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/babeld.pid
-ExecStart=/usr/sbin/babeld -d
+ExecStart=/usr/bin/babeld -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service
index aae58be2c..b0bf1db0f 100644
--- a/community/quagga/bgpd.service
+++ b/community/quagga/bgpd.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/bgpd.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/bgpd.pid
-ExecStart=/usr/sbin/bgpd -d
+ExecStart=/usr/bin/bgpd -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service
index fa5a716e8..5ad16c1a4 100644
--- a/community/quagga/isisd.service
+++ b/community/quagga/isisd.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/isisd.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/isisd.pid
-ExecStart=/usr/sbin/isisd -d
+ExecStart=/usr/bin/isisd -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service
index eacb89159..dae3dc322 100644
--- a/community/quagga/ospf6d.service
+++ b/community/quagga/ospf6d.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospf6d.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/ospf6d.pid
-ExecStart=/usr/sbin/ospf6d -d
+ExecStart=/usr/bin/ospf6d -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service
index 57a946f8e..e43c474cc 100644
--- a/community/quagga/ospfd.service
+++ b/community/quagga/ospfd.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospfd.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/ospfd.pid
-ExecStart=/usr/sbin/ospfd -d
+ExecStart=/usr/bin/ospfd -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service
index bf7c5ac6f..a55498100 100644
--- a/community/quagga/ripd.service
+++ b/community/quagga/ripd.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripd.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/ripd.pid
-ExecStart=/usr/sbin/ripd -d
+ExecStart=/usr/bin/ripd -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service
index 465263ba3..4990669d2 100644
--- a/community/quagga/ripngd.service
+++ b/community/quagga/ripngd.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripngd.conf
 [Service]
 Type=forking
 PIDFile=/run/quagga/ripngd.pid
-ExecStart=/usr/sbin/ripngd -d
+ExecStart=/usr/bin/ripngd -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service
index c8707083e..02813c37c 100644
--- a/community/quagga/zebra.service
+++ b/community/quagga/zebra.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/zebra.conf
 Type=forking
 PIDFile=/run/quagga/zebra.pid
 ExecStartPre=/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra -d
+ExecStart=/usr/bin/zebra -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index d47a1edc8..da26dca53 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,50 +1,90 @@
-# $Id: PKGBUILD 79252 2012-11-01 19:02:54Z mtorromeo $
+# $Id: PKGBUILD 91733 2013-05-26 19:25:26Z jelle $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
-pkgname=quassel
-pkgver=0.8.0
-pkgrel=2
+pkgbase=quassel
+pkgname=('quassel-client' 'quassel-core')
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://quassel-irc.org/"
 license=('GPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=quassel.install
-backup=(etc/conf.d/quassel)
-source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2"
+makedepends=('cmake' 'automoc4' 'qt4' 'icu')
+source=("http://quassel-irc.org/pub/quassel-$pkgver.tar.bz2"
         'quassel.service'
-        'rc.quassel'
         'quassel.conf')
-sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071'
+
+sha256sums=('2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027'
             '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3'
-            '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
-
 build() {
+  cd $srcdir
   [[ ! -d build ]] && mkdir build
+  mkdir build-client
+
+  # Core
   cd build
 
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DWITH_KDE=1 \
+    -DWITH_KDE=0 \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=ON \
+    -DWANT_MONO=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWITH_DBUS=OFF \
+    -DWITH_OXYGEN=OFF \
+    -DWITH_PHONON=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+
+  make
+
+  # Client
+  cd $srcdir/build-client
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DWITH_KDE=0 \
+    -DWITH_OPENSSL=ON \
     -DCMAKE_BUILD_TYPE="Release" \
-    ../${pkgname}-${pkgver}/ \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=ON \
+    -DWANT_MONO=ON \
+    ../quassel-${pkgver}/ \
     -Wno-dev
 
   make
+  
 }
 
-package() {
-  cd build
+package_quassel-core() {
+pkgdesc="Qt4 IRC client with a separated core - core only"
+depends=('qt4' 'icu')
+backup=(etc/conf.d/quassel)
+install=quassel.install
+  cd $srcdir/build
 
   make DESTDIR="${pkgdir}" install
+  
+  # Remove unneeded pixmap icons
+  rm -r $pkgdir/usr/share
+
+
+  install -Dm644 "${srcdir}"/$pkgbase.service \
+    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
+  install -Dm644 "${srcdir}"/$pkgbase.conf \
+    "${pkgdir}"/etc/conf.d/$pkgbase
+}
+
+package_quassel-client() {
+pkgdesc="Qt4 IRC client with a separated core - client only"
+depends=('qt4')
+install=quassel-client.install
+  cd $srcdir/build-client
 
-  install -Dm644 "${srcdir}"/$pkgname.service \
-    "${pkgdir}"/usr/lib/systemd/system/$pkgname.service
-  install -D "${srcdir}"/rc.$pkgname \
-    "${pkgdir}"/etc/rc.d/$pkgname
-  install -Dm644 "${srcdir}"/$pkgname.conf \
-    "${pkgdir}"/etc/conf.d/$pkgname
+  make DESTDIR=${pkgdir} install
 }
diff --git a/community/quassel/quassel-client.install b/community/quassel/quassel-client.install
new file mode 100644
index 000000000..1c93ee3f9
--- /dev/null
+++ b/community/quassel/quassel-client.install
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}
diff --git a/community/quassel/quassel.install b/community/quassel/quassel.install
index 289ecc63f..5cd29276b 100644
--- a/community/quassel/quassel.install
+++ b/community/quassel/quassel.install
@@ -1,7 +1,7 @@
 post_install() {
   useradd -r -s /bin/sh -d /var/lib/quassel quassel
   mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
@@ -12,15 +12,10 @@ post_upgrade() {
 ==> - quasselcore now listens to port 127.0.0.1 by default
 ==> - both of above are configurable: /etc/conf.d/quassel
 EOF
-    /etc/rc.d/quassel stop
     post_install
   ) || true
 }
 
-pre_remove() {
-  /etc/rc.d/quassel stop
-}
-
 post_remove() {
   userdel quassel
 }
diff --git a/community/quassel/rc.quassel b/community/quassel/rc.quassel
deleted file mode 100644
index 99b82eec9..000000000
--- a/community/quassel/rc.quassel
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/quassel
-
-PIDFILE=/var/run/quassel.pid
-PID=`pidof -o %PPID /usr/bin/quasselcore`
-
-case "$1" in
-  start)
-    stat_busy "Starting Quassel Core"
-    [ -z "$PID" ] && su -l -c "/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=$LISTEN &" $QUASSEL_USER &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > $PIDFILE
-      add_daemon quassel
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Quassel Core"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f $PIDFILE
-      rm_daemon quassel
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 8c93df3e5..6dd3df121 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88368 2013-04-16 19:57:49Z seblu $
+# $Id: PKGBUILD 90532 2013-05-13 00:28:44Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
 pkgver=1.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
@@ -15,10 +15,14 @@ backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d'
-          'f1e97885117b5ee2a533916624fa4297ce66e418')
+          '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-pidfile=/run/radvd.pid \
     --mandir=/usr/share/man
   make
 }
diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service
index 92685d73b..2f1b1a7fa 100644
--- a/community/radvd/radvd.service
+++ b/community/radvd/radvd.service
@@ -3,7 +3,7 @@ Description=IPv6 Router Advertisement Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/radvd --nodaemon --logmethod=stderr
+ExecStart=/usr/bin/radvd --nodaemon --logmethod=stderr
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 9025408c6..9dced31e5 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88329 2013-04-16 13:30:45Z spupykin $
+# $Id: PKGBUILD 91024 2013-05-18 10:14:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=recoll
-pkgver=1.18.2
+pkgver=1.19.2
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'aspell-en: English stemming support')
 install=recoll.install
 source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('fee17c0edbe9199ae7662f6ec46eda07')
+md5sums=('caffd86c122476ca0bcdde55177b393b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index e1a879ac5..6d45cce5f 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89919 2013-05-05 14:50:37Z spupykin $
+# $Id: PKGBUILD 90717 2013-05-13 14:36:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
 pkgver=2.6.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://redis.io/"
@@ -15,11 +15,9 @@ makedepends=('gcc>=3.1' 'make' 'pkgconfig')
 backup=("etc/redis.conf"
 	"etc/logrotate.d/redis")
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
-	"redis.d"
 	"redis.service"
 	"redis.logrotate")
 md5sums=('c4be422013905c64af18b1ef140de21f'
-         '8d843919d9f165e9a47e56cadb4ac2ed'
          '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
@@ -35,7 +33,6 @@ package() {
   make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install
 
   install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
-  install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis"
   install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
   install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
   sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf
diff --git a/community/redis/redis.d b/community/redis/redis.d
deleted file mode 100644
index e1c79dd2b..000000000
--- a/community/redis/redis.d
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-daemon_name=redis
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-REDISPORT=6379
-EXEC=/usr/bin/redis-server
-CLIEXEC=/usr/bin/redis-cli
-PIDFILE=/var/run/redis.pid
-WORKDIR=/var/lib/redis
-CONF="/etc/redis.conf"
-
-# Check if process exists
-PID=$(cat $PIDFILE 2>/dev/null)
-[ -d /proc/${PID} ] || rm -f $PIDFILE
-
-# Grab the server password, if exists
-REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\  -f 2`
-[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS"
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    [ -d $WORKDIR ] || mkdir $WORKDIR
-
-    if [ -f $PIDFILE ]; then
-      stat_fail
-      exit 1
-    else
-      $EXEC $CONF >/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name"
-
-    if [ ! -f $PIDFILE ]; then
-      stat_fail
-      exit 1
-    else
-      PID=$(cat $PIDFILE)
-
-      # And grab the server address
-      REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2`
-      [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR"
-
-      $CLIEXEC -p $REDISPORT shutdown
-      [ -d /proc/${PID} ] && sleep 1
-      [ -d /proc/${PID} ] && sleep 5
-      [ -d /proc/${PID} ] && kill -9 $PID
-      [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; }
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-exit 0
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index aa558a490..aded6c0b6 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88305 2013-04-16 12:29:33Z ttoepper $
+# $Id: PKGBUILD 92214 2013-06-02 21:00:23Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.7.1
+pkgver=2.7.2
 pkgrel=1
 pkgdesc='Tabbed, VTE-based terminal emulator'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-md5sums=('97b33c75fbded13d99ecdc1452ec6d0b')
-sha1sums=('3fb4012d5b5283cb740962cd295cdfd5c6c0044d')
+md5sums=('8ef80f9a5e0aea659b1f9cd6de9869b4')
+sha1sums=('fa32ceeb19a097d5fb8a54c24cb7a6f1b957e74d')
 
 
 build() {
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 9d8e173b6..90f24a027 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88526 2013-04-19 10:32:19Z spupykin $
+# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
 pkgver=7.2.7
-pkgrel=1
+pkgrel=3
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,19 +19,16 @@ backup=('etc/rsyslog.conf'
 	'etc/conf.d/rsyslog')
 options=('strip' 'zipman' '!libtool')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-	'rsyslog'
 	'rsyslog.logrotate'
-	'rsyslog.conf.d'
 	'rsyslog.conf')
 md5sums=('4a61d182acb5b5487e7b99dea8974857'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
-         '18565f38a4445136446a31a3c95ffc3e'
+         '304bc9ea26aa1ff910870899a30512f1'
          'd61dd424e660eb16401121eed20d98bc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --enable-mysql \
               --enable-pgsql \
               --enable-mail \
@@ -47,11 +44,9 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make install DESTDIR=${pkgdir}
   # Install Daemons and Configuration Files
-  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
   install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example
   install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
   install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
-  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
 
   # fix location of systemctl and remove start precondition
   sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
diff --git a/community/rsyslog/rsyslog b/community/rsyslog/rsyslog
deleted file mode 100644
index ee0145418..000000000
--- a/community/rsyslog/rsyslog
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d
deleted file mode 100644
index fc0770666..000000000
--- a/community/rsyslog/rsyslog.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c6"
diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate
index 76306c560..354581767 100644
--- a/community/rsyslog/rsyslog.logrotate
+++ b/community/rsyslog/rsyslog.logrotate
@@ -2,6 +2,6 @@
     missingok
     sharedscripts
     postrotate
-	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+	/usr/bin/killall -HUP /usr/bin/rsyslogd
     endscript
 }
diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD
index 7968cc713..a9c30ac5c 100644
--- a/community/rtorrent/PKGBUILD
+++ b/community/rtorrent/PKGBUILD
@@ -4,15 +4,15 @@
 # Contributor: sh__
 
 pkgname=rtorrent
-pkgver=0.9.2
+pkgver=0.9.3
 pkgrel=2
 pkgdesc='Ncurses BitTorrent client based on libTorrent'
 url='http://libtorrent.rakshasa.no/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libtorrent=0.13.2' 'curl' 'xmlrpc-c')
+depends=('libtorrent=0.13.3' 'curl' 'xmlrpc-c' 'libsigc++')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2a642d722745091265037ed8929a23c237a3b99f')
+sha1sums=('89ec5683a46f000dc23c9bf8a8808985759220e4')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,8 +29,5 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-
-	install -D doc/faq.xml "${pkgdir}"/usr/share/doc/rtorrent/faq.xml
-	install -D doc/rtorrent.1 "${pkgdir}"/usr/share/man/man1/rtorrent.1
 	install -D doc/rtorrent.rc "${pkgdir}"/usr/share/doc/rtorrent/rtorrent.rc
 }
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 7fe16ed85..ad961fe99 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -29,7 +29,8 @@ prepare() {
     "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
     "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
     "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
-    "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux"
+    "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
+    "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/mips64el-linux"
 }
 
 build() {
diff --git a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch
new file mode 100644
index 000000000..adb140bcc
--- /dev/null
+++ b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch
@@ -0,0 +1,12 @@
+# https://bugs.archlinux.org/task/35420
+--- a/src/perl/tabbed	2012-09-12 17:32:04.000000000 +0900
++++ b/src/perl/tabbed	2013-05-24 13:04:37.000000000 +0900
+@@ -402,7 +402,7 @@
+ # simply proxies all interesting calls back to the tabbed class.
+ 
+ {
+-   for my $hook qw(start destroy key_press property_notify) {
++   for my $hook (qw(start destroy key_press property_notify)) {
+       eval qq{
+          sub on_$hook {
+             my \$parent = \$_[0]{term}{parent}
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index a362b9f26..4881e7f10 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90167 2013-05-07 19:14:34Z seblu $
+# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $
 # Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=rxvt-unicode
 pkgver=9.18
-pkgrel=3
+pkgrel=5
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -18,11 +18,17 @@ source=(
   'urxvt.desktop'
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
+  '01-fix-tabber-perl-ext.patch'
 )
 md5sums=('963ccc748fe5bca925e7b92c0404d68b'
          'fec94dc986fa37ec380079d81de3e0b2'
          'fac55f0a8404c86dad3e702146762332'
-         '8a5599197568c63720e282b9722a7990')
+         '8a5599197568c63720e282b9722a7990'
+         '0c26ae7022a128e68981577785358b63')
+
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 27c573cb0..57d6934a8 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $
+# $Id: PKGBUILD 91566 2013-05-23 21:46:56Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.8
+pkgver=5.9
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -15,17 +15,16 @@ arch=('i686' 'x86_64')
 license=('GPL')
 #depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo')
 depends=('desktop-file-utils')
-makedepends=('gcc-fortran' )
+makedepends=('gcc-fortran' 'freetype2')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
             'openssh: to use the notebook in secure mode'
-            'ffmpeg: to show animations')
-options=('!makeflags')
+            'ffmpeg: to show animations'
+            'cairo: R plots')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-md5sums=('fc5b401174ee1efa7aea163e804c2b42'
-         'b82f94383829eee26648feb977e2d89b')
+        'SAGE-notebook.desktop'
+        'sage.service')
 
 build() {
   cd sage-${pkgver}
@@ -38,8 +37,7 @@ build() {
   unset LDFLAGS
 
   # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
+  export MAKE="make -j$(nproc)"
 
   # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
   export FC=/usr/bin/gfortran
@@ -52,7 +50,11 @@ build() {
   export SAGE_FAT_BINARY='yes'
 
   # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
+  mkdir "$srcdir/buiild"
+  export DOT_SAGE="$srcdir/build"
+
+  # Singular is broken
+  export CPP='/usr/bin/cpp'
 
   # only build sage, no documents
   #make build
@@ -95,8 +97,12 @@ package() {
   # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
   rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
+
+  # install a systemd user unit
+  install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('b91d6c20798f396a9c875527c78b3587'
-         'b82f94383829eee26648feb977e2d89b')
+md5sums=('708520904f2d42039c714ac72a631948'
+         'b82f94383829eee26648feb977e2d89b'
+         '985da1c1d1dcdc3ea9aa73035cb7996b')
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
index ab5dae235..3da751689 100644
--- a/community/sage-mathematics/sage-mathematics.install
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -41,6 +41,8 @@ echo '
 
 post_upgrade() {
   post_install $1
+  echo "There is now a user session unit included to run a sage notebook as your user."
+  echo "The wiki includes a guide on starting systemd user sessions"
 }
 
 post_remove() {
diff --git a/community/sage-mathematics/sage.service b/community/sage-mathematics/sage.service
new file mode 100644
index 000000000..d999414de
--- /dev/null
+++ b/community/sage-mathematics/sage.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=A free open-source mathematics software system
+
+[Service]
+ExecStart=/opt/sage/sage -n
+
+[Install]
+WantedBy=default.target
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index 004b76ec2..a2e3164f9 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65429 2012-02-21 05:43:32Z spupykin $
+# $Id: PKGBUILD 91530 2013-05-23 11:17:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=scponly
 pkgver=4.8
-pkgrel=8
+pkgrel=9
 pkgdesc="A limited shell for ssh/scp"
 arch=(i686 x86_64 'mips64el')
 url="http://sublimation.org/scponly/"
@@ -19,9 +19,9 @@ md5sums=('139ac9abd7f3b8dbc5c5520745318f8a'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --build=$CHOST --sysconfdir=/etc \
-	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary
+	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary \
+	--sbindir=/usr/bin
   sed -i 's|^#elif|#else|' helper.c
   make
 }
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index ddcc11a27..b3974172f 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.scummvm.org/"
 depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d71d1df5c8262556fedbe885972fbf6e')
+md5sums=('473c151ff44e3db7b603ecacd800a0d2')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index 8b43b2ade..210848517 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $
+# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,15 +14,25 @@ optdepends=('python')
 url="http://sdcc.sourceforge.net/"
 options=(!strip)
 source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
+md5sums=('c7c6aa75415580795ecc4fd31948e5ba')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure
+}
 
 build() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
   ./configure \
 	--prefix=/usr \
 	--includedir=/usr/include/sdcc \
 	--libdir=/usr/lib/sdcc
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make install DESTDIR=$pkgdir
 
   if [ -d $pkgdir/usr/lib/lib ]; then
diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD
index b01a9324a..917763d9c 100644
--- a/community/ser2net/PKGBUILD
+++ b/community/ser2net/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77110 2012-10-05 10:16:21Z spupykin $
+# $Id: PKGBUILD 91532 2013-05-23 11:17:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=ser2net
 pkgver=2.8rc3
-pkgrel=1
+pkgrel=3
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/ser2net"
@@ -12,15 +12,13 @@ license=('GPL')
 depends=('glibc')
 backup=(etc/ser2net.conf)
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz
-	ser2net.init
 	ser2net.service)
 md5sums=('bbe95fb557781c314d321356897a50b9'
-         '6db420d54ce8f78464e885efe935dd18'
-         '7f9d879325b9ed6ddc313dcbc3f83e56')
+         '9a94f9ba5595359c92d099465ab7c828')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/rc/-rc}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
@@ -28,6 +26,5 @@ package() {
   cd $srcdir/${pkgname}-${pkgver/rc/-rc}
   make DESTDIR=$pkgdir install
   install -Dm0644 ser2net.conf $pkgdir/etc/ser2net.conf
-  install -Dm0755 $srcdir/ser2net.init $pkgdir/etc/rc.d/ser2net
   install -Dm0644 $srcdir/ser2net.service $pkgdir/usr/lib/systemd/system/ser2net.service
 }
diff --git a/community/ser2net/ser2net.init b/community/ser2net/ser2net.init
deleted file mode 100644
index f35984686..000000000
--- a/community/ser2net/ser2net.init
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof ser2net
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ser2net daemon"
-
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      [ -f /var/run/ser2net.pid ] && rm -f /var/run/ser2net.pid
-      ser2net
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ser2net.pid
-        add_daemon ser2net
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ser2net daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ser2net.pid &> /dev/null
-      rm_daemon ser2net
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service
index fcf054e22..7bb3137d4 100644
--- a/community/ser2net/ser2net.service
+++ b/community/ser2net/ser2net.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ser2net
+ExecStart=/usr/bin/ser2net
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index a5b491226..eee3f1403 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $
+# $Id: PKGBUILD 91394 2013-05-21 16:28:38Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -29,4 +29,4 @@ package() {
   sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc"
 }
 
-md5sums=('e0ace61f7e01c6b545ac767fc499f817')
+md5sums=('3401d9c8a02f227b63a0d10e2718ab37')
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
index 72fba4f35..50f8142b7 100644
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ b/community/signon-plugin-oauth2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84333 2013-02-16 20:09:04Z bgyorgy $
+# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=signon-plugin-oauth2
 _pkgname=signon-oauth2
-pkgver=0.15
+pkgver=0.17
 pkgrel=1
 pkgdesc="OAuth 2 plugin for signon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,16 +12,18 @@ license=('LGPL')
 depends=('signon-ui' 'qjson')
 makedepends=('signon')
 source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('31f63f73eca2c8341ab41ec0d63650c9a0b4820a')
+sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
+  sed -i '/-Werror/d' common-project-config.pri
+
   # Do not install tests and example
   echo 'INSTALLS =' >>tests/tests.pro
   echo 'INSTALLS =' >>example/example.pro
 
-  qmake PREFIX=/usr LIBDIR=/usr/lib
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD
index 9e8762906..05f6d3c93 100644
--- a/community/signon/PKGBUILD
+++ b/community/signon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87393 2013-03-30 17:15:21Z bgyorgy $
+# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
 pkgname=('signon' 'signon-doc')
-pkgver=8.49
+pkgver=8.51
 pkgrel=1
 pkgdesc="Framework to provide credential storage and authentication service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=(etc/signond.conf)
 install=$pkgname.install
 source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2
         use_keyring.patch)
-sha1sums=('349d700eed718977463020f252269786883bc4c6'
+sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65'
           'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
 
 build() {
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 9a2d46733..f89d77c77 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85723 2013-03-05 18:54:32Z jlichtblau $
+# $Id: PKGBUILD 91047 2013-05-18 14:03:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=1.6.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('kdepim-libkdepim: for KDE PIM integration')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7237400f0ae9af317ec9ac45d8d35144f827146b8cb4e37fa092412fec5f0b0e')
+sha256sums=('7427c9c4a93a9c6794e6419ef225c8f512548217ab2eac7abf217f5802cd6a88')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index 81cf3a3d2..862db7099 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,4 +1,7 @@
-2013-03-50 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* skrooge 1.7.1-1
+
+2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* skrooge 1.6.0-1
 
 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD
index 8c11194a9..8acee1114 100644
--- a/community/smbnetfs/PKGBUILD
+++ b/community/smbnetfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $
+# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=smbnetfs
 pkgver=0.5.3a
-pkgrel=5
+pkgrel=6
 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smbnetfs.sourceforge.net/"
@@ -17,19 +17,23 @@ backup=('etc/smbnetfs/.smb/smb.conf'
 install=smbnetfs.install
 options=(docs)
 source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2
-	rc-smbnetfs
 	conf-smbnetfs
 	smbnetfs.service)
 md5sums=('66d1477ca981f5a07b4b21c6bdbdc442'
-         'b6cff0ee75cafd739ad44216236b5e28'
          'e150c4cd894cc6ade11b94c95cf17ec4'
          '0fdd0dbaa5f16b1ecd00ec1ddcdfc223')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
+  sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|g' \
+    src/smb_conn_srv.c src/smb_conn_proto.h src/function.c src/main.c src/event.c
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --docdir=/usr/share/doc/smbnetfs --with-gnome-keyring=no
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make DESTDIR=$pkgdir install
 
   mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs
@@ -37,7 +41,6 @@ build() {
   mkdir -p $pkgdir/etc/smbnetfs/.smb
   install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/
   install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README
-  install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs
   install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs
   install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service
   touch $pkgdir/etc/smbnetfs/.smb/smb.conf
diff --git a/community/smbnetfs/rc-smbnetfs b/community/smbnetfs/rc-smbnetfs
deleted file mode 100644
index 69c00d120..000000000
--- a/community/smbnetfs/rc-smbnetfs
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/smbnetfs
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	echo `pidof smbnetfs`
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting smbnetfs"
-
-    [ -f /var/run/smbnetfs.pid ] && rm -f /var/run/smbnetfs.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      cd /tmp && \
-	[ -d $SMBNETFS_MOUNT_POINT ] && \
-	su - nobody -s /bin/bash -c "HOME=/etc/smbnetfs exec smbnetfs -o allow_other $SMBNETFS_MOUNT_POINT" &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/smbnetfs.pid
-        add_daemon smbnetfs
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping smbnetfs"
-
-    fusermount -u $SMBNETFS_MOUNT_POINT &> /dev/null
-    rm -f /var/run/smbnetfs.pid &> /dev/null
-    rm_daemon smbnetfs
-    stat_done
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index aa03be4fc..7f8253657 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88078 2013-04-11 05:47:45Z cinelli $
+# $Id: PKGBUILD 91603 2013-05-25 11:22:11Z bpiotrowski $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Dave Reisner <d@falconindy.com>
 # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org>
@@ -6,7 +6,7 @@
 
 pkgname=smem
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Generate reports on memory usage."
 url="http://www.selenic.com/smem/"
 license=("GPL")
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index 2bd24d7f9..4e1d69ae4 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65453 2012-02-21 05:52:41Z spupykin $
+# $Id: PKGBUILD 91957 2013-05-30 09:44:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 
 pkgname=sniffit
 pkgver=0.3.7.beta
-pkgrel=11
-pkgdesc="very good packet sniffer for unix with ncurses interactive mode."
+pkgrel=13
+pkgdesc="Very good packet sniffer for unix with ncurses interactive mode"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.ubuntu.com/source/sniffit"
 #seems the website are out, ubuntu have all sources
@@ -27,9 +27,13 @@ build() {
   rm -f config.sub config.guess
   cp  /usr/share/libtool/config/config.{guess,sub} .
 
-  ./configure --prefix=/usr --no-recursion
+  ./configure --prefix=/usr --no-recursion --sbindir=/usr/bin
   make
-  install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}}
-  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit
+}
+
+package() {
+  cd "${srcdir}/${pkgname}.${pkgver}"
+  install -d -m0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit
   install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
 }
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index aaaa0ba11..cb9016c33 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $
+# $Id: PKGBUILD 91008 2013-05-17 10:22:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
@@ -6,21 +6,28 @@
 pkgname=sqlitebrowser
 pkgver=2.0b1
 _pkgrealver=200_b1
-pkgrel=3
+pkgrel=4
 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sqlitebrowser.sf.net"
 license=('GPL')
-depends=('qt4')
+depends=('qt4' 'sqlite')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz)
 md5sums=('5ca3d41cca454235b93ce72cd585dfe3')
 
-build() {
+prepare() {
   cd $srcdir/trunk/$pkgname
   sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c
   sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h
-  qmake
-  make LINK="g++ -ldl"
+  sed -i '/sqlite_source\/sqlite3.h/d' sqlitebrowser/sqlbrowser_util.c # Remove two useless #include
+  sed -i 's/"sqlite_source\/sqlite3.h"/<sqlite3.h>/' sqlitebrowser/sqlbrowser_util.h
+  sed -i -e '1i LIBS += -lsqlite3' -e '/sqlite_source/d' sqlitebrowser/sqlitebrowser.pro
+}
+
+build() {
+  cd $srcdir/trunk/$pkgname
+  qmake-qt4
+  make
 }
 
 package() {
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 00d33aaa0..ffefbc54e 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $
+# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Original TU: Jeff Mickey <j@codemac.net>
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
@@ -17,13 +17,11 @@ md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
 
 build() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
-    sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
-    make
+    make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
 }
 
 package() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs
-    install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs
+    install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs
 }
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 9e63cf082..396e514a3 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $
+# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.3
-pkgrel=1
+pkgver=3.3.5
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -15,21 +15,16 @@ makedepends=('libcap')
 license=('GPL')
 options=('emptydirs')
 backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
+        'etc/squid/mime.conf')
 install=$pkgname.install
 source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('20f63ab34eae93b36969c9c7519f6462'
-         'e90895ce22c0b618c89a46a9a181fe6c'
-         '2383772ef94efddc7b920628bc7ac5b0'
+md5sums=('c7991aa8528034af0e21a69edf26e41b'
          '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
+         'a71425c4951f2e5b640d19e6a5048531'
+         'ceeb57c69ebb165676219222f109a24e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -46,6 +41,7 @@ build() {
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --datadir=/usr/share/squid \
     --sysconfdir=/etc/squid \
     --libexecdir=/usr/lib/squid \
@@ -85,9 +81,7 @@ package() {
   cd "$srcdir"
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid"
   install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
-  install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid"
   install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
   install -Dm644 "$srcdir/squid.service" \
     "$pkgdir/usr/lib/systemd/system/squid.service"
diff --git a/community/squid/squid b/community/squid/squid
deleted file mode 100644
index ea80aaa2e..000000000
--- a/community/squid/squid
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-  unset PID
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/community/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/community/squid/squid.cron b/community/squid/squid.cron
index c78e51105..7425df894 100644
--- a/community/squid/squid.cron
+++ b/community/squid/squid.cron
@@ -4,6 +4,6 @@
 { read pid </run/squid.pid; } 2>/dev/null || exit 0
 
 # make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
+if [ /proc/$pid/exec -ef /usr/bin/squid ]; then
+  /usr/bin/squid -k rotate
 fi
diff --git a/community/squid/squid.install b/community/squid/squid.install
index e7aa5ff68..a7c76d87a 100644
--- a/community/squid/squid.install
+++ b/community/squid/squid.install
@@ -1,10 +1,10 @@
 post_install() {
   if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
+    groupadd -g 15 proxy &>/dev/null
   fi
 
   id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
+    useradd -u 15 -g proxy -d /var/empty proxy
 
   chown proxy.proxy var/{cache,log}/squid
 
@@ -18,9 +18,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
+  userdel proxy &> /dev/null
   if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
+    groupdel proxy &>/dev/null
   fi
 }
 
diff --git a/community/squid/squid.service b/community/squid/squid.service
index 9d41cc243..1db8860e5 100644
--- a/community/squid/squid.service
+++ b/community/squid/squid.service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
+ExecStart=/usr/bin/squid -sYC
+ExecStop=/usr/bin/squid -k shutdown
+ExecReload=/usr/bin/squid -k reconfigure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index e786ec243..276987c87 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84143 2013-02-11 15:20:18Z spupykin $
+# $Id: PKGBUILD 92088 2013-05-31 11:33:59Z mtorromeo $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=10
+pkgrel=13
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
 #url="http://sourceforge.net/projects/sshguard/"
@@ -14,20 +14,16 @@ depends=('iptables')
 options=(zipman)
 install=sshguard.install
 source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2"
-	sshguard.rc
-	sshguard.conf.d
 	sshguard.service
 	sshguard-journalctl)
 sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
-            'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e'
-            '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3'
-            '2b2a3c1140349296c3629e77f74c3b29f4ef2ce5f77cb3a811cbed5b46d23028'
-            '9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e')
+            'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd'
+            '7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|^DAYNO.*|DAYNO       [0-9]?[1-9]|' src/parser/attack_scanner.l
-  ./configure --prefix=/usr --with-firewall=iptables
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables
   make
 }
 
@@ -38,9 +34,7 @@ check() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir/usr" install
+  make DESTDIR="$pkgdir" install
   install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service"
-  install -Dm0755 "$srcdir/sshguard.rc" "$pkgdir/etc/rc.d/sshguard"
-  install -Dm0644 "$srcdir/sshguard.conf.d" "$pkgdir/etc/conf.d/sshguard"
   install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl"
 }
diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl
index 13afd6f33..fb106f5b6 100644
--- a/community/sshguard/sshguard-journalctl
+++ b/community/sshguard/sshguard-journalctl
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@"
+/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/bin/sshguard -l- "$@"
diff --git a/community/sshguard/sshguard.conf.d b/community/sshguard/sshguard.conf.d
deleted file mode 100644
index 8fa351a19..000000000
--- a/community/sshguard/sshguard.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Arguments to be passed to sshguard
-#
-SSHGUARD_ARGS=""
diff --git a/community/sshguard/sshguard.install b/community/sshguard/sshguard.install
index 0821c61e0..486e55fbd 100644
--- a/community/sshguard/sshguard.install
+++ b/community/sshguard/sshguard.install
@@ -1,8 +1,14 @@
 post_install() {
-  mkdir -p /var/db/sshguard
-  echo "-- You should add chain to your firewall:"
+  mkdir -p var/db/sshguard
+  echo "-- You should add chains to your firewall:"
   echo "--   iptables -N sshguard"
   echo "--   iptables -A INPUT -p tcp --dport 22 -j sshguard"
-  echo "-- For more information, see http://www.sshguard.net/doc/"
-  /bin/true
+  echo "--   ip6tables -N sshguard"
+  echo "--   ip6tables -A INPUT -p tcp --dport 22 -j sshguard"
+  echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6"
+  echo "-- For more information, see https://wiki.archlinux.org/index.php/Sshguard"
+}
+
+post_upgrade() {
+  echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6"
 }
diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc
deleted file mode 100644
index dbd95c9ea..000000000
--- a/community/sshguard/sshguard.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/sshguard ] && . /etc/conf.d/sshguard
-
-case "$1" in
-  start)
-    stat_busy "Starting SSHGuard"
-    /usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} &> /dev/null &
-    add_daemon sshguard
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping SSHGuard"
-    kill `pidof sshguard` &> /dev/null
-    rm_daemon sshguard
-    stat_done
-    ;;
-  restart)
-  $0 stop
-  $0 start
-  ;;
-*)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service
index 9340d8e9f..d6324d459 100644
--- a/community/sshguard/sshguard.service
+++ b/community/sshguard/sshguard.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Block hacking attempts
-After=iptables.service network.target
-Wants=iptables.service
+After=iptables.service ip6tables.service network.target
+Wants=iptables.service ip6tables.service
 
 [Service]
 ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 09c883e80..3a860f36e 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.12.0
-pkgrel=2
+pkgver=0.12.1
+pkgrel=1
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
@@ -64,4 +64,4 @@ package() {
         "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 }
-md5sums=('38ed5bae81f6513cc898aa12efda2c38')
+md5sums=('47d7c65cf72786d446e1289533af01de')
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index e218d11a8..a889fa914 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87349 2013-03-30 09:40:31Z lfleischer $
+# $Id: PKGBUILD 92065 2013-05-31 02:33:12Z seblu $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
 pkgver=4.56
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stunnel.org"
@@ -15,13 +15,11 @@ install=$pkgname.install
 options=('!libtool')
 source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'Makefile.patch'
-        'stunnel.rc.d'
         'stunnel.tmpfiles.conf')
 
 md5sums=('ac4c4a30bd7a55b6687cbd62d864054c'
          'd68c7dd65d515c678cdde15bbf0ce344'
          'f15398497e10e080c2406d2fc541660c'
-         '4c7e3634a9d4dc040102f5d4160fb123'
          '2e065a39998e57727ee79887bbd1751e')
 
 build() {
@@ -48,7 +46,6 @@ package() {
   done
 
   install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf"
-  install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel"
   install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf"
 
   # move systemd service into place
diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d
deleted file mode 100644
index 76f7b796a..000000000
--- a/community/stunnel/stunnel.rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/var/run/stunnel/stunnel.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting stunnel"
-    if [[ -z $PID ]] && /usr/bin/stunnel; then
-      add_daemon stunnel
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping stunnel"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon stunnel
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
index 168bbc623..5c286dcdc 100644
--- a/community/stuntrally/PKGBUILD
+++ b/community/stuntrally/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jason Melton <jason.melton@gmail.com>
 
 pkgname=stuntrally
-pkgver=1.9
-pkgrel=3
+pkgver=2.0
+pkgrel=1
 pkgdesc='Stunt Rally game with track editor, based on VDrift'
 arch=('x86_64' 'i686')
 license=('GPL3')
@@ -14,14 +14,16 @@ depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stu
 makedepends=('cmake' 'boost')
 install=stuntrally.install
 source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver")
-sha256sums=('651d10aa00cf73b275198f08b0360a34ff98e6b520013041863854babeb20da7')
+sha256sums=('ef3e645e4911f37c28925e3339c39555e849b7ac13511f009742030f531eed68')
 
 build() {
   cd "$srcdir/stuntrally-$pkgver/"
 
   rm -rf build
   mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" ..
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DSHARE_INSTALL="share/stuntrally"
   make
 }
 
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 578ad1447..c93ee70a1 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $
+# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: vande198
@@ -6,24 +6,32 @@
 
 pkgname=supertux
 pkgver=0.3.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
+makedepends=('cmake' 'boost' 'mesa' 'optipng')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
         supertux2-0.3.3-squirrel-gcc47.patch)
 md5sums=('f3f803e629ee51a9de0b366a036e393d'
          'eb06315514be4f200428f14b927beb66')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
   sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
   sed -i '/types\.h/d' src/addon/addon_manager.cpp
+
+  # Fix invalid PNG image to work with libpng 1.6
+  optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
   make
 }
diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD
index eef2325c0..4fcf46c12 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $
+# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=swftools
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of SWF manipulation and creation utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swftools.org/"
 license=('GPL')
-depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
+depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
 makedepends=('bison' 'flex' 'zlib' 'patch')
 changelog=$pkgname.changelog
 source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
@@ -17,6 +17,12 @@ source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
 sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1'
             '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d')
 
+prepare() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c
+}
+
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 26d0d5691..b760e510f 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 87533 2013-04-02 17:43:50Z bpiotrowski $
+# $Id: PKGBUILD 92171 2013-06-02 10:38:24Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
-pkgver=1.1
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc='Simple X Image Viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
 depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
-source=(https://github.com/muennich/sxiv/archive/$pkgver.tar.gz
+source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
         sxiv.desktop
         config.h)
-sha256sums=('7d22b060d264be25ee0e95afff9df535299dbdd48067c9fc795133e583e2583f'
+sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f'
             'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47'
             '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c')
 
diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD
index 5dcf03feb..9eeee0884 100644
--- a/community/synce-serial/PKGBUILD
+++ b/community/synce-serial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65481 2012-02-21 06:01:39Z spupykin $
+# $Id: PKGBUILD 91842 2013-05-28 17:05:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-serial
 pkgver=0.11
-pkgrel=4
+pkgrel=5
 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
@@ -15,10 +15,13 @@ md5sums=('a83f20eb59c845de192645158d051062')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sbindir=/usr/bin
   make
-  make DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial-common
   sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial.conf
 }
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 1c1817a07..55df83ac8 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -2,15 +2,16 @@
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
+# Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=synergy
-pkgver=1.4.10
-pkgrel=2
+pkgver=1.4.12
+pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'libxtst' 'libxinerama')
-makedepends=('libxt' 'cmake' 'qt4')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++')
+makedepends=('libxt' 'cmake' 'qt4' 'unzip')
 optdepends=('qt4: gui support')
 license=('GPL2')
 source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
@@ -18,15 +19,13 @@ source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.service"
         "synergy.png"
         "synergy.desktop")
-md5sums=('18aee04a7e232e4d821f46ff24da3364'
-         '58f48336836d6faf3d5eecbe4155b77e'
-         'b95e4b83d8a19c0bd81a15280078fcd5'
-         '11fdb13390908e02c6e2f19c4c09eded'
-         '1e8d574c19994d13e6f342ed08e531bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
+  # Unzip the crypto library
+  unzip -d tools/cryptopp562 tools/cryptopp562.zip
+
   cmake -D CMAKE_INSTALL_PREFIX=/usr . 
   make
 
@@ -55,3 +54,9 @@ package() {
   install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
   install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
+
+sha512sums=('5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d'
+            'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
+            'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f'
+            'cb3db9593c943bce11ce5ae962e120feb70e6afa9206887a6971c77491711afcebc78653e7413e87e33d031c43a507f4a9a6e8747d10b60c6642106ae1690f18'
+            'c1c76ecfbed5c22f1a2a7562dce20971a784ff6b0edbf5c9b5f7c796f9ead882b82f970bb24f35533b928c341f87f66b0b10d9d96e122d14d74102cac8997445')
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index c1e1c441d..411267419 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 90094 2013-05-06 19:39:42Z foutrelis $
+# $Id: PKGBUILD 90606 2013-05-13 10:37:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
-pkgver=0.63.05
-pkgrel=3
+pkgver=0.64.0
+pkgrel=1
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
 depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng'
-	 'libtiff' 'libdv' 'libmng')
+	 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
+makedepends=('boost')
 optdepends=('openexr' 'libsigc++')
 conflicts=('synfig-core')
 replaces=('synfig-core')
@@ -18,7 +19,7 @@ options=(!libtool)
 source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
 	build-fix.patch
 	ffmpeg-0.8.patch)
-md5sums=('8591cf17c26405d68d2cc050a2929292'
+md5sums=('124cb4059b9f48dc5c37204660053d6f'
          'b5568b06fae1a7ee465b5380b1139b83'
          'ebf41046097cfd778dee9a9854561dae')
 
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index 053d9c098..11cffef70 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $
+# $Id: PKGBUILD 90608 2013-05-13 10:38:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfigstudio
-pkgver=0.63.05
+pkgver=0.64.0
 pkgrel=1
 pkgdesc="Professional vector animation program (GUI)"
 arch=(i686 x86_64 'mips64el')
@@ -11,11 +11,11 @@ url="http://synfig.org"
 license=('GPL2')
 depends=('gtkmm' 'synfig')
 makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi'
-	     'xorg-fonts-misc' 'xorg-fonts-type1')
+	     'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool')
 install=synfigstudio.install
 options=('!libtool')
 source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz)
-md5sums=('ca01b7523118e32c904b681d8ff0a085')
+md5sums=('bbda14359a07254b8efe5e706de192df')
 
 build() {
   cd $srcdir/synfigstudio-$pkgver
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index 4a1e94626..85dfb62ac 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87478 2013-04-01 10:36:38Z spupykin $
+# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
 pkgver=10.1.5
-pkgrel=1
+pkgrel=3
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -16,10 +16,8 @@ options=(zipman)
 backup=('etc/conf.d/sysstat'
 	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
-	sysstat
 	sysstat.service)
 md5sums=('cdf66d6acd5c8cab709e07980b77ea6b'
-         '3ce41ebf7330aba01e70b38658afed1f'
          '12ba479c606620193e8b7c6e982d5088')
 
 build() {
@@ -37,7 +35,7 @@ package() {
   make DESTDIR=$pkgdir install
   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
   chown -R root:root $pkgdir
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  mv $pkgdir/usr/bin/nfsiostat $pkgdir/usr/bin/$pkgname-nfsiostat
 }
diff --git a/community/sysstat/sysstat b/community/sysstat/sysstat
deleted file mode 100644
index d0e40aa05..000000000
--- a/community/sysstat/sysstat
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.d/functions
-. /etc/conf.d/sysstat
-. /etc/rc.conf
-
-case "$1" in
-  start)
-    stat_busy "Writing SysStat restart record"
-    /usr/lib/sa/sadc -L -F ${SADC_OPTIONS} -
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sysstat
-      stat_done
-    fi
-    ;;
-  stop)
-    echo "Stopping SysStat is useless"
-    rm_daemon sysstat
-    ;;
-  *)
-    echo "usage: $0 {start|stop}"
-esac
-exit 0
diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD
index b6a2bfc08..59dc75b5b 100644
--- a/community/tabbed/PKGBUILD
+++ b/community/tabbed/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75438 2012-08-23 21:00:37Z lfleischer $
+# $Id: PKGBUILD 92069 2013-05-31 08:05:10Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: totoloco <totoloco at gmx>
 
 pkgname=tabbed
-pkgver=0.4.1
+pkgver=0.5
 pkgrel=1
 pkgdesc='Simple generic tabbed fronted to xembed aware applications.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('libx11')
 install='tabbed.install'
 source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('6349b763f8a4d5e42d18245169fb136c'
-         '5aa6c1fdc7971b21363704391bea6e1b')
+md5sums=('cd9cfd696db745637486ec3b9bbe4b75'
+         'cea7b04d4f67d917c68673cd0e63ae32')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/tabbed/config.h b/community/tabbed/config.h
index 402cf25d1..ca4b8d6b4 100644
--- a/community/tabbed/config.h
+++ b/community/tabbed/config.h
@@ -1,21 +1,36 @@
-static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-static const char *normbgcolor = "#cccccc";
-static const char *normfgcolor = "#000000";
-static const char *selbgcolor  = "#0066ff";
-static const char *selfgcolor  = "#ffffff";
-static const char *before      = "<";
-static const char *after       = ">";
-static const int tabwidth      = 200;
-static const Bool foreground   = False;
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+static const char normbgcolor[] = "#222222";
+static const char normfgcolor[] = "#cccccc";
+static const char selbgcolor[]  = "#555555";
+static const char selfgcolor[]  = "#ffffff";
+static const char before[]      = "<";
+static const char after[]       = ">";
+static const int  tabwidth      = 200;
+static const Bool foreground    = True;
+
+/*
+ * Where to place a new tab when it is opened. When npisrelative is True,
+ * then the current position is changed + newposition. If npisrelative
+ * is False, then newposition is an absolute position.
+ */
+static int  newposition   = 0;
+static Bool npisrelative  = False;
 
 #define MODKEY ControlMask
 static Key keys[] = { \
 	/* modifier                     key        function        argument */
 	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          { .v = (char*[]){ "surf", "-e", winid, NULL} } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
+
 	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
 	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_j,      movetab,        { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_k,      movetab,        { .i = +1 } },
 	{ MODKEY,                       XK_Tab,    rotate,         { .i = 0 } },
+
 	{ MODKEY,                       XK_1,      move,           { .i = 0 } },
 	{ MODKEY,                       XK_2,      move,           { .i = 1 } },
 	{ MODKEY,                       XK_3,      move,           { .i = 2 } },
@@ -26,5 +41,9 @@ static Key keys[] = { \
 	{ MODKEY,                       XK_8,      move,           { .i = 7 } },
 	{ MODKEY,                       XK_9,      move,           { .i = 8 } },
 	{ MODKEY,                       XK_0,      move,           { .i = 9 } },
+
 	{ MODKEY,                       XK_q,      killclient,     { 0 } },
+
+	{ 0,                            XK_F11,    fullscreen,     { 0 } },
 };
+
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 8ba258d91..916c25874 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 89278 2013-04-28 12:14:49Z cinelli $
+# $Id: PKGBUILD 91601 2013-05-25 11:19:17Z bpiotrowski $
 #Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=texmaker
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc='Free cross-platform LaTeX editor'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('ghostscript: LaTeX to HTML conversion command'
 	    'poppler: PDF rendering support')
 install="$pkgname.install"
 source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('62f87f7b44e92ca68817663d3d5aeca4')
+md5sums=('2097b5911acc461a85fd631dd1e2e5dc')
 
 build() {  
   cd "$pkgname-$pkgver"
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index d0454b011..3fe65db54 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $
+# $Id: PKGBUILD 92047 2013-05-31 00:34:01Z seblu $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
@@ -6,26 +6,23 @@
 
 pkgname=tinc
 pkgver=1.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'openssl')
-backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
-        tincd.rc tincd.conf tincd@.service)
+        tincd@.service)
 md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d'
          'SKIP'
-         '64bb53748d9051255f243003f0d511f5'
-         '7c0276d4812cc5d3cc18142562a3aa82'
-         '035b0e549b08da55d19a8df5b8306e4d')
+         '112327da32fdb56ab779fe004712235f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
   make
 }
 
@@ -38,7 +35,5 @@ package() {
   find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
   find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
 
-  install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd"
-  install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf"
   install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service"
 }
diff --git a/community/tinc/tincd.conf b/community/tinc/tincd.conf
deleted file mode 100644
index 6e0902bbb..000000000
--- a/community/tinc/tincd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Extra options to be passed to tincd.
-# TINCD_EXTRAOPTS="-d"
-
-# Arrays containing all names of the networks to be started from rc.d.
-NETNAMES=()
diff --git a/community/tinc/tincd.rc b/community/tinc/tincd.rc
deleted file mode 100644
index 48c132f25..000000000
--- a/community/tinc/tincd.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-daemon_name=tincd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-case "$1" in
-  start)
-    for net in "${NETNAMES[@]}"; do
-      stat_busy "Starting ${daemon_name}"
-      /usr/sbin/tincd -n "${net}" $TINCD_EXTRAOPTS &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  stop)
-    stat_busy "Stopping ${daemon_name}"
-    for net in "${NETNAMES[@]}"; do
-      /usr/sbin/tincd -k -n "${net}" &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  restart)
-    "$0" stop
-    sleep 5
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/tinc/tincd@.service b/community/tinc/tincd@.service
index ef8f2da9f..069bf4570 100644
--- a/community/tinc/tincd@.service
+++ b/community/tinc/tincd@.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/tincd -n %i
+ExecStart=/usr/bin/tincd -n %i
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index 7206f5728..af06dc7ef 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80139 2012-11-16 17:14:04Z lfleischer $
+# $Id: PKGBUILD 92033 2013-05-30 23:55:47Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=tinyproxy
 pkgver=1.8.3
-pkgrel=6
+pkgrel=7
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://banu.com/tinyproxy/'
@@ -13,18 +13,17 @@ makedepends=('asciidoc')
 install="${pkgname}.install"
 backup=('etc/tinyproxy/tinyproxy.conf')
 source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
-        'tinyproxy'
         'tinyproxy.tmpfiles.conf'
         'tinyproxy.service')
 md5sums=('292ac51da8ad6ae883d4ebf56908400d'
-         '90eb2b3371e56d5a784fd826d4a6e5f8'
          '3c2764578f26581346fe312da0519a3e'
-         '299ca484c08d9873c74e1eb96f6a5cc0')
+         '41938243faca487a14beeee5114f244e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent
+  ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --sbindir=/usr/bin \
+     --localstatedir=/var --enable-transparent
   make
 }
 
@@ -32,7 +31,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  install -Dm0755 "${srcdir}/tinyproxy" "${pkgdir}/etc/rc.d/tinyproxy"
   install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf"
 
   install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}"
diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy
deleted file mode 100644
index 5580ea804..000000000
--- a/community/tinyproxy/tinyproxy
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/tinyproxy)
-
-start() {
-  stat_busy "Starting Tinyproxy"
-
-  [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \
-    /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null
-
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon tinyproxy
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Tinyproxy"
-
-  [ ! -z "$PID" ]  && kill $PID &> /dev/null
-
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon tinyproxy
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service
index 8776a0ee1..f1ef18faa 100644
--- a/community/tinyproxy/tinyproxy.service
+++ b/community/tinyproxy/tinyproxy.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
+ExecStart=/usr/bin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
 PIDFile=/run/tinyproxy/tinyproxy.pid
 
 [Install]
diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD
index 1dfa52704..7fc5fabe6 100644
--- a/community/tnftp/PKGBUILD
+++ b/community/tnftp/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 56963 2011-10-17 10:15:04Z spupykin $
+# $Id: PKGBUILD 91426 2013-05-22 10:27:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 
 pkgname=tnftp
-pkgver=20100108
-pkgrel=2
+pkgver=20130505
+pkgrel=1
 pkgdesc="NetBSD FTP client with several advanced features"
 arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 license=('BSD')
-depends=('ncurses' 'dante')
+depends=('ncurses' 'dante' 'openssl')
 source=(ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/$pkgname-$pkgver.tar.gz)
-md5sums=('192aac255abd515d7d4cc9b397dc0cba')
+md5sums=('66e218d02ec7d9fc39ab70ba2900305a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-editcomplete
+  ./configure --prefix=/usr --enable-editcomplete --enable-ssl
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make install DESTDIR=$pkgdir
   install -Dm755 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 3e1d64afd..40a71d07f 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $
+# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
@@ -7,7 +7,7 @@ _basever=2.5.0
 _timestamp=20130214
 _file=53357
 pkgver=${_basever}.${_timestamp}
-pkgrel=2
+pkgrel=3
 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tomoyo.sourceforge.jp'
@@ -21,10 +21,10 @@ md5sums=('ffff6b531ed9ac32b01722a9cd749a2f')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  make
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
-  make INSTALLDIR="${pkgdir}" install
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install
 }
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 8c5975a32..53b161791 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $
+# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=tor
 pkgver=0.2.3.25
-pkgrel=1.1
+pkgrel=2
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.torproject.org/'
@@ -13,19 +13,14 @@ depends=('openssl' 'libevent' 'tsocks' 'bash')
 makedepends=('ca-certificates')
 backup=('etc/tor/torrc'
         'etc/tor/torrc-dist'
-        'etc/tor/tor-tsocks.conf'
-        'etc/conf.d/tor')
+        'etc/tor/tor-tsocks.conf')
 install='tor.install'
 source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'torrc'
-        'tor'
-        'tor.conf.d'
         'tor.service')
 md5sums=('a1c364189a9a66ed9daa8e6436489daf'
          'a4c12795ffb8f68550a5dab4a9eb0654'
          '56c75d4e8a66f34167d31e38c43793dd'
-         'f8e6868a389877346e7eebaacd1078bb'
-         '5c7c6834064b3530c442def6079ac3aa'
          'b8989a7b3ab39d697624b243f7fc255d')
 
 build() {
@@ -44,8 +39,6 @@ package() {
 
   mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist"
   install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc"
-  install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor"
-  install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor"
 
   install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
diff --git a/community/tor/tor b/community/tor/tor
deleted file mode 100644
index 522c498ce..000000000
--- a/community/tor/tor
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor
-
-PID=`pidof -o %PPID /usr/bin/tor`
-case "$1" in
-  start)
-    stat_busy "Starting Tor Daemon"
-    if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then
-      [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon tor
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tor Daemon"
-    [ ! -z "$PID" ] && kill -INT $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-# vim: ft=sh ts=2 sw=2
diff --git a/community/tor/tor.conf.d b/community/tor/tor.conf.d
deleted file mode 100644
index e9fa098e0..000000000
--- a/community/tor/tor.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Location of the config file.
-TOR_CONF='/etc/tor/torrc'
-
-# Custom ulimit for maximum number of open files.
-TOR_MAX_FD=
-
-# Additional arguments.
-TOR_ARGS="--quiet"
-
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
index 30aa15133..0497dd696 100644
--- a/community/torsocks/PKGBUILD
+++ b/community/torsocks/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=torsocks
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Wrapper to safely torify applications'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/torsocks'
@@ -13,36 +13,18 @@ depends=('tor')
 makedepends=('git')
 options=(!libtool)
 backup=("etc/${pkgname}.conf")
-
-__gitroot=https://git.torproject.org/torsocks
-__gitname=torsocks
+source=("git://git.torproject.org/torsocks.git#tag=1.3")
+md5sums=(SKIP)
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$__gitname" ]]; then
-    cd "$__gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$__gitroot" "$__gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-
-  git checkout $pkgver
-
+  cd $pkgname
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd $pkgname
   make DESTDIR="$pkgdir/" install
+  find "$pkgdir/usr/share" -maxdepth 1 -type f -delete
 }
diff --git a/community/turbojpeg/PKGBUILD b/community/turbojpeg/PKGBUILD
deleted file mode 100644
index d6f7dba16..000000000
--- a/community/turbojpeg/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
-
-pkgname=turbojpeg
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="turbojpeg library from libjpeg-turbo"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.libjpeg-turbo.org/About/TurboJPEG"
-license=('GPL' 'custom')
-depends=('glibc' 'libjpeg')
-makedepends=('nasm')
-options=('!libtool')
-source=(http://sourceforge.net/projects/libjpeg-turbo/files/$pkgver/libjpeg-turbo-$pkgver.tar.gz)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
- 
-build() {
-  cd "$srcdir/libjpeg-turbo-$pkgver"
- 
-  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
-  make
-}
- 
-check() {
-  cd "$srcdir/libjpeg-turbo-$pkgver"
- 
-  make test
-}
- 
-package() {
-  cd "$srcdir/libjpeg-turbo-$pkgver"
- 
-  make DESTDIR="$pkgdir/" install
- 
-  # only distribute libturbojpeg
-  rm -rf "$pkgdir"/usr/share
-  rm "$pkgdir"/usr/include/j*.h
-  rm "$pkgdir"/usr/lib/libj*
-  rm "$pkgdir"/usr/bin/{djpeg,rdjpgcom,wrjpgcom,jpegtran,cjpeg}
- 
-  install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
-  install -Dm644 README-turbo.txt "$pkgdir/usr/share/licenses/$pkgname/README-turbo.txt"
-}
-
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 4b5f98823..fb55d868d 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90097 2013-05-06 19:39:46Z foutrelis $
+# $Id: PKGBUILD 91097 2013-05-19 11:35:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=8
+pkgrel=9
 pkgdesc='Drawing program designed for young children'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.tuxpaint.org/'
@@ -14,7 +14,7 @@ license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
 depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango'
          'libpaper' 'librsvg')
-makedepends=('setconf')
+makedepends=('setconf' 'optipng')
 optdepends=('tuxpaint-stamps: more stamps'
             'tuxpaint-conf: configuration manager')
 source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz"
@@ -22,18 +22,28 @@ source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.
 sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9'
             '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
+  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
   # python2 fix
   for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
     sed -i '0,/on/s//on2/' $f
   done
 
+  # libpng15 fix
   patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
   sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile
-  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
-  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
+  # libpng16 fix
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make PREFIX=/usr
 }
 
diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD
index 2c37d9c3c..fdcea7796 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70178 2012-05-01 12:01:36Z andrea $
+# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=twin
 pkgver=0.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A text-mode window environment"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/twin/'
@@ -17,7 +17,7 @@ md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  LDFLAGS="-lX11" ./configure --prefix=/usr \
+  LDFLAGS="-lX11" ./configure --prefix=/usr --sbindir=/usr/bin \
 	--enable-tt=yes \
 	--enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \
 	--enable-tt-hw-xml=yes
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
index c1c9c1c7b..d0e01b090 100644
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ubuntuone-client-gnome
 pkgver=4.2.0
 pkgrel=2
 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/ubuntuone-client-gnome"
 license=('GPL')
 depends=('nautilus' 'gconf' 'ubuntuone-client')
diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD
index 17a8bc881..84bdb16b1 100644
--- a/community/ucarp/PKGBUILD
+++ b/community/ucarp/PKGBUILD
@@ -1,37 +1,37 @@
-# $Id: PKGBUILD 83576 2013-02-03 13:21:29Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 90534 2013-05-13 00:32:20Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=ucarp
 pkgver=1.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Userspace implementation of the CARP protocol'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ucarp.org/project/ucarp'
 license=('GPL2')
 depends=('libpcap')
 optdepends=('iproute2')
-source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz"
-        'ucarp.service'
-        'ucarp.8'
+source=("http://download.pureftpd.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
+        "$pkgname.service"
+        "$pkgname.8"
         '01-fix-getopt.patch'
         '02-fix-downscript-on-error.c')
 md5sums=('e3caa733316a32c09e5d3817617e9145'
-         '40fdef66560e3c98eb7c04adf7c31739'
+         'fdc72a8d6f89224b40c78705df1f46f9'
          '2ccfdc464b88c437b38bd0324cf1fef3'
          '3f20699aaf2ef8139dcd337f1e7f06ab'
          '09d26233c37956cf08e629554a91b8cd')
 
+prepare() {
+  # Apply patches
+  patch -N -p1 -d $pkgname-$pkgver < 01-fix-getopt.patch
+  patch -N -p1 -d $pkgname-$pkgver < 02-fix-downscript-on-error.c
+}
+
 build() {
   cd $pkgname-$pkgver
-  patch -N -p1 -i ../01-fix-getopt.patch
-  patch -N -p1 -i ../02-fix-downscript-on-error.c
-
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 
-  # fix iproute2 path
-  sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-down.sh
-  sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-up.sh
 }
 
 package() {
diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service
index 41c8322e2..2ff694d2c 100644
--- a/community/ucarp/ucarp.service
+++ b/community/ucarp/ucarp.service
@@ -2,7 +2,7 @@
 Description=UCARP daemon
 
 [Service]
-ExecStart=/usr/sbin/ucarp
+ExecStart=/usr/bin/ucarp
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD
index ce25824bf..465716987 100644
--- a/community/ude/PKGBUILD
+++ b/community/ude/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 65333 2012-02-21 02:10:03Z spupykin $
+# $Id: PKGBUILD 90591 2013-05-13 09:59:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=ude
-pkgver=0.2.10a
-pkgrel=4
-pkgdesc="Unix Desktop Environment is a GUI desktop environment"
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=0.2.11
+pkgrel=1
+pkgdesc="Unix Desktop Environment (GUI desktop environment)"
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
-depends=('libjpeg' 'libxmu' 'libxpm')
+depends=('libjpeg' 'libxmu' 'libxpm' 'bash')
+makedepends=('gendesk')
 url="http://udeproject.sourceforge.net/index.shtml"
-source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz
-	$pkgname.desktop)
-md5sums=('1370418179f56612ffe63d6ed0c89d13'
-         '84f94253ea284258c4465cd76edf599f')
+source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz)
+md5sums=('d4952a7edffd30ac07f32fce244c86d7')
 
 build() {
-  cd $srcdir/uwm-$pkgver
+  cd "$srcdir"
+  gendesk
+
+  cd "uwm-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/uwm-$pkgver
+  cd "$srcdir/uwm-$pkgver"
+
   mkdir -p $pkgdir/etc/X11/sessions
   make prefix=$pkgdir/usr install
-  cp $srcdir/$pkgname.desktop $pkgdir/etc/X11/sessions
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/etc/X11/sessions"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
   mv $pkgdir/usr/doc $pkgdir/usr/share/
 }
diff --git a/community/ude/ude.desktop b/community/ude/ude.desktop
deleted file mode 100644
index 48a022d0b..000000000
--- a/community/ude/ude.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Ude
-Comment=The ude window manager
-Exec=uwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 7aaf3345d..5d44fd6d2 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $
+# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -30,12 +30,18 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 md5sums=('660516de4b5b1e110c12dae414619e0f'
          'dd32eeee0949adff4188544419acd17e'
          'c21531312f95e790ed19aa267a17d35a'
-         '42fc2c0568ff89ec00c2f0797280f296')
+         '092d72209e30c132e0a08112e4062772')
 
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-mysql \
+    --with-pgsql \
+    --with-dbi
   make
 }
 
diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service
index 8858427fa..12450c9cc 100644
--- a/community/ulogd/ulogd.service
+++ b/community/ulogd/ulogd.service
@@ -3,7 +3,7 @@ Description=Netfilter Ulogd daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/ulogd
+ExecStart=/usr/bin/ulogd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD
index cdbe120c7..dcbdf5b73 100644
--- a/community/ultimate-ircd/PKGBUILD
+++ b/community/ultimate-ircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $
+# $Id: PKGBUILD 90729 2013-05-13 14:39:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ultimate-ircd
 pkgver=3.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc="ultimate irc server"
 arch=(i686 x86_64 'mips64el')
 url="http://www.shadow-realm.org/"
@@ -16,12 +16,10 @@ provides=(ircd)
 backup=()
 install=ircd.install
 source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
-	ultimate-ircd
 	ultimate-ircd.service
 	ultimate-ircd.tmpfiles
 	conf-fix.patch)
 md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
-         'cf6ab14d8dd8805342b70a9beb01c9af'
          '526fd78018b9b011787e4e9012437116'
          'e51723ab29e7a3ddc3589846815de0c9'
          '5e0f2a02e12675ac070a148c3234e111')
@@ -42,7 +40,10 @@ build() {
 
   cd include && patch -N <../../conf-fix.patch && cd ..
   make || return 1
+}
 
+package() {
+  cd $srcdir/Ultimate$pkgver
   mkdir -p $pkgdir/usr/bin
   mkdir -p $pkgdir/var/log/ircd
   mkdir -p $pkgdir/etc/ircd/networks
@@ -54,7 +55,6 @@ build() {
   mv mkpasswd irc-mkpasswd
   mv ssl-cert.sh irc-ssl-cert.sh
   mv ssl-search.sh irc-ssl-search.sh
-  install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd
   install -d -m 0755 $pkgdir/var/lib/ircd
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
diff --git a/community/ultimate-ircd/ultimate-ircd b/community/ultimate-ircd/ultimate-ircd
deleted file mode 100644
index df73d7389..000000000
--- a/community/ultimate-ircd/ultimate-ircd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/bin/ircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Ultimate IRCd"
-
-    [ -d /var/run/ircd ] || mkdir -p /var/run/ircd
-    [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon ultimate-ircd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ultimate IRCd"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ircd/ircd.pid &> /dev/null
-      rm_daemon ultimate-ircd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/uml_utilities/PKGBUILD b/community/uml_utilities/PKGBUILD
deleted file mode 100644
index a5620b335..000000000
--- a/community/uml_utilities/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Mike Sampson <mike at sambodata dot com>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=uml_utilities
-pkgver=20070815
-pkgrel=5
-pkgdesc="User Mode Linux Utilities"
-arch=(i686 x86_64 'mips64el')
-depends=('fuse' 'readline' 'perl')
-url="http://user-mode-linux.sourceforge.net/"
-source=(http://user-mode-linux.sourceforge.net/${pkgname}_${pkgver}.tar.bz2)
-license=('GPL2')
-md5sums=('b0468ac8b79cef53f36f5f9517907462')
-
-build() {
-  cd $srcdir/tools-$pkgver
-  sed 's|lib64|lib|g' -i Makefile
-  make all
-}
-
-package() {
-  cd $srcdir/tools-$pkgver
-  make DESTDIR=$pkgdir install
-  chown root $pkgdir/usr/bin/*
-}
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index c9e0357c4..38dde02e3 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,54 +1,48 @@
-# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $
+# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
 pkgver=1.4.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 depends=('openssl' 'ldns')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
 backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
-        'unbound.service'
-        'unbound.conf'
-        'rc.d')
+        'service'
+        'conf')
 sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
-          'a2493cb105ff6aa23d756514badb13b02d37f319'
-          '5d473ec2943fd85367cdb653fcd58e186f07383f'
-          'dc96e772f467b32555df21d16fdb15e98194c228')
+          'b543ae6f8b87423bec095fca6b335a9ee43739a8'
+          '5d473ec2943fd85367cdb653fcd58e186f07383f')
 
+options=('!libtool')
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
+		--sbindir=/usr/bin \
+		--disable-static \
 		--disable-rpath \
 		--with-conf-file=/etc/unbound/unbound.conf \
-		--with-pidfile=/run/unbound.pid \
-
+		--with-pidfile=/run/unbound.pid
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf"
-	install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
-	install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service"
+	install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service"
+	install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf"
 }
diff --git a/community/unbound/unbound.conf b/community/unbound/conf
index 445bceff1..445bceff1 100644
--- a/community/unbound/unbound.conf
+++ b/community/unbound/conf
diff --git a/community/unbound/rc.d b/community/unbound/rc.d
deleted file mode 100644
index b5b6466de..000000000
--- a/community/unbound/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=unbound
-prog="/usr/sbin/unbound"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && eval $prog &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
diff --git a/community/unbound/unbound.service b/community/unbound/service
index 8e59e5a6a..c569602de 100644
--- a/community/unbound/unbound.service
+++ b/community/unbound/service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 PIDFile=/run/unbound.pid
-ExecStart=/usr/sbin/unbound -d
+ExecStart=/usr/bin/unbound -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
diff --git a/community/unhide/PKGBUILD b/community/unhide/PKGBUILD
index 598623562..18f16e8f4 100644
--- a/community/unhide/PKGBUILD
+++ b/community/unhide/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 66390 2012-02-24 12:30:25Z lfleischer $
+# $Id: PKGBUILD 92031 2013-05-30 23:43:09Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=unhide
-pkgver=20110113
-pkgrel=3
+pkgver=20130526
+pkgrel=1
 pkgdesc='A forensic tool to find processes hidden by rootkits, LKMs or by other techniques.'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.unhide-forensics.info/'
+url='http://sourceforge.net/projects/unhide/'
 license=('GPL3')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tgz")
-md5sums=('0dff8ee5029615f1f81db96dcf6758f7')
+depends=('iproute2' 'lsof' 'psmisc' 'net-tools' 'procps-ng')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver.tgz")
+md5sums=('f3d68ed8eb239614abb0ff5ace22cf85')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cc -Os -static unhide.c -o unhide-posix
-  cc -Os -static -pthread unhide-linux26.c -o unhide-linux26
-  cc -Os -static unhide-tcp.c -o unhide-tcp
+  cd $pkgname-$pkgver
+  cc -Wall -O2 --static -pthread unhide-linux*.c unhide-output.c -o unhide-linux
+  cc -Wall -O2 --static unhide_rb.c -o unhide_rb
+  cc -Wall -O2 --static unhide-posix.c -o unhide-posix
+  cc -Wall -O2 --static unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -Dm0755 unhide-posix "${pkgdir}/usr/sbin/unhide-posix"
-  install -Dm0755 unhide-linux26 "${pkgdir}/usr/sbin/unhide-linux26"
-  install -Dm0755 unhide-tcp "${pkgdir}/usr/sbin/unhide-tcp"
-  ln -fs ./unhide-linux26 "${pkgdir}/usr/sbin/unhide"
-  install -Dm0644 man/unhide.8 "${pkgdir}/usr/share/man/man8/unhide.8"
+  cd $pkgname-$pkgver
+  for _p in unhide-linux unhide-posix unhide_rb unhide-tcp; do
+    install -Dm0755 "$_p" "$pkgdir/usr/bin/$_p"
+  done
+  ln -s unhide-linux "$pkgdir/usr/bin/unhide"
+  install -Dm0644 man/unhide.8 "$pkgdir/usr/share/man/man8/unhide.8"
 }
 
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index f5b6c0477..eeaae0545 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88335 2013-04-16 13:31:44Z spupykin $
+# $Id: PKGBUILD 90818 2013-05-14 10:59:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=unifdef
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc="Remove #ifdef'ed lines"
 arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,7 @@ url="http://dotat.at/prog/unifdef/"
 license=('GPL')
 depends=()
 source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz")
-md5sums=('72357e9faa877fe21f5d621d2024a242')
+md5sums=('1cfb5fa5dcab6e6246c07897a1a304b4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index e3adb060e..8ed04aa6b 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82103 2013-01-08 15:57:53Z spupykin $
+# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zerial <fernando@zerial.org>
 
 pkgname=unrealircd
 pkgver=3.2.10
-pkgrel=1
+pkgrel=4
 pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://unrealircd.com"
@@ -15,17 +15,13 @@ provides=('ircd')
 backup=('etc/unrealircd/unrealircd.conf'
 	'etc/conf.d/unrealircd')
 source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
-	unrealircd.rc
 	unrealircd.service
 	arch-fixes.patch)
 md5sums=('05b0bbdbfab9ffc2304f7595951d7cec'
-         '07ffa1e82a01f319a8b997e155d2af1d'
-         '2103ce8a4a4e79f6955920bfebea0202'
+         '93276a1cd426e4a811c072c35fc31e94'
          '77807313c4578f2c30286b9f9e3fb21c')
 
 build() {
-  mkdir -p $pkgdir/etc/unrealircd
-  mkdir -p $pkgdir/usr/bin
   cd $srcdir/Unreal$pkgver
 
   patch -p1 <$srcdir/arch-fixes.patch
@@ -40,10 +36,19 @@ build() {
       --enable-dynamic-linking \
       --enable-ziplinks \
       --enable-ssl \
+      --enable-ipv6 \
       --enable-libcurl=/usr \
       --with-system-cares
 
   make
+}
+
+package() {
+  cd $srcdir/Unreal$pkgver
+
+  mkdir -p $pkgdir/etc/unrealircd
+  mkdir -p $pkgdir/usr/bin
+
   make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install
 
   mv $srcdir/Unreal$pkgver/src/ircd $pkgdir/usr/bin/unrealircd
@@ -51,7 +56,6 @@ build() {
   mkdir -p $pkgdir/usr/lib/unrealircd
   mv $pkgdir/etc/unrealircd/modules $pkgdir/usr/lib/unrealircd/
   ln -s /usr/lib/unrealircd/modules $pkgdir/etc/unrealircd/modules
-  install -D -m0755 $srcdir/unrealircd.rc $pkgdir/etc/rc.d/unrealircd
 
   # log
   mkdir -p $pkgdir/var/log/unrealircd/
diff --git a/community/unrealircd/unrealircd.rc b/community/unrealircd/unrealircd.rc
deleted file mode 100644
index 2cede46c8..000000000
--- a/community/unrealircd/unrealircd.rc
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-daemon_name=unrealircd
-
-. /etc/conf.d/unrealircd
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof ircd unrealircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      export PID_FILE="/var/run/unrealircd.pid"
-      su -c /usr/bin/unrealircd -p - $UNREALIRCD_USER 1>>/var/log/unrealircd/ircd.log 2>>/var/log/unrealircd/ircd.log
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=`get_pid`
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service
index 42279fae0..a81419f2a 100644
--- a/community/unrealircd/unrealircd.service
+++ b/community/unrealircd/unrealircd.service
@@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target
 Type=forking
 User=ircd
 PIDFile=/var/run/unrealircd.pid
-ExecStart=/usr/bin/unrealircd -p
+ExecStart=/usr/bin/unrealircd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index 3f6ae3fa8..e3dbdc641 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72798 2012-06-22 12:52:28Z dreisner $
+# $Id: PKGBUILD 91504 2013-05-23 10:15:34Z spupykin $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Killian <tomk@runbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=uptimed
 pkgver=0.3.17
-pkgrel=2
+pkgrel=4
 pkgdesc="A system uptime record daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://podgorny.cz/uptimed/"
@@ -16,33 +16,31 @@ backup=(etc/uptimed.conf)
 options=('!libtool')
 install=$pkgname.install
 source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
-        rc.d
         service)
 md5sums=('528b62c33454b33537c3bf2366977bdb'
-         '4ae90bee9fc78014a889a5072effb735'
-         '657102b06613ddb9811427bee1973c6b')
+         '6d1e97b9c54d622edc0bd607acbf3c10')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  
+
   # Change log path to Arch standard
   for M in `ls M*`; do
-    sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M
+    sed -i "s|/var/spool/uptimed|/var/log/uptimed|" $M
   done
   sed -i 's|spool|log|' libuptimed/urec.h
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac
 
   autoreconf
   libtoolize --force
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install
+  make install DESTDIR=$pkgdir
 
   mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf
-  install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed
   install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service
 }
diff --git a/community/uptimed/rc.d b/community/uptimed/rc.d
deleted file mode 100644
index 6fe9ec3e3..000000000
--- a/community/uptimed/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/uptimed`
-case "$1" in
-  start)
-    stat_busy "Starting Uptimed Daemon"
-    [ -z "$PID" ] && /usr/sbin/uptimed -b    # create the boot record
-    if [ $? -gt 0 ] ; then
-      stat_fail
-    else
-      add_daemon uptimed                     # create the 'state' dir
-      /usr/sbin/uptimed                      # fire up the daemon
-	if [ $? -gt 0 ]; then
-	  stat_fail
-	fi
-      stat_done 
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Uptimed Daemon"
-    [ "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon uptimed                      # remove the 'state' dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/uptimed/service b/community/uptimed/service
index 2fd785318..36e074d04 100644
--- a/community/uptimed/service
+++ b/community/uptimed/service
@@ -4,8 +4,8 @@ Description=System uptime record daemon
 [Service]
 Type=forking
 PIDFile=/var/run/uptimed
-ExecStartPre=/usr/sbin/uptimed -b
-ExecStart=/usr/sbin/uptimed
+ExecStartPre=/usr/bin/uptimed -b
+ExecStart=/usr/bin/uptimed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/uptimed/uptimed.install b/community/uptimed/uptimed.install
index 178061706..7edd1f66c 100644
--- a/community/uptimed/uptimed.install
+++ b/community/uptimed/uptimed.install
@@ -1,7 +1,3 @@
-# arg 1: the old package version
 pre_remove() {
-	# clean up after ourselves
-	#
-	/bin/rm -rf /var/log/uptimed
+  rm -rf var/log/uptimed
 }
-
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index d482a3e4b..a9b6b7e44 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $
+# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
 
 pkgname=uriparser
-pkgver=0.7.7
+pkgver=0.7.8
 pkgrel=1
 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
 url="http://sourceforge.net/projects/uriparser/"
@@ -12,7 +12,7 @@ makedepends=(doxygen graphviz)
 arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2)
-md5sums=('2da950ef006be5a842dcc383cbbeaa78')
+md5sums=('1ff590e25e8d9f5eaaa409c741fc387b')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 456616062..97ff732c9 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $
+# $Id: PKGBUILD 91584 2013-05-24 18:58:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
 pkgver=1.2.5
-pkgrel=1
+pkgrel=3
 _pkgdata=20121109
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,10 +19,15 @@ md5sums=('c393603908eceab95444c5bde790f6f0'
          'a7d23a03157871013a0d708ab2b1b6df'
          '9918bbdc0f68873410688604c80d25c4')
 
+prepare() {
+  cd $srcdir/usb-modeswitch-$pkgver/
+  sed -i 's|/usr/sbin/usb_mode|/usr/bin/usb_mode|g' usb_modeswitch.{conf,tcl,sh}
+}
+
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
   make clean
-  make
+  make SBINDIR=/usr/bin
 }
 
 package() {
@@ -32,7 +37,7 @@ package() {
   mkdir -p $pkgdir/etc
   mkdir -p $pkgdir/usr/share/man/man1
 
-  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install
+  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev SBINDIR=$pkgdir/usr/bin install
 
   cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 597b1541f..f2f2a48ca 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75096 2012-08-13 19:22:01Z spupykin $
+# $Id: PKGBUILD 90735 2013-05-13 14:41:02Z 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=18
+pkgrel=19
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
@@ -15,13 +15,11 @@ backup=('etc/ushare/ushare.conf'
 	'etc/conf.d/ushare')
 install=ushare.install
 source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2"
-	"ushare"
 	"upnp-build-fix.patch"
 	"ushare-config.patch"
 	"segfault.patch"
 	"ushare.service")
 md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251'
-         'e3cf0a44b0280da4966177c21e49361c'
          '32c29f9f673e8b3a3d9e7bf5e60febbc'
          '5243475c0cebc5db49296b2f3691085b'
          '0b0fbf5d103f0ebb72716cbad0b28ffa'
@@ -44,7 +42,6 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/etc/${pkgname}/init.d
-  install -Dm0755 ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare
   install -dm0755 ${pkgdir}/etc/conf.d/
   cat >${pkgdir}/etc/conf.d/ushare <<EOF
 #PARAMS="-c /tmp -i eth0"
diff --git a/community/ushare/ushare b/community/ushare/ushare
deleted file mode 100644
index b545b85d4..000000000
--- a/community/ushare/ushare
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-DESC="uShare UPnP A/V Media Server"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -r "/etc/ushare/ushare.conf" ] && . /etc/ushare/ushare.conf
-[ -r "/etc/conf.d/ushare" ] && . /etc/conf.d/ushare
-
-[ -z $USHARE_USER ] && USHARE_USER=ushare
-
-# abort if no executable exists
-#[ -x $DAEMON ] || stat_fail
-
-# abort if no shared directory is defined
-#[ -z "$USHARE_DIR" ] && stat_fail
-
-#set -e
-
-#checkpid() {
-#  [ -e $PIDFILE ] || touch $PIDFILE
-#}
-
-PID=`pidof -o %PPID /usr/bin/ushare`
-case "$1" in
-  start)
-    stat_busy "Starting $DESC"
-    [ -z "$PID" ] && sudo -u $USHARE_USER /usr/bin/ushare -D -x $PARAMS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/bin/ushare`
-      echo $PID > /var/run/ushare.pid
-      add_daemon ushare
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $DESC"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/ushare.pid
-      rm_daemon ushare
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/ussp-push/PKGBUILD b/community/ussp-push/PKGBUILD
index 950caff8a..c0a6e4e1f 100644
--- a/community/ussp-push/PKGBUILD
+++ b/community/ussp-push/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 65357 2012-02-21 02:19:32Z spupykin $
+# $Id: PKGBUILD 92147 2013-06-01 15:32:36Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=ussp-push
 pkgver=0.11
-pkgrel=4
+pkgrel=6
 pkgdesc="OBEX object pusher for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xmailserver.org/ussp-push.html"
 depends=('openobex')
 source=(http://xmailserver.org/$pkgname-$pkgver.tar.gz
-	ussp-push-remote-name.patch)
+	build-fix.patch)
 md5sums=('5c44983ee27809867041feff6bb4423a'
-         '3c58795be3a977a5bf7b267f00dde660')
+         'b9020ea9bb34b811206366b407f5e3cd')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/build-fix.patch
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/ussp-push-remote-name.patch
+  export LDFLAGS="$LDFLAGS -lopenobex-apps-common"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ussp-push/build-fix.patch b/community/ussp-push/build-fix.patch
new file mode 100644
index 000000000..ae57ca00f
--- /dev/null
+++ b/community/ussp-push/build-fix.patch
@@ -0,0 +1,66 @@
+diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c
+--- ussp-push-0.11.old/src/obex_socket.c	2009-05-15 11:03:34.904797689 +0200
++++ ussp-push-0.11/src/obex_socket.c	2009-05-15 11:03:45.599797286 +0200
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
+diff -wbBur ussp-push-0.11/src/obex_main.c ussp-push-0.11.q/src/obex_main.c
+--- ussp-push-0.11/src/obex_main.c	2008-08-25 00:48:53.000000000 +0400
++++ ussp-push-0.11.q/src/obex_main.c	2013-05-27 14:13:06.533474671 +0400
+@@ -85,41 +85,6 @@
+ int bt_debug;
+ 
+ 
+-
+-/*
+- * These two functions are from affix/profiles/obex/obex_io.c
+- */
+-int get_filesize(const char *filename)
+-{
+-	struct stat stats;
+-
+-	stat(filename, &stats);
+-	return (int) stats.st_size;
+-}
+-
+-uint8_t *easy_readfile(const char *filename, int *file_size)
+-{
+-	int actual;
+-	int fd;
+-	uint8_t *buf;
+-
+-	fd = open(filename, O_RDONLY, 0);
+-	if (fd == -1) {
+-		return NULL;
+-	}
+-	*file_size = get_filesize(filename);
+-	printf("name=%s, size=%d\n", filename, *file_size);
+-	if (!(buf = malloc(*file_size))) {
+-		return NULL;
+-	}
+-
+-	actual = read(fd, buf, *file_size);
+-	close(fd);
+-
+-	*file_size = actual;
+-	return buf;
+-}
+-
+ /*
+  * This function comes from affix/profiles/obex/obex_client.c .. All I changed
+  * was a BTERROR() macro.  The OBEX_HandleInput() calls inside the loop should
+@@ -197,7 +197,7 @@
+ 		*err = -1;
+ 		return NULL;
+ 	}
+-	if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) {
++	if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) {
+ 		BTERROR("OBEX_Init failed: %s\n", strerror(errno));
+ 		obex_free(gt);
+ 		*err = -1;
diff --git a/community/ussp-push/ussp-push-remote-name.patch b/community/ussp-push/ussp-push-remote-name.patch
deleted file mode 100644
index 6cc6b7e9b..000000000
--- a/community/ussp-push/ussp-push-remote-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c
---- ussp-push-0.11.old/src/obex_socket.c	2009-05-15 11:03:34.904797689 +0200
-+++ ussp-push-0.11/src/obex_socket.c	2009-05-15 11:03:45.599797286 +0200
-@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
- 	for (i = 0; i < niinf; i++) {
- 		char devname[128];
- 
--		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
-+		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
- 				    devname, 100000) >= 0) {
- 			if (strcasecmp(devname, btname) == 0) {
- 				*btaddr = piinf[i].bdaddr;
diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD
index b4b7ee31d..d8cf4e153 100644
--- a/community/uucp/PKGBUILD
+++ b/community/uucp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61375 2011-12-29 09:59:32Z spupykin $
+# $Id: PKGBUILD 91914 2013-05-29 10:32:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jick Nan <jick.nan@gmail.com>
 
 pkgname=uucp
 pkgver=1.07
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/uucp/uucp.html"
@@ -16,11 +16,25 @@ backup=('etc/uucp/config'
 source=(http://ftp.gnu.org/gnu/uucp/${pkgname}-${pkgver}.tar.gz)
 md5sums=('64c54d43787339a7cced48390eb3e1d0')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|${CC-cc} -E|${CC-cc} -E -O2|g' configure
+#  sed -i \
+#    -e '1,1i#include <unistd.h>' \
+#    -e '1,1i#include <fcntl.h>' \
+#    -e '1,1i#include <sys/types.h>' \
+#    uuconf/rdlocs.c unix/{efopen,cusub,init}.c
+#  sed -i '1,1i#include <sys/statvfs.h>' unix/fsusg.c
+}
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp --sbindir=/usr/bin
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 sample/config ${pkgdir}/etc/uucp/config
@@ -28,4 +42,3 @@ build() {
   install -D -m644 sample/port ${pkgdir}/etc/uucp/port
   mv ${pkgdir}/usr/info ${pkgdir}/usr/share/
 }
-
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
index c3100085b..f84a6d362 100644
--- a/community/v8/PKGBUILD
+++ b/community/v8/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84803 2013-02-24 19:02:59Z bpiotrowski $
+# $Id: PKGBUILD 90963 2013-05-16 17:56:17Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: tocer <tocer.deng@gmail.com>
 
 pkgname=v8
-pkgver=3.16.4.1
-pkgrel=3
+pkgver=3.19.0
+pkgrel=1
 pkgdesc='Fast and modern Javascript engine'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/v8'
@@ -12,18 +12,18 @@ license=('BSD')
 depends=('gcc-libs' 'readline')
 makedepends=('subversion' 'python2')
 source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2)
-sha256sums=('74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b')
+sha256sums=('35af5629792e958968eacc94daef3ad358b6ed7126875db6138664f51c061368')
 
 [[ "$CARCH" = 'i686' ]]   && ARCH=ia32
 [[ "$CARCH" = 'x86_64' ]] && ARCH=x64
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+prepare() {
+  cd $pkgname-$pkgver
 
   # Fetch gyp
   make dependencies
 
-  # The world isn't ready for python2
+  # The world isn't ready for python3
   export PYTHON=python2
   find build/ test/ tools/ src/ -type f \
     -exec sed -e 's_^#!/usr/bin/env python$_&2_' \
@@ -31,24 +31,28 @@ build() {
               -e 's_^#!/usr/bin/python$_&2_' \
               -e "s_'python'_'python2'_" -i {} \;
   sed -i 's/python /python2 /' Makefile
+}
+
+build() {
+  cd $pkgname-$pkgver
 
-  make $ARCH.release library=shared console=readline
+  make $ARCH.release library=shared console=readline werror=no
 
-  cd $srcdir && cp -r $pkgname-$pkgver d8-static-$pkgver
+  cd "$srcdir" && cp -r $pkgname-$pkgver d8-static-$pkgver
   cd d8-static-$pkgver
-  make $ARCH.release library=static console=readline
+  make $ARCH.release library=static console=readline werror=no
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
-  install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8
-  install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so
+  install -Dm755 "$srcdir"/d8-static-$pkgver/out/$ARCH.release/d8 "$pkgdir"/usr/bin/d8
+  install -Dm755 out/$ARCH.release/lib.target/libv8.so "$pkgdir"/usr/lib/libv8.so
 
-  install -d $pkgdir/usr/include
-  install -Dm644 include/*.h $pkgdir/usr/include
+  install -d "$pkgdir"/usr/include
+  install -Dm644 include/*.h "$pkgdir"/usr/include
 
-  install -d $pkgdir/usr/share/licenses/v8
+  install -d "$pkgdir"/usr/share/licenses/v8
   install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8
 }
 
diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index d39993d3b..a6e2058eb 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $
+# $Id: PKGBUILD 92026 2013-05-30 23:36:55Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Christian Storm <Christian.Storm@gmx.DE>
 # Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=vbetool
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Uses lrmi in order to run code from the video BIOS"
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
@@ -19,9 +19,9 @@ md5sums=('ffb03b118867a02296d7449019ad8846')
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
   if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --without-x86emu
+    ./configure --prefix=/usr --sbindir=/usr/bin --without-x86emu
   else
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --sbindir=/usr/bin
   fi
   make LIBS=-lpci
 }
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index ebed24e7d..e843dd9b5 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 83376 2013-01-30 19:44:55Z jlichtblau $
+# $Id: PKGBUILD 91037 2013-05-18 13:22:47Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=vifm
-pkgver=0.7.4b
+pkgver=0.7.5
 pkgrel=1
 pkgdesc="Ncurses based file manager with vi like keybindings"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('ncurses' 'gtk2')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57')
+sha256sums=('01346f3573fa40d3c851b4844fb19ea2f1f63416bc8500bacb243997bf482de4')
 
 build() {
    cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog
index ce8f9ff9c..62411bb21 100644
--- a/community/vifm/vifm.changelog
+++ b/community/vifm/vifm.changelog
@@ -1,3 +1,6 @@
+2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* vifm 0.7.5-1
+
 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* vifm 0.7.4b-1
 
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 528d5fcc2..6be683faa 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84763 2013-02-24 12:35:22Z jlichtblau $
+# $Id: PKGBUILD 91039 2013-05-18 13:32:51Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.4
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,16 +12,17 @@ url="http://viking.sourceforge.net/"
 license=('GPL2')
 depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel')
 makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs' '!makeflags')
+optdepends=(geo: for geocaches)
+options=('!emptydirs') 
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799')
+sha256sums=('20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-expedia #--enable-geocaches gives error
+  ./configure --prefix=/usr --enable-expedia --enable-geocaches
   make
 }
 
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index c8005b19e..6f22365fd 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.4.1-1
+
 2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.4-1
 
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 838f836fd..b03e92a2d 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 90419 2013-05-12 09:09:05Z thomas $
+# $Id: PKGBUILD 91789 2013-05-27 20:00:36Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.12
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-headers'
+makedepends=('linux'
+             'linux-headers'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  #_kernver=3.9.0-1-ARCH
+  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -30,39 +32,36 @@ build() {
 }
 
 package_virtualbox-host-modules(){
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  #_kernver=3.9.0-1-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
+  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install"
 }
 
 package_virtualbox-guest-modules(){
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  #_kernver=3.9.0-1-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
-
+  _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 9084c05fd..8706a7205 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -1,17 +1,18 @@
+VERSION='3.9.4-1-ARCH'
+
 post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 78791f71d..c75dd089c 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -1,19 +1,20 @@
+VERSION='3.9.4-1-ARCH'
+
 post_install() {
 cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
+  depmod $VERSION
+  echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.9-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD
index 8bf79dcd3..0f6721646 100644
--- a/community/virtualgl/PKGBUILD
+++ b/community/virtualgl/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=virtualgl
 pkgver=2.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://virtualgl.org"
 license=('LGPL')
-depends=('libxv' 'glu' 'turbojpeg')
+depends=('libxv' 'glu' 'libjpeg-turbo')
 makedepends=('cmake' 'mesa')
 source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz")
 sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9')
diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD
index ca8374104..9c8e97647 100644
--- a/community/vlan/PKGBUILD
+++ b/community/vlan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vlan
 pkgver=1.9
 pkgrel=2
 pkgdesc='Virtual LAN configuration utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.candelatech.com/~greear/vlan.html'
 license=('GPL')
 source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz")
diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD
index 355eedeee..bf84f067f 100644
--- a/community/vnstat/PKGBUILD
+++ b/community/vnstat/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72799 2012-06-22 12:52:33Z dreisner $
+# $Id: PKGBUILD 91534 2013-05-23 11:17:51Z spupykin $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=vnstat
 pkgver=1.11
-pkgrel=3
+pkgrel=5
 pkgdesc="A console-based network traffic monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://humdi.net/vnstat/"
@@ -15,22 +15,19 @@ makedepends=('gd')
 optdepends=('gd: image output')
 backup=(etc/vnstat.conf)
 source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz
-        http://humdi.net/vnstat/init.d/arch/vnstat
-        service)
+	service)
 md5sums=('a5a113f9176cd61fb954f2ba297f5fdb'
-         'e89a566dd7514ff0d2d3fc77b2d4ca7e'
-         'fcc189e3dee616ff414dac72637c1a19')
+         'df452896729db4a569005f1ebf6b57f4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make all
+  make all SBIN=/usr/bin
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make DESTDIR=$pkgdir install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install SBIN=$pkgdir/usr/bin
 
-  install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat
   install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service
 
   install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron
diff --git a/community/vnstat/service b/community/vnstat/service
index f312351ea..5c593eb1b 100644
--- a/community/vnstat/service
+++ b/community/vnstat/service
@@ -2,7 +2,7 @@
 Description=Network traffic monitor
 
 [Service]
-ExecStart=/usr/sbin/vnstatd -n
+ExecStart=/usr/bin/vnstatd -n
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD
index e23bd81d8..b96a2a0f7 100644
--- a/community/webfs/PKGBUILD
+++ b/community/webfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79331 2012-11-03 03:32:04Z kkeen $
+# $Id: PKGBUILD 92107 2013-05-31 15:10:32Z foutrelis $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
@@ -7,18 +7,18 @@
 
 pkgname=webfs
 pkgver=1.21
-pkgrel=9
+pkgrel=10
 pkgdesc="Simple and instant http server for mostly static content."
 arch=(i686 x86_64 'mips64el')
 url="http://linux.bytesex.org/misc/webfs.html"
 license=("GPL")
 depends=('mime-types' 'openssl')
-backup=(etc/conf.d/webfsd)
+backup=('etc/conf.d/webfsd')
 source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz
-        webfsd.rc webfsd.conf webfs.patch
+        webfsd.conf
+        webfs.patch
         webfsd.service)
 md5sums=('6dc125fe160479404147e7bbfc781dbc'
-         '3ae9fcdcf79b193aa88e386055e9ebd7'
          'b2c1ab041a82acd8391b06dc38d986be'
          '7294edcec2589df04bb775270d56536e'
          'e1202dd915cba1a02e0016aa3a516b4a')
@@ -34,7 +34,6 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	make prefix=/usr DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir/webfsd.rc"       "$pkgdir/etc/rc.d/webfsd"
 	install -Dm644 "$srcdir/webfsd.conf"     "$pkgdir/etc/conf.d/webfsd"
 	install -Dm755 "$srcdir/webfsd.service"  "$pkgdir/usr/lib/systemd/system/webfsd.service"
 }
diff --git a/community/webfs/webfsd.rc b/community/webfs/webfsd.rc
deleted file mode 100644
index 1c854ebdb..000000000
--- a/community/webfs/webfsd.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# source application-specific settings
-[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID webfsd`
-case "$1" in
-  start)
-    stat_busy "Starting webfsd"
-    [ -z "$PID" ] && /usr/bin/webfsd ${WEBFSD_ARGS} &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon webfsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping webfsd"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon webfsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index b78ea24fe..e915453bf 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90106 2013-05-06 19:40:04Z foutrelis $
+# $Id: PKGBUILD 90785 2013-05-13 21:57:41Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=wesnoth
 pkgver=1.10.6
-pkgrel=3
+pkgrel=5
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,15 +19,19 @@ options=(!emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         wesnothd.tmpfiles.conf
         wesnothd.rc.d
-        wesnothd.service)
+        wesnothd.service
+        https://github.com/wesnoth/wesnoth-old/commit/bbd7f6.patch)
 md5sums=('547e3489bbfa778912b11dbee612c380'
          '2d2fea6b3d86dfd589f5ad35a3be1f97'
          '85659b47d22dfdf4e4d046556973fc3e'
-         'd1b6bf1d3dc05086ee6a370adff0ae4a')
+         'd1b6bf1d3dc05086ee6a370adff0ae4a'
+         'edc7c0547e67cba4ca4f813ca261f572')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -i $srcdir/bbd7f6.patch
+
   mkdir build && cd build
   cmake .. \
       -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index e081f135d..40b6c260a 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $
+# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.7.0
+pkgver=4.7.1
 pkgrel=1
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ makedepends=('gendesk')
 optdepends=('perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('646e5091f7ee4b5fa9998d2cca9cf795')
+md5sums=('e42383c4594c24ebf2f9fdc5dc89e255')
 
 build() {
   cd "${srcdir}"
diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD
index c1fef78a1..3933f9a48 100644
--- a/community/xdelta/PKGBUILD
+++ b/community/xdelta/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xdelta
 pkgver=1.1.4
-pkgrel=4
+pkgrel=4.1
 pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xdelta/"
 license=('GPL')
 depends=('glib' 'zlib')
diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD
index 58270c4a4..bd8d6cd9f 100644
--- a/community/xdelta3/PKGBUILD
+++ b/community/xdelta3/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 83184 2013-01-27 16:27:33Z pierre $
+# $Id: PKGBUILD 90967 2013-05-16 19:50:32Z bpiotrowski $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 # Contributor: Henning Garus <henning.garus@gmail.com>
 
 pkgname=xdelta3
-pkgver=3.0.6
+pkgver=3.0.7
 pkgrel=1
-pkgdesc="A diff utility which works with binary files"
+pkgdesc="Diff utility which works with binary files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xdelta.org/"
 license=('GPL')
 depends=('xz')
 source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('652048ab4a7e5f927bce045228a17b31')
+md5sums=('ef6631e4f9219a80bcb9e3020962b6ec')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./xdelta3 test
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD
index 3fd142e5c..f3af11392 100644
--- a/community/xe-guest-utilities/PKGBUILD
+++ b/community/xe-guest-utilities/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $
+# $Id: PKGBUILD 91549 2013-05-23 14:44:31Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at code gtmanfred com>
 # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl>
@@ -6,7 +6,7 @@
 pkgbase=xe-guest-utilities
 pkgname=('xe-guest-utilities' 'xenstore')
 pkgver=6.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Citrix XenServer Tools"
 arch=('i686' 'x86_64')
 url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
@@ -69,6 +69,7 @@ package_xe-guest-utilities(){
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service"
   install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/"
+  sed -i 's:sbin:bin:' $pkgdir/usr/bin/xe-daemon
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index 9a11417c6..258f5d9de 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $
+# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
 pkgver=1.3.1
-pkgrel=1
+pkgrel=3
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xelerance.com/services/software/xl2tpd/"
@@ -13,7 +13,6 @@ depends=('ppp')
 options=(emptydirs zipman docs)
 backup=(etc/ppp/options.l2tpd)
 source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
-	xl2tpd.rc
 	xl2tpd.conf.client-example
 	xl2tpd.conf.server-example
 	options.l2tpd
@@ -21,11 +20,10 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p
 	xl2tpd.tmpfiles
 	ipparam.patch)
 md5sums=('38c2461d3562f98b08454ca403706886'
-         '1439d13084fc09c2a19c97b24a834345'
          '5f0ae07026e61a3dd15a76fd4144a6d5'
          '16ed0886115d4dcc21072cfb847250bb'
          'ed57eb67335cdf246251285dad502cc7'
-         '5ba9ddaf66c9827fe4a2caef67cf61c2'
+         '219942dd098ce4fdba37d1db327baf57'
          '2e95e4fc03e1521ab20fd7e249efab5a'
          '4d258a58cc109d5c4d96af8f81d481cf')
 
@@ -34,10 +32,14 @@ build() {
 
   patch -p1 <$srcdir/ipparam.patch
 
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
 
-  install -D -m0755 $srcdir/xl2tpd.rc $pkgdir/etc/rc.d/xl2tpd
   install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
   install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
   install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
diff --git a/community/xl2tpd/xl2tpd.rc b/community/xl2tpd/xl2tpd.rc
deleted file mode 100644
index a06e0d41e..000000000
--- a/community/xl2tpd/xl2tpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        [ -d /var/run/xl2tpd ] || mkdir -p /var/run/xl2tpd
-        stat_busy "Starting xl2tpd"
-        /usr/sbin/xl2tpd
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon xl2tpd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping xl2tpd"
-	[ -f /var/run/xl2tpd.pid ] && kill `cat /var/run/xl2tpd.pid`
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/xl2tpd.pid
-            rm_daemon xl2tpd
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service
index b47cadf02..e55b9cb12 100644
--- a/community/xl2tpd/xl2tpd.service
+++ b/community/xl2tpd/xl2tpd.service
@@ -7,8 +7,8 @@ After=ipsec.service
 
 [Service]
 Type=simple
-PIDFile=/var/run/xl2tpd/xl2tpd.pid
-ExecStart=/usr/sbin/xl2tpd -D
+PIDFile=/run/xl2tpd/xl2tpd.pid
+ExecStart=/usr/bin/xl2tpd -D
 Restart=on-abort
 
 [Install]
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 41b8529cc..7a67d6d18 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88557 2013-04-19 17:25:15Z spupykin $
+# $Id: PKGBUILD 90741 2013-05-13 14:42:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=12
+pkgrel=13
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
@@ -53,12 +53,10 @@ conflicts=('xmms2-devel')
 install=xmms2.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	"xmms2d.conf"
-	"xmms2d.rc"
 	"xmms2d.service"
 	"ffmpeg-0.11.diff")
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
-         '31ab8c0980966dbe3e9f5e80b7b82612'
          '47e68461589578e8a99857746c5b6f29'
          'e176971ef96807f72fa8fc17d260c20a')
 
@@ -91,7 +89,6 @@ package() {
   ./waf build
   ./waf --destdir=${pkgdir} install
 
-  install -Dm0755 $srcdir/xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d
   install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf
   install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service
 }
diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc
deleted file mode 100644
index 5387448d9..000000000
--- a/community/xmms2/xmms2d.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/xmms2d.conf
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof xmms2d xmms2-et`
-case "$1" in
-  start)
-    stat_busy "Starting xmms2d"
-    [ -z "$PID" ] && su -c "/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null" - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xmms2d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xmms2d"
-    [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD
index 8bdff37a9..2b788f819 100644
--- a/community/zathura-djvu/PKGBUILD
+++ b/community/zathura-djvu/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 82565 2013-01-21 01:01:19Z dwallace $
+# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-djvu
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Adds DjVu support to zathura by using the djvulibre library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/"
 license=('custom')
 depends=('djvulibre' 'zathura')
+install="$pkgname.install"
 source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz")
-md5sums=('38344cb762e1f5b5fe66f6ef49ac173f')
+md5sums=('a472f706d6f6384d8bc2750141a84fc6')
 
 build(){
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-djvu/zathura-djvu.install b/community/zathura-djvu/zathura-djvu.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-djvu/zathura-djvu.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index d11cfdb2b..3a19e8af9 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.3
-pkgrel=2
+pkgver=0.2.4
+pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
@@ -13,7 +13,7 @@ license=('custom')
 depends=('mupdf>=1.1' 'zathura')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('777ba69a321ef4bb9cbced8f6733927a')
+md5sums=('aa9667425dab93147dd8605eda020e59')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD
index e18440510..cfa86d218 100644
--- a/community/zathura-pdf-poppler/PKGBUILD
+++ b/community/zathura-pdf-poppler/PKGBUILD
@@ -4,15 +4,17 @@
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-pdf-poppler
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.3
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the poppler engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/"
 license=('custom')
 depends=('poppler-glib' 'zathura')
+install="$pkgname.install"
+
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('83f2dba1f6d715f5b1a33044d2a64829')
+md5sums=('1d8deb2d2ee5a6847267f977b8f2e542')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-pdf-poppler/zathura-pdf-poppler.install b/community/zathura-pdf-poppler/zathura-pdf-poppler.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-pdf-poppler/zathura-pdf-poppler.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD
index a74eab3c6..b470d5a34 100644
--- a/community/zathura-ps/PKGBUILD
+++ b/community/zathura-ps/PKGBUILD
@@ -3,15 +3,16 @@
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-ps
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="Adds ps support to zathura by using the libspectre library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-ps/"
 license=('custom')
 depends=('libspectre' 'zathura')
+install="$pkgname.install"
 source=(https://pwmt.org/projects/zathura/plugins/download/zathura-ps-$pkgver.tar.gz)
-md5sums=('45619e744b69bf16b408b50cf32f2df5')
+md5sums=('338af976c03c0aa1471b156a0efdc45c')
 
 build(){
   make -C "$pkgname-$pkgver"
diff --git a/community/zathura-ps/zathura-ps.install b/community/zathura-ps/zathura-ps.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-ps/zathura-ps.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 65ea30a7d..568c017ce 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82563 2013-01-21 00:12:49Z dwallace $
+# $Id: PKGBUILD 90594 2013-05-13 10:03:23Z spupykin $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="a document viewer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ url="http://pwmt.org/projects/zathura/"
 license=('custom')
 depends=('girara-gtk2' 'sqlite' 'desktop-file-utils')
 makedepends=('python2-docutils')
-optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps')
+optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps')
 install=zathura.install
 source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz
 	    bash-completion)
-md5sums=('51558163e942b52036ee00c60bd1500c'
+md5sums=('c0265fd9fa64a37b01d729efb75a7c32'
          'cac20c37f0e77ba62a8138788f4ccabb')
 
 build() {
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index 0cbac9901..b82957a75 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $
+# Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=znc
 pkgver=1.0
-pkgrel=4
+pkgrel=7
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
 license=('GPL2')
@@ -27,7 +27,7 @@ build() {
     --enable-python \
     --enable-perl \
     --enable-tcl \
-    --with-systemdsystemunitdir=yes
+    --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }
 
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index b5ce8787a..1e3602001 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=zynaddsubfx
 pkgver=2.4.3
 pkgrel=1
 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zynaddsubfx.sourceforge.net"
 license=('GPL')
 depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml')
@@ -17,11 +17,13 @@ options=('!emptydirs')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2"
 	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
 	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch"
-	"$pkgname.svg")
+	"$pkgname.svg"
+	"zynaddsubfx-2.4.3-no_sse_generic.patch")
 md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a'
          'eb95d339ff5deac8c6b54965f04a8c60'
          '49464a33ab9c4250520eda0df7705663'
-         '6f7e9c3ce3947088a10c99c46a65431f')
+         '6f7e9c3ce3947088a10c99c46a65431f'
+	 'd997b35b47eff56a2d056df61b737ddc')
 
 build() {
   cd "$srcdir"
@@ -33,6 +35,7 @@ build() {
   # patches
 #  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
 #  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+  patch -Np1 -i ${srcdir}/zynaddsubfx-2.4.3-no_sse_generic.patch
   sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp
 
   [ -d build ] || mkdir build && cd build
diff --git a/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch
new file mode 100644
index 000000000..8eb295689
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch
@@ -0,0 +1,21 @@
+--- ZynAddSubFX-2.4.3.orig/src/CMakeLists.txt	2012-06-15 23:22:35.000000000 -0500
++++ ZynAddSubFX-2.4.3/src/CMakeLists.txt	2013-06-15 10:53:13.109741210 -0500
+@@ -116,8 +116,8 @@
+ )
+ 
+ set (BuildOptionsBasic
+-    "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
+-    CACHE STRING "basic X86 complier options"
++    "-O3 -ffast-math -fomit-frame-pointer"
++    CACHE STRING "basic complier options"
+ )
+ 
+ set (BuildOptionsDebug
+@@ -173,7 +173,6 @@
+ include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
+ 
+ add_definitions(
+-	 -DASM_F2I_YES
+ 	 -g #TODO #todo put in a better location
+ 	 -Wall
+ 	 -Wextra