Tue Jun 4 00:27:56 PDT 2013

64 files changed, 1061 insertions, 682 deletions

diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index abc33e580..d66921dba 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $
+# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=1
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
+backup=(etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
@@ -36,11 +36,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         apache.conf.d
         apache.tmpfiles.conf
         httpd.logrotate
-        httpd
         httpd.service
         arch.layout)
 md5sums=('91bd1484aca13a7095d6432be37fc7ae'
-         'f8f0d879b5fda028aad7ac9f329e057b'
+         'SKIP'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -54,10 +53,9 @@ md5sums=('91bd1484aca13a7095d6432be37fc7ae'
          '4ac64df6e019edbe137017cba1ff2f51'
          '08b3c875f6260644f2f52b4056d656b0'
          '82068753dab92fe86312b1010a2904d7'
-         '6382331e9700ed9e8cc78ea51887b537'
-         'c7e300a287ef7e2e066ac7639536f87e'
-         'ed219c8228d4d5ae9b7a55107cf79706'
-         '3d659d41276ba3bfcb20c231eb254e0c')
+         '13dbaaf949c5bc36cfcf5718b95cb020'
+         'a823bb355c136fd0e2b3fb820e2d903c'
+         '6b7122245a67597230a3b3f317eaf34e')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
@@ -71,31 +69,41 @@ build() {
 
 	cat "${srcdir}/arch.layout" >> config.layout
 
+	cd ..
+	cp -r httpd-${pkgver} httpd-itk-${pkgver}
+
+	cd httpd-itk-${pkgver}
+	
+	# Fix patch to apply with latest Apache version
+	sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
+
+	mkdir -p server/mpm/experimental/itk
+	cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+	mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
+
+	patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
+	patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
+	patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
+	patch -Np1 -i "${srcdir}/05-add-copyright.patch"
+	patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
+	patch -Np1 -i "${srcdir}/07-base-functionality.patch"
+	patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
+	patch -Np1 -i "${srcdir}/09-capabilities.patch"
+	patch -Np1 -i "${srcdir}/10-nice.patch"
+	patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
+
+	autoconf
+	cd ..
 	for mpm in prefork worker itk; do
 		if [ "${mpm}" = "itk" ]; then
-                        # Fix patch to apply with latest Apache version
-                        sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
-
-			mkdir -p server/mpm/experimental/itk
-			cp -r server/mpm/prefork/* server/mpm/experimental/itk/
-			mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
-
-			patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
-			patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
-			patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
-			patch -Np1 -i "${srcdir}/05-add-copyright.patch"
-			patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
-			patch -Np1 -i "${srcdir}/07-base-functionality.patch"
-			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
-			patch -Np1 -i "${srcdir}/09-capabilities.patch"
-			patch -Np1 -i "${srcdir}/10-nice.patch"
-                        patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
-
-			autoconf
+			CONFIGURE=../httpd-itk-${pkgver}/configure
+		else
+			CONFIGURE=../httpd-${pkgver}/configure
 		fi
+
 		mkdir build-${mpm}
 		pushd build-${mpm}
-		../configure --enable-layout=Arch \
+		$CONFIGURE --enable-layout=Arch \
 			--enable-modules=all \
 			--enable-mods-shared=all \
 			--enable-so \
@@ -103,7 +111,7 @@ build() {
 			--with-suexec-caller=http \
 			--with-suexec-docroot=/srv/http \
 			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
+			--with-suexec-bin=/usr/bin/suexec \
 			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
 			--enable-ldap --enable-authnz-ldap \
 			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
@@ -117,15 +125,19 @@ build() {
 			--with-pcre=/usr \
 			--with-mpm=${mpm}
 		make
-		if [ "${mpm}" = "prefork" ]; then
-			make DESTDIR="${pkgdir}" install
-		else
-			install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
-		fi
 		popd
 	done
+}
+
+package() {
+	cd "${srcdir}"
+	cd build-prefork
+	make DESTDIR="${pkgdir}" install
+	cd ..
+	
+	install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker"
+	install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
 
-	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
 	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
 	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
 	install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
@@ -149,9 +161,7 @@ build() {
 	rm -rf "${pkgdir}/usr/share/httpd/manual"
 	rm -rf "${pkgdir}/etc/httpd/conf/original"
 	rm -rf "${pkgdir}/srv/"
-	rm -rf "${pkgdir}/usr/bin"
-	rm -rf "${pkgdir}/var/run"
-
+	rm -rf "${pkgdir}/run"
 
         install -m755 -d "${pkgdir}/usr/lib/systemd/system"
         install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout
index ab59db84b..d5d2e8a08 100644
--- a/extra/apache/arch.layout
+++ b/extra/apache/arch.layout
@@ -2,7 +2,7 @@
 	prefix:          /etc/httpd
 	exec_prefix:     /usr
 	bindir:          /usr/bin
-	sbindir:         /usr/sbin
+	sbindir:         /usr/bin
 	libdir:          /usr/lib/httpd
 	libexecdir:      /usr/lib/httpd/modules
 	mandir:          /usr/share/man
@@ -16,7 +16,7 @@
 	cgidir:          /srv/http/cgi-bin
 	includedir:      /usr/include/httpd
 	localstatedir:   /var
-	runtimedir:      /var/run/httpd
+	runtimedir:      /run/httpd
 	logfiledir:      /var/log/httpd
 	proxycachedir:   /var/cache/httpd
 </Layout>
\ No newline at end of file
diff --git a/extra/apache/httpd b/extra/apache/httpd
deleted file mode 100755
index 6fa9c3cc7..000000000
--- a/extra/apache/httpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
-  start)
-    stat_busy "Starting Apache Web Server"
-    [ ! -d /var/run/httpd ] && install -d /var/run/httpd
-    if $APACHECTL start >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Apache Web Server"
-    if $APACHECTL stop >/dev/null ; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading Apache Web Server"
-    if $APACHECTL graceful >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting Apache Web Server"
-    if $APACHECTL restart >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking Apache Web Server status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate
index a723d20d2..c9755de14 100644
--- a/extra/apache/httpd.logrotate
+++ b/extra/apache/httpd.logrotate
@@ -1,6 +1,6 @@
 /var/log/httpd/*log {
    missingok
    postrotate
-      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
    endscript
 }
diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service
index bb02b5992..247e28fba 100644
--- a/extra/apache/httpd.service
+++ b/extra/apache/httpd.service
@@ -5,9 +5,9 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 PIDFile=/run/httpd/httpd.pid
-ExecStart=/usr/sbin/apachectl start
-ExecStop=/usr/sbin/apachectl graceful-stop
-ExecReload=/usr/sbin/apachectl graceful
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
 PrivateTmp=true
 LimitNOFILE=infinity
 
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index bbd3a3814..5570600dd 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $
+# $Id: PKGBUILD 187088 2013-06-03 15:58:10Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.21
+pkgver=2.23
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ optdepends=('python2:           for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c')
+sha1sums=('c24de9766ae7195c1cda947f9d2ae07497a0af8f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,7 +27,8 @@ build() {
   ./configure --enable-gc=/usr \
               --prefix=/usr \
               --with-latex=/usr/share/texmf/tex/latex \
-              --with-context=/usr/share/texmf/tex/context
+              --with-context=/usr/share/texmf/tex/context \
+              --enable-offscreen
   make all
 }
 
diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 21bcaa93b..2e586a131 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157961 2012-04-30 07:30:22Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 187051 2013-06-03 11:16:12Z allan $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy carrier <geoffroy@archlinux.org>
 
 pkgname=bluez-hcidump
 pkgver=2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -23,4 +23,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}"/usr/sbin "${pkgdir}"/usr/bin
 }
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index f6270a7ad..2e1cfe46a 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $
+# $Id: PKGBUILD 187050 2013-06-03 11:16:11Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.101
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('dbus-core' 'python2' 'systemd-tools')
 makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
 optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
             "alsa-lib: Audio bluetooth devices support"
-            "dbus-python: to run bluez-simple-agent"
-            "pygobject: to run bluez-simple-agent"
+            "python2-dbus: to run bluez-simple-agent"
+            "python2-gobject: to run bluez-simple-agent"
             "libusb-compat: USB adapters support"
             "cups: CUPS backend")
 conflicts=('bluez-libs' 'bluez-utils')
@@ -77,6 +77,11 @@ package() {
     "${pkgdir}"/usr/bin/bluez-simple-agent \
     "${pkgdir}"/usr/bin/bluez-test-device \
     "${pkgdir}"/usr/bin/bluez-test-input
+
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin/* usr/bin
+        rmdir usr/sbin
 }
 md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
          '7412982b440f29fa7f76a41a87fef985'
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 9364a1f45..318b69b28 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $
+# $Id: PKGBUILD 187084 2013-06-03 11:23:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -13,8 +13,15 @@ depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('be6008f2299613d23fe82ab53ef7472e')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'imagemagick.patch')
+md5sums=('be6008f2299613d23fe82ab53ef7472e'
+         '19c4cf0e6e9c9a890f3698c9df8062f1')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/imagemagick.patch 
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch
new file mode 100644
index 000000000..8e5279030
--- /dev/null
+++ b/extra/cmake/imagemagick.patch
@@ -0,0 +1,27 @@
+From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
+From: Funda Wang <fundawang@gmail.com>
+Date: Tue, 28 May 2013 06:17:49 +0000
+Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174)
+
+The header files of ImageMagick are now located at
+<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
+---
+ Modules/FindImageMagick.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
+index cd97b38..02a5777 100644
+--- a/Modules/FindImageMagick.cmake
++++ b/Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
+       ${ImageMagick_INCLUDE_DIRS}
+       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+     PATH_SUFFIXES
+-      ImageMagick
++      ImageMagick ImageMagick-6
+     DOC "Path to the ImageMagick include dir."
+     )
+   find_library(ImageMagick_${component}_LIBRARY
+-- 
+1.7.0
+
diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch
deleted file mode 100644
index 0518681f0..000000000
--- a/extra/cmake/qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake-2.8.10.2/Modules/FindQt4.cmake~	2013-03-07 16:50:35.388399689 +0000
-+++ cmake-2.8.10.2/Modules/FindQt4.cmake	2013-03-07 16:51:35.017991029 +0000
-@@ -497,7 +497,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
-+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
-   PATHS
-     ENV QTDIR
-     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index a6dff7a79..49976813d 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $
+# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=3
+pkgrel=4
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        saslauthd
         tmpfiles.conf)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
@@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20'
          '45bb0192d2f188066240b9a66ee6365f')
 
 build() {
@@ -74,6 +72,7 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+      --sbin=/usr/bin \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
       --disable-static \
@@ -131,7 +130,6 @@ package_cyrus-sasl() {
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
   make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
   install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf"
diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/extra/cyrus-sasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index a682bf185..1b2807981 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165783 2012-08-29 23:04:18Z thomas $
+# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=davfs2
 pkgver=1.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="File system driver that allows you to mount a WebDAV folder"
 arch=(i686 x86_64)
 url="http://savannah.nongnu.org/projects/davfs2"
@@ -14,19 +14,14 @@ sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug
+  dav_user=nobody dav_group=network ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-debug
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # Create some dirs
-  install -d -m755 "${pkgdir}/sbin"
   make DESTDIR="${pkgdir}" install
 
-  rm -f ${pkgdir}/sbin/{u,}mount.davfs
-  ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs"
-  ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs"
-
+  rm -rf ${pkgdir}/sbin
   rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS}
 }
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 70f7eadf8..10a547001 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $
+# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.5
-_pkgver=4.2.5
-pkgrel=1
+pkgver=4.2.5.p1
+_pkgver=4.2.5-P1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 makedepends=('bash' 'iproute2')
 source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-        dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
+        dhcpd4.service
+        dhcpd6.service
         dhcp-4.2.5-client_script-1.patch
         dhcp-4.2.5-missing_ipv6-1.patch)
-md5sums=('6489e919ac093d17249270ee9be1020e'
-         '022bc7038b3061cfb31da4736e7ab8a8'
-         'c49b1497837ba56c54e401a66e1bab9b'
-         '12c2f3ae47ed23eb698eb7f1bfd80f20'
-         '8f357e46e1efcbb746f38737a3f977a2'
+md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
+         'SKIP'
          '439ee2f145a1e86dd644cb94a854f8e7'
          '588aa85b6fe228c45623185a58d11992'
          '9e4dcf90beec15bfcb6631809cdcc780'
          'da655f02f1cf4d95b4708e84e69edbc8')
 
-build() {
+
+prepare() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"
 
   # Define _GNU_SOURCE to fix IPV6.
@@ -36,8 +35,11 @@ build() {
   patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
   # Make dhcp client script suck less.
   patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
+}
 
-  ./configure --prefix=/usr --sysconfdir=/etc \
+build() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
       --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
       --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
       --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
@@ -48,15 +50,12 @@ build() {
 
 package_dhcp(){
   pkgdesc="A DHCP server, client, and relay agent"
-  backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
+  backup=('etc/dhcpd.conf')
   install=dhcp.install
-  
+
   cd "${srcdir}/${pkgbase}-${_pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
-  install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
-  install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
   install -d "${pkgdir}/var/lib/dhcp"
 
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
@@ -67,7 +66,7 @@ package_dhcp(){
 
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
-  
+
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
 }
@@ -82,11 +81,11 @@ package_dhclient(){
 
   install -m755 -d "${pkgdir}/usr/share/dhclient"
   mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
-  
+
   install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
-  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
+  install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script"
 
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
diff --git a/extra/dhcp/dhcp b/extra/dhcp/dhcp
deleted file mode 100644
index d4f228d9c..000000000
--- a/extra/dhcp/dhcp
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-# ipv4 runtime parameters
-DHCP4_ARGS="-q"
-
-# ipv6 runtime parameters
-DHCP6_ARGS="-q"
-
diff --git a/extra/dhcp/dhcp.conf.d b/extra/dhcp/dhcp.conf.d
deleted file mode 100644
index 99ba6d13d..000000000
--- a/extra/dhcp/dhcp.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-DHCP_ARGS="-q"
-
diff --git a/extra/dhcp/dhcp4 b/extra/dhcp/dhcp4
deleted file mode 100644
index 8e1277a37..000000000
--- a/extra/dhcp/dhcp4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv4 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then
-      add_daemon dhcp4
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv4 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp4
-      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/extra/dhcp/dhcp6 b/extra/dhcp/dhcp6
deleted file mode 100644
index 6b4b4d359..000000000
--- a/extra/dhcp/dhcp6
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcp6.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv6 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then
-      add_daemon dhcp6
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv6 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp6
-      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/extra/dhcp/dhcpd b/extra/dhcp/dhcpd
deleted file mode 100755
index 1fbb31e7c..000000000
--- a/extra/dhcp/dhcpd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting DHCP Server"
-    if [ "$PID" = "" ]; then 
-       /usr/sbin/dhcpd $DHCP_ARGS 
-    fi
-    if [ "$PID" != "" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCP Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    rm -f $PIDFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 527e359df..d0ebfd507 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $
+# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.1.0
-pkgrel=4
+pkgver=3.2.0
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'lensfun')
+             'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "digikam-3.1.0-htmlexport.patch"
         "digikam-3.1.0-fixed-pngs.tar.gz")
 noextract=("digikam-3.1.0-fixed-pngs.tar.gz")
-sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd'
-          'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb'
+sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f'
           'b0a1991e0df9b72c79562c719bc9d944a3b8bc78')
 
 prepare() {
@@ -27,9 +25,6 @@ prepare() {
 
   cd  ${pkgname}-${pkgver}
 
-  # https://bugs.kde.org/show_bug.cgi?id=316620
-  patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch"
-
   # Fix invalid PNG images to work with libpng 1.6
   # https://bugs.kde.org/show_bug.cgi?id=319350
   tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1
@@ -50,7 +45,7 @@ package_digikam() {
   pkgdesc="Digital photo management application for KDE"
   depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
            'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun')
-  optdepends=('kipi-plugins: for more extras and plugins')
+  optdepends=('kipi-plugins: more tools and plugins')
   install=digikam.install
 
   cd build/core
@@ -60,7 +55,7 @@ package_digikam() {
   cd ../../build/po
   make DESTDIR="${pkgdir}" install
 
-  # Fix conflicts with kde-l10n-*
+  # Fix conflicts with kde-l10n-* (FS#33762)
   rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo
 }
 
@@ -98,12 +93,14 @@ package_libmediawiki() {
 
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
+  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
+  optdepends=('libkgeomap: Geolocalize tool'
+              'libmediawiki: MediaWiki Export plugin'
+              'libkvkontakte: VKontakte.ru Exporter plugin'
+              'libgpod: iPodExport plugin'
+              'opencv: Remove Red Eyes plugin'
+              'imagemagick: Video SlideShow plugin'
+              'qt-gstreamer: Video SlideShow plugin')
   install=kipi-plugins.install
 
   cd build/extra/kipi-plugins
diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch
deleted file mode 100644
index c9e2ff365..000000000
--- a/extra/digikam/digikam-3.1.0-htmlexport.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt	2013-03-11 10:24:11.000000000 +0200
-+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt	2013-03-13 00:15:05.539275132 +0200
-@@ -468,9 +468,9 @@
-     # Currently the cmake module distributed w/ cmake uses a different variable
-     # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule 
-     # distributed w/ kdelibs LIBEXSLT_LIBRARIES.
--    if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
--        set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES})
--    endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES)
-+    if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
-+        set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES})
-+    endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES)
-     IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)
-         ADD_SUBDIRECTORY(htmlexport)
-     ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES)
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index c538a4a96..5b7f43f8c 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $
+# $Id: PKGBUILD 187100 2013-06-03 19:31:59Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor : Murtuza Akhtari <inxsible at gmail dot com>
 # Contributor: Keshav P R <skodabenz at rocketmail dot com>
 
 pkgname=efibootmgr
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
 arch=('i686' 'x86_64')
 url="http://linux.dell.com/efibootmgr/"
@@ -15,7 +15,9 @@ makedepends=()
 provides=()
 options=(strip purge docs zipman !emptydirs)
 
-source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz")
+source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz"
+        "efibootmgr-tilt_slashes-func.patch"
+)
 
 build () {	
 	rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true
@@ -23,7 +25,7 @@ build () {
 	cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build
 	
 	cd ${srcdir}/efibootmgr-${pkgver}_build/
-	
+	patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch
 	echo
 	
 	CFLAGS= make
@@ -43,4 +45,5 @@ package() {
 	install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
 	
 }
-md5sums=('9e9a31d79e579644de83a14139b66d10')
+md5sums=('9e9a31d79e579644de83a14139b66d10'
+         '3622c0e978cf859cae60803a6b6a0c5e')
diff --git a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch b/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch
new file mode 100644
index 000000000..ce857bb3c
--- /dev/null
+++ b/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch
@@ -0,0 +1,61 @@
+diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
+index 236365a..9883961 100644
+--- a/src/efibootmgr/efibootmgr.c
++++ b/src/efibootmgr/efibootmgr.c
+@@ -803,6 +803,7 @@ usage()
+ 	printf("\t-V | --version          return version and exit\n");
+ 	printf("\t-w | --write-signature  write unique sig to MBR if needed\n");
+ 	printf("\t-@ | --append-binary-args file  append extra args from file (use \"-\" for stdin)\n");
++	printf("\t   | --help             show help/usage\n");
+ }
+ 
+ static void
+@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv)
+ 			{"version",                no_argument, 0, 'V'},
+ 			{"write-signature",        no_argument, 0, 'w'},
+ 			{"append-binary-args", required_argument, 0, '@'},
++			{"help",                   no_argument, 0,   2},
+ 			{0, 0, 0, 0}
+ 		};
+ 
+@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv)
+ 			opts.write_signature = 1;
+ 			break;
+ 
++		case 2:
++			usage();
++			exit(1);
++
+ 		default:
+ 			usage();
+ 			exit(1);
+diff --git a/src/lib/efi.c b/src/lib/efi.c
+index a4ce5cf..8ef8be8 100644
+--- a/src/lib/efi.c
++++ b/src/lib/efi.c
+@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out)
+         return out;
+ }
+ 
++char *
++tilt_slashes(char *s)
++{
++	char *p;
++	for (p = s; *p; p++)
++		if (*p == '/')
++			*p = '\\';
++	return s;
++}
++
+ void
+ set_fs_kernel_calls()
+ {
+@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk)
+ 				     signature,
+ 				     mbr_type, signature_type);
+ 
+-    efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path));
++    efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path));
+     p += make_file_path_device_path (p, os_loader_path);
+     p += make_end_device_path       (p);
+ 
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index 6b1505a4f..c3086e6c2 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $
+# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
 pkgver=2.9.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
 url="http://fuse.sourceforge.net/"
@@ -19,14 +19,18 @@ options=(!libtool)
 sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
-
   # fix building with glibc-2.14
-  sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+  sed -i '1i#define _GNU_SOURCE' util/fusermount.c 
+  
+  sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure
+}
 
-  ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \
-              --enable-util --bindir=/bin
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --libdir=/usr/lib \
+              --enable-lib --enable-util
   make
 }
 
@@ -38,7 +42,6 @@ package() {
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
   rm -rf ${pkgdir}/etc/init.d
-  #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
 
   # install sample config file
   install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index dfd2e82fd..f26385c19 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $
+# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
 pkgver=3.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -23,7 +23,7 @@ sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
             'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
 
-build() {
+prepare() {
   cd "GConf-$pkgver"
 
   # Patch from fedora - reloads gconf after installing schemas
@@ -33,6 +33,10 @@ build() {
 
   # Python2 fix
   sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
+}
+
+build() {
+  cd "GConf-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/GConf \
@@ -48,5 +52,5 @@ package() {
 
   install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system"
   install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/"
-  install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg"
+  install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg"
 }
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 79c74ba78..aaae65137 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $
+# $Id: PKGBUILD 187059 2013-06-03 11:16:35Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm
 pkgname=(gdm libgdm)
 pkgver=3.8.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
@@ -25,6 +25,7 @@ build() {
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/gdm \
     --localstatedir=/var \
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 5b3920e4d..a183c7805 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185106 2013-05-11 07:24:47Z bpiotrowski $
+# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
@@ -6,7 +6,7 @@
 
 pkgname=giflib
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
 arch=('i686' 'x86_64')
@@ -17,12 +17,15 @@ provides=("libungif=${pkgver}")
 conflicts=('libungif')
 replaces=('libungif')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('bbd3324af24156d5d7e66ab1cee8508d')
+source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
+        giflib-4.2.1-quantize.patch)
+md5sums=('bbd3324af24156d5d7e66ab1cee8508d'
+         '67e46b344340ac10f4f597d772679f23')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
+  patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch
   autoreconf -fi
 }
 
diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch
new file mode 100644
index 000000000..197f88b77
--- /dev/null
+++ b/extra/giflib/giflib-4.2.1-quantize.patch
@@ -0,0 +1,404 @@
+diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in
+--- giflib-4.2.1/lib/Makefile.in.quantize	2012-10-09 00:37:59.000000000 -0300
++++ giflib-4.2.1/lib/Makefile.in	2012-11-17 12:16:04.485736553 -0200
+@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libgif_la_DEPENDENCIES =
+ am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
+-	gifalloc.lo gif_err.lo
++	gifalloc.lo gif_err.lo quantize.lo
+ libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
+ libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c  \
+ 					gif_hash.h	\
+                     gifalloc.c  \
+                     gif_err.c   \
++                    quantize.c  \
+ 					gif_lib_private.h
+ 
+ libgif_la_LDFLAGS = -version-info @SHLIBVERSION@
+@@ -319,6 +320,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h
+--- giflib-4.2.1/lib/gif_lib.h.quantize	2012-10-09 00:36:32.000000000 -0300
++++ giflib-4.2.1/lib/gif_lib.h	2012-11-17 12:16:04.488735917 -0200
+@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile)
+ #define D_GIF_ERR_IMAGE_DEFECT   112
+ #define D_GIF_ERR_EOF_TOO_SOON   113
+ 
++/******************************************************************************
++ * O.K., here are the routines from GIF_LIB file QUANTIZE.C.              
++******************************************************************************/
++int QuantizeBuffer(unsigned int Width, unsigned int Height,
++                   int *ColorMapSize, GifByteType * RedInput,
++                   GifByteType * GreenInput, GifByteType * BlueInput,
++                   GifByteType * OutputBuffer,
++                   GifColorType * OutputColorMap);
++
+ /* These are legacy.  You probably do not want to call them directly */
+ int DGifGetScreenDesc(GifFileType * GifFile);
+ int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType);
+diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
+--- giflib-4.2.1/lib/quantize.c.quantize	2012-11-17 12:17:44.741435334 -0200
++++ giflib-4.2.1/lib/quantize.c	2012-11-17 12:16:04.491735283 -0200
+@@ -0,0 +1,332 @@
++/*****************************************************************************
++ *   "Gif-Lib" - Yet another gif library.
++ *
++ * Written by:  Gershon Elber            IBM PC Ver 0.1,    Jun. 1989
++ ******************************************************************************
++ * Module to quatize high resolution image into lower one. You may want to
++ * peek into the following article this code is based on:
++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert
++ * SIGGRAPH 1982 page 297-307.
++ ******************************************************************************
++ * History:
++ * 5 Jan 90 - Version 1.0 by Gershon Elber.
++ *****************************************************************************/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef __MSDOS__
++#include <dos.h>
++#include <alloc.h>
++#include <graphics.h>
++#endif /* __MSDOS__ */
++
++#include <stdlib.h>
++#include <stdio.h>
++#include "gif_lib.h"
++#include "gif_lib_private.h"
++
++#define ABS(x)    ((x) > 0 ? (x) : (-(x)))
++
++#define PROGRAM_NAME	"giflib"
++
++/* The colors are stripped to 5 bits per primary color if non MSDOS system
++ * or to 4 (not enough memory...) if MSDOS as first step.
++ */
++#ifdef __MSDOS__
++#define COLOR_ARRAY_SIZE 4096
++#define BITS_PER_PRIM_COLOR 4
++#define MAX_PRIM_COLOR      0x0f
++#else
++#define COLOR_ARRAY_SIZE 32768
++#define BITS_PER_PRIM_COLOR 5
++#define MAX_PRIM_COLOR      0x1f
++#endif /* __MSDOS__ */
++
++static int SortRGBAxis;
++
++typedef struct QuantizedColorType {
++    GifByteType RGB[3];
++    GifByteType NewColorIndex;
++    long Count;
++    struct QuantizedColorType *Pnext;
++} QuantizedColorType;
++
++typedef struct NewColorMapType {
++    GifByteType RGBMin[3], RGBWidth[3];
++    unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
++    unsigned long Count; /* Total number of pixels in all the entries */
++    QuantizedColorType *QuantizedColors;
++} NewColorMapType;
++
++static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
++                          unsigned int ColorMapSize,
++                          unsigned int *NewColorMapSize);
++static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2);
++
++/******************************************************************************
++ * Quantize high resolution image into lower one. Input image consists of a
++ * 2D array for each of the RGB colors with size Width by Height. There is no
++ * Color map for the input. Output is a quantized image with 2D array of
++ * indexes into the output color map.
++ *   Note input image can be 24 bits at the most (8 for red/green/blue) and
++ * the output has 256 colors at the most (256 entries in the color map.).
++ * ColorMapSize specifies size of color map up to 256 and will be updated to
++ * real size before returning.
++ *   Also non of the parameter are allocated by this routine.
++ *   This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
++ ******************************************************************************/
++int
++QuantizeBuffer(unsigned int Width,
++               unsigned int Height,
++               int *ColorMapSize,
++               GifByteType * RedInput,
++               GifByteType * GreenInput,
++               GifByteType * BlueInput,
++               GifByteType * OutputBuffer,
++               GifColorType * OutputColorMap) {
++
++    unsigned int Index, NumOfEntries;
++    int i, j, MaxRGBError[3];
++    unsigned int NewColorMapSize;
++    long Red, Green, Blue;
++    NewColorMapType NewColorSubdiv[256];
++    QuantizedColorType *ColorArrayEntries, *QuantizedColor;
++
++    ColorArrayEntries = (QuantizedColorType *)malloc(
++                           sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
++    if (ColorArrayEntries == NULL) {
++        _GifError = E_GIF_ERR_NOT_ENOUGH_MEM;
++        return GIF_ERROR;
++    }
++
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
++        ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
++        ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
++           MAX_PRIM_COLOR;
++        ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
++        ColorArrayEntries[i].Count = 0;
++    }
++
++    /* Sample the colors and their distribution: */
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        ColorArrayEntries[Index].Count++;
++    }
++
++    /* Put all the colors in the first entry of the color map, and call the
++     * recursive subdivision process.  */
++    for (i = 0; i < 256; i++) {
++        NewColorSubdiv[i].QuantizedColors = NULL;
++        NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[i].RGBMin[j] = 0;
++            NewColorSubdiv[i].RGBWidth[j] = 255;
++        }
++    }
++
++    /* Find the non empty entries in the color table and chain them: */
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++)
++        if (ColorArrayEntries[i].Count > 0)
++            break;
++    QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
++    NumOfEntries = 1;
++    while (++i < COLOR_ARRAY_SIZE)
++        if (ColorArrayEntries[i].Count > 0) {
++            QuantizedColor->Pnext = &ColorArrayEntries[i];
++            QuantizedColor = &ColorArrayEntries[i];
++            NumOfEntries++;
++        }
++    QuantizedColor->Pnext = NULL;
++
++    NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
++    NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
++    NewColorMapSize = 1;
++    if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
++       GIF_OK) {
++        free((char *)ColorArrayEntries);
++        return GIF_ERROR;
++    }
++    if (NewColorMapSize < *ColorMapSize) {
++        /* And clear rest of color map: */
++        for (i = NewColorMapSize; i < *ColorMapSize; i++)
++            OutputColorMap[i].Red = OutputColorMap[i].Green =
++                OutputColorMap[i].Blue = 0;
++    }
++
++    /* Average the colors in each entry to be the color to be used in the
++     * output color map, and plug it into the output color map itself. */
++    for (i = 0; i < NewColorMapSize; i++) {
++        if ((j = NewColorSubdiv[i].NumEntries) > 0) {
++            QuantizedColor = NewColorSubdiv[i].QuantizedColors;
++            Red = Green = Blue = 0;
++            while (QuantizedColor) {
++                QuantizedColor->NewColorIndex = i;
++                Red += QuantizedColor->RGB[0];
++                Green += QuantizedColor->RGB[1];
++                Blue += QuantizedColor->RGB[2];
++                QuantizedColor = QuantizedColor->Pnext;
++            }
++            OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
++        } else
++            fprintf(stderr,
++                    "\n%s: Null entry in quantized color map - that's weird.\n",
++                    PROGRAM_NAME);
++    }
++
++    /* Finally scan the input buffer again and put the mapped index in the
++     * output buffer.  */
++    MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        Index = ColorArrayEntries[Index].NewColorIndex;
++        OutputBuffer[i] = Index;
++        if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
++            MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
++        if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
++            MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
++        if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
++            MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
++    }
++
++#ifdef DEBUG
++    fprintf(stderr,
++            "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
++            MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
++#endif /* DEBUG */
++
++    free((char *)ColorArrayEntries);
++
++    *ColorMapSize = NewColorMapSize;
++
++    return GIF_OK;
++}
++
++/******************************************************************************
++ * Routine to subdivide the RGB space recursively using median cut in each
++ * axes alternatingly until ColorMapSize different cubes exists.
++ * The biggest cube in one dimension is subdivide unless it has only one entry.
++ * Returns GIF_ERROR if failed, otherwise GIF_OK.
++ ******************************************************************************/
++static int
++SubdivColorMap(NewColorMapType * NewColorSubdiv,
++               unsigned int ColorMapSize,
++               unsigned int *NewColorMapSize) {
++
++    int MaxSize;
++    unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
++    long Sum, Count;
++    QuantizedColorType *QuantizedColor, **SortArray;
++
++    while (ColorMapSize > *NewColorMapSize) {
++        /* Find candidate for subdivision: */
++        MaxSize = -1;
++        for (i = 0; i < *NewColorMapSize; i++) {
++            for (j = 0; j < 3; j++) {
++                if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
++                      (NewColorSubdiv[i].NumEntries > 1)) {
++                    MaxSize = NewColorSubdiv[i].RGBWidth[j];
++                    Index = i;
++                    SortRGBAxis = j;
++                }
++            }
++        }
++
++        if (MaxSize == -1)
++            return GIF_OK;
++
++        /* Split the entry Index into two along the axis SortRGBAxis: */
++
++        /* Sort all elements in that entry along the given axis and split at
++         * the median.  */
++        SortArray = (QuantizedColorType **)malloc(
++                      sizeof(QuantizedColorType *) * 
++                      NewColorSubdiv[Index].NumEntries);
++        if (SortArray == NULL)
++            return GIF_ERROR;
++        for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
++             j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
++             j++, QuantizedColor = QuantizedColor->Pnext)
++            SortArray[j] = QuantizedColor;
++
++        qsort(SortArray, NewColorSubdiv[Index].NumEntries,
++              sizeof(QuantizedColorType *), SortCmpRtn);
++
++        /* Relink the sorted list into one: */
++        for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
++            SortArray[j]->Pnext = SortArray[j + 1];
++        SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
++        NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
++        free((char *)SortArray);
++
++        /* Now simply add the Counts until we have half of the Count: */
++        Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
++        NumEntries = 1;
++        Count = QuantizedColor->Count;
++        while ((Sum -= QuantizedColor->Pnext->Count) >= 0 &&
++               QuantizedColor->Pnext != NULL &&
++               QuantizedColor->Pnext->Pnext != NULL) {
++            QuantizedColor = QuantizedColor->Pnext;
++            NumEntries++;
++            Count += QuantizedColor->Count;
++        }
++        /* Save the values of the last color of the first half, and first
++         * of the second half so we can update the Bounding Boxes later.
++         * Also as the colors are quantized and the BBoxes are full 0..255,
++         * they need to be rescaled.
++         */
++        MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
++        MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
++        MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
++        MinColor <<= (8 - BITS_PER_PRIM_COLOR);
++
++        /* Partition right here: */
++        NewColorSubdiv[*NewColorMapSize].QuantizedColors =
++           QuantizedColor->Pnext;
++        QuantizedColor->Pnext = NULL;
++        NewColorSubdiv[*NewColorMapSize].Count = Count;
++        NewColorSubdiv[Index].Count -= Count;
++        NewColorSubdiv[*NewColorMapSize].NumEntries =
++           NewColorSubdiv[Index].NumEntries - NumEntries;
++        NewColorSubdiv[Index].NumEntries = NumEntries;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
++               NewColorSubdiv[Index].RGBMin[j];
++            NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
++               NewColorSubdiv[Index].RGBWidth[j];
++        }
++        NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
++           NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
++           NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
++        NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
++
++        NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
++           MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
++
++        (*NewColorMapSize)++;
++    }
++
++    return GIF_OK;
++}
++
++/****************************************************************************
++ * Routine called by qsort to compare to entries.
++ ****************************************************************************/
++static int
++SortCmpRtn(const VoidPtr Entry1,
++           const VoidPtr Entry2) {
++
++    return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
++       (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
++}
+diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c
+--- giflib-4.2.1/util/rgb2gif.c.quantize	2012-10-09 00:28:12.000000000 -0300
++++ giflib-4.2.1/util/rgb2gif.c	2012-11-17 12:16:04.490735495 -0200
+@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1
+  *   This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
+  ******************************************************************************/
+ static int
+-QuantizeBuffer(unsigned int Width,
++GifQuantizeBuffer(unsigned int Width,
+                unsigned int Height,
+                int *ColorMapSize,
+                GifByteType * RedInput,
+@@ -428,7 +428,7 @@ int main(int argc, char **argv)
+ 					    sizeof(GifByteType))) == NULL)
+ 	GIF_EXIT("Failed to allocate memory required, aborted.");
+ 
+-    if (QuantizeBuffer(Width, Height, &ColorMapSize,
++    if (GifQuantizeBuffer(Width, Height, &ColorMapSize,
+ 		       RedBuffer, GreenBuffer, BlueBuffer,
+ 		       OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
+ 	QuitGifError(NULL);
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index 86075450f..871afe0b1 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160611 2012-06-02 21:10:00Z ibiru $
+# $Id: PKGBUILD 187060 2013-06-03 11:16:37Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: sh0 <mee@sh0.org>
 
 pkgname=iptraf-ng
 pkgver=1.1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
 url="https://fedorahosted.org/iptraf-ng/"
 arch=('i686' 'x86_64')
@@ -12,13 +12,20 @@ depends=('ncurses')
 license=('GPL2')
 replaces=('iptraf')
 options=('!libtool')
-source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('1a2c02944b0b012d6a3de96207610fa2')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz
+        iptraf-ng-linux-3.5-compat.patch)
+md5sums=('1a2c02944b0b012d6a3de96207610fa2'
+         'd2ddee5f9ff485155235f7cb4671d8fb')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i ${srcdir}/iptraf-ng-linux-3.5-compat.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --sbindir=/usr/sbin
+      --localstatedir=/var --sbindir=/usr/bin
   make CFLAGS="$CFLAGS -std=gnu99"
 }
 
diff --git a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch
new file mode 100644
index 000000000..85fd791df
--- /dev/null
+++ b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch
@@ -0,0 +1,127 @@
+From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
+From: Nikola Pajkovsky <npajkovs@redhat.com>
+Date: Wed, 23 May 2012 16:32:27 +0200
+Subject: [PATCH 01/91] token-ring: kernel v3.5 kill off token-ring support
+
+Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
+---
+ src/hostmon.c          | 10 ----------
+ src/iptraf-ng-compat.h |  1 -
+ src/othptab.c          |  6 ------
+ src/packet.c           | 27 ---------------------------
+ src/tcptable.c         |  4 ----
+ 5 files changed, 48 deletions(-)
+
+diff --git a/src/hostmon.c b/src/hostmon.c
+index 40a2b95..72b91f8 100644
+--- a/src/hostmon.c
++++ b/src/hostmon.c
+@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
+ 				       FDDI_K_ALEN);
+ 				list = flist;
+ 				break; }
+-			case ARPHRD_IEEE802:
+-			case ARPHRD_IEEE802_TR: {
+-				struct trh_hdr *hdr_trh =
+-					(struct trh_hdr *)pkt.pkt_buf;
+-				memcpy(scratch_saddr, hdr_trh->saddr,
+-				       TR_ALEN);
+-				memcpy(scratch_daddr, hdr_trh->daddr,
+-				       TR_ALEN);
+-				list = flist;
+-				break; }
+ 			default:
+ 				/* unknown link protocol */
+ 				continue;
+diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
+index d5aee4a..2d9da96 100644
+--- a/src/iptraf-ng-compat.h
++++ b/src/iptraf-ng-compat.h
+@@ -39,7 +39,6 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
+ #include <linux/types.h>
+ #include <linux/isdn.h>
+ 
+diff --git a/src/othptab.c b/src/othptab.c
+index d12cdfd..1181eb1 100644
+--- a/src/othptab.c
++++ b/src/othptab.c
+@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
+ 					      saddr), new_entry->smacaddr);
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      daddr), new_entry->dmacaddr);
+-		} else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
+-			   || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), new_entry->smacaddr);
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      daddr), new_entry->dmacaddr);
+ 		}
+ 	}
+ 
+diff --git a/src/packet.c b/src/packet.c
+index a43a27a..f3e4304 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
+ 	return (u_short) (~sum);
+ }
+ 
+-static unsigned int get_tr_ip_offset(char *pkt)
+-{
+-	struct trh_hdr *trh;
+-	unsigned int riflen = 0;
+-
+-	trh = (struct trh_hdr *) pkt;
+-
+-	/*
+-	 * Check if this packet has TR routing information and get
+-	 * its length.
+-	 */
+-	if (trh->saddr[0] & TR_RII)
+-		riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
+-
+-	return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
+-	    sizeof(struct trllc);
+-}
+-
+ static int packet_adjust(struct pkt_hdr *pkt)
+ {
+ 	int retval = 0;
+@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
+ 		pkt->pkt_payload += sizeof(struct fddihdr);
+ 		pkt->pkt_len -= sizeof(struct fddihdr);
+ 		break;
+-	case ARPHRD_IEEE802_TR:
+-	case ARPHRD_IEEE802:
+-		pkt->pkt_payload = pkt->pkt_buf;
+-		/* Token Ring patch supplied by Tomas Dvorak */
+-		/* Get the start of the IP packet from the Token Ring frame. */
+-		unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
+-		pkt->pkt_payload += dataoffset;
+-		pkt->pkt_len -= dataoffset;
+-		break;
+ 	default:
+ 		/* return a NULL packet to signal an unrecognized link */
+ 		/* protocol to the caller.  Hopefully, this switch statement */
+diff --git a/src/tcptable.c b/src/tcptable.c
+index 56c4780..b0e5ccc 100644
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
+ 		} else if (linkproto == ARPHRD_FDDI) {
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      saddr), newmacaddr);
+-		} else if ((linkproto == ARPHRD_IEEE802)
+-			   || (linkproto == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), newmacaddr);
+ 		}
+ 
+ 		if (tableentry->smacaddr[0] != '\0') {
+-- 
+1.8.3
+
diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD
index 81a787709..f46ee6a8b 100644
--- a/extra/libatasmart/PKGBUILD
+++ b/extra/libatasmart/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165610 2012-08-27 09:02:59Z jgc $
+# $Id: PKGBUILD 187061 2013-06-03 11:16:38Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libatasmart
 pkgver=0.19
-pkgrel=1
+pkgrel=2
 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -18,6 +18,7 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
+    --sbindir=/usr/bin \
     --disable-static
   make
 }
diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD
index de2d527e5..cf6c7cbde 100644
--- a/extra/libbonobo/PKGBUILD
+++ b/extra/libbonobo/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 177011 2013-02-04 08:29:28Z jgc $
+# $Id: PKGBUILD 187062 2013-06-03 11:16:40Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonobo
 pkgver=2.32.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('orbit2' 'libxml2' 'glib2')
+depends=('orbit2' 'libxml2' 'glib2' 'popt')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
@@ -18,9 +18,14 @@ install=libbonobo.install
 sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b'
             '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/bonobo
   make
diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD
index 37f66af52..c82f0757b 100644
--- a/extra/libsmbios/PKGBUILD
+++ b/extra/libsmbios/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 144413 2011-12-05 15:46:35Z jgc $
+# $Id: PKGBUILD 187063 2013-06-03 11:16:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: daniel g. siegel <dgsiegel@gmail.com> 
 
 pkgname=libsmbios
 pkgver=2.2.28
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for providing access to as much BIOS information as possible"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://linux.dell.com/libsmbios/main/index.html"
 license=('GPL' 'custom')
 depends=('gcc-libs')
@@ -21,7 +21,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   mkdir build
   cd build
-  PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc --disable-static
+  PYTHON=python2 ../configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-static
   mkdir -p out/libsmbios_c
   mkdir -p out/libsmbios_c++
   make
@@ -31,7 +31,7 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 
-  chrpath -d "${pkgdir}/usr/sbin/smbios-sys-info-lite"
+  chrpath -d "${pkgdir}/usr/bin/smbios-sys-info-lite"
 
   cp -a ../src/include/* "${pkgdir}/usr/include/"
   cp -a out/public-include/* "${pkgdir}/usr/include/"
@@ -40,7 +40,7 @@ package() {
   rm -rf "${pkgdir}/usr/lib/yum-plugins"
 
   sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|g' \
-      -i "${pkgdir}"/usr/sbin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info}
+      -i "${pkgdir}"/usr/bin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 ../COPYING-OSL "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD
index a50746dc0..4cfc24fef 100644
--- a/extra/lsof/PKGBUILD
+++ b/extra/lsof/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $
+# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -7,7 +7,7 @@
 
 pkgname=lsof
 pkgver=4.87
-pkgrel=1
+pkgrel=2
 pkgdesc="Lists open files for running Unix processes"
 arch=('i686' 'x86_64')
 url="http://people.freebsd.org/~abe/"
@@ -34,7 +34,7 @@ package() {
         $pkgdir/usr/share/doc/$pkgname/$file
     done
 
-	install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof 
+	install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof 
 	install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 
    
 	install -D -m0644 -o root -g root ${srcdir}/license.txt \
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 95c48d2c7..493f63cbf 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $
+# $Id: PKGBUILD 187065 2013-06-03 11:16:44Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=modemmanager
 _realname=ModemManager
 pkgver=0.7.990
-pkgrel=4
+pkgrel=5
 pkgdesc="Mobile broadband modem management service"
 arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 license=(GPL2)
-depends=(udev ppp libqmi polkit hicolor-icon-theme)
+depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme)
 makedepends=(intltool git gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
 install=modemmanager.install
 #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
-source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6")
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=67d3ed1")
 sha256sums=('SKIP')
 
 build() {
@@ -24,6 +24,7 @@ build() {
    ./autogen.sh --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
+        --sbindir=/usr/bin \
         --with-udev-base-dir=/usr/lib/udev \
         --disable-static \
         --with-polkit
diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install
index be187f2b4..d0e87bc18 100644
--- a/extra/modemmanager/modemmanager.install
+++ b/extra/modemmanager/modemmanager.install
@@ -1,6 +1,7 @@
 post_install() {
-  type -P gtk-update-icon-cache &>/dev/null &&
+  if type -P gtk-update-icon-cache &>/dev/null; then
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  fi
 }
 
 post_upgrade() {
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 95b103c05..134fab5cd 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $
+# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
 pkgver=1.4.31
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
@@ -48,7 +48,6 @@ package_msmtp-mta() {
   provides=('smtp-forwarder')
   conflicts=('smtp-forwarder')
 
-  install -d "${pkgdir}"/usr/{s,}bin
+  install -d "${pkgdir}"/usr/bin
   ln -s msmtp "${pkgdir}/usr/bin/sendmail"
-  ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail"
 }
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 01f43b2ba..5fc37eb52 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $
+# $Id: PKGBUILD 187067 2013-06-03 11:16:48Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -9,7 +9,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -27,31 +27,31 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+        NetworkManager.conf disable_set_hostname.patch)
 sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
-build() {
+prepare() {
   cd $_pkgname-$pkgver
-
   patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../dnsmasq-path.patch
-  #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+}
 
+build() {
+  cd $_pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/networkmanager \
+    --sbindir=/usr/bin \
     --with-crypto=nss \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/usr/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
+    --with-dhclient=/usr/bin/dhclient \
+    --with-dhcpcd=/usr/bin/dhcpcd \
+    --with-iptables=/usr/bin/iptables \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/sbin/resolvconf \
+    --with-resolvconf=/usr/bin/resolvconf \
     --with-session-tracking=systemd \
     --with-modem-manager-1 \
     --disable-static \
diff --git a/extra/networkmanager/dnsmasq-path.patch b/extra/networkmanager/dnsmasq-path.patch
deleted file mode 100644
index c0e713266..000000000
--- a/extra/networkmanager/dnsmasq-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
-@@ -52,8 +52,11 @@
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
-diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
-@@ -170,8 +170,11 @@
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index 48aa64667..c290417cc 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $
+# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=obex-data-server
 pkgver=0.4.6
-pkgrel=6
+pkgrel=7
 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
 arch=('i686' 'x86_64')
 url="http://wiki.muiline.com/obex-data-server"
 license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
+depends=('dbus-glib' 'openobex' 'imagemagick' 'libusb-compat')
 source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz"
         "obex-data-server-openobex17.patch")
 md5sums=('961ca5db6fe9c97024e133cc6203cc4d'
diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD
index 0565c319a..9e2abe7d4 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -1,37 +1,31 @@
-# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Maintainer: kevin <kevin@archlinux.org>
+# $Id: PKGBUILD 187097 2013-06-03 18:17:55Z eric $
+# Maintainer: 
 
 pkgname=perl-yaml-syck
-_realname=YAML-Syck
-pkgver=1.25
-pkgrel=2
+pkgver=1.27
+pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 arch=('i686' 'x86_64')
-license=('custom')
-url="http://search.cpan.org/dist/${_realname}/"
+url="http://search.cpan.org/dist/YAML-Syck/"
+license=('BSD' 'custom')
 depends=('perl')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
-md5sums=('847f315cbd074b42c44f360383ac13e9')
+source=(http://www.cpan.org/authors/id/T/TO/TODDR/YAML-Syck-$pkgver.tar.gz)
+md5sums=('8920091e68a078cfa9c42041e5759162')
 
 build() {
-  cd "${srcdir}/${_realname}-$pkgver"
-
-  # install module in vendor directories.
+  cd YAML-Syck-$pkgver
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_realname}-$pkgver"
+  cd YAML-Syck-$pkgver
   make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-$pkgver"
+  cd YAML-Syck-$pkgver
   make install DESTDIR="${pkgdir}"
-
-  # license.
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD
index 9f861a506..d6e079c5c 100644
--- a/extra/pm-utils/PKGBUILD
+++ b/extra/pm-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $
+# $Id: PKGBUILD 187068 2013-06-03 11:16:50Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
 arch=('i686' 'x86_64')
 url="http://pm-utils.freedesktop.org"
@@ -31,6 +31,7 @@ build() {
   patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch"
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
+      --sbindir=/usr/bin \
       --localstatedir=/var
   make
 }
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index ac465b8a6..9dad6a619 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $
+# $Id: PKGBUILD 187069 2013-06-03 11:16:51Z allan $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.10.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
@@ -15,12 +15,10 @@ depends=('pcre' 'libsasl' 'libldap' 'db'
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'aliases.patch'
-        'service'
-        'rc.d')
+        'service')
 sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
+          '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
 
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
@@ -38,10 +36,12 @@ build() {
 		-DHAS_PGSQL -I/usr/include/postgresql \
 		-DHAS_SQLITE \
 		-DHAS_CDB \
-		-DDEF_MANPAGE_DIR=\"/usr/share/man\" \
+		-DDEF_COMMAND_DIR=\"/usr/bin\" \
 		-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
-		-DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \
+		-DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \
 		-DDEF_README_DIR=\"/usr/share/doc/postfix\" \
+		-DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \
+		-DDEF_MANPAGE_DIR=\"/usr/share/man\" \
 	' AUXLIBS=' \
 		-lsasl2 \
 		-lldap -llber \
@@ -60,7 +60,6 @@ package() {
 
 	sh postfix-install -non-interactive install_root="${pkgdir}"
 
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/extra/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 274020c5c..087b35c41 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172942 2012-12-07 18:25:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $
+# Maintainer:
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
 
 pkgname=rtmpdump
 pkgver=20121203
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to download rtmp streams"
 arch=('i686' 'x86_64')
 url="http://rtmpdump.mplayerhq.hu/"
@@ -22,4 +22,8 @@ build() {
 
 package() {
     make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin/* usr/bin
+        rmdir usr/sbin
 }
diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
new file mode 100644
index 000000000..8bfd29b66
--- /dev/null
+++ b/extra/sane/1.0.23-hp2400c.patch
@@ -0,0 +1,81 @@
+From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
+Date: Mon, 3 Jun 2013 06:33:08 +0200
+Subject: [PATCH] bug 314293 fix
+
+- don't use non-existent end of records
+---
+ ChangeLog               |    3 +++
+ backend/genesys_gl646.c |   14 +++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
+index c6a5af5..2d5cddc 100644
+--- a/backend/genesys_gl646.c
++++ b/backend/genesys_gl646.c
+@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
+   i = 0;
+   dpi = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* computes distance and keep mode if it is closer than previous */
+       if (sensor == sensor_master[i].sensor
+@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
+   dpi = 0;
+   dist = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
+    * sensor mode setting */
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->ccd_type == sensor_master[i].sensor
+ 	  && sensor_master[i].dpi == xresolution
+@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
+    * motor mode setting */
+   i = 0;
+   nb = sizeof (motor_master) / sizeof (Motor_Master);
+-  while (motor_master[i].motor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->motor_type == motor_master[i].motor
+ 	  && motor_master[i].dpi == resolution
+@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
+   /* now we can search for the specific sensor settings */
+   i = 0;
+   nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
+-  while (sensor_settings[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (sensor->sensor == sensor_settings[i].sensor
+ 	  && sensor->cksel == sensor_settings[i].cksel)
+-- 
+1.7.2.5
+
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index e43ede0ad..966dccd0c 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $
+# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
@@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'saned.socket'
         'saned.service'
         'kodakaio.c.patch'
-        'network.patch')
+        'network.patch'
+        '1.0.23-hp2400c.patch')
 options=(!libtool)
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
+   # fix FS#35549
+   patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
    # fix FS#33657
    patch -Np0 -i ${srcdir}/kodakaio.c.patch
    # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
@@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573'
          'e57e9e15528f47f5f1b3f1411135ed5d'
          '3f9fe36b0c4ff0b01b53b1cffa5d9700'
          'e65dbefb7c3d69955fb6eb3ace14aa12'
-         '44e77692c52db15b0f530a1d9a8e1296')
+         '44e77692c52db15b0f530a1d9a8e1296'
+         '0c8bfabcaa499c4a2583aa2fe53d1686')
diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD
index 755a1c863..44f914776 100644
--- a/extra/ssmtp/PKGBUILD
+++ b/extra/ssmtp/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
+# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $
+# Maintainer:
 
 pkgname=ssmtp
 pkgver=2.64
-pkgrel=3
+pkgrel=4
 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://packages.debian.org/stable/mail/ssmtp"
-depends=('openssl')
+depends=('openssl' 'inetutils')
 conflicts=('exim')
 provides=('smtp-forwarder')
 backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases')
@@ -40,4 +40,7 @@ package() {
    ln -s ssmtp "${pkgdir}/usr/sbin/sendmail"
    ln -s ssmtp "${pkgdir}/usr/sbin/newaliases"
    ln -s ssmtp "${pkgdir}/usr/sbin/mailq"
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin usr/bin
 }
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index a31369dd9..fe22ae96f 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $
+# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs' 'qt4')
+depends=('dbus' 'exiv2' 'libxml2' 'boost-libs')
 makedepends=('cmake' 'pkg-config' 'boost')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
-source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d69443234f4286d71997db9de543331a')
+source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc48.patch')
+md5sums=('d69443234f4286d71997db9de543331a'
+         'd48d65014650644ba61821813101c2f4')
 
-build() {
-  . /etc/profile.d/qt4.sh
+prepare() {
+  cd ${pkgname}-${pkgver}/libstreams
+  patch -p1 -i "${srcdir}"/gcc48.patch
+}
 
+build() {
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -31,24 +36,12 @@ build() {
     -DENABLE_FAM=OFF \
     -DENABLE_CLUCENE=OFF \
     -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
+    -DENABLE_FFMPEG=OFF \
+    -DENABLE_QT4=OFF
   make
 }
 
 package() {
-  pushd build/libstreams
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/libstreamanalyzer
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/strigiclient/lib/searchclient/qtdbus
-  make DESTDIR="${pkgdir}" install
-  popd
-  
-  pushd build/strigiutils
+  cd build
   make DESTDIR="${pkgdir}" install
-  popd
 }
diff --git a/extra/strigi/gcc48.patch b/extra/strigi/gcc48.patch
new file mode 100644
index 000000000..ed60e4fbb
--- /dev/null
+++ b/extra/strigi/gcc48.patch
@@ -0,0 +1,12 @@
+--- a/include/strigi/bufferedstream.h
++++ b/include/strigi/bufferedstream.h
+@@ -34,7 +34,7 @@
+  * BufferedStream will do the rest.
+  */
+ template <class T>
+-class BufferedStream : public StreamBase<T> {
++class STREAMS_EXPORT BufferedStream : public StreamBase<T> {
+ private:
+     StreamBuffer<T> buffer;
+     bool finishedWritingToBuffer;
+
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index a882cbfb3..bbbe9040d 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $
+# $Id: PKGBUILD 187009 2013-06-03 08:16:28Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Christopher Reimer <c.reimer1993@gmail.com>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
-pkgver=1.0.7.16
-pkgrel=2
+pkgver=1.0.7.19
+pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64')
 url="http://www.texmacs.org/"
@@ -19,7 +18,7 @@ optdepends=('transfig: convert images using fig2ps'
 source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
 install=texmacs.install
 options=('!emptydirs')
-sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231')
+sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
@@ -33,7 +32,10 @@ build() {
   sed -i '/update-mime-database/d' Makefile.in
   sed -i '/gtk-update-icon-cache/d' Makefile.in
   sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
-
+  
+  export QMAKE=qmake-qt4
+  export MOC=moc-qt4
+  export UIC=uic-qt4
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --libexecdir=/usr/lib
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 9ae7f37fd..1f33526b9 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $
+# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -19,6 +19,7 @@ sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8')
 build() {
   cd "udisks-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
+      --sbindir=/usr/bin \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --localstatedir=/var --disable-static
   make
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index 4666b7cef..beb49de32 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $
+# $Id: PKGBUILD 187073 2013-06-03 11:16:58Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=usbmuxd
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64')
@@ -32,10 +32,13 @@ package() {
   # fix udev dir being hardcoded
   mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
   rmdir "${pkgdir}/lib"
+  # usrmove
+  mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/"
+  rmdir "${pkgdir}/usr/sbin"
   # install systemd service file
   install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
   # use udev rule that works with systemd
-  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
+  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ 
 }
 md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
          'dae0660f972510a6483992b5b81e1b5a'
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 7dc7aaa02..94ad1cf44 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $
+# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -23,7 +23,7 @@ options=(!libtool)
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD
index 13cc2eb7d..96304c84d 100644
--- a/extra/v86d/PKGBUILD
+++ b/extra/v86d/PKGBUILD
@@ -1,36 +1,41 @@
-# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# $Id: PKGBUILD 187075 2013-06-03 11:17:01Z allan $
+# Maintainer:
 
 pkgname=v86d
 pkgver=0.1.10
-pkgrel=4
+pkgrel=5
 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
 arch=('i686' 'x86_64')
-url="http://dev.gentoo.org/~spock/projects/uvesafb/"
+url="https://github.com/mjanusz/v86d"
 license=('GPL2')
 depends=('glibc')
+makedepends=('git')
 options=('!makeflags')
-source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
-        v86d
+source=("git://github.com/mjanusz/v86d.git#tag=$pkgname-$pkgver"
+        v86d_install
         v86d_hook
         modprobe.uvesafb)
-md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
+md5sums=(SKIP
          '66ab32602ab29cc5635eaac7f3e42283'
          '5f75b8bc4a7ddf595014591e5db263cb'
          '2d7cc8dc6a41916a13869212d0191147')
 
 build() {
-  cd "$srcdir/v86d-$pkgver"
+  cd "$pkgname"
   ./configure --with-x86emu
   # we only need /usr/include/video/uvesafb.h
   make KDIR=/usr
 }
 
 package() {
-  cd "$srcdir/v86d-$pkgver"
+  cd "$pkgname"
   make DESTDIR="$pkgdir" install
 
-  install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d"
+  install -D -m644 "$srcdir/v86d_install" "$pkgdir/usr/lib/initcpio/install/v86d"
   install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d"
   install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf"
+
+  # usrmove
+  cd "$pkgdir"
+  mv sbin usr/bin
 }
diff --git a/extra/v86d/v86d b/extra/v86d/v86d_install
index 840b34eec..840b34eec 100644
--- a/extra/v86d/v86d
+++ b/extra/v86d/v86d_install
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index df19144f9..802d06d87 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $
+# $Id: PKGBUILD 187076 2013-06-03 11:17:02Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
 pkgver=5.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/watchdog"
@@ -15,14 +15,18 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.systemd)
 md5sums=('153455f008f1cf8f65f6ad9586a21ff1'
          'c90c2686975b5254f82b3de683f1f442'
-         'a835ae5cbdbb21c19a468dedb5d734e4')
+         '06677f094ec76b7fbb7b0db141209dec')
+prepare() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
+}
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
   ./configure \
 	--prefix=/usr \
+        --sbindir=/usr/bin \
 	--mandir=/usr/share/man \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd
index 57c73fb45..4bd08f95c 100644
--- a/extra/watchdog/watchdog.systemd
+++ b/extra/watchdog/watchdog.systemd
@@ -4,7 +4,7 @@ Description=Watchdog Daemon
 [Service]
 Type=forking
 PIDFile=/run/watchdog.pid
-ExecStart=/usr/sbin/watchdog
+ExecStart=/usr/bin/watchdog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index 7beeec21f..c90e36cc5 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $
+# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=wpa_supplicant_gui
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64')
@@ -13,16 +13,15 @@ source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
 sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09')
 
 build() {
-  . /etc/profile.d/qt4.sh
   cd wpa_supplicant-${pkgver}
   cd wpa_supplicant/wpa_gui-qt4
-  qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" 
+  qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" 
   make
 }
 
 package() {
   cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4"
-  install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui"
+  install -Dm755 wpa_gui "${pkgdir}/usr/bin/wpa_gui"
   install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg"
   install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop"
   install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index 4fd34a023..2b2edf481 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $
+# $Id: PKGBUILD 187079 2013-06-03 11:17:12Z allan $
 # Mantainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=yp-tools
 pkgver=2.14
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux NIS Tools'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/yp-tools/'
@@ -29,6 +29,10 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname"
 	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
+	# usrmove
+	cd "$pkgdir"
+	mv usr/sbin/* usr/bin
+	rmdir usr/sbin
 }
 md5sums=('ba1f121c17e3ad65368be173b977cd13'
          '5a78cd2218936241133e5f61383a2dc8'
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 2ec03a9e5..a922500b2 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $
+# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=5.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -11,7 +11,7 @@ license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 backup=('etc/zsh/zprofile')
 install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
 md5sums=('b8f2ad691acf58b3252225746480dcad'
          '24a9335edf77252a7b5f52e079f7aef7')
@@ -19,12 +19,6 @@ md5sums=('b8f2ad691acf58b3252225746480dcad'
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# FS#16360
-	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
-				 Doc/zsh.texi \
-				 Completion/Unix/Type/_services \
-				 Completion/Unix/Command/_init_d
-
 	# Set correct keymap path
 	sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
 
@@ -34,7 +28,6 @@ build() {
 	rm -f  Completion/Unix/Command/_osc
 
 	./configure --prefix=/usr \
-		--bindir=/bin \
 		--enable-etcdir=/etc/zsh \
 		--enable-zshenv=/etc/zsh/zshenv \
 		--enable-zlogin=/etc/zsh/zlogin \
@@ -51,7 +44,7 @@ build() {
 		--enable-pcre \
 		--enable-cap \
 		--enable-zsh-secure-free
-	make all info
+	make
 }
 
 check() {
@@ -61,7 +54,7 @@ check() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install install.info
+	make DESTDIR="${pkgdir}/" install
 	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
 	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install
index 8e54d92ee..a2aafa252 100644
--- a/extra/zsh/zsh.install
+++ b/extra/zsh/zsh.install
@@ -1,12 +1,5 @@
-infodir=usr/share/info
-filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6)
-
 post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-	[ -x usr/bin/install-info ] || return 0
-	for file in ${filelist[@]}; do
-	    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-	done
+	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
 }
 
 post_upgrade() {
@@ -14,9 +7,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-	[ -x usr/bin/install-info ] || return 0
-	for file in ${filelist[@]}; do
-	    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-	done
+	sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
 }
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index b46b4321c..5c0a18f2c 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $
+# $Id: PKGBUILD 187081 2013-06-03 11:17:17Z allan $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=zvbi
 pkgver=0.2.33
-pkgrel=5
+pkgrel=6
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
 arch=('i686' 'x86_64')
@@ -35,4 +35,9 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin/* usr/bin/
+        rmdir usr/sbin
 }