Merge branch 'master' of gitpar:abslibre-mips64el

428 files changed, 7594 insertions, 1692 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
new file mode 100644
index 000000000..8a84fc0e9
--- /dev/null
+++ b/community/0ad/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
+pkgname=0ad
+pkgver=a8
+_pkgver=r10803-alpha
+pkgrel=1
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('i686' 'x86_64')
+url="http://wildfiregames.com/0ad"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data')
+makedepends=('boost' 'cmake' 'mesa')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
+md5sums=('92ac750c433a8aea4db602019b27a274')
+
+build() {
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+  sed -i 's/unix_names = { "boost_signals-mt", "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_signals", "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
+
+  # next version use this
+  # sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
+  # sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
+
+
+  ./update-workspaces.sh \
+      --with-system-enet \
+      --bindir=/usr/bin \
+      --libdir=/usr/lib \
+      --datadir=/usr/share/${pkgname}/data
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  make CONFIG=Release
+}
+
+package() {
+  install -d ${pkgdir}/usr/{bin,lib}
+  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin
+  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib
+
+  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
diff --git a/community/acpi/PKGBUILD b/community/acpi/PKGBUILD
new file mode 100644
index 000000000..634c26b0f
--- /dev/null
+++ b/community/acpi/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 148027 2012-01-30 03:41:28Z dan $
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=acpi
+pkgver=1.6
+pkgrel=1
+pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/acpiclient"
+depends=('glibc')
+source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
+license=('GPL2')
+sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
new file mode 100644
index 000000000..fa62a9ebb
--- /dev/null
+++ b/community/acpid/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 67166 2012-03-05 00:42:11Z pschmitz $
+# Maintainer:
+# Contributor: xduugu
+# Contributor: Manolis Tzanidakis
+# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
+
+pkgname=acpid
+pkgver=2.0.14
+pkgrel=1
+pkgdesc="A daemon for delivering ACPI power management events with netlink support"
+arch=('i686' 'x86_64')
+url="http://tedfelix.com/linux/acpid-netlink.html"
+license=('GPL')
+depends=('bash')
+replaces=('acpid2')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
+        'acpid'
+        'anything'
+        'handler.sh'
+        'acpid.conf.d')
+md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
+         'd69203a032c4583f9abaafcf21a7ed84'
+         '2d37b98d6e74bab815604b8b48c6cfd4'
+         'd411b758e8531adee191b66bcbc2892d'
+         '929c6d2e91295c22ed9ec6212d7eabef')
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
+  install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
+  install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
+  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
+
+  chmod 755 "${pkgdir}"/usr/sbin/acpid
+}
diff --git a/community/acpid/acpid b/community/acpid/acpid
new file mode 100644
index 000000000..288ac078d
--- /dev/null
+++ b/community/acpid/acpid
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid
+
+PID=`pidof -o %PPID /usr/sbin/acpid`
+case "$1" in
+  start)
+    stat_busy "Starting acpid"
+    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon acpid
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping acpid"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon acpid
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/acpid/acpid.conf.d b/community/acpid/acpid.conf.d
new file mode 100644
index 000000000..b60103a2d
--- /dev/null
+++ b/community/acpid/acpid.conf.d
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the acpid daemon
+#
+
+ACPID_ARGS=""
diff --git a/community/acpid/anything b/community/acpid/anything
new file mode 100644
index 000000000..d1828989b
--- /dev/null
+++ b/community/acpid/anything
@@ -0,0 +1,3 @@
+# Pass all events to our one handler script
+event=.*
+action=/etc/acpi/handler.sh %e
diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh
new file mode 100644
index 000000000..505ed7c11
--- /dev/null
+++ b/community/acpid/handler.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Default acpi script that takes an entry for all actions
+
+minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
+maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
+setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
+
+set $*
+
+case "$1" in
+    button/power)
+        #echo "PowerButton pressed!">/dev/tty5
+        case "$2" in
+            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
+            *)          logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    button/sleep)
+        case "$2" in
+            SLPB)   echo -n mem >/sys/power/state ;;
+            *)      logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    ac_adapter)
+        case "$2" in
+            AC|ACAD|ADP0)
+                case "$4" in
+                    00000000)
+                        echo -n $minspeed >$setspeed
+                        #/etc/laptop-mode/laptop-mode start
+                    ;;
+                    00000001)
+                        echo -n $maxspeed >$setspeed
+                        #/etc/laptop-mode/laptop-mode stop
+                    ;;
+                esac
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    battery)
+        case "$2" in
+            BAT0)
+                case "$4" in
+                    00000000)   #echo "offline" >/dev/tty5
+                    ;;
+                    00000001)   #echo "online"  >/dev/tty5
+                    ;;
+                esac
+                ;;
+            CPU0)	
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    button/lid)
+       	case "$3" in
+	    close)
+		#echo "LID closed!">/dev/tty5
+		;;
+	    open)
+		#echo "LID opened!">/dev/tty5
+        	;;
+	esac
+	;;
+
+    *)
+        logger "ACPI group/action undefined: $1 / $2"
+        ;;
+esac
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
new file mode 100644
index 000000000..4f078a8ca
--- /dev/null
+++ b/community/alex/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 67160 2012-03-05 00:29:42Z pschmitz $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Philip Nilsson <pnilsson@nullref.se>
+
+pkgname=alex
+pkgver=3.0.1
+pkgrel=1
+pkgdesc='a lexical analyser generator for Haskell'
+arch=('i686' 'x86_64')
+url='http://www.haskell.org/alex/'
+license=('custom:BSD3')
+depends=('gmp')
+makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
+source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('5dec239c89165d159faa2154bc0724cd')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
+  runghc Setup.lhs build
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  runghc Setup.lhs copy --destdir=$pkgdir
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
+
+  # doc/ contains only license which already installed into proper place
+  rm -rf $pkgdir/usr/share/doc
+}
diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD
new file mode 100644
index 000000000..8e5a88a8b
--- /dev/null
+++ b/community/allegro/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 146876 2012-01-19 02:37:24Z eric $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: arjan <arjan@archlinux.org>
+
+pkgname=allegro
+pkgver=5.0.6
+pkgrel=1
+pkgdesc="Portable library mainly aimed at video game and multimedia programming"
+arch=('x86_64' 'i686')
+url="http://alleg.sourceforge.net/"
+license=('custom')
+depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
+makedepends=('cmake' 'mesa' 'freetype2')
+source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz")
+sha256sums=('d981a1cac937085e6636e597c492ddb743066516c1d215c2a39e4049bd70dc24')
+
+build() {
+  mkdir build
+  cd build
+  cmake "../$pkgname-$pkgver" \
+  	-DCMAKE_BUILD_TYPE=Release \
+  	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DWANT_DOCS=OFF
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "../$pkgname-$pkgver/LICENSE.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD
index e9aef2380..287ded396 100644
--- a/community/aspell-cs/PKGBUILD
+++ b/community/aspell-cs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 43275 2011-03-24 13:21:51Z andrea $
+# $Id: PKGBUILD 67108 2012-03-04 12:33:51Z stativ $
 # Maintainer: Jaroslav Lichtblau <tu@dragonlord.cz>
 # Contributor: Michal Karas <largon@largon.net>
 
 pkgname=aspell-cs
 pkgver=20040614
-pkgrel=5
+pkgrel=6
 pkgdesc="Czech dictionary for aspell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
@@ -14,14 +14,14 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$pkgver-1.tar.bz2)
 md5sums=('50f0c2b7b6fcfe47bb647ad8993d2fe8')
 
 build() {
-  cd aspell6-cs-$pkgver-1
+  cd "$srcdir"/aspell6-cs-$pkgver-1
 
   ./configure
   make
 }
 
 package() {
-  cd aspell6-cs-$pkgver-1
+  cd "$srcdir"/aspell6-cs-$pkgver-1
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 5dfb0c657..346343521 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56999 2011-10-18 03:48:36Z ebelanger $
+# $Id: PKGBUILD 67099 2012-03-04 08:25:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
 # Contributor: Charlie Cox <ccoxiv@yahoo.com>
 
 pkgname=atanks
-pkgver=5.2
+pkgver=5.3
 pkgrel=1
 pkgdesc="Atomic Tanks"
 url="http://atanks.sourceforge.net"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 makedepends=('sed')
 depends=('allegro4>=4.4.0.1' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
-md5sums=('05bedbb7b3f50831a30b47f7776c8c1a')
+md5sums=('33e344eb18b1421df120a59696958d5c')
 
 build() {
   cd atanks-${pkgver}
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index d5ee232b4..b4c2d8a56 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 57389 2011-10-26 20:55:52Z mtorromeo $
+# $Id: PKGBUILD 67260 2012-03-05 23:04:32Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.1.3
+pkgver=2.2
 pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
 arch=(i686 x86_64)
-depends=(linux-headers python2 libldap)
-makedepends=(libldap swig)
+depends=(krb5 libcap-ng)
+makedepends=(libldap swig linux-headers python2)
 license=(GPL)
 options=(!libtool emptydirs)
 backup=(
@@ -30,11 +30,9 @@ source=(
 	auditd.rc
 	python2.patch
 )
-md5sums=(
-	abf26e3ac09f666905c5636dd24611fa
-	bd5574064e0c88748aebf0cd92ebcf0c
-	45a33c6bef84f8e1701cb0b5e187336b
-)
+md5sums=('b60366dbe0c3a7497bdd8b3f7065b266'
+         '5f86e87354d0c3b9b408a26daed7a906'
+         '45a33c6bef84f8e1701cb0b5e187336b')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -43,7 +41,9 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/audit \
-		--with-apparmor
+		--with-python=yes \
+		--enable-gssapi-krb5=yes \
+		--with-libcap-ng=yes #--with-apparmor=yes
 	make
 }
 
diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc
index ea2e305ba..69764aa73 100755
--- a/community/audit/auditd.rc
+++ b/community/audit/auditd.rc
@@ -9,15 +9,11 @@ case "$1" in
 	start)
 		stat_busy "Starting auditd"
 		[ -z "$PID" ] && {
-			/sbin/auditctl -R /etc/audit/audit.rules >/dev/null
-			/sbin/auditd
+			/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
+			/sbin/auditd || stat_die
 		}
-		if [ $? -ne 0 ]; then
-			stat_fail
-		else
-			add_daemon auditd
-			stat_done
-		fi
+		add_daemon auditd
+		stat_done
 		;;
 
 	stop)
@@ -49,7 +45,7 @@ case "$1" in
 		;;
 
 	*)
-		echo "usage: $0 {start|stop|restart|reload}"  
+		echo "usage: $0 {start|stop|restart|reload}"
 esac
 
 exit 0
diff --git a/community/bin2iso/PKGBUILD b/community/bin2iso/PKGBUILD
index cba38728a..c6d211426 100644
--- a/community/bin2iso/PKGBUILD
+++ b/community/bin2iso/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 21845 2010-07-17 17:50:15Z dgriffiths $
-# Contributer: Benjamin Andresen <benny@klapmuetz.org>
+# $Id: PKGBUILD 67258 2012-03-05 22:50:06Z arodseth $
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+# Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: Thomas Baechler <thomas.baechler@rwth-aachen.de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=bin2iso
 pkgver=1.9b
 _dlver=${pkgver/./}
-pkgrel=2
-pkgdesc="bin2iso converts RAW format (.bin/.cue) files to ISO/WAV format"
+pkgrel=3
+pkgdesc="Converts RAW format (.bin/.cue) files to ISO/WAV format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://users.eastlink.ca/~doiron/bin2iso/"
 license=('GPL')
 depends=('glibc')
-source=(http://users.eastlink.ca/~doiron/${pkgname}/linux/${pkgname}${_dlver}_linux.c)
-md5sums=('01dab72496175a772bcf6e08c854d440')
-
-build() {
-	/bin/true
-}
+source=("http://users.eastlink.ca/~doiron/$pkgname/linux/$pkgname${_dlver}_linux.c")
+sha256sums=('1e8a6ae79e91325acd50f3a0e506edf4d8cb57b72d1dcfd8b276a04aff82e43d')
 
 package() {
-	cd ${srcdir}
-	[ -z "$CC" ] && CC=gcc
-	$CC $CFLAGS -Wall -o ${pkgname} ${pkgname}${_dlver}_linux.c || return 1
-	install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  cd "$srcdir"
+
+  [ -z "$CC" ] && CC=gcc
+  $CC $CFLAGS -Wall -o "$pkgname" "$pkgname${_dlver}_linux.c"
+  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index 60a9f9983..e57e82843 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64569 2012-02-16 20:09:53Z svenstaro $
+# $Id: PKGBUILD 67172 2012-03-05 08:56:35Z ibiru $
 # Contributor: John Sowiak <john@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
@@ -14,7 +14,7 @@ _svn=false
 
 pkgname=blender
 pkgver=2.62
-pkgrel=1
+pkgrel=2
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 80998bfd6..7cd8d1484 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.19.4
 pkgrel=1
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64" 'mips64el')
-url="http://busybox.net"
+url="http://www.busybox.net"
 license=('GPL')
 makedepends=("make" "gcc" "sed" "ncurses")
 source=($url/downloads/$pkgname-$pkgver.tar.bz2
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
index 3f0bbe4ab..e4577bd84 100644
--- a/community/camlp5/PKGBUILD
+++ b/community/camlp5/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Massimiliano Brocchini <brocchini@netseven.it>
 
 pkgname=('camlp5' 'camlp5-transitional')
-_baseversion=6.03
+_baseversion=6.05
 _patchlevel=0
 #pkgver=${_baseversion}.${_patchlevel}
 pkgver=${_baseversion}
@@ -18,8 +18,7 @@ source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${_baseversion}
 for i in $(seq ${_patchlevel}); do
   source+=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${_baseversion}-${i}")
 done
-
-md5sums=('4988b871dc1ce713476819805b6dd7c6')
+md5sums=('51e333f027ead70aa1b0cd7993320e24')
 
 build() {
   cd camlp5-${_baseversion}
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index a7b45ed08..508f5ea7e 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64309 2012-02-11 23:19:16Z allan $
+# $Id: PKGBUILD 67251 2012-03-05 20:57:45Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.8
-pkgrel=2
+pkgver=0.7.9
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('01ffbe54e48440721b3c283c993928f1')
+md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD
index 68d86922c..3a43d3d81 100644
--- a/community/choqok/PKGBUILD
+++ b/community/choqok/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 61252 2011-12-26 11:59:59Z andrea $
+# $Id: PKGBUILD 67102 2012-03-04 10:12:03Z andrea $
 # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Emanuele Rossi <newdna1510@yahoo.it>
 # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
 
 pkgname=choqok
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
 pkgdesc="A Twitter/identi.ca/laconica client for KDE"
-url="http://choqok.gnufolks.org/"
+url='http://choqok.gnufolks.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
@@ -16,20 +16,19 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror: proxy support')
 install="${pkgname}.install"
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('05d01f4c93c081f3a84ea013cfba7229')
+md5sums=('87eea4f2c23467fb021e3e6b794eb37d')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKWEBKITPART_LIBRARIES=/usr/lib/kde4/
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index efdc0b91d..5e0d912fd 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=chrony
 pkgver=1.26
 pkgrel=2
 pkgdesc="Dial-up friendly NTP daemon and excellent replacement for NTP on desktop systems"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
 options=('strip')
 license=('GPL')
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 5c3163f90..1a340f999 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,21 +1,17 @@
-# $Id: PKGBUILD 62636 2012-01-23 00:53:34Z lfleischer $
+# $Id: PKGBUILD 67249 2012-03-05 20:47:53Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
-pkgver=0.6.17
-pkgrel=4
-pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm'
+pkgver=0.6.18
+pkgrel=2
+pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
-depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"
-        'botobackend.patch'
-        'duplicity-0.6.17-fix-memleak.patch')
-md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f'
-         '49bbdc327230fe5985d18eaae37eec0c'
-         'b77e98d006842414fdda9662c8081d3b')
+depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface' 'python-paramiko')
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('66b5e64de43e09d3c3ff9890faf9de07')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,12 +22,6 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  # add hotfix issued by upstream (FS#27390)
-  patch -p0 -i ../botobackend.patch
-
-  # fix a memory leak (upstream bug #908228)
-  patch -p0 -i ../duplicity-0.6.17-fix-memleak.patch
-
   python2 setup.py install --root="$pkgdir" --optimize=1
 
   # fix broken documentation permissions until upstream does (FS#27301)
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 402c2e4ea..6d0ec155b 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59928 2011-12-02 20:58:12Z ibiru $
+# $Id: PKGBUILD 67176 2012-03-05 08:56:46Z ibiru $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=encfs
 pkgver=1.7.4
-pkgrel=6
+pkgrel=7
 pkgdesc='Encrypted filesystem in user-space'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.arg0.net/encfs'
diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD
index caee5b9a3..93ec88a20 100644
--- a/community/espeak/PKGBUILD
+++ b/community/espeak/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 61395 2011-12-30 08:21:47Z bpiotrowski $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: niQo
+# $Id: PKGBUILD 67106 2012-03-04 10:23:58Z andrea $
+# Maintainer:
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Christoph Siegenthaler <csi@gmx.ch>
 
 pkgname=espeak
-pkgver=1.46.01
+pkgver=1.46.02
 pkgrel=1
 pkgdesc="Text to Speech engine for good quality English, with support for other languages"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://espeak.sourceforge.net/"
+url='http://espeak.sourceforge.net/'
 license=('GPL')
 depends=('gcc-libs' 'portaudio')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip)
-md5sums=('a3e9de4b2a56ec19c059115dca587494')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-source.zip")
+md5sums=('84e8e44562f05a3afc5427218afc8af1')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver-source/src
 	cp portaudio19.h portaudio.h
 	make
 }
+
 package() {
 	cd $srcdir/$pkgname-$pkgver-source/src
 	make DESTDIR=$pkgdir install
-	find "$pkgdir/usr/share/espeak-data" -type f -print0 |xargs -0 chmod 644
+
+    # Fix permissions
+    chmod 644 ${pkgdir}/usr/lib/libespeak.a
 }
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 09ae546f0..f914a6d91 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61071 2011-12-21 20:50:30Z andrea $
+# $Id: PKGBUILD 67178 2012-03-05 08:56:50Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=fatrat
 pkgver=1.2.0_beta1
-pkgrel=3
+pkgrel=4
 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fatrat.dolezel.info/"
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index fdddeba55..151e68d24 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -12,7 +12,7 @@ url="http://www.flashrom.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libftdi' 'pciutils')
-optdepends=('dmidecode: for SMBIOS/DMI table decoder support')
+[ "$CARCH" != "mips64el" ] && optdepends=('dmidecode: for SMBIOS/DMI table decoder support')
 source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('3b82658d71fb852aa45001cdf5f3e013')
 
diff --git a/community/gftp/PKGBUILD b/community/gftp/PKGBUILD
new file mode 100644
index 000000000..ecf7042e2
--- /dev/null
+++ b/community/gftp/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 67144 2012-03-05 00:04:12Z pschmitz $
+# Maintainer:
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+
+pkgname=gftp
+pkgver=2.0.19
+pkgrel=4
+pkgdesc="A multithreaded ftp client for X Windows"
+arch=('i686' 'x86_64')
+url="http://www.gftp.org/"
+license=('GPL2')
+depends=('gtk2' 'openssl' 'readline')
+source=(http://www.gftp.org/$pkgname-$pkgver.tar.bz2)
+md5sums=('5183cb4955d94be0e03c892585547c64')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr --mandir=/usr/share/man
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}
diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD
new file mode 100644
index 000000000..5cc3b5703
--- /dev/null
+++ b/community/gimp-refocus/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $
+# Maintainer: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+pkgname=gimp-refocus
+pkgver=0.9.0
+pkgrel=3
+pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering"
+arch=('i686' 'x86_64')
+url="http://refocus.sourceforge.net/"
+license=('GPL2')
+depends=('gimp')
+source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \
+        refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch)
+md5sums=('8d4eac4ef45c904fb5e73021696bec94'
+         '8ef9dfe697cd20be2be14c1ee53a240a'
+         '532593cba030feab8ffa7800fc9cd782'
+         '6b55dbdc656646c765064cf21e1a3c57')
+
+build() {
+  cd "${srcdir}/refocus-${pkgver}"
+  patch -Np0 -i ../refocus-gimp-2.0.patch
+  patch -Np0 -i ../refocus-mirror-fix.patch
+  patch -Np0 -i ../refocus-gimp-preview.patch
+  aclocal
+  autoconf
+  automake --add-missing
+  ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins
+  make
+}
+
+package() {
+  cd "${srcdir}/refocus-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch
new file mode 100644
index 000000000..259ee9f87
--- /dev/null
+++ b/community/gimp-refocus/refocus-gimp-2.0.patch
@@ -0,0 +1,209 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/refocus/refocus/configure.in,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 configure.in
+--- configure.in	30 Jan 2003 21:29:29 -0000	1.1.1.1
++++ configure.in	6 Apr 2004 20:26:54 -0000
+@@ -1,8 +1,8 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(README)
+-
+-AM_INIT_AUTOMAKE(refocus, 0.9.0)
++AC_INIT([refocus],[0.9.0])
++AC_CONFIG_SRCDIR(README)
++AM_INIT_AUTOMAKE
+ 
+ AC_PROG_CC
+ AC_CHECK_PROG(GCC3, gcc3, gcc3)
+@@ -12,7 +12,7 @@
+    AC_MSG_RESULT([using $CC as compiler])
+ fi
+ 
+-AC_STDC_HEADERS
++AC_HEADER_STDC([])
+ AC_PROG_RANLIB
+ 
+ # Check if the user has ATLAS installed in ./lib-atlas
+@@ -36,7 +36,7 @@
+ AC_SUBST(LAPACK_INCLUDE_DIR)
+ AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)
+ 
+-AM_PATH_GIMP(1.2.0)
++AM_PATH_GIMP_2_0(2.0.0)
+ AM_PATH_GTK_2_0(2.0.0)
+ AM_PATH_GLIB_2_0(2.0.0)
+ 
+@@ -106,5 +106,6 @@
+ #Check if erf is defined in the mathlibrary
+ AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF))
+ 
+-AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
++AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
++AC_OUTPUT
+ 
+Index: lib/Makefile.am
+===================================================================
+RCS file: /cvsroot/refocus/refocus/lib/Makefile.am,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 Makefile.am
+--- lib/Makefile.am	30 Jan 2003 21:29:52 -0000	1.1.1.1
++++ lib/Makefile.am	6 Apr 2004 20:26:55 -0000
+@@ -1,4 +1,4 @@
+-CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
++AM_CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
+ 
+ 
+ noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvsroot/refocus/refocus/src/Makefile.am,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 Makefile.am
+--- src/Makefile.am	30 Jan 2003 21:30:18 -0000	1.1.1.1
++++ src/Makefile.am	6 Apr 2004 20:26:55 -0000
+@@ -11,7 +11,7 @@
+ EXTRA_DIST = dummy-plugin.c
+ 
+ refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
+-refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas}
++refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}
+ refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
+ 
+ test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
+Index: src/gimppreview.c
+===================================================================
+RCS file: /cvsroot/refocus/refocus/src/gimppreview.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 gimppreview.c
+--- src/gimppreview.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
++++ src/gimppreview.c	6 Apr 2004 20:26:55 -0000
+@@ -344,7 +344,7 @@
+ 
+   /* Save the drawable info. */
+   preview->drawable = drawable;
+-  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id);
++  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
+ 
+   /* Calculate our preview size. */
+   if (preview_size == PREVIEW_FIXED_SIZE)
+Index: src/prevman.c
+===================================================================
+RCS file: /cvsroot/refocus/refocus/src/prevman.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 prevman.c
+--- src/prevman.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
++++ src/prevman.c	6 Apr 2004 20:26:56 -0000
+@@ -52,7 +52,7 @@
+   tile_source->width = drawable->width;
+   tile_source->height = drawable->height;
+   tile_source->bpp = drawable->bpp;
+-  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id);
++  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
+   tile_source->un.drw.drawable = drawable;
+   gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width,
+                        height, FALSE, FALSE);
+@@ -144,7 +144,7 @@
+   tile_sink->width = drawable->width;
+   tile_sink->height = drawable->height;
+   tile_sink->bpp = drawable->bpp;
+-  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
++  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
+   gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width,
+                        height, TRUE, TRUE);
+ }
+@@ -159,7 +159,7 @@
+   tile_sink->width = width;
+   tile_sink->height = height;
+   tile_sink->bpp = drawable->bpp;
+-  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
++  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
+   tile_sink->un.prv.data = g_new (guchar,
+                                   tile_sink->width * tile_sink->height *
+                                   tile_sink->bpp);
+Index: src/refocus.c
+===================================================================
+RCS file: /cvsroot/refocus/refocus/src/refocus.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 refocus.c
+--- src/refocus.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
++++ src/refocus.c	6 Apr 2004 20:26:56 -0000
+@@ -45,9 +45,9 @@
+ 
+ /* Declare local functions. */
+ static void query (void);
+-static void run (char *name,
++static void run (const gchar *name,
+                  gint nparams,
+-                 GimpParam * param,
++                 const GimpParam * param,
+                  gint * nreturn_vals, GimpParam ** return_vals);
+ static gint dialog ();
+ static void doit (void);
+@@ -111,7 +111,6 @@
+     {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"},
+   };
+   static GimpParamDef *return_vals = NULL;
+-  static gint nargs = (gint) (sizeof (args) / sizeof (args[0]));
+   static gint nreturn_vals = 0;
+ 
+   gimp_install_procedure ("plug_in_refocus",
+@@ -123,15 +122,15 @@
+                           "<Image>/Filters/Enhance/Refocus ...",
+                           "RGB*, GRAY*",
+                           GIMP_PLUGIN,
+-                          nargs, nreturn_vals, args, return_vals);
++                          G_N_ELEMENTS(args), nreturn_vals, args, return_vals);
+ }
+ 
+ static void
+-run (char *name, gint n_params, GimpParam * param,
++run (const gchar *name, gint n_params, const GimpParam * param,
+      gint * nreturn_vals, GimpParam ** return_vals)
+ {
+   static GimpParam values[1];
+-  GimpRunModeType run_mode;
++  GimpRunMode run_mode;
+   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
+ 
+   (void) name;                  /* Shut up warnings about unused parameters. */
+@@ -186,8 +185,8 @@
+     {
+ 
+       /*  Make sure that the drawable is gray or RGB color  */
+-      if (gimp_drawable_is_rgb (drawable->id) ||
+-          gimp_drawable_is_gray (drawable->id))
++      if (gimp_drawable_is_rgb (drawable->drawable_id) ||
++          gimp_drawable_is_gray (drawable->drawable_id))
+         {
+           doit ();
+ 
+@@ -411,7 +410,7 @@
+           event_is_current =
+             gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview),
+                                             event->event_id,
+-                                            gimp_drawable_type (drawable->id),
++                                            gimp_drawable_type (drawable->drawable_id),
+                                             row, buf);
+         };
+       g_free (buf);
+@@ -608,7 +607,7 @@
+   gimp_progress_init ("Computing matrix");
+   update_matrix ();
+   gimp_progress_init ("Applying convolution");
+-  gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2);
++  gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2);
+   width = sx2 - sx1;
+   height = sy2 - sy1;
+   tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height);
+@@ -618,7 +617,7 @@
+                   matrix, 2 * my_config.mat_width + 1,
+                   &update_progress_closure);
+   gimp_drawable_flush (drawable);
+-  gimp_drawable_merge_shadow (drawable->id, TRUE);
+-  gimp_drawable_update (drawable->id, sx1, sy1, width, height);
++  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
++  gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height);
+   g_free (matrix);
+ }
diff --git a/community/gimp-refocus/refocus-gimp-preview.patch b/community/gimp-refocus/refocus-gimp-preview.patch
new file mode 100644
index 000000000..089365dcb
--- /dev/null
+++ b/community/gimp-refocus/refocus-gimp-preview.patch
@@ -0,0 +1,440 @@
+diff -ur src/gimppreview.c src/gimppreview.c
+--- src/gimppreview.c	2008-03-17 17:20:49.000000000 -0700
++++ src/gimppreview.c	2008-03-17 17:15:51.000000000 -0700
+@@ -36,18 +36,18 @@
+ #include "gimppreview.h"
+ 
+ 
+-static void gimp_preview_init (GimpPreview * preview);
+-static void gimp_preview_class_init (GimpPreviewClass * klass);
++static void gimp_preview_init (RefocusPreview * preview);
++static void gimp_preview_class_init (RefocusPreviewClass * klass);
+ 
+ static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data);
+ static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data);
+ static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event,
+                                 gpointer data);
+-static void gimp_preview_recompute_sizes (GimpPreview * preview,
++static void gimp_preview_recompute_sizes (RefocusPreview * preview,
+                                           gdouble newscale);
+-static void gimp_preview_update_preview (GimpPreview * preview);
++static void gimp_preview_update_preview (RefocusPreview * preview);
+ 
+-static void gimp_preview_image_set_size (GimpPreview * preview, gint width,
++static void gimp_preview_image_set_size (RefocusPreview * preview, gint width,
+                                          gint height);
+ static void gimp_preview_size_request (GtkWidget * widget,
+                                        GtkRequisition * requisition);
+@@ -58,7 +58,7 @@
+                                  GtkCallback callback,
+                                  gpointer callback_data);
+ gboolean gimp_preview_update_preview_idle_fun (gpointer data);
+-void gimp_preview_schedule_update (GimpPreview * preview);
++void gimp_preview_schedule_update (RefocusPreview * preview);
+ 
+ #define PROGRESS_BAR_HEIGHT (10)
+ #define PREVIEW_SIZE (100)
+@@ -94,11 +94,11 @@
+ 
+ 
+ /*
+- * Apps which use a GimpPreview widget should not be accessing the private
++ * Apps which use a RefocusPreview widget should not be accessing the private
+  * data!
+  */
+ #define PREVIEW_DATA(preview) \
+-        ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data))
++        ((RefocusPreviewData*)(GIMP_PREVIEW (preview)->private_data))
+ 
+ typedef struct
+ {
+@@ -126,7 +126,7 @@
+   GtkWidget *image;
+   GtkWidget *progress_bar;
+ }
+-GimpPreviewData;
++RefocusPreviewData;
+ 
+ 
+ /* Convert coordinate in preview space to image coordinates */
+@@ -155,20 +155,20 @@
+   if (!preview_type)
+     {
+       GTypeInfo preview_info = {
+-        sizeof (GimpPreviewClass),
++        sizeof (RefocusPreviewClass),
+         (GBaseInitFunc) NULL,
+         (GBaseFinalizeFunc) NULL,
+         (GClassInitFunc) gimp_preview_class_init,
+         (GClassFinalizeFunc) NULL,
+         (gconstpointer) NULL,   /* class_data */
+-        sizeof (GimpPreview),
++        sizeof (RefocusPreview),
+         0,                      /* n_preallocs */
+         (GInstanceInitFunc) gimp_preview_init,
+         (GTypeValueTable *) NULL /* value_table */
+       };
+ 
+       preview_type =
+-        g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview",
++        g_type_register_static (GTK_TYPE_CONTAINER, "RefocusPreview",
+                                 &preview_info, 0);
+     }
+ 
+@@ -181,7 +181,7 @@
+  * by GTK's internal mechanisms.
+  */
+ static void
+-gimp_preview_class_init (GimpPreviewClass * klass)
++gimp_preview_class_init (RefocusPreviewClass * klass)
+ {
+   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+@@ -190,7 +190,7 @@
+     g_signal_new ("update_preview",
+                   G_TYPE_FROM_CLASS (klass),
+                   G_SIGNAL_RUN_FIRST,
+-                  G_STRUCT_OFFSET (GimpPreviewClass, update_preview),
++                  G_STRUCT_OFFSET (RefocusPreviewClass, update_preview),
+                   NULL,
+                   NULL,
+                   g_cclosure_marshal_VOID__POINTER,
+@@ -200,7 +200,7 @@
+     g_signal_new ("preview_changed",
+                   G_TYPE_FROM_CLASS (klass),
+                   G_SIGNAL_RUN_FIRST,
+-                  G_STRUCT_OFFSET (GimpPreviewClass, preview_changed),
++                  G_STRUCT_OFFSET (RefocusPreviewClass, preview_changed),
+                   NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ 
+   klass->update_preview = NULL;
+@@ -212,7 +212,7 @@
+ 
+ 
+ void
+-gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount)
++gimp_preview_set_scale_amount(RefocusPreview *preview, gdouble scale_amount)
+ {
+   /*
+    * If the caller wants to set the scale amount, let them do so.
+@@ -269,7 +269,7 @@
+  * by GTK's internal mechanisms.
+  */
+ static void
+-gimp_preview_init (GimpPreview * preview)
++gimp_preview_init (RefocusPreview * preview)
+ {
+   gchar buffer[10];
+ 
+@@ -277,7 +277,7 @@
+   GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW);
+   GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE;
+ 
+-  preview->private_data = g_malloc0 (sizeof (GimpPreviewData));
++  preview->private_data = g_malloc0 (sizeof (RefocusPreviewData));
+ 
+ 
+   PREVIEW_DATA (preview)->label = gtk_label_new ("");
+@@ -307,7 +307,7 @@
+ gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size,
+                             gdouble cb_scale_amount, gint cb_allow_scale)
+ {
+-  GimpPreview *preview;
++  RefocusPreview *preview;
+   GtkWidget *frame;
+   GtkWidget *hbox;
+   GtkWidget *event_box;
+@@ -454,7 +454,7 @@
+ static void
+ gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition)
+ {
+-  GimpPreview *preview = GIMP_PREVIEW (widget);
++  RefocusPreview *preview = GIMP_PREVIEW (widget);
+   GtkRequisition resize_box_requisition;
+ 
+ #ifdef PREVIEW_DEBUG
+@@ -478,7 +478,7 @@
+ static void
+ gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
+ {
+-  GimpPreview *preview = GIMP_PREVIEW (widget);
++  RefocusPreview *preview = GIMP_PREVIEW (widget);
+   GtkAllocation resize_box_allocation, progress_bar_allocation,
+     event_box_allocation;
+   GtkRequisition resize_box_requisition;
+@@ -543,7 +543,7 @@
+                      gboolean include_internals,
+                      GtkCallback callback, gpointer callback_data)
+ {
+-  GimpPreview *preview = GIMP_PREVIEW (container);
++  RefocusPreview *preview = GIMP_PREVIEW (container);
+ 
+   if (PREVIEW_DATA (preview)->resize_box)
+     {
+@@ -564,7 +564,7 @@
+  * Plug-ins call this to do an update of the preview area.
+  */
+ void
+-gimp_preview_update (GimpPreview * preview)
++gimp_preview_update (RefocusPreview * preview)
+ {
+   gimp_preview_recompute_sizes (preview, preview->scale);
+   gimp_preview_update_preview (preview);
+@@ -579,7 +579,7 @@
+ static void
+ gimp_preview_plus_callback (GtkWidget * widget, gpointer data)
+ {
+-  GimpPreview *preview;
++  RefocusPreview *preview;
+   gchar buffer[10];
+   gdouble new_scale;
+ 
+@@ -616,7 +616,7 @@
+ static void
+ gimp_preview_minus_callback (GtkWidget * widget, gpointer data)
+ {
+-  GimpPreview *preview;
++  RefocusPreview *preview;
+   gchar buffer[10];
+   gdouble new_scale;
+ 
+@@ -651,7 +651,7 @@
+ static gint
+ gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data)
+ {
+-  GimpPreview *preview;
++  RefocusPreview *preview;
+   GdkEventButton *button_event;
+   gint x, y;
+   gint dx, dy;
+@@ -733,7 +733,7 @@
+  * This function is also used for initializing the preview.
+  */
+ static void
+-gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale)
++gimp_preview_recompute_sizes (RefocusPreview * preview, gdouble new_scale)
+ {
+ 
+   /* The center of the preview in image coordinates.
+@@ -765,7 +765,7 @@
+ }
+ 
+ void
+-gimp_preview_generate_update_event (GimpPreview * preview)
++gimp_preview_generate_update_event (RefocusPreview * preview)
+      /* Signal the user that the preview must be updated */
+ {
+   const gdouble scale = preview->scale;
+@@ -783,7 +783,7 @@
+            0,
+            preview->drawable->height - image_y);
+ 
+-  GimpPreviewEvent preview_event;
++  RefocusPreviewEvent preview_event;
+ 
+   preview_event.event_id = PREVIEW_DATA (preview)->current_event_id;
+   preview_event.scale = preview->scale;
+@@ -814,7 +814,7 @@
+  * to step through source and destination!
+  */
+ static void
+-gimp_preview_update_preview (GimpPreview * preview)
++gimp_preview_update_preview (RefocusPreview * preview)
+ {
+   GimpPixelRgn region;
+   guchar *image_data = NULL;
+@@ -1012,7 +1012,7 @@
+ 
+ 
+ void
+-gimp_preview_force_redraw (GimpPreview * preview)
++gimp_preview_force_redraw (RefocusPreview * preview)
+ {
+   gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image));
+ }
+@@ -1022,7 +1022,7 @@
+ gboolean
+ gimp_preview_update_preview_idle_fun (gpointer data)
+ {
+-  GimpPreview *preview = GIMP_PREVIEW (data);
++  RefocusPreview *preview = GIMP_PREVIEW (data);
+   gint event_id = PREVIEW_DATA (preview)->current_event_id;
+ 
+ #ifdef PREVIEW_DEBUG
+@@ -1041,7 +1041,7 @@
+ }
+ 
+ void
+-gimp_preview_schedule_update (GimpPreview * preview)
++gimp_preview_schedule_update (RefocusPreview * preview)
+ {
+   PREVIEW_DATA (preview)->current_event_id++;
+ 
+@@ -1082,7 +1082,7 @@
+ }
+ 
+ void
+-gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height)
++gimp_preview_image_set_size (RefocusPreview * preview, gint width, gint height)
+ {
+   const gint real_width = MIN (preview->max_width, width);
+   const gint real_height = MIN (preview->max_height, height);
+@@ -1120,8 +1120,8 @@
+ 
+ /**
+  * gimp_preview_draw_row:
+- * @preview: the #GimpPreview
+- * @event_id: event_id that was sent with the #GimpPreviewEvent.
++ * @preview: the #RefocusPreview
++ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
+  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
+  * @row:the relative number of the row within the preview.
+  * The top row of the preview is number 0.
+@@ -1137,7 +1137,7 @@
+  * with the same event-id will be ignored by the preview.
+  **/
+ gboolean
+-gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
++gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
+                        GimpImageType type, gint row,
+                        const guchar * const data)
+ {
+@@ -1247,8 +1247,8 @@
+ 
+ /**
+  * gimp_preview_draw_unscaled_row:
+- * @preview: the #GimpPreview
+- * @event_id: event_id that was sent with the #GimpPreviewEvent.
++ * @preview: the #RefocusPreview
++ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
+  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
+  * @row:row is the relative position of the row w.r.t. preview_event->image_y.
+  * The top row has number 0.
+@@ -1267,7 +1267,7 @@
+  * with the same event-id will be ignored by the preview.
+  **/
+ gboolean
+-gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id,
++gimp_preview_draw_unscaled_row (RefocusPreview * preview, const gint event_id,
+                                 GimpImageType type, const gint row,
+                                 const guchar * const data)
+ {
+@@ -1445,8 +1445,8 @@
+ 
+ /**
+  * gimp_preview_progress_set_fraction:
+- * @preview: the #GimpPreview.
+- * @event_id: event_id that was sent with the #GimpPreviewEvent.
++ * @preview: the #RefocusPreview.
++ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
+  * @fraction: the fraction completed.
+  *
+  * Set the progress bar of the preview to @fraction completed.
+@@ -1456,7 +1456,7 @@
+  * with the same event-id will be ignored by the preview.
+  **/
+ gboolean
+-gimp_preview_progress_set_fraction (GimpPreview * preview,
++gimp_preview_progress_set_fraction (RefocusPreview * preview,
+                                     const gint event_id, double fraction)
+ {
+   const gboolean return_status =
+diff -ur src/gimppreview.h src/gimppreview.h
+--- src/gimppreview.h	2003-01-30 13:30:18.000000000 -0800
++++ src/gimppreview.h	2008-03-17 17:16:29.000000000 -0700
+@@ -33,24 +33,24 @@
+ #define PREVIEW_FIXED_SIZE           0
+ #define PREVIEW_DEFAULT_SIZE         -1
+ #define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
+-#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview))
+-#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass))
++#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, RefocusPreview))
++#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, RefocusPreviewClass))
+ #define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
+ #define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
+-typedef struct _GimpPreview GimpPreview;
+-typedef struct _GimpPreviewClass GimpPreviewClass;
+-typedef struct _GimpPreviewEvent GimpPreviewEvent;
++typedef struct _RefocusPreview RefocusPreview;
++typedef struct _RefocusPreviewClass RefocusPreviewClass;
++typedef struct _RefocusPreviewEvent RefocusPreviewEvent;
+ 
+-struct _GimpPreviewClass
++struct _RefocusPreviewClass
+ {
+   GtkContainerClass parent_class;
+ 
+-  void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event);
+-  void (*preview_changed) (GimpPreview * preview);
++  void (*update_preview) (RefocusPreview * preview, RefocusPreviewEvent * event);
++  void (*preview_changed) (RefocusPreview * preview);
+ };
+ 
+ 
+-struct _GimpPreview
++struct _RefocusPreview
+ {
+   GtkContainer parent;
+ 
+@@ -75,13 +75,13 @@
+ };
+ 
+ /**
+- * GimpPreviewEvent:
++ * RefocusPreviewEvent:
+  * @event_id: Id of this event. This is needed for gimp_preview_draw_row,
+  * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction.
+  * @scale: Current scale of the preview.
+  *
+  **/
+-struct _GimpPreviewEvent
++struct _RefocusPreviewEvent
+ {
+   gint event_id;                /* Id of this event */
+   gdouble scale;                /* Scale of preview */
+@@ -113,20 +113,20 @@
+                                        gint preview_size,
+                                        gdouble scale_amount,
+                                        gint allow_scale);
+-void gimp_preview_update (GimpPreview * preview);
++void gimp_preview_update (RefocusPreview * preview);
+ 
+-gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
++gboolean gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
+                                 GimpImageType type, const gint row,
+                                 const guchar * const data);
+ 
+-gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview,
++gboolean gimp_preview_draw_unscaled_row (RefocusPreview * preview,
+                                          const gint event_id,
+                                          GimpImageType type, const gint row,
+                                          const guchar * const data);
+ 
+-void gimp_preview_force_redraw (GimpPreview * preview);
++void gimp_preview_force_redraw (RefocusPreview * preview);
+ 
+-gboolean gimp_preview_progress_set_fraction (GimpPreview * preview,
++gboolean gimp_preview_progress_set_fraction (RefocusPreview * preview,
+                                              const gint event_id,
+                                              double fraction);
+ 
+diff -ur src/refocus.c src/refocus.c
+--- src/refocus.c	2008-03-17 17:20:49.000000000 -0700
++++ src/refocus.c	2008-03-17 17:18:48.000000000 -0700
+@@ -25,6 +25,7 @@
+ #include <time.h>
+ #include <string.h>
+ #include <libgimp/gimp.h>
++#include <libgimp/gimpcompat.h>
+ #include <gtk/gtk.h>
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -372,7 +373,7 @@
+ }
+ 
+ static void
+-preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data)
++preview_callback (GtkWidget * widget, RefocusPreviewEvent * event, gpointer data)
+ {
+   TileSource source;
+   TileSink sink;
diff --git a/community/gimp-refocus/refocus-mirror-fix.patch b/community/gimp-refocus/refocus-mirror-fix.patch
new file mode 100644
index 000000000..af79dd893
--- /dev/null
+++ b/community/gimp-refocus/refocus-mirror-fix.patch
@@ -0,0 +1,54 @@
+Index: src/tilebuf.c
+===================================================================
+RCS file: /cvsroot/refocus/refocus/src/tilebuf.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 tilebuf.c
+--- src/tilebuf.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
++++ src/tilebuf.c	6 Apr 2004 20:26:56 -0000
+@@ -140,7 +140,10 @@
+ 
+         for (x = x_lo - 1; x >= buf->real_x; x--)
+           {
+-            copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x);
++            gint sx = 2 * x_lo - x;
++            copy_col (buf,
++                      sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1,
++                      y_start, y_end - y_start, x);
+           };
+       }
+       break;
+@@ -171,7 +174,9 @@
+ 
+         for (x = x_hi; x < buf->real_x + buf->real_width; x++)
+           {
+-            copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x);
++            gint sx = 2 * (x_hi - 1) - x;
++            copy_col (buf, sx>=buf->real_x?sx:buf->real_x,
++                      y_start, y_end - y_start, x);
+           };
+       }
+       break;
+@@ -200,7 +205,10 @@
+ 
+         for (y = y_lo - 1; y >= buf->real_y; y--)
+           {
+-            copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y);
++            gint sy = 2 * y_lo - y;
++            copy_row (buf, buf->real_x,
++                      sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1,
++                      buf->real_width, y);
+           };
+       }
+       break;
+@@ -230,8 +238,9 @@
+ 
+         for (y = y_hi; y < buf->real_y + buf->real_height; y++)
+           {
+-            copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width,
+-                      y);
++            gint sy = 2 * (y_hi - 1) - y;
++            copy_row (buf, buf->real_x, sy>=buf->real_y?sy:buf->real_y,
++                      buf->real_width, y);
+           };
+       }
+       break;
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 7e64bd13d..7008749fb 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59934 2011-12-02 20:58:35Z ibiru $
+# $Id: PKGBUILD 67182 2012-03-05 08:57:11Z ibiru $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=10
+pkgrel=11
 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.globulation2.org/"
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index b30e99470..317810951 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 59936 2011-12-02 20:58:42Z ibiru $
+# $Id: PKGBUILD 67184 2012-03-05 08:57:17Z ibiru $
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=glom
-pkgver=1.20.1
+pkgver=1.20.4
 pkgrel=1
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
 license=('GPL')
 depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
-makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
+makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c76edc09d767eb2de8673fa8bb1cebbf8863fb3c8eb365e4a42fc430730f68d5')
+sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-
   ./configure --prefix=/usr \
     --with-postgres-utils=/usr/bin \
     --disable-scrollkeeper \
@@ -31,5 +30,6 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index 0079d27c5..f4023057d 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64706 2012-02-17 21:38:09Z heftig $
+# $Id: PKGBUILD 67186 2012-03-05 08:57:26Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.10
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index 3cf91b2a1..bb4a01cde 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59940 2011-12-02 20:59:00Z ibiru $
+# $Id: PKGBUILD 67188 2012-03-05 08:57:37Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=gpsdrive
 pkgver=2.11
-pkgrel=11
+pkgrel=12
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.gpsdrive.de/"
@@ -42,7 +42,7 @@ build() {
   export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-  unset LDFLAGS
+  export LDFLAGS="`pkg-config --libs gtk+-2.0` -lboost_system -lboost_thread"
 
   # see DefineOptions.cmake for a list of common options and defaults
   # cmake -L for a more in-depth listing
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 327d7ad40..360098d29 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 57325 2011-10-25 20:41:56Z spupykin $
+# $Id: PKGBUILD 67044 2012-03-03 16:09:25Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('ghc' 'alex' 'happy')
+makedepends=('ghc' 'alex' 'happy' 'haskell-random')
 depends=('gmp')
 options=('strip')
 provides=('haskell-gtk2hs-buildtools')
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index e510a0e99..8c85b4aa8 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64826 2012-02-18 13:49:20Z kkeen $
+# $Id: PKGBUILD 66978 2012-03-03 05:41:51Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.32
+pkgver=3.3.33
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('716bba48c1898e39c81b43118e192ac3')
+md5sums=('18a8acc803814d4873fd342bc70b6b8a')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 428053719..f951e5c67 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 59136 2011-11-21 12:20:52Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: 
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haddock
-pkgver=2.9.2
-pkgrel=4
+pkgver=2.10.0
+pkgrel=1
 pkgdesc="Tool for generating documentation for Haskell libraries"
-url="http://hackage.haskell.org/package/$pkgname"
+url="http://hackage.haskell.org/package/haddock"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('alex' 'happy')
-depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') 
-options=(strip)
-install=haddock.install
+depends=('ghc=7.4.1-2' 'haskell-xhtml=3000.2.0.5-2' 'haskell-ghc-paths=0.1.0.8-7') # 'haskell-mtl'
+install=$pkgname.install
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('04928e132827a1da20ace52babb43e47')
+sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   
+  # These doesn't make haddock work for ghc 7.4.1
   #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
+  #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal
+  #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs
+
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
     --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
@@ -41,5 +45,3 @@ package() {
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
   mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD
index fd76ca872..c55afc770 100644
--- a/community/haskell-binary/PKGBUILD
+++ b/community/haskell-binary/PKGBUILD
@@ -1,18 +1,20 @@
+# $Id: PKGBUILD 67046 2012-03-03 16:09:33Z tdziedzic $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-binary
-pkgver=0.5.0.2
-pkgrel=8
+pkgver=0.5.1.0
+pkgrel=1
 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
 url="http://hackage.haskell.org/package/binary"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh)
+depends=(ghc=7.4.1 sh)
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
 install=haskell-binary.install
-md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
+sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3')
 
 build() {
   cd "$srcdir/binary-$pkgver"
diff --git a/community/haskell-binary/haskell-binary.install b/community/haskell-binary/haskell-binary.install
index 0084ebef8..844b8a67c 100644
--- a/community/haskell-binary/haskell-binary.install
+++ b/community/haskell-binary/haskell-binary.install
@@ -1,18 +1,24 @@
 HS_DIR=usr/share/haskell/haskell-binary
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
+
 pre_upgrade() {
   ${HS_DIR}/unregister.sh
 }
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
 post_upgrade() {
   ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  post_remove
 }
-pre_remove() {
-  ${HS_DIR}/unregister.sh
+
+post_install() {
+  post_upgrade
 }
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+
+pre_remove() {
+  pre_upgrade
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 2ee9c0cb4..576ac74a3 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,23 +1,18 @@
-# $Id$
+# $Id: PKGBUILD 67048 2012-03-03 16:09:42Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
-pkgver=0.3.5
-pkgrel=1
+pkgver=0.3.5.1
+pkgrel=2
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://code.haskell.org/~dolio/"
 license=("BSD3")
 arch=('i686' 'x86_64')
 makedepends=()
-depends=("ghc=7.0.3"
-         "haskell-array=0.3.0.2"
-         "haskell-binary=0.5.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0")
-options=('strip')
+depends=("ghc=7.4.1-2")
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('934edba94aeceef6e9fc1b174d4f94ea')
+md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd')
 
 build() {
   cd ${srcdir}/bytestring-show-${pkgver}
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index 4d58b76ea..05b65a6ee 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58942 2011-11-20 18:00:00Z spupykin $
+# $Id: PKGBUILD 67050 2012-03-03 16:09:51Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
@@ -20,6 +20,7 @@ md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c')
 
 build() {
     cd ${srcdir}/cairo-$pkgver
+    sed -i 's#cToBool :: Num a => a -> Bool#cToBool :: (Eq a, Num a) => a -> Bool#' Graphics/Rendering/Cairo/Types.chs
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index 7ea26e610..015dcd164 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,19 +1,20 @@
+# $Id: PKGBUILD 67052 2012-03-03 16:10:16Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
+
 _hkgname=dataenc
 pkgname=haskell-dataenc
-pkgver=0.13.0.4
-pkgrel=3.2
+pkgver=0.14.0.3
+pkgrel=1
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
+md5sums=('643a8c022b9c840f801faf9a661fe637')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index d66585d8c..2311006a1 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 58269 2011-11-09 16:24:41Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer:
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.8
-pkgrel=5
+pkgrel=7
 pkgdesc="Knowledge of GHC's installation directories"
 url="http://hackage.haskell.org/package/ghc-paths"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=()
-depends=(ghc=7.0.3-2)
-options=('strip')
+depends=('ghc=7.4.1-2')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install=haskell-ghc-paths.install
 md5sums=('d2b23dc563888e380588501d2ce1d82b')
@@ -42,4 +41,5 @@ package() {
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 7adc33eaf..1f31860dc 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58944 2011-11-20 18:01:09Z spupykin $
+# $Id: PKGBUILD 67054 2012-03-03 16:10:24Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
@@ -20,6 +20,7 @@ md5sums=('5d8a04be9a975fb70c6508f95aeb3265')
 
 build() {
     cd ${srcdir}/glib-$pkgver
+    sed -i 's|cap=rts_evalIO|rts_evalIO|' System/Glib/hsgclosure.c
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 0a5bb037d..415881fe9 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58946 2011-11-20 18:02:05Z spupykin $
+# $Id: PKGBUILD 67056 2012-03-03 16:10:32Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
 license=('LGPL2.1')
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index f5759bb83..620b08ea1 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,19 +1,20 @@
+# $Id: PKGBUILD 67058 2012-03-03 16:10:40Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=haskeline
 pkgname=haskell-haskeline
-pkgver=0.6.3.2
-pkgrel=2.2
+pkgver=0.6.4.6
+pkgrel=1
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('d75863f63a1cfb499d0198e4f28ac2af')
+md5sums=('c43d01e3ea23eed266060391ca680a76')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index ad7e5aaa5..864bcd213 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 57050 2011-10-19 10:31:34Z spupykin $
+# $Id: PKGBUILD 67060 2012-03-03 16:10:47Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
-_hkgname=hslogger
 pkgname=haskell-hslogger
 pkgver=1.1.5
-pkgrel=1
+pkgrel=6
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-options=('strip')
+depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
 md5sums=('cd3dfd6f88176bd53b333ea29130a857')
@@ -22,16 +20,13 @@ build() {
 	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
 	--enable-library-profiling
   runhaskell Setup build
-  RUnhaskell Setup haddock
+  runhaskell Setup haddock
   runhaskell Setup register   --gen-script
   runhaskell Setup unregister --gen-script
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-
   cd ${srcdir}/hslogger-${pkgver}
   install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
   install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
new file mode 100644
index 000000000..44a3ea50b
--- /dev/null
+++ b/community/haskell-html/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.6
+
+_hkgname=html
+pkgname=haskell-html
+pkgver=1.0.1.2
+pkgrel=10
+pkgdesc="HTML combinator library"
+url="http://hackage.haskell.org/package/html"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-html/haskell-html.install b/community/haskell-html/haskell-html.install
new file mode 100644
index 000000000..768297e0a
--- /dev/null
+++ b/community/haskell-html/haskell-html.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-html
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh &> /dev/null
+  exit 0
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index def9c2c71..ff6d0017b 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58948 2011-11-20 18:06:21Z spupykin $
+# $Id: PKGBUILD 67062 2012-03-03 16:10:53Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
new file mode 100644
index 000000000..7b27cfb0c
--- /dev/null
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.5
+
+_hkgname=QuickCheck
+pkgname=haskell-quickcheck
+pkgver=2.4.2
+pkgrel=1
+pkgdesc="Automatic testing of Haskell programs"
+url="http://hackage.haskell.org/package/QuickCheck"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+install=${pkgname}.install
+md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-quickcheck/haskell-quickcheck.install b/community/haskell-quickcheck/haskell-quickcheck.install
new file mode 100644
index 000000000..c9e12fadc
--- /dev/null
+++ b/community/haskell-quickcheck/haskell-quickcheck.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-quickcheck
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
new file mode 100644
index 000000000..3b8ecb4bb
--- /dev/null
+++ b/community/haskell-regex-base/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
+_hkgname=regex-base
+pkgname=haskell-regex-base
+pkgver=0.93.2
+pkgrel=5
+pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+install=${pkgname}.install
+md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-regex-base/haskell-regex-base.install b/community/haskell-regex-base/haskell-regex-base.install
new file mode 100644
index 000000000..3ad2fea28
--- /dev/null
+++ b/community/haskell-regex-base/haskell-regex-base.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-regex-base
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD
new file mode 100644
index 000000000..c880ff4f2
--- /dev/null
+++ b/community/haskell-regex-compat/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
+_hkgname=regex-compat
+pkgname=haskell-regex-compat
+pkgver=0.95.1
+pkgrel=1
+pkgdesc="Replaces and enhances Text.Regex"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('d0573ab4e2f3de5faa61380b67333320')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-regex-compat/haskell-regex-compat.install b/community/haskell-regex-compat/haskell-regex-compat.install
new file mode 100644
index 000000000..898c0bba1
--- /dev/null
+++ b/community/haskell-regex-compat/haskell-regex-compat.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-regex-compat
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD
new file mode 100644
index 000000000..1bed15490
--- /dev/null
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
+_hkgname=regex-posix
+pkgname=haskell-regex-posix
+pkgver=0.95.1
+pkgrel=1
+pkgdesc="The posix regex backend for regex-base"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-regex-posix/haskell-regex-posix.install b/community/haskell-regex-posix/haskell-regex-posix.install
new file mode 100644
index 000000000..2b89fae7b
--- /dev/null
+++ b/community/haskell-regex-posix/haskell-regex-posix.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-regex-posix
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index fe62847d3..fa9819d51 100644
--- a/community/haskell-stm/PKGBUILD
+++ b/community/haskell-stm/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=stm
 pkgname=haskell-stm
 pkgver=2.2.0.1
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'sh')
+depends=('ghc=7.4.1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('b1cf03ed315e00c33160746feeee8682')
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index 64faf05ed..9223379b2 100644
--- a/community/haskell-syb/PKGBUILD
+++ b/community/haskell-syb/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=syb
 pkgname=haskell-syb
-pkgver=0.3
-pkgrel=2.1
+pkgver=0.3.6
+pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
+depends=('ghc=7.4.1' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c4f6771fa32d467a029e6e813757a9fe')
+md5sums=('0d807bb244fdeb95fa546b4311fcd8df')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 3dd8401a0..469d9a305 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $
+# $Id: PKGBUILD 67068 2012-03-03 16:11:12Z tdziedzic $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-tar
-pkgver=0.3.1.0
-pkgrel=5
+pkgver=0.4.0.0
+pkgrel=1
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh)
+depends=('ghc=7.4.1')
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
-md5sums=('10b54856495f9ef0a42aa270085c7d5e')
+sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
 
 build() {
   cd "$srcdir/tar-$pkgver"
@@ -41,4 +42,5 @@ package() {
   install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index 3ae8d8635..ccdb4dfda 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,18 +1,19 @@
+# $Id: PKGBUILD 67070 2012-03-03 16:11:18Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=terminfo
 pkgname=haskell-terminfo
-pkgver=0.3.1.3
-pkgrel=4.2
+pkgver=0.3.2.3
+pkgrel=1
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('8c0e052340f628b76f5687fa23379628')
+md5sums=('706f546c629ac100a402c9c2629c25fa')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index e92e71f0a..8b300aab7 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,19 +1,19 @@
+# $Id: PKGBUILD 67072 2012-03-03 16:11:24Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 _hkgname=utf8-string
 pkgname=haskell-utf8-string
-pkgver=0.3.6
-pkgrel=7.2
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.4.1' 'sh')
 install=${pkgname}.install
-md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+md5sums=('50e5c395713e716e0e4a56da73f87ccd')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index 4a35ea0b3..9f0809ad1 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 60408 2011-12-13 13:21:02Z spupykin $
+# $Id: PKGBUILD 67076 2012-03-03 16:11:39Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.6-7.2' 'libxft')
+depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 60a60b930..b5740707d 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60398 2011-12-13 10:28:38Z spupykin $
+# $Id: PKGBUILD 67074 2012-03-03 16:11:32Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
@@ -6,13 +6,13 @@
 _hkgname=X11
 pkgname=haskell-x11
 pkgver=1.5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64 'mips64el')
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama')
+depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
new file mode 100644
index 000000000..b3762851d
--- /dev/null
+++ b/community/haskell-xhtml/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.6
+
+_hkgname=xhtml
+pkgname=haskell-xhtml
+pkgver=3000.2.0.5
+pkgrel=2
+pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
+url="http://hackage.haskell.org/package/xhtml"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+install=${pkgname}.install
+md5sums=('d51e20de416b825aba6b874a221acfc4')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-xhtml/haskell-xhtml.install b/community/haskell-xhtml/haskell-xhtml.install
new file mode 100644
index 000000000..d03b8a053
--- /dev/null
+++ b/community/haskell-xhtml/haskell-xhtml.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-xhtml
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh &> /dev/null
+  exit 0
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 18ff0d9c4..8acb86b92 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 58974 2011-11-20 18:15:24Z spupykin $
+# $Id: PKGBUILD 67078 2012-03-03 16:11:51Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
 depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake' 'ghc'
-	     'haskell-utf8-string' 'haskell-dataenc' 'haskell-network'
-	     'haskell-hslogger' 'haskell-bytestring-show' 'haskell-deepseq')
+makedepends=('fpc' 'cmake'
+             # haskell specific
+             'ghc=7.4.1-2'
+	     'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2'
+	     'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' 
+	     'haskell-hslogger=1.1.5-6')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
@@ -20,20 +23,25 @@ md5sums=('77c0bc4bc664604adbba67fab606d8f1'
          'eeb14d50df39063549ac5eca9dbc65d1')
 
 build() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
+
 #  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
+
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
 	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
 	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
 	-DWITH_SERVER=1 .
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
+
   make DESTDIR=$pkgdir install
+
   install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
   install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
   install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 0644c49c9..1124f8856 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 61683 2012-01-06 14:16:13Z bluewind $
+# $Id: PKGBUILD 66907 2012-03-01 10:58:35Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.7
+pkgver=3.8
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=(qt lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2)
-md5sums=('dab2d059f4115b5ac0b5d329401d883b')
+md5sums=('e15030b5e6115d7b4f7c635246ceec0a')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index 3cf71a0b3..b01650f9f 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63896 2012-02-06 16:45:24Z tdziedzic $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 66946 2012-03-02 16:54:51Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
-pkgver=0.11.0
+pkgver=0.11.1
 pkgrel=1
 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('480377508522fe088dd78452d06c5972')
+md5sums=('30c239876fd0fd4eadb874c3cb2ebe10')
 
 build() {
   cd "$srcdir"
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index 97cab3f21..7574d167c 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 66627 2012-02-26 15:31:41Z lfleischer $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $
+# Maintainer:
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
-pkgver=2.0.6.1
-pkgrel=3
-pkgdesc="A MSN Messenger client for Linux."
+pkgver=2.0.6.2
+pkgrel=1
+pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://kmess.sourceforge.net/"
+url='http://kmess.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake' 'docbook-xsl')
+makedepends=('automoc4' 'cmake')
 optdepends=('cabextract: provides winks support')
-install=kmess.install
-source=("http://downloads.sourceforge.net/sourceforge/kmess/kmess-$pkgver.tar.bz2")
-md5sums=('bc960c0bacb38be6dc118a2d2a6e69a6')
+install=${pkgname}.install
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
+md5sums=('a2e57911713308bef81b9347135cc5dd')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
-
diff --git a/community/kmess/kmess.install b/community/kmess/kmess.install
index c5571196e..c0797237a 100644
--- a/community/kmess/kmess.install
+++ b/community/kmess/kmess.install
@@ -1,11 +1,11 @@
 post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+    post_install
 }
 
 post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+    post_install
 }
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 73830ab85..d41a7ee87 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 66316 2012-02-23 14:03:25Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 67170 2012-03-05 08:41:38Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 
 pkgname=knemo
 pkgver=0.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=12956"
@@ -36,5 +37,5 @@ package() {
   make DESTDIR=${pkgdir} install
 
   # remove knemo autostart
-  rm -rf ${pkgdir}/usr/share/autostart
+  # rm -rf ${pkgdir}/usr/share/autostart
 }
diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD
index c76f66a97..8567024bb 100644
--- a/community/libident/PKGBUILD
+++ b/community/libident/PKGBUILD
@@ -1,20 +1,34 @@
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 67228 2012-03-05 13:41:53Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+#
+# TODO: Write a pkg-conf file
+
 pkgname=libident
 pkgver=0.32
-pkgrel=2
+pkgrel=3
 pkgdesc="New libident C library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/libident/"
 license=('custom')
-source=(http://www.remlab.net/files/libident/libident-$pkgver.tar.gz)
-md5sums=('9b9346eacc28d842d164881f0efa3388')
+options=('!libtool')
+source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz")
+sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	install -D -m 755 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm755 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 9a4eddc5b..30a5848a3 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66318 2012-02-23 14:03:47Z allan $
+# $Id: PKGBUILD 67039 2012-03-03 14:31:16Z giovanni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -19,8 +19,8 @@ optdepends=('bridge-utils: for briged networking (default)'
 	    'kvm'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
-	    'radvd'
-	    'dmidecode')
+	    'radvd')
+[ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode')
 options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
 	'etc/conf.d/libvirtd-guests'
diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch
new file mode 100644
index 000000000..69e172145
--- /dev/null
+++ b/community/luajit/Makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2011-12-14 15:15:00.000000000 +0100
++++ Makefile	2012-03-04 14:53:43.137778596 +0100
+@@ -41,7 +41,7 @@
+ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
+ 
+-INSTALL_TNAME= luajit-$(VERSION)
++INSTALL_TNAME= $(INSTALL_TSYMNAME)
+ INSTALL_TSYMNAME= luajit
+ INSTALL_ANAME= libluajit-$(ABIVER).a
+ INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
new file mode 100644
index 000000000..8e1f0b122
--- /dev/null
+++ b/community/luajit/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 67115 2012-03-04 14:30:22Z bpiotrowski $
+# Maintainer:  Chris Brannon <chris@the-brannons.com>
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor: Anders Bergh <anders1@gmail.com>
+
+pkgname=luajit 
+pkgver=2.0.0b9
+pkgrel=1
+pkgdesc="A Just-In-Time Compiler for Lua"
+arch=('i686' 'x86_64')
+url="http://luajit.org/"
+license=('MIT')
+depends=('gcc-libs') 
+source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz"
+        "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch"
+        'luaconf.patch'
+        'Makefile.patch')
+md5sums=('e7e03e67e2550817358bc28b44270c6d'
+         '4920f04fcef1ce486891509faf26b4f1'
+         'c8da9c6790e20a12a0e2496f438d9dc3'
+         '8997c5e5fa4f6e8e0b86cc6b888de631')
+
+build() { 
+  cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
+
+  patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch"
+  patch -Np0 -i "$srcdir/luaconf.patch"
+  patch -Np0 -i "$srcdir/Makefile.patch"
+
+  make
+}
+
+package() {
+  cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
+  make install DESTDIR="$pkgdir" PREFIX=/usr
+
+  install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \
+                 "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+}
diff --git a/community/luajit/luaconf.patch b/community/luajit/luaconf.patch
new file mode 100644
index 000000000..ba9373b52
--- /dev/null
+++ b/community/luajit/luaconf.patch
@@ -0,0 +1,11 @@
+--- src/luaconf.h.orig	2010-08-24 15:00:00.000000000 +0200
++++ src/luaconf.h	2010-09-06 15:52:22.043333530 +0200
+@@ -33,7 +33,7 @@
+ #define LUA_CPATH_DEFAULT \
+   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #ifdef LUA_XROOT
diff --git a/community/luajit/luajit-arch.patch b/community/luajit/luajit-arch.patch
new file mode 100644
index 000000000..689a87d4e
--- /dev/null
+++ b/community/luajit/luajit-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN LuaJIT-1.1.4.orig/src/luaconf.h LuaJIT-1.1.3/src/luaconf.h
+--- LuaJIT-1.1.4.orig/src/luaconf.h	2007-05-24 13:30:00.000000000 +0200
++++ LuaJIT-1.1.4/src/luaconf.h	2007-11-02 06:28:59.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index 94fa2b7c4..9e72f4ab2 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63656 2012-02-05 12:03:53Z ibiru $
+# $Id: PKGBUILD 67190 2012-03-05 08:57:43Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Initial contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 pkgname=luxrender
 pkgver=0.8
 _pkgver=45d3e13eb94c
-pkgrel=12
+pkgrel=13
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD
index c33d6e556..31e705bb3 100644
--- a/community/lwm/PKGBUILD
+++ b/community/lwm/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 66767 2012-02-28 10:21:19Z giovanni $
+# $Id: PKGBUILD 67238 2012-03-05 15:00:02Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Ben Mazer <blm@groknil.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=lwm
 pkgver=1.2.2
-pkgrel=2
-pkgdesc="A very light weight window manager"
+pkgrel=3
+pkgdesc="a very light weight window manager"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
 url="http://www.jfc.org.uk/software/lwm.html"
-depends=('xorg-server' 'libsm' 'libxext')
+license=('GPL')
+depends=('xorg-server' 'libxext' 'libsm')
 makedepends=('imake')
-source=(http://www.jfc.org.uk/files/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://www.jfc.org.uk/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('1748722a293e03d632b615275ef84498')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+	cd "$srcdir/$pkgname-$pkgver"
 
-  sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile
-  xmkmf
-  make EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS}"
+	xmkmf
+	sed -i 's/^LOCAL_LIBRARIES.*/& $(ICELIB)/' Makefile
+	make
+	strip lwm
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+	cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 lwm ${pkgdir}/usr/bin/lwm
-  install -Dm644 lwm.man ${pkgdir}/usr/share/man/man1/lwm.1
+	install -Dm755 lwm "$pkgdir/usr/bin/lwm"
+	install -Dm644 lwm.man "$pkgdir/usr/share/man/man1/lwm.1"
 }
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index bb82b6528..b1a96f587 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66755 2012-02-28 08:12:38Z giovanni $
+# $Id: PKGBUILD 67090 2012-03-03 20:37:59Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=macchanger
 pkgver=1.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A small utility to change you NIC's MAC address"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnu.org/gnu/macchanger"
@@ -13,7 +13,7 @@ source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz)
 md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --infodir=/usr/share/man
@@ -21,7 +21,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD
new file mode 100644
index 000000000..975b3cb96
--- /dev/null
+++ b/community/mailman/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 67164 2012-03-05 00:39:58Z pschmitz $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgname=mailman
+pkgver=2.1.14
+pkgrel=4
+pkgdesc="Mailing list manager with built in web access"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.list.org/"
+depends=('python2' 'smtp-server')
+# we need to have the mailman user to build mailman
+makedepends=('mailman')
+# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
+backup=('usr/lib/mailman/Mailman/mm_cfg.py')
+install=$pkgname.install
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
+        'mailman-2.1-build.patch'
+        'rc.mailman')
+md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
+         'ed04d062379eb21e39ce1e70e6b1ade2'
+         '3d83d06d0ec3319bf3c7d9df5d18e89f')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # fix calls to /usr/bin/python
+  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
+  # fix directory permissions to satisfy check_perms
+  patch -p1 -i ${srcdir}/mailman-2.1-build.patch
+  # set some sane defaults before the configure script has a chance to screw them up
+  sed -e 's/@MAILHOST@/localhost/g' \
+      -e 's/@URLHOST@/localhost/g' \
+      -i Mailman/Defaults.py.in
+
+  ./configure --without-permcheck \
+              --prefix=/usr/lib/mailman \
+              --with-var-prefix=/var/lib/mailman \
+              --with-mail-gid=mailman \
+              --with-username=mailman --with-groupname=mailman \
+              --with-cgi-gid=http --with-python=/usr/bin/python2
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # let's follow Fedora FHS way; Gentoo does it the other way round
+
+  # Create a link so that the config file mm_cfg.py appears in config
+  # directory /etc/mailman. We don't put mm_cfg.py in the config directory
+  # because its executable code (python file) and the security policy wants
+  # to keep executable code out of /etc and inside of a lib directory instead,
+  # and because traditionally mm_cfg.py was in the Mailman subdirectory and
+  # experienced mailman admins will expect to find it there. But having it
+  # "appear" in the config directory is good practice and heading in the
+  # right direction for FHS compliance.
+  install -d -m755 ${pkgdir}/etc/${pkgname}
+  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
+
+  # fix some permissions to satisfy check_perms
+  chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
+  chown http:mailman ${pkgdir}/var/lib/mailman/archives/private
+  chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
+  chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
+  chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
+
+  # install the launch script
+  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
+}
diff --git a/community/mailman/mailman-2.1-build.patch b/community/mailman/mailman-2.1-build.patch
new file mode 100644
index 000000000..d00613ad7
--- /dev/null
+++ b/community/mailman/mailman-2.1-build.patch
@@ -0,0 +1,694 @@
+diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
+--- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -56,7 +55,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -72,8 +71,6 @@
+ 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
+--- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -68,8 +67,6 @@
+ 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
+--- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -47,7 +46,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -63,8 +62,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
+--- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
+--- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -47,7 +46,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -63,8 +62,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
+         done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
+--- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
+--- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
+--- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
+--- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
+--- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -20,8 +20,6 @@
+ 
+ # Variables set by configure
+ 
+-VERSION=	@VERSION@
+-
+ VPATH=		@srcdir@
+ srcdir= 	@srcdir@
+ bindir= 	@bindir@
+@@ -30,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -48,7 +45,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -79,12 +76,6 @@
+ 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
+ 	done
+ 
+-finish:
+-	@for d in $(SUBDIRS); \
+-	do \
+-	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
+-	done
+-
+ clean:
+ 	for d in $(SUBDIRS); \
+ 	do \
+diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
+--- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
+--- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -45,7 +44,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,8 +60,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
+--- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -61,11 +61,10 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+-DIRSETGID=	chmod g+s
+ 
+ DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
+ LANGPACK = README-I18N.en templates messages
+@@ -85,14 +84,24 @@
+ 
+ doinstall: $(SUBDIRS)
+ 	@echo "Creating architecture independent directories..."
++	dir=$(DESTDIR)$(prefix); \
++	if test ! -d $$dir; then \
++		echo "Creating directory hierarchy $$dir"; \
++		$(INSTALL) -d -m $(DIRMODE) $$dir; \
++	else true; \
++	fi;
++	dir=$(DESTDIR)$(var_prefix); \
++	if test ! -d $$dir; then \
++		echo "Creating directory hierarchy $$dir"; \
++		$(INSTALL) -d -m $(DIRMODE) $$dir; \
++	else true; \
++	fi;
+ 	@for d in $(VAR_DIRS); \
+ 	do \
+ 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+-		$(srcdir)/mkinstalldirs $$dir; \
+-		chmod $(DIRMODE) $$dir; \
+-		$(DIRSETGID) $$dir; \
++		$(INSTALL) -d -m $(DIRMODE) $$dir; \
+ 	    else true; \
+ 	    fi; \
+ 	done
+@@ -102,9 +111,7 @@
+ 	    dir=$(DESTDIR)$(prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+-		$(srcdir)/mkinstalldirs $$dir; \
+-		chmod $(DIRMODE) $$dir; \
+-		$(DIRSETGID) $$dir; \
++		$(INSTALL) -d -m $(DIRMODE) $$dir; \
+ 	    else true; \
+ 	    fi; \
+ 	done
+@@ -114,9 +121,7 @@
+ 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+-		$(srcdir)/mkinstalldirs $$dir; \
+-		chmod $(DIRMODE) $$dir; \
+-		$(DIRSETGID) $$dir; \
++		$(INSTALL) -d -m $(DIRMODE) $$dir; \
+ 	    else true; \
+ 	    fi; \
+ 	done
+diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
+--- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -32,7 +32,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -43,7 +42,6 @@
+ CFLAGS=		$(OPT) $(DEFS)
+ PACKAGEDIR= 	$(prefix)/messages
+ SHELL=		/bin/sh
+-DIRSETGID=	chmod g+s
+ MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
+ MSGMERGE=	msgmerge
+ 
+@@ -60,7 +58,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -90,9 +88,8 @@
+ 	do \
+ 	    dir=$(DESTDIR)$(prefix)/$$d; \
+ 	    echo "Creating language directory $$dir"; \
+-	    $(srcdir)/../mkinstalldirs $$dir; \
+-	    chmod $(DIRMODE) $$dir; \
+-	    $(DIRSETGID) $$dir; \
++	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
++	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
+ 	done
+ 	@for d in $(LANGUAGES); \
+ 	do \
+@@ -113,8 +110,6 @@
+ 
+ mofiles: $(MOFILES)
+ 
+-finish:
+-
+ clean:
+ 	-rm -f */LC_MESSAGES/mailman.mo
+ 
+diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
+--- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -30,7 +30,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ PYTHON=		@PYTHON@
+ 
+@@ -62,7 +61,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ DATAMODE=	664
+@@ -101,8 +100,6 @@
+ 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
+--- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -49,7 +48,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -68,8 +67,6 @@
+ 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
+ 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
+--- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
++++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ PYTHON=  	@PYTHON@
+ 
+@@ -63,10 +62,9 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
+-EXEMODE=	755
++DIRMODE=	2775
++EXEMODE=	2755
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+-DIRSETGID=	chmod g+s
+ 
+ # Fixed definitions
+ 
+@@ -110,20 +108,10 @@
+ 	do \
+ 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
+ 	    $(INSTALL_PROGRAM) $$f $$exe; \
+-	    $(DIRSETGID) $$exe; \
+ 	done
+ 	for f in $(MAIL_PROGS); \
+ 	do \
+ 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
+-	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
+-	done
+-
+-finish:
+-	-for f in $(SUID_CGI_PROGS); \
+-	do \
+-	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
+-	    chown $(MAILMAN_USER) $$exe; \
+-	    chmod u+s $$exe; \
+ 	done
+ 
+ clean:
+diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
+--- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ TRUE=		@TRUE@
+ 
+@@ -48,7 +47,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -61,15 +60,13 @@
+ install:
+ 	for d in $(LANGUAGES); \
+ 	do \
+-	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
++	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+ 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
+ 	    do \
+ 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+ 	    done; \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
+--- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -46,7 +45,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -60,8 +59,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
+--- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -46,7 +45,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -71,8 +70,6 @@
+ 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
+diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
+--- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
+@@ -28,7 +28,6 @@
+ DESTDIR=
+ 
+ CC=		@CC@
+-CHMOD=  	@CHMOD@
+ INSTALL=	@INSTALL@
+ 
+ DEFS=   	@DEFS@
+@@ -46,7 +45,7 @@
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE=	775
++DIRMODE=	2775
+ EXEMODE=	755
+ FILEMODE=	644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -60,8 +59,6 @@
+ 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
+ 	done
+ 
+-finish:
+-
+ clean:
+ 
+ distclean:
diff --git a/community/mailman/mailman.install b/community/mailman/mailman.install
new file mode 100644
index 000000000..ec85260a5
--- /dev/null
+++ b/community/mailman/mailman.install
@@ -0,0 +1,31 @@
+## arg 1:  the new package version
+post_install() {
+  # Make sure the group and user "mailman" exists on this system and has the correct values
+  if grep -q "^mailman:" /etc/group &> /dev/null ; then
+    groupmod -g 80 -n mailman mailman &> /dev/null
+  else
+    groupadd -g 80 mailman &> /dev/null
+  fi
+  
+  if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then
+    usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null
+  else
+    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null
+  fi 
+
+  # check file permissions
+#  cd /usr/lib/mailman && bin/check_perms -f  > /dev/null 2>&1     # -f applies fixes we should solve in the PKGBUILD
+  cd /usr/lib/mailman && bin/check_perms > /dev/null
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+## arg 1:  the old package version
+pre_remove() {
+  userdel mailman &>/dev/null
+  groupdel mailman &>/dev/null || /bin/true
+}
diff --git a/community/mailman/rc.mailman b/community/mailman/rc.mailman
new file mode 100644
index 000000000..07660e530
--- /dev/null
+++ b/community/mailman/rc.mailman
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting mailman Daemon"
+      /usr/lib/mailman/bin/mailmanctl start &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mailman
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping mailman Daemon"
+    /usr/lib/mailman/bin/mailmanctl stop &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mailman
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index f17501d54..8e2875a96 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63658 2012-02-05 12:04:01Z ibiru $
+# $Id: PKGBUILD 67192 2012-03-05 08:57:49Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=0.7.1
-pkgrel=13
+pkgrel=14
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD
index f3f114783..117cdb177 100644
--- a/community/me-tv/PKGBUILD
+++ b/community/me-tv/PKGBUILD
@@ -5,8 +5,9 @@
 #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
 
 pkgname=me-tv
-pkgver=2.0.1
-pkgrel=3
+pkgver=1.3.6
+pkgrel=1
+epoch=1
 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/me-tv"
@@ -16,7 +17,6 @@ makedepends=('intltool')
 install='me-tv.install'
 source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
 options=('!emptydirs')
-md5sums=('7cda820b795f2fea522ba3de5e312483')
 
 build() {
 
@@ -40,3 +40,4 @@ package() {
 	rm -rf "${pkgdir}/usr/etc/"
 
 }
+md5sums=('948a6957c3cd268717e139046269c410')
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
new file mode 100644
index 000000000..815e16643
--- /dev/null
+++ b/community/midori/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 67138 2012-03-04 23:52:43Z pschmitz $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: rabyte <rabyte.at.gmail.dot.com>
+# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+
+pkgname=midori
+pkgver=0.4.3
+pkgrel=1
+pkgdesc="A lightweight web browser based on Gtk WebKit"
+arch=('i686' 'x86_64')
+url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+license=('LGPL2.1')
+install=midori.install
+depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
+optdepends=('vala: for use in extensions')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # python2 
+  export PYTHON=/usr/bin/python2
+  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
+  
+  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
+	--enable-addons \
+	--disable-hildon \
+	--enable-unique \
+	--enable-nls \
+	--enable-docs \
+	--enable-apidocs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/midori/midori.install b/community/midori/midori.install
new file mode 100644
index 000000000..4da5511fd
--- /dev/null
+++ b/community/midori/midori.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/midori/webkit_search.diff b/community/midori/webkit_search.diff
new file mode 100644
index 000000000..620cdc96f
--- /dev/null
+++ b/community/midori/webkit_search.diff
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Wed, 21 Sep 2011 21:50:51 +0000
+Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
+
+Fixes: https://bugs.launchpad.net/midori/+bug/799603
+---
+diff --git a/midori/midori-view.c b/midori/midori-view.c
+index 0d7a96e..e426e7f 100644
+--- a/midori/midori-view.c
++++ b/midori/midori-view.c
+@@ -39,9 +39,11 @@
+     #include <sys/utsname.h>
+ #endif
+ 
++#if !WEBKIT_CHECK_VERSION (1, 5, 1)
+ /* This is unstable API, so we need to declare it */
+ gchar*
+ webkit_web_view_get_selected_text (WebKitWebView* web_view);
++#endif
+ 
+ static void
+ midori_view_construct_web_view (MidoriView* view);
+@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
+ gboolean
+ midori_view_has_selection (MidoriView* view)
+ {
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++    WebKitDOMDocument* doc;
++    WebKitDOMDOMWindow* window;
++    WebKitDOMDOMSelection* selection;
++    WebKitDOMRange* range;
++#endif
++
+     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
+ 
++
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++    doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
++    window = webkit_dom_document_get_default_view (doc);
++    selection = webkit_dom_dom_window_get_selection (window);
++    if (selection == NULL)
++        return FALSE;
++
++    range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
++    if (range == NULL)
++        return FALSE;
++
++    katze_assign (view->selected_text, webkit_dom_range_get_text (range));
++#else
+     katze_assign (view->selected_text, webkit_web_view_get_selected_text (
+         WEBKIT_WEB_VIEW (view->web_view)));
++#endif
++
+     if (view->selected_text && *view->selected_text)
+         return TRUE;
+     else
+--
+cgit 
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
index 430a67ffa..ecee22ddf 100644
--- a/community/milkytracker/PKGBUILD
+++ b/community/milkytracker/PKGBUILD
@@ -4,14 +4,16 @@
 
 pkgname=milkytracker
 pkgver=0.90.85
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast Tracker II inspired music tracker"
 arch=('x86_64' 'i686')
 url="http://www.milkytracker.org/"
 license=('GPL3')
 depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs')
+makedepends=('jack-audio-connection-kit')
 optdepends=('jack-audio-connection-kit: JACK audio support')
 options=('docs')
+install=$pkgname.install
 source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2"
         'arch.patch'
         "$pkgname.desktop")
@@ -23,7 +25,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   
   patch -p1 -i ../arch.patch 
-  ./configure --prefix=/usr --with-alsa
+  ./configure --prefix=/usr --with-alsa --with-jack
   make
 }
 
@@ -35,7 +37,8 @@ package() {
     "$pkgdir/usr/share/doc/milkytracker"
   install -Dm644 resources/pictures/carton.png \
     "$pkgdir/usr/share/pixmaps/milkytracker.png"
-  install -m644 "$srcdir/milkytracker.desktop" "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/milkytracker.desktop" \
+    "$pkgdir/usr/share/applications"
   install -m644 docs/ChangeLog.html "$pkgdir/usr/share/doc/milkytracker"
   install -m644 docs/MilkyTracker.html "$pkgdir/usr/share/doc/milkytracker"
   install -m644 docs/readme_unix "$pkgdir/usr/share/doc/milkytracker"
diff --git a/community/milkytracker/milkytracker.install b/community/milkytracker/milkytracker.install
new file mode 100644
index 000000000..aeef78890
--- /dev/null
+++ b/community/milkytracker/milkytracker.install
@@ -0,0 +1,18 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+  echo 'If you wish to use jack (or jack2), use this command the first time'
+  echo 'you start milkytracker: SDL_AUDIODRIVER=jack milkytracker'
+  echo 'Then select the jack driver in milkytracker and connect the audio'
+  echo 'with a program like qjackctl.'
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 517935780..2a4d7fb6e 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66824 2012-02-29 00:49:06Z tdziedzic $
+# $Id: PKGBUILD 67194 2012-03-05 08:58:08Z ibiru $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index e12f7ee0c..df25eb4d9 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58411 2011-11-12 17:18:08Z ibiru $
-# Maintainer:
+# $Id: PKGBUILD 67264 2012-03-06 01:23:37Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=2
+pkgrel=3
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,9 +11,18 @@ url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
 depends=('ffmpeg' 'libjpeg' 'v4l-utils')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	rc.motion
+	ffmpeg-0.8.patch
+	linux-headers.patch)
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '77be944e4466ab66836d50ea216af3b6'
+         'd36687710837d69fbce4608b1345fa34'
+         'd8c3c4fdded5cfbd729710475559a21d')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          'e092b0d880d0169feb56ed1e8a3c95729a7896f7'
+          '6912448db0711f85322505ee6f8052f8f98ae634'
+          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -33,29 +42,3 @@ package(){
 
   install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
 }
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '2f422c268337dce583b9dac344005e93')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '7b41c8c273980c147694d82af7c9cb9e51302dd9')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '5db295d7c2e4c38f36e861a3c4dfdd8d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '2b12df6d9053d17f6ac1969e3510dd50c6fe6667')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34'
-         'd8c3c4fdded5cfbd729710475559a21d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634'
-          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
diff --git a/community/motion/rc.motion b/community/motion/rc.motion
index 6ae95d17b..b6057744a 100755
--- a/community/motion/rc.motion
+++ b/community/motion/rc.motion
@@ -7,6 +7,7 @@ PID=`pidof -o %PPID /usr/bin/motion`
 case "$1" in
   start)
     stat_busy "Starting Motion"
+    mkdir -p /var/run/motion
     [ -z "$PID" ] && /usr/bin/motion
     if [ $? -gt 0 ]; then
       stat_fail
@@ -31,6 +32,6 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 6ee79439c..69703ea49 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.24.2
 pkgrel=2
 epoch=1
 pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
 license=('GPL')
 depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD
index 2130d9940..cde0f2af2 100644
--- a/community/naev/PKGBUILD
+++ b/community/naev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63674 2012-02-05 12:05:32Z ibiru $
+# $Id: PKGBUILD 66940 2012-03-02 03:03:12Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Johan Rehnberg <cleanrock@gmail.com>
 
 pkgname=naev
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=2
 pkgdesc='2D action/rpg space game'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
 makedepends=('freeglut')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f7d754a17ace87aac540d0d6d48313d6')
+md5sums=('a5fea2f4e0fef23d8932167b568d1868')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index f559175b7..3a18e5fdc 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 64813 2012-02-18 11:01:32Z arodseth $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 67247 2012-03-05 20:22:45Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
-pkgver=18
-pkgrel=2
+pkgver=19
+pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
 arch=('i686' 'x86_64' 'mips64el')
 backup=(etc/ngircd.conf)
@@ -13,7 +14,7 @@ license=('GPL')
 depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
         ngircd.sh)
-sha256sums=('b24a9cc3e9d32e845836d01e33fd2cfbbe2ecb5c86b6c0d0bc3178229e8472dc'
+sha256sums=('10d153ea88f5108aedf49e044b5daf8f19ad8053b7721e72408aabe77505388b'
             'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5')
 
 build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index d3332ebf4..7cd403639 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64710 2012-02-18 00:19:36Z tdziedzic $
+# $Id: PKGBUILD 66966 2012-03-02 23:22:53Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -7,7 +7,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.11
+pkgver=0.6.12
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('2f554353e831b8a22e6a85c676374374')
+md5sums=('a12766ae4003c9712927d1fa134ed9f6')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index dd91ef261..49ab732b2 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,10 +1,11 @@
+# $Id: PKGBUILD 67198 2012-03-05 08:58:24Z ibiru $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 _pkg=OpenImageIO
 pkgname=openimageio
 pkgver=0.10.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index 29d554111..9e054e0c1 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65701 2012-02-22 08:49:10Z lcarlier $
+# $Id: PKGBUILD 67244 2012-03-05 19:05:33Z svenstaro $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.2.0rc1
-_realpkgver=1.2.0-RC1
+pkgver=1.2.0rc2
+_realpkgver=1.2.0-RC2
 pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz")
-md5sums=('e2b32c0623a884e43e6d8b29cbb1febf')
+md5sums=('e0d9e02c33f087573e67105a7bb601f2')
 
 build() {
   cd ${pkgname}-${_realpkgver} 
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
deleted file mode 100644
index 09c3ca5ed..000000000
--- a/community/pcsxr/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-## Maintainer: schuay <jakob.gruber@gmail.com>
-## Contributor: quantax -- contact via Arch Linux forum or AUR
-## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=pcsxr
-pkgver=1.9.92
-pkgrel=3
-pkgdesc='A Sony PlayStation emulator based on the PCSX-df Project'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pcsxr.codeplex.com/'
-license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa')
-conflicts=('pcsx-df')
-_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)"
-source=($pkgname-$pkgver.tar.bz2::$_pkgurl)
-md5sums=('28411aed0b4424f97227d94bdefaec83')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr --enable-libcdio --enable-opengl
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
-
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index c1e64f0f2..ef98f7ab6 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63696 2012-02-05 12:07:40Z ibiru $
+# $Id: PKGBUILD 67200 2012-03-05 08:58:33Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=12
+pkgrel=13
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index d6841b2a7..d6f63db00 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61909 2012-01-10 16:08:51Z foutrelis $
+# $Id: PKGBUILD 67120 2012-03-04 18:04:34Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcached
-pkgver=1.0.2
-pkgrel=6
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcached"
@@ -11,7 +11,7 @@ license=('PHP')
 depends=('php' 'libmemcached')
 backup=('etc/php/conf.d/memcached.ini')
 source=(http://pecl.php.net/get/memcached-$pkgver.tgz)
-sha256sums=('16de77317e43b0a5bfd802c0bd2ef575adbad2093e8632d58738974e6cb14129')
+sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff')
 
 build() {
   cd "$srcdir/memcached-$pkgver"
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index e8b4871c9..04ccb85ef 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 63708 2012-02-05 12:08:32Z ibiru $
+# $Id: PKGBUILD 67202 2012-03-05 08:58:41Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
 license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
-makedepends=('scons' 'boost>=1.48' 'mesa')
+depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49')
+makedepends=('scons' 'boost>=1.49' 'mesa')
 source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
 	pingus.desktop)
 md5sums=('561798686f34d3fa4e69135d655f47ac'
diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD
index c47091deb..222ec87c7 100644
--- a/community/pion-net/PKGBUILD
+++ b/community/pion-net/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59958 2011-12-02 21:00:12Z ibiru $
+# $Id: PKGBUILD 67204 2012-03-05 08:58:47Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: David Watzke <david@watzke.cz>
 
 pkgname=pion-net
 pkgver=4.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
 url="http://www.pion.org/projects/pion-network-library"
 arch=('i686' 'x86_64')
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 3051fa127..53b6939ee 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64956 2012-02-18 23:33:35Z svenstaro $
+# $Id: PKGBUILD 67206 2012-03-05 08:58:57Z ibiru $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
@@ -6,7 +6,7 @@
 pkgname=pokerth
 _realname=PokerTH
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 8a00e25f6..e85e59349 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 24103 2010-08-19 22:45:29Z heftig $
+# $Id: PKGBUILD 67110 2012-03-04 12:47:55Z stativ $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
 pkgver=1.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool that finds the software that makes your laptop use more power than necessary"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesswatts.org/projects/powertop/"
 license=('GPL2')
 depends=('ncurses')
-source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz)
-md5sums=('78aa17c8f55178004223bf236654298e')
+source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz \
+        powertop-1.13-with-3.0.6.patch)
+md5sums=('78aa17c8f55178004223bf236654298e'
+         '2b4c9d75fb0f5c96bcd549bcbbeb9c9d')
 
 build() {
   cd "$srcdir/powertop-$pkgver"
+
+  # fix the reported batery usage on recent kernels
+  patch -Np1 < "$srcdir/powertop-1.13-with-3.0.6.patch" || true
+
   make
 }
 
diff --git a/community/powertop/powertop-1.13-with-3.0.6.patch b/community/powertop/powertop-1.13-with-3.0.6.patch
new file mode 100644
index 000000000..fc61913a8
--- /dev/null
+++ b/community/powertop/powertop-1.13-with-3.0.6.patch
@@ -0,0 +1,142 @@
+Common subdirectories: powertop-1.13/kernel-patches and powertop-patched/kernel-patches
+Common subdirectories: powertop-1.13/po and powertop-patched/po
+diff -u powertop-1.13/powertop.c powertop-patched/powertop.c
+--- powertop-1.13/powertop.c	2010-07-20 01:08:21.000000000 +0200
++++ powertop-patched/powertop.c	2011-10-20 14:34:41.163951192 +0200
+@@ -547,95 +547,6 @@
+ 	qsort (lines, linehead, sizeof (struct line), line_compare);
+ }
+ 
+-
+-
+-int print_battery_proc_acpi(void)
+-{
+-	DIR *dir;
+-	struct dirent *dirent;
+-	FILE *file;
+-	double rate = 0;
+-	double cap = 0;
+-
+-	char filename[256];
+-
+-	dir = opendir("/proc/acpi/battery");
+-	if (!dir)
+-		return 0;
+-
+-	while ((dirent = readdir(dir))) {
+-		int dontcount = 0;
+-		double voltage = 0.0;
+-		double amperes_drawn = 0.0;
+-		double watts_drawn = 0.0;
+-		double amperes_left = 0.0;
+-		double watts_left = 0.0;
+-		char line[1024];
+-
+-		if (strlen(dirent->d_name) < 3)
+-			continue;
+-
+-		sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name);
+-		file = fopen(filename, "r");
+-		if (!file)
+-			continue;
+-		memset(line, 0, 1024);
+-		while (fgets(line, 1024, file) != NULL) {
+-			char *c;
+-			if (strstr(line, "present:") && strstr(line, "no"))
+-				break;
+-
+-			if (strstr(line, "charging state:")
+-			    && !strstr(line, "discharging"))
+-				dontcount = 1;
+-			c = strchr(line, ':');
+-			if (!c)
+-				continue;
+-			c++;
+-
+-			if (strstr(line, "present voltage"))
+-				voltage = strtoull(c, NULL, 10) / 1000.0;
+-
+-			if (strstr(line, "remaining capacity") && strstr(c, "mW"))
+-				watts_left = strtoull(c, NULL, 10) / 1000.0;
+-
+-			if (strstr(line, "remaining capacity") && strstr(c, "mAh"))
+-				amperes_left = strtoull(c, NULL, 10) / 1000.0;
+-
+-			if (strstr(line, "present rate") && strstr(c, "mW"))
+-				watts_drawn = strtoull(c, NULL, 10) / 1000.0 ;
+-
+-			if (strstr(line, "present rate") && strstr(c, "mA"))
+-				amperes_drawn = strtoull(c, NULL, 10) / 1000.0;
+-
+-		}
+-		fclose(file);
+-
+-		if (!dontcount) {
+-			rate += watts_drawn + voltage * amperes_drawn;
+-		}
+-		cap += watts_left + voltage * amperes_left;
+-
+-
+-	}
+-	closedir(dir);
+-	if (prev_bat_cap - cap < 0.001 && rate < 0.001)
+-		last_bat_time = 0;
+-	if (!last_bat_time) {
+-		last_bat_time = prev_bat_time = time(NULL);
+-		last_bat_cap = prev_bat_cap = cap;
+-	}
+-	if (time(NULL) - last_bat_time >= 400) {
+-		prev_bat_cap = last_bat_cap;
+-		prev_bat_time = last_bat_time;
+-		last_bat_time = time(NULL);
+-		last_bat_cap = cap;
+-	}
+-
+-	show_acpi_power_line(rate, cap, prev_bat_cap - cap, time(NULL) - prev_bat_time);
+-	return 1;
+-}
+-
+ int print_battery_proc_pmu(void)
+ {
+ 	char line[80];
+@@ -719,9 +630,6 @@
+ 
+ 	char filename[256];
+ 
+-	if (print_battery_proc_acpi())
+-		return;
+-
+ 	if (print_battery_proc_pmu())
+ 		return;
+ 
+@@ -733,7 +641,6 @@
+ 	while ((dirent = readdir(dir))) {
+ 		int dontcount = 0;
+ 		double voltage = 0.0;
+-		double amperes_drawn = 0.0;
+ 		double watts_drawn = 0.0;
+ 		double watts_left = 0.0;
+ 		char line[1024];
+@@ -790,8 +697,12 @@
+ 			watts_left *= strtoull(line, NULL, 10) / 1000000.0;
+ 		fclose(file);
+ 
+-		sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name);
++		sprintf(filename, "/sys/class/power_supply/%s/power_now", dirent->d_name);
+ 		file = fopen(filename, "r");
++		if (!file) {
++		  sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name);
++		  file = fopen(filename, "r");
++		}
+ 		if (!file)
+ 			continue;
+ 		memset(line, 0, 1024);
+@@ -801,7 +712,7 @@
+ 		fclose(file);
+ 
+ 		if (!dontcount) {
+-			rate += watts_drawn + voltage * amperes_drawn;
++			rate += watts_drawn;
+ 		}
+ 		cap += watts_left;
+ 
diff --git a/community/pwgen/PKGBUILD b/community/pwgen/PKGBUILD
new file mode 100644
index 000000000..863c8c4b2
--- /dev/null
+++ b/community/pwgen/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 67140 2012-03-04 23:54:53Z pschmitz $
+# Maintainer: damir <damir@archlinux.org>
+# Contributor : Tobias Powalowski <t.powa@gmx.de>
+
+pkgname=pwgen
+pkgver=2.06
+pkgrel=3
+pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
+arch=("i686" "x86_64")
+url="http://sourceforge.net/projects/pwgen/"
+license=('GPL')
+depends=('glibc')
+source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz")
+md5sums=('935aebcbe610fbc9de8125e7b7d71297')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community/python2-pychm/PKGBUILD b/community/python2-pychm/PKGBUILD
new file mode 100644
index 000000000..3b53d9005
--- /dev/null
+++ b/community/python2-pychm/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 67234 2012-03-05 14:21:09Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: iom <pizorn@gmail.com>
+
+pkgname=python2-pychm
+pkgver=0.8.4
+pkgrel=1
+pkgdesc="Python bindings for chmlib"
+arch=('x86_64' 'i686')
+url="http://gnochm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'python2')
+replaces=('python-pychm=0.8.4')
+source=(http://downloads.sourceforge.net/sourceforge/gnochm/pychm-$pkgver.tar.gz)
+sha256sums=('84c99d7b28fb6862ee60a5d1d52fad0da4c95f1934e9c101d3293ee7e8b5357d')
+
+package() {
+  cd "$srcdir/pychm-$pkgver"
+
+  python2 setup.py install --root="$pkgdir"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 210a87f2b..e3167a023 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61485 2012-01-01 11:40:37Z schiv $
+# $Id: PKGBUILD 67085 2012-03-03 16:18:50Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('qt' 'jack' 'slv2' 'libmad' 'liblo'
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cae94dd21628f22351dec5521b5a564d')
+md5sums=('9f52ff00ed66d6de07dc444537949ed9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index afe2ca3ec..a8aaa6d61 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,38 +1,48 @@
-# $Id: PKGBUILD 66535 2012-02-25 23:57:00Z lfleischer $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 66970 2012-03-03 00:47:31Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
-pkgver=1.8.2
-pkgrel=2
-pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon'
+pkgver=1.8.5
+pkgrel=1
+pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
 depends=('glibc')
 arch=('i686' 'x86_64' 'mips64el')
-install=radvd.install
-source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d')
-md5sums=('ac8a862d2b232d25ea2622274a2da8a4'
-         '65a585f5850a1ac2a0c2c2a7096ec92a')
+backup=('etc/radvd.conf' 'etc/conf.d/radvd')
+source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
+        "$pkgname.rc"
+        "$pkgname.conf"
+        "$pkgname.service")
+sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d'
+          '7b187db1f0ba2897cc07ea14233c079593b69ef0'
+          'd7755ac7e752452e5ac92d2bfd970db00525902d'
+          'd95dc4d650a086641d62bf42806669e0a407d1df')
 
 build() {
   cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \
     --mandir=/usr/share/man
-
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}
+  make DESTDIR="$pkgdir" install
 
-  make DESTDIR=$pkgdir install
+  # install default config
+  install -D -m 644 radvd.conf.example "$pkgdir/etc/radvd.conf"
 
-  install -Dm644 radvd.conf.example \
-    $pkgdir/usr/share/doc/radvd/radvd.conf.example
-  install -Dm644 COPYRIGHT \
-    $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT 
-  install -Dm755 $srcdir/radvd.rc.d $pkgdir/etc/rc.d/radvd
+  # install license
+  install -D -m 644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+
+  # install initscripts & systemd files
+  install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  install -D -m 644 ../$pkgname.service \
+    "$pkgdir/lib/systemd/system/$pkgname.service"
 }
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/radvd/radvd.conf b/community/radvd/radvd.conf
new file mode 100644
index 000000000..26cd410d1
--- /dev/null
+++ b/community/radvd/radvd.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+DAEMON_OPTS='--logmethod syslog'
diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc
new file mode 100644
index 000000000..b5dc6e27b
--- /dev/null
+++ b/community/radvd/radvd.rc
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${0##*/}
+
+NAME='IPv6 Router Advertisement Daemon'
+DAEMON=/usr/sbin/radvd
+PID=$(pidof -o %PPID $DAEMON)
+
+case "$1" in
+	start)
+		stat_busy "Starting $NAME daemon"
+		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
+		stat_fail
+	;;
+  stop)
+		stat_busy "Stopping $NAME daemon"
+		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
+		stat_fail
+	;;
+  restart)
+		$0 stop
+		$0 start
+		exit 0
+	;;
+  *) 
+		echo "usage: ${0##*/} {start|stop|restart}" >&2
+	;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service
new file mode 100644
index 000000000..47a5f7f67
--- /dev/null
+++ b/community/radvd/radvd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=IPv6 Router Advertisement Daemon
+
+[Service]
+ExecStart=/usr/sbin/radvd --nodaemon --logmethod stderr
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index f72b5a364..c6ed1f53d 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60395 2011-12-13 10:24:06Z plewis $
+# $Id: PKGBUILD 66942 2012-03-02 15:35:36Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=0.8.1
+pkgver=0.9.0
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,15 @@ license=('GPL')
 depends=('kdebase-keditbookmarks')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('907c3bd299ee95806d337b749c74531441e0d205055998678337266ccc6c9b7f')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'fix-build.patch')
+sha256sums=('2dc4f9b041bba89937c3278f53cbcc61964d3e2e2279dd44000c19902459b6cc'
+            '3ef9f0e6dc37f479c7cc38d84f6a6366a499f371610df01bcdaff9f4b71d246e')
 
 build(){
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-build.patch
+
   cd ${srcdir}
   mkdir build 
   cd build
diff --git a/community/rekonq/fix-build.patch b/community/rekonq/fix-build.patch
new file mode 100644
index 000000000..1a401ce2c
--- /dev/null
+++ b/community/rekonq/fix-build.patch
@@ -0,0 +1,11 @@
+--- rekonq-0.9.0/doc/nl/index.docbook~	2012-03-02 15:31:21.730372412 +0000
++++ rekonq-0.9.0/doc/nl/index.docbook	2012-03-02 15:31:48.780152894 +0000
+@@ -82,7 +82,7 @@
+ ></surname
+ > </personname>
+     </author>
+-&ged.vertaald;&Freek.de.Kruijf; 
++&Freek.de.Kruijf; 
+     </authorgroup>
+ <legalnotice
+ >&FDLNotice;</legalnotice>
diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD
new file mode 100644
index 000000000..ce3d74f98
--- /dev/null
+++ b/community/ristretto/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 67146 2012-03-05 00:06:06Z pschmitz $
+# Maintainer:
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=ristretto
+pkgver=0.3.4
+pkgrel=1
+pkgdesc="A fast and lightweight picture-viewer for Xfce"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/ristretto"
+license=('GPL')
+depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils')
+makedepends=('intltool')
+groups=('xfce4-goodies')
+install=ristretto.install
+source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
+sha1sums=('7da6c287c45949193fd6046e82a099fd0469278c')
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/ristretto/ristretto.install b/community/ristretto/ristretto.install
new file mode 100644
index 000000000..75e2b7b55
--- /dev/null
+++ b/community/ristretto/ristretto.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 66bbc18d0..632fb473b 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62568 2012-01-21 14:00:13Z ttopper $
+# $Id: PKGBUILD 66956 2012-03-02 19:09:35Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.4.2
-pkgrel=2
+pkgver=2.5.2
+pkgrel=1
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://roxterm.sourceforge.net/"
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('663f5ffedebde550317cff4b3e61d2772881cd2f')
-md5sums=('7c3bb1471f814a8bfdfcf169ad18e425')
+sha1sums=('32d18b8a12f1711dc7bb5ae52300dc9eb6869e09')
+md5sums=('d879ba09c4d72546fca2e2e5f18eac07')
 
 
 build() {
diff --git a/community/rxvt-unicode/ChangeLog b/community/rxvt-unicode/ChangeLog
new file mode 100644
index 000000000..ba267d49e
--- /dev/null
+++ b/community/rxvt-unicode/ChangeLog
@@ -0,0 +1,14 @@
+2012-01-22  Angel Velasquez <angvp@archlinux.org>
+	* Version bump to 9.15
+
+2011-12-02  Angel Velasquez <angvp@archlinux.org>
+	* Version bump to 9.14
+
+2011-12-02  Angel Velasquez <angvp@archlinux.org>
+	* Moved perl from optdepend to depend (closes FS#25782)
+
+2011-05-22  Angel Velasquez <angvp@archlinux.org>
+	* Rebuilt against perl 5.14.0
+
+2011-05-17  Angel Velasquez <angvp@archlinux.org>
+	* Removed not accepted upstream patch (closes FS#23324)
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
new file mode 100644
index 000000000..ce0beeac1
--- /dev/null
+++ b/community/rxvt-unicode/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 67162 2012-03-05 00:37:20Z pschmitz $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+
+pkgname=rxvt-unicode
+pkgver=9.15
+pkgrel=1
+pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
+arch=('i686' 'x86_64')
+url="http://software.schmorp.de/pkg/rxvt-unicode.html"
+license=('GPL')
+depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
+optdepends=('gtk2-perl: to use the urxvt-tabbed')
+changelog=ChangeLog
+source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
+        ${pkgname}.desktop)
+md5sums=('15595aa326167ac5eb68c28d95432faf'
+         '3de6c13126a45bc3bc9f6bba077a1311')
+sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
+          '962aebc88982dbeb62a7c4a051ff567e015f61a0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --with-terminfo=/usr/share/terminfo \
+    --enable-256-color \
+    --enable-font-styles \
+    --enable-xim \
+    --enable-keepscrolling \
+    --enable-selectionscrolling \
+    --enable-smart-resize \
+    --enable-pixbuf \
+    --enable-transparency \
+    --enable-utmp \
+    --enable-wtmp \
+    --enable-lastlog \
+    --disable-frills
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/share/terminfo"
+  export TERMINFO="${pkgdir}/usr/share/terminfo"
+  make DESTDIR="${pkgdir}" install
+ # install the tabbing wrapper ( requires gtk2-perl! )
+  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
+  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
+ # install freedesktop menu
+  install -Dm644 ../${pkgname}.desktop \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+}
diff --git a/community/rxvt-unicode/rxvt-unicode.desktop b/community/rxvt-unicode/rxvt-unicode.desktop
new file mode 100644
index 000000000..68d613dbd
--- /dev/null
+++ b/community/rxvt-unicode/rxvt-unicode.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=rxvt-unicode
+Comment=An Unicode capable rxvt clone
+Exec=urxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index a2ae0f37e..1e3fb4438 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59964 2011-12-02 21:00:43Z ibiru $
+# $Id: PKGBUILD 67210 2012-03-05 08:59:27Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
-pkgver=1.4.23
-pkgrel=3
+pkgver=1.4.25
+pkgrel=1
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
@@ -27,7 +27,7 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.
 	'arch32-copyfiles'
 	'arch32-mount'
 	'arch32-nssdatabases')
-md5sums=('73873e0fee83a45655ed8efa246a1e26'
+md5sums=('c9e5056becd82b6330ac4502f59260f1'
          'a8d77cac806a0a9adef3f93cdbeb280a'
          '1e34db5387c4e5de911e15d8a9208bdb'
          '5a3f7b839c7e0b8933748da7c5b6385b'
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index 3a6cb9e24..10e7381bf 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 59548 2011-11-28 01:04:30Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Baumi <baumi@gmx.com>
 
 pkgname=sfk
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
 arch=('i686' 'x86_64')
 url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
+depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('263df6a8e18f6ebb6032f3c048df0b6d')
+md5sums=('b40c0c01785d40e7cde7cba3e4227f0b')
 
 build() {
   cd ${pkgname}${pkgver//./}
-  g++ $CXXFLAGS $LDFLAGS sfk.cpp sfknet.cpp patch.cpp inst.cpp -o sfk
+  g++ $CXXFLAGS $LDFLAGS sfk.cpp sfknet.cpp patch.cpp inst.cpp -o $pkgname
 }
 
 package() {
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index 9a0b23c2d..de781bee4 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63744 2012-02-05 12:11:13Z ibiru $
+# $Id: PKGBUILD 67212 2012-03-05 08:59:37Z ibiru $
 # Maintainer:
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=smc
 pkgver=1.9
-pkgrel=14
+pkgrel=15
 pkgdesc="Secret Maryo Chronicles"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.secretmaryo.org/"
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index ffed84675..c34a68abf 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66606 2012-02-26 14:17:33Z svenstaro $
+# $Id: PKGBUILD 67214 2012-03-05 08:59:41Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
 pkgname=spring
 pkgver=0.86.0
 _pkgver=86.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index d44f0bfcc..0b6e61eea 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62116 2012-01-16 02:08:51Z svenstaro $
+# $Id: PKGBUILD 67216 2012-03-05 08:59:53Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
 pkgver=0.141
-pkgrel=1
+pkgrel=2
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD
index b2751c52d..02425df5e 100644
--- a/community/tagpy/PKGBUILD
+++ b/community/tagpy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59972 2011-12-02 21:01:17Z ibiru $
+# $Id: PKGBUILD 67218 2012-03-05 09:00:00Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Callan Barrett <wizzomafizzo@gmail.com>
 # Contributor: Scott Horowitz <stonecrest@gmail.com>
 
 pkgname=tagpy
 pkgver=0.94.8
-pkgrel=6
+pkgrel=7
 pkgdesc="Python bindings for TagLib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/tagpy"
diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD
new file mode 100644
index 000000000..356e6006f
--- /dev/null
+++ b/community/tightvnc/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 67142 2012-03-04 23:56:49Z pschmitz $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+pkgname=tightvnc
+pkgver=1.3.10
+pkgrel=6
+pkgdesc="VNC Unix server && viewer"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.tightvnc.com"
+depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth')
+makedepends=('imake')
+conflicts=('vnc')
+options=('!makeflags')
+source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
+        'tightvnc-fontpath-xcolors.patch')
+md5sums=('397b35faad32d5246b6d44b142f8304f'
+         '21aa7f3376ec3c608ff22d199a19c601')
+
+build() {
+  cd $srcdir/vnc_unixsrc
+  patch -Np1 -i ../tightvnc-fontpath-xcolors.patch
+  sed -i 's|/usr/local/|/usr/share/|' vncserver
+
+  xmkmf
+  make World
+  cd Xvnc
+  ./configure
+  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
+    -i programs/Xserver/os/Makefile lib/font/fc/Makefile
+  make
+}
+
+package() {
+  cd $srcdir/vnc_unixsrc
+  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
+  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
+
+  # install java classes
+  mkdir -p $pkgdir/usr/share/vnc/classes
+  install -Dm644 $srcdir/vnc_unixsrc/classes/* \
+    $pkgdir/usr/share/vnc/classes
+}
diff --git a/community/tightvnc/tightvnc-fontpath-xcolors.patch b/community/tightvnc/tightvnc-fontpath-xcolors.patch
new file mode 100644
index 000000000..10bc4b596
--- /dev/null
+++ b/community/tightvnc/tightvnc-fontpath-xcolors.patch
@@ -0,0 +1,13 @@
+diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
+--- vnc_unixsrc/vncserver	2009-02-11 23:27:18.000000000 -0500
++++ vnc_unixsrc.fixed/vncserver	2009-04-23 21:46:46.000000000 -0400
+@@ -34,7 +34,8 @@
+ $desktopName = "X";
+ $vncClasses = "/usr/local/vnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
++$colorPath = "/usr/share/X11/rgb";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # Read configuration from the system-wide and user files if present.
diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD
index 7088849a9..95160b25e 100644
--- a/community/twinkle/PKGBUILD
+++ b/community/twinkle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64393 2012-02-12 19:27:33Z arodseth $
+# $Id: PKGBUILD 67220 2012-03-05 09:00:06Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=twinkle
 pkgver=1.4.2
-pkgrel=14
+pkgrel=15
 pkgdesc="Softphone for voice over IP and IM communication using SIP"
 arch=('x86_64' 'i686')
 url="http://www.twinklephone.com/"
@@ -18,6 +18,8 @@ source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz
         "twinkle.desktop")
 sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
             '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
+sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
+            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
new file mode 100644
index 000000000..1215b4714
--- /dev/null
+++ b/community/vsftpd/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 67148 2012-03-05 00:08:24Z pschmitz $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=vsftpd
+pkgver=2.3.5
+pkgrel=1
+pkgdesc="Very Secure FTP daemon"
+arch=('i686' 'x86_64')
+url="https://security.appspot.com/vsftpd.html"
+license=('GPL2')
+depends=('openssl')
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
+install=vsftpd.install
+source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
+        'vsftpd.xinetd' 'vsftpd.d')
+sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
+          '2ddf92782f19dafc72439a2917acb1d7e124d149'
+          'c87b4ce56dac15223694a6e86c01ea813b877596'
+          '24f268956c24e78be0c234c6d31f41487922eafe')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # build-time config
+  sed \
+    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
+    -i builddefs.h
+  make CFLAGS="${CFLAGS}"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
+  install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
+  install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
+  install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
+  install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
+  install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
+
+  install -d -m755 "${pkgdir}/usr/share/empty"
+}
diff --git a/community/vsftpd/vsftpd.d b/community/vsftpd/vsftpd.d
new file mode 100644
index 000000000..27310855c
--- /dev/null
+++ b/community/vsftpd/vsftpd.d
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+daemon_name=vsftpd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=$(get_pid)
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name &
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo $(get_pid) > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=$(get_pid)
+    # KILL
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/community/vsftpd/vsftpd.install b/community/vsftpd/vsftpd.install
new file mode 100644
index 000000000..48f134e24
--- /dev/null
+++ b/community/vsftpd/vsftpd.install
@@ -0,0 +1,17 @@
+# arg 1:  the new package version
+post_install() {
+  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
+    echo ">>> It appears that your current kernel has linux security"
+    echo ">>> capabilities built as a module.  vsftpd requires this"
+    echo ">>> functionality to operate."
+    echo ">>>"
+    echo ">>> To activate the module, please load it now (modprobe capability)."
+    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
+    echo ">>> it will be activated automatically at boot-up."
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
diff --git a/community/vsftpd/vsftpd.xinetd b/community/vsftpd/vsftpd.xinetd
new file mode 100644
index 000000000..eff2eb3db
--- /dev/null
+++ b/community/vsftpd/vsftpd.xinetd
@@ -0,0 +1,10 @@
+service ftp
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/vsftpd
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index ba3715bf3..2fe9a7873 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66692 2012-02-27 12:46:09Z svenstaro $
+# $Id: PKGBUILD 67222 2012-03-05 09:00:17Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=wesnoth
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 04b748d41..04d987cf8 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60381 2011-12-12 16:41:59Z spupykin $
+# $Id: PKGBUILD 67224 2012-03-05 09:00:24Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD
new file mode 100644
index 000000000..4364dd27a
--- /dev/null
+++ b/community/wxcam/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+pkgname=wxcam
+pkgver=1.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=(GPL)
+pkgdesc="Webcam application for linux"
+# version of CImg library needed to compile wxcam -
+# http://cimg.sourceforge.net/
+_CImg_ver=1.4.9
+url="http://wxcam.sourceforge.net"
+makedepends=('intltool>=0.35.0')
+depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib')
+source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2
+	    http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip)
+md5sums=('c9ea8991b6375c1709a7ce4e61fcc263'
+         'a07cba03f6d66a9970e0b3fcc230bddc')
+
+build() {
+    cp $srcdir/CImg-${_CImg_ver}/CImg.h $srcdir/$pkgname-$pkgver
+
+    cd $srcdir/$pkgname-$pkgver
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+    make DESTDIR=$pkgdir install
+
+    mv $pkgdir/usr/doc $pkgdir/usr/share/
+}
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 9fa62dba5..ed26181bd 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60406 2011-12-13 10:42:25Z spupykin $
+# $Id: PKGBUILD 67080 2012-03-03 16:12:00Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.4
 
 pkgname=xmobar
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index ee51d9f10..6e2977c70 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 60798 2011-12-18 11:12:08Z jelle $
+# $Id: PKGBUILD 67084 2012-03-03 16:12:24Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.3' 'xmonad=0.10' 'sh' 'haskell-x11=1.5.0.1'
-         'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('616cbc632bbde5cd4cdb643ee47e74d2')
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,4 +32,3 @@ package() {
   runhaskell Setup.lhs copy --destdir=$pkgdir
   install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
 }
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 0d015a40d..1719df6fc 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 62068 2012-01-15 15:18:39Z jelle $
+# $Id: PKGBUILD 67082 2012-03-03 16:12:17Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index 1df0d7b06..af16b61c8 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -26,7 +26,6 @@ build() {
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  export CFLAGS+="-Wparentheses"
 
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD
index b79831cb5..300107b22 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
-makedepends=('python-m2crypto' 'pkg-config')
+makedepends=('python-m2crypto')
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
         crda.rc libnl32.patch)
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 77aa80bd8..3819ef24b 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 142187 2011-11-06 02:25:41Z stephane $
+# $Id: PKGBUILD 152239 2012-03-05 17:06:10Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.1_20111020
-pkgrel=1.1
+pkgver=1.1_20120215
+pkgrel=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('ddabc0950275db4e9cef382a862ff3b20746e843')
+sha1sums=('0d8a07e064c6d4f9cc7d9cb21c4609dc4a19537e')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver/_/-}"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 5ea4f6637..b733a5087 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148652 2012-02-05 03:55:39Z allan $
+# $Id: PKGBUILD 151925 2012-03-04 10:58:06Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -9,9 +9,9 @@ if [[ "${CARCH}" != "mips64el" ]]; then
 else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
-pkgver=4.6.2
-pkgrel=7
-_snapshot=4.6-20120120
+pkgver=4.6.3
+pkgrel=1
+#_snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,14 +24,14 @@ else
 fi
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
         gcc_mips64el_lib.patch
 	gcc-hash-style-both.patch
 	gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+md5sums=('773092fe5194353b02bb0110052a972e'
          '450772ce32daed97d7383199f8797f33'
          '4030ee1c08dd1e843c0225b772360e76'
          '67e337993d821d72fccacbed52d48c34'
diff --git a/core/glibc/.arch b/core/glibc/.arch
deleted file mode 100644
index 9fe4d07f7..000000000
--- a/core/glibc/.arch
+++ /dev/null
@@ -1 +0,0 @@
-mips64el=false
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 8e0684797..175e7a3b2 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150228 2012-02-15 09:53:59Z allan $
+# $Id: PKGBUILD 151829 2012-03-03 08:49:00Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=6
+pkgrel=7
 _glibcdate=20111227
 _glibcportsver=2.15
 _glibcportsdate=20120127
@@ -25,13 +25,12 @@ install=glibc.install
 source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
         http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz
         glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
         glibc-__i686.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
         glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
+        glibc-2.15-fix-res_query-assert.patch
         glibc-2.15-regex.patch
         glibc-2.15-lddebug-scopes.patch
         glibc-2.15-revert-c5a0802a.patch
@@ -43,30 +42,47 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_
         glibc-2.15-revert-netlink-cache.patch
         glibc-2.15-arena.patch
         glibc-2.15-negative-result-cache.patch
+        glibc-2.15-multiarch-x86-strcmp.patch
+        glibc-2.15-vdso.patch
+        glibc-2.15-feraiseexcept-plt.patch
+        glibc-2.15-vfprintf-nargs.patch
+        glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+        glibc-2.15-fmtmsg-locking.patch
+        glibc-2.15-non-signalling-comparisons.patch
+        glibc-2.15-rintf-rounding.patch
+        glibc-2.15-nearbyintf-rounding.patch
         nscd
         locale.gen.txt
         locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '935995663b89924a98d20a636045949a'
          '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
+         'e60e33591c9ec1447e4cddadcbb9cf3a'
          '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
+         '31f415b41197d85d3bbee3d1eecd06a3'
          'b3526cbd5e29773560dba725db99af5a'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
-         '39353f53168f4a7509ba5fe0d9f218b8'
-         '136eb969f5d6bb6f5155f72a1a7cf23e'
+         'f0782ddbf38e0b30ec6b85348816046f'
+         '3d844b53b2dbb7c996e39c7ad932f55d'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
          'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
-         '6771b0b2bb8aa3870a259fd2f46c424f'
+         '94b61302a7ca6c5764d013dc7738fcfe'
          'a9ffadcfd2d357f91fee0b861fd4a7c6'
          '2c46b8e294de24c531f2253ff69aeef3'
+         '7a2998a04ebfcf8bf820540f490ce714'
+         '0d77d20fa7fe2f87ad945cb9edb4d91d'
+         'bfdefac3d705f41fbf84b1de1dc945af'
+         'dded423e264cdd178500f3e8ad62fe66'
+         '340deaa582a95ddde86edb624c3bfea0'
+         '6bbac50e6ff82187654e6a0a7bd849e7'
+         'c483504cf404ed0b44480af627813a97'
+         '1419d61fd1dbc6cdc48bb59da86fa66f'
+         '7ff501435078b1a2622124fbeaafc921'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -89,34 +105,25 @@ mksource-ports() {
   tar -cvJf glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-ports/*
 }
 
+
 build() {
   cd ${srcdir}/glibc
 
   # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
+  patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
 
-  # Undefine __i686 for gcc <= 4.6
+  # undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+  patch -p1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+  patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9  (fedora branch)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely (but rebuilds may fix):
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013  (used by opensuse)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
+  patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873  (fedora branch)
@@ -124,7 +131,11 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3  (fedora branch)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
-  # Fix up regcomp/regexec
+  # fix res_query assertion
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
+
+  # fix up regcomp/regexec
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
   patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
 
@@ -149,28 +160,65 @@ build() {
   # fix AVX detection
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
-  patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
   # and "fix" strcasecmp
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79  (fedora branch)
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
   # handle ARENA_TEST correctly
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
-  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
 
   # Do not cache negative results in nscd if these are transient
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
-  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
+  # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
+  patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
+  
+  # always set l_used for vDSO.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
+  patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
+
+  # fix x86 PLT slot usage for feraiseexcept
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
+  patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
+
+  # vfprintf nargs overflow - CVE-2012-0864
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13656
+  # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html
+  patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
+
+  # avoid out ouf bounds read in __libc_res_nquerydomain
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
+  patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+
+  # make fmtmsg function thread-safe
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
+  patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
+
+  # use non-signaling floating-point comparisons in math functions
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
+  patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
+
+  # fix rintf rounding.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
+  patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
+
+  # fix nearbyintf rounding
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
+  patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
 
   if [ "${CARCH}" = "mips64el" ]; then
       ln -s ../glibc-ports ports
diff --git a/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
index ce089b49c..533fc1b4b 100644
--- a/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ b/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@@ -1,13 +1,3 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
 diff --git a/elf/dl-object.c b/elf/dl-object.c
 index 22a1635..7674d49 100644
 --- a/elf/dl-object.c
@@ -22,5 +12,3 @@ index 22a1635..7674d49 100644
  
    return new;
  }
--- 
-1.7.2
diff --git a/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
new file mode 100644
index 000000000..6f0a0398f
--- /dev/null
+++ b/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
@@ -0,0 +1,24 @@
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..abccd4a 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
+ 		 * copy without '.' if present.
+ 		 */
+ 		n = strlen(name);
+-		if (n >= MAXDNAME) {
++
++		/* Decrement N prior to checking it against MAXDNAME
++		   so that we detect a wrap to SIZE_MAX and return
++		   a reasonable error.  */
++		n--;
++		if (n >= MAXDNAME - 1) {
+ 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
+ 			return (-1);
+ 		}
+-		n--;
+-		if (n >= 0 && name[n] == '.') {
++		if (name[n] == '.') {
+ 			strncpy(nbuf, name, n);
+ 			nbuf[n] = '\0';
+ 		} else
diff --git a/core/glibc/glibc-2.15-feraiseexcept-plt.patch b/core/glibc/glibc-2.15-feraiseexcept-plt.patch
new file mode 100644
index 000000000..c41acc169
--- /dev/null
+++ b/core/glibc/glibc-2.15-feraiseexcept-plt.patch
@@ -0,0 +1,20 @@
+diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
+index 70f9ee2..6e2ce35 100644
+--- a/sysdeps/i386/fpu/feupdateenv.c
++++ b/sysdeps/i386/fpu/feupdateenv.c
+@@ -1,5 +1,5 @@
+ /* Install given floating-point environment and raise exceptions.
+-   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
++   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
+   /* Raise the saved exception.  Incidently for us the implementation
+      defined format of the values in objects of type fexcept_t is the
+      same as the ones specified using the FE_* constants.  */
+-  feraiseexcept ((int) temp);
++  __feraiseexcept ((int) temp);
+ 
+   /* Success.  */
+   return 0;
diff --git a/core/glibc/glibc-2.15-fix-res_query-assert.patch b/core/glibc/glibc-2.15-fix-res_query-assert.patch
new file mode 100644
index 000000000..a894da9c7
--- /dev/null
+++ b/core/glibc/glibc-2.15-fix-res_query-assert.patch
@@ -0,0 +1,51 @@
+--- a/resolv/res_query.c	
++++ a/resolv/res_query.c	
+@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
+ 		  int *resplen2)
+ {
+ 	HEADER *hp = (HEADER *) answer;
++	HEADER *hp2;
+ 	int n, use_malloc = 0;
+ 	u_int oflags = statp->_flags;
+ 
+@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
+ 	  /* __libc_res_nsend might have reallocated the buffer.  */
+ 	  hp = (HEADER *) *answerp;
+ 
+-	/* We simplify the following tests by assigning HP to HP2.  It
+-	   is easy to verify that this is the same as ignoring all
+-	   tests of HP2.  */
+-	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
+-
+-	if (n < (int) sizeof (HEADER) && answerp2 != NULL
+-	    && *resplen2 > (int) sizeof (HEADER))
++	/* We simplify the following tests by assigning HP to HP2 or
++	   vice versa.  It is easy to verify that this is the same as
++	   ignoring all tests of HP or HP2.  */
++	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp = hp2;
++	    hp2 = hp;
+ 	  }
+-	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+-		 && n > (int) sizeof (HEADER))
++	else
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp2 = hp;
++	    hp2 = (HEADER *) *answerp2;
++	    if (n < (int) sizeof (HEADER))
++	      {
++	        hp = hp2;
++	      }
+ 	  }
+ 
++	/* Make sure both hp and hp2 are defined */
++	assert((hp != NULL) && (hp2 != NULL));
++
+ 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
+ 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
+ #ifdef DEBUG
diff --git a/core/glibc/glibc-2.15-fmtmsg-locking.patch b/core/glibc/glibc-2.15-fmtmsg-locking.patch
new file mode 100644
index 000000000..f5976abd9
--- /dev/null
+++ b/core/glibc/glibc-2.15-fmtmsg-locking.patch
@@ -0,0 +1,148 @@
+diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
+index 9203317..4c02302 100644
+--- a/stdlib/fmtmsg.c
++++ b/stdlib/fmtmsg.c
+@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	const char *text, const char *action, const char *tag)
+ {
+   __libc_once_define (static, once);
+-  int result = MM_OK;
+   struct severity_info *severity_rec;
+ 
+   /* Make sure everything is initialized.  */
+@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	return MM_NOTOK;
+     }
+ 
+-  for (severity_rec = severity_list; severity_rec != NULL;
+-       severity_rec = severity_rec->next)
+-    if (severity == severity_rec->severity)
+-      /* Bingo.  */
+-      break;
+-
+-  /* If we don't know anything about the severity level return an error.  */
+-  if (severity_rec == NULL)
+-    return MM_NOTOK;
+-
+-
+ #ifdef __libc_ptf_call
+   /* We do not want this call to be cut short by a thread
+      cancellation.  Therefore disable cancellation for now.  */
+@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
+ 		   0);
+ #endif
+ 
+-  /* Now we can print.  */
+-  if (classification & MM_PRINT)
+-    {
+-      int do_label = (print & label_mask) && label != MM_NULLLBL;
+-      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
+-      int do_text = (print & text_mask) && text != MM_NULLTXT;
+-      int do_action = (print & action_mask) && action != MM_NULLACT;
+-      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
+-
+-      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+-		      do_label ? label : "",
+-		      do_label && (do_severity | do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_severity ? severity_rec->string : "",
+-		      do_severity && (do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_text ? text : "",
+-		      do_text && (do_action | do_tag) ? "\n" : "",
+-		      do_action ? "TO FIX: " : "",
+-		      do_action ? action : "",
+-		      do_action && do_tag ? "  " : "",
+-		      do_tag ? tag : "") < 0)
+-	/* Oh, oh.  An error occurred during the output.  */
+-	result = MM_NOMSG;
+-    }
++  __libc_lock_lock (lock);
+ 
+-  if (classification & MM_CONSOLE)
++  for (severity_rec = severity_list; severity_rec != NULL;
++       severity_rec = severity_rec->next)
++    if (severity == severity_rec->severity)
++      /* Bingo.  */
++      break;
++
++  /* If we don't know anything about the severity level return an error.  */
++  int result = MM_NOTOK;
++  if (severity_rec != NULL)
+     {
+-      int do_label = label != MM_NULLLBL;
+-      int do_severity = severity != MM_NULLSEV;
+-      int do_text = text != MM_NULLTXT;
+-      int do_action = action != MM_NULLACT;
+-      int do_tag = tag != MM_NULLTAG;
+-
+-      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
+-	      do_label ? label : "",
+-	      do_label && (do_severity | do_text | do_action | do_tag)
+-	      ? ": " : "",
+-	      do_severity ? severity_rec->string : "",
+-	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
+-	      do_text ? text : "",
+-	      do_text && (do_action | do_tag) ? "\n" : "",
+-	      do_action ? "TO FIX: " : "",
+-	      do_action ? action : "",
+-	      do_action && do_tag ? "  " : "",
+-	      do_tag ? tag : "");
++      result = MM_OK;
++
++      /* Now we can print.  */
++      if (classification & MM_PRINT)
++	{
++	  int do_label = (print & label_mask) && label != MM_NULLLBL;
++	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
++	  int do_text = (print & text_mask) && text != MM_NULLTXT;
++	  int do_action = (print & action_mask) && action != MM_NULLACT;
++	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
++			  do_label ? label : "",
++			  need_colon ? ": " : "",
++			  do_severity ? severity_rec->string : "",
++			  do_severity && (do_text | do_action | do_tag)
++			  ? ": " : "",
++			  do_text ? text : "",
++			  do_text && (do_action | do_tag) ? "\n" : "",
++			  do_action ? "TO FIX: " : "",
++			  do_action ? action : "",
++			  do_action && do_tag ? "  " : "",
++			  do_tag ? tag : "") < 0)
++	    /* Oh, oh.  An error occurred during the output.  */
++	    result = MM_NOMSG;
++	}
++
++      if (classification & MM_CONSOLE)
++	{
++	  int do_label = label != MM_NULLLBL;
++	  int do_severity = severity != MM_NULLSEV;
++	  int do_text = text != MM_NULLTXT;
++	  int do_action = action != MM_NULLACT;
++	  int do_tag = tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
++		  do_label ? label : "",
++		  need_colon ? ": " : "",
++		  do_severity ? severity_rec->string : "",
++		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
++		  do_text ? text : "",
++		  do_text && (do_action | do_tag) ? "\n" : "",
++		  do_action ? "TO FIX: " : "",
++		  do_action ? action : "",
++		  do_action && do_tag ? "  " : "",
++		  do_tag ? tag : "");
++	}
+     }
+ 
++  __libc_lock_unlock (lock);
++
+ #ifdef __libc_ptf_call
+   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ #endif
diff --git a/core/glibc/glibc-2.15-ifunc.patch b/core/glibc/glibc-2.15-ifunc.patch
index 8ad0b9d7a..115afa02a 100644
--- a/core/glibc/glibc-2.15-ifunc.patch
+++ b/core/glibc/glibc-2.15-ifunc.patch
@@ -1,23 +1,3 @@
-
-From 6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 Mon Sep 17 00:00:00 2001
-From: Ulrich Drepper <drepper@gmail.com>
-Date: Fri, 27 Jan 2012 15:05:19 -0500
-Subject: [PATCH] Sort objects before relocations
-
----
- ChangeLog              |   11 ++++
- Makeconfig             |    6 ++
- NEWS                   |    4 +-
- elf/Makefile           |   15 +++++-
- elf/dl-open.c          |  128 ++++++++++++++++++++++++++++++++++++------------
- elf/tst-relsort1.c     |   19 +++++++
- elf/tst-relsort1mod1.c |    7 +++
- elf/tst-relsort1mod2.c |    7 +++
- 8 files changed, 160 insertions(+), 37 deletions(-)
- create mode 100644 elf/tst-relsort1.c
- create mode 100644 elf/tst-relsort1mod1.c
- create mode 100644 elf/tst-relsort1mod2.c
-
 diff --git a/Makeconfig b/Makeconfig
 index 2db2821..68547b2 100644
 --- a/Makeconfig
@@ -280,6 +260,3 @@ index 0000000..a2c3e55
 +{
 +  return floor (d) != 0.0;
 +}
--- 
-1.7.3.4
-
diff --git a/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch b/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
new file mode 100644
index 000000000..38c9e617f
--- /dev/null
+++ b/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
@@ -0,0 +1,39 @@
+diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+index d10e872..d4fcd2b 100644
+--- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strcasecmp.c>
+ 
++strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
+index 5410d17..b3b9eb8 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp.S
++++ b/sysdeps/i386/i686/multiarch/strcmp.S
+@@ -111,6 +111,7 @@ END(STRCMP)
+ # endif
+ #endif
+ 
+-#ifndef USE_AS_STRNCMP
++#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
++    && !defined USE_AS_STRNCASECMP_L
+ # include "../strcmp.S"
+ #endif
+diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+index 0c68b8d..7e601af 100644
+--- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strncase.c>
+ 
++strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/core/glibc/glibc-2.15-nearbyintf-rounding.patch b/core/glibc/glibc-2.15-nearbyintf-rounding.patch
new file mode 100644
index 000000000..b2bb9caac
--- /dev/null
+++ b/core/glibc/glibc-2.15-nearbyintf-rounding.patch
@@ -0,0 +1,75 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index c8186c8..1016753 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -4632,6 +4632,29 @@ nearbyint_test (void)
+   TEST_f_f (nearbyint, 524286.75, 524287.0);
+   TEST_f_f (nearbyint, 524288.75, 524289.0);
+ 
++  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
++  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
++  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
++  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
++  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
++  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
++  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
++  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
++  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
++  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
++#endif
++
+   END (nearbyint);
+ }
+ 
+diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+index 04ef9ab..a6d602b 100644
+--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
++++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+@@ -30,18 +30,12 @@ __nearbyintf(float x)
+ {
+ 	fenv_t env;
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		libc_feholdexceptf (&env);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+@@ -49,17 +43,11 @@ __nearbyintf(float x)
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	libc_feholdexceptf (&env);
+ 	w = TWO23[sx]+x;
+ 	t = w-TWO23[sx];
diff --git a/core/glibc/glibc-2.15-non-signalling-comparisons.patch b/core/glibc/glibc-2.15-non-signalling-comparisons.patch
new file mode 100644
index 000000000..874f8b4cb
--- /dev/null
+++ b/core/glibc/glibc-2.15-non-signalling-comparisons.patch
@@ -0,0 +1,886 @@
+diff --git a/math/w_acos.c b/math/w_acos.c
+index 3138408..0490933 100644
+--- a/math/w_acos.c
++++ b/math/w_acos.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __acos (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosf.c b/math/w_acosf.c
+index 0e41a2c..2500a7d 100644
+--- a/math/w_acosf.c
++++ b/math/w_acosf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __acosf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosh.c b/math/w_acosh.c
+index 0bd2686..d632987 100644
+--- a/math/w_acosh.c
++++ b/math/w_acosh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __acosh (double x)
+ {
+-  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 29);
+ 
+diff --git a/math/w_acoshf.c b/math/w_acoshf.c
+index c59bf94..f77df2b 100644
+--- a/math/w_acoshf.c
++++ b/math/w_acoshf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __acoshf (float x)
+ {
+-  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard_f (x, x, 129);
+ 
+diff --git a/math/w_acoshl.c b/math/w_acoshl.c
+index 819bdfc..cc823b8 100644
+--- a/math/w_acoshl.c
++++ b/math/w_acoshl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __acoshl (long double x)
+ {
+-  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 229);
+ 
+diff --git a/math/w_acosl.c b/math/w_acosl.c
+index 6417068..05023b4 100644
+--- a/math/w_acosl.c
++++ b/math/w_acosl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __acosl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asin.c b/math/w_asin.c
+index d4e89ce..0fa9487 100644
+--- a/math/w_asin.c
++++ b/math/w_asin.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __asin (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinf.c b/math/w_asinf.c
+index 270961f..c28edab 100644
+--- a/math/w_asinf.c
++++ b/math/w_asinf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __asinf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinl.c b/math/w_asinl.c
+index 32e5273..e4036d8 100644
+--- a/math/w_asinl.c
++++ b/math/w_asinl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __asinl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_atanh.c b/math/w_atanh.c
+index 1022bd5..190d2e9 100644
+--- a/math/w_atanh.c
++++ b/math/w_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ double
+ __atanh (double x)
+ {
+-  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabs (x) > 1.0
+ 			      ? 30		/* atanh(|x|>1) */
+diff --git a/math/w_atanhf.c b/math/w_atanhf.c
+index 3c8cf83..e0c5dc3 100644
+--- a/math/w_atanhf.c
++++ b/math/w_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ float
+ __atanhf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x,
+ 				fabsf (x) > 1.0f
+ 				? 130		/* atanh(|x|>1) */
+diff --git a/math/w_atanhl.c b/math/w_atanhl.c
+index f582acf..319535d 100644
+--- a/math/w_atanhl.c
++++ b/math/w_atanhl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ long double
+ __atanhl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabsl (x) > 1.0L
+ 			      ? 230		/* atanh(|x|>1) */
+diff --git a/math/w_exp2.c b/math/w_exp2.c
+index bf22326..7a3b0af 100644
+--- a/math/w_exp2.c
++++ b/math/w_exp2.c
+@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
+ double
+ __exp2 (double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finite (x))
+     /* exp2 overflow: 44, exp2 underflow: 45 */
+     return __kernel_standard (x, x, 44 + (x <= o_threshold));
+diff --git a/math/w_exp2f.c b/math/w_exp2f.c
+index 7215fca..c4e9e94 100644
+--- a/math/w_exp2f.c
++++ b/math/w_exp2f.c
+@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
+ float
+ __exp2f (float x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitef (x))
+     /* exp2 overflow: 144, exp2 underflow: 145 */
+     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
+diff --git a/math/w_exp2l.c b/math/w_exp2l.c
+index ac8d231..442a637 100644
+--- a/math/w_exp2l.c
++++ b/math/w_exp2l.c
+@@ -13,7 +13,8 @@ static const long double u_threshold
+ long double
+ __exp2l (long double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitel (x))
+     /* exp2 overflow: 244, exp2 underflow: 245 */
+     return __kernel_standard (x, x, 244 + (x <= o_threshold));
+diff --git a/math/w_j0.c b/math/w_j0.c
+index 1dff8b4..f8d3724 100644
+--- a/math/w_j0.c
++++ b/math/w_j0.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j0 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 34);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
+ double
+ y0 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j0f.c b/math/w_j0f.c
+index fc52f26..cef36aa 100644
+--- a/math/w_j0f.c
++++ b/math/w_j0f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ j0f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 134);
+@@ -38,7 +38,8 @@ j0f (float x)
+ float
+ y0f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++                        || isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j0l.c b/math/w_j0l.c
+index 8d72d50..144f33c 100644
+--- a/math/w_j0l.c
++++ b/math/w_j0l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j0l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 234);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
+ long double
+ __y0l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_j1.c b/math/w_j1.c
+index 358e0e1..e9a5357 100644
+--- a/math/w_j1.c
++++ b/math/w_j1.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j1 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 36);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
+ double
+ y1 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j1f.c b/math/w_j1f.c
+index 096fdf5..29bd949 100644
+--- a/math/w_j1f.c
++++ b/math/w_j1f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ j1f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 136);
+ 
+@@ -37,7 +38,8 @@ j1f (float x)
+ float
+ y1f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j1l.c b/math/w_j1l.c
+index 93e4ee4..01b8551 100644
+--- a/math/w_j1l.c
++++ b/math/w_j1l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j1l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 236);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
+ long double
+ __y1l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_jn.c b/math/w_jn.c
+index f0dd8c6..fd3fb16 100644
+--- a/math/w_jn.c
++++ b/math/w_jn.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ jn (int n, double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard (n, x, 38);
+ 
+@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
+ double
+ yn (int n, double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_jnf.c b/math/w_jnf.c
+index ef29eb4..36d6f6d 100644
+--- a/math/w_jnf.c
++++ b/math/w_jnf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ jnf (int n, float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard_f (n, x, 138);
+@@ -38,7 +38,8 @@ jnf (int n, float x)
+ float
+ ynf (int n, float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_log.c b/math/w_log.c
+index efc1c4c..ec33605 100644
+--- a/math/w_log.c
++++ b/math/w_log.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10.c b/math/w_log10.c
+index 2717ade..fe799ad 100644
+--- a/math/w_log10.c
++++ b/math/w_log10.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log10 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10f.c b/math/w_log10f.c
+index 60737ca..4b821f7 100644
+--- a/math/w_log10f.c
++++ b/math/w_log10f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log10f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_log10l.c b/math/w_log10l.c
+index b26f18c..0e5a137 100644
+--- a/math/w_log10l.c
++++ b/math/w_log10l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log10l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_log2.c b/math/w_log2.c
+index 998e5d9..e58e109 100644
+--- a/math/w_log2.c
++++ b/math/w_log2.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log2 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2f.c b/math/w_log2f.c
+index 6d91bf4..6963ed2 100644
+--- a/math/w_log2f.c
++++ b/math/w_log2f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log2f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2l.c b/math/w_log2l.c
+index e51c1bc..eed04ff6c 100644
+--- a/math/w_log2l.c
++++ b/math/w_log2l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log2l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_logf.c b/math/w_logf.c
+index 8aa27c8..38d408f 100644
+--- a/math/w_logf.c
++++ b/math/w_logf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __logf (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_logl.c b/math/w_logl.c
+index a3139ff..593b37d 100644
+--- a/math/w_logl.c
++++ b/math/w_logl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __logl (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_sqrt.c b/math/w_sqrt.c
+index 409a6df..f6ba542 100644
+--- a/math/w_sqrt.c
++++ b/math/w_sqrt.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __sqrt (double x)
+ {
+-  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 26); /* sqrt(negative) */
+ 
+   return __ieee754_sqrt (x);
+diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
+index 3c3d2f8..c128e9b 100644
+--- a/math/w_sqrtf.c
++++ b/math/w_sqrtf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __sqrtf (float x)
+ {
+-  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtf (x);
+diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
+index 5e18f44..2a4a048 100644
+--- a/math/w_sqrtl.c
++++ b/math/w_sqrtl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __sqrtl (long double x)
+ {
+-  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 226); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtl (x);
+diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
+index 9fc21ab..5f471b1 100644
+--- a/sysdeps/ieee754/dbl-64/e_atanh.c
++++ b/sysdeps/ieee754/dbl-64/e_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
+ {
+   double xa = fabs (x);
+   double t;
+-  if (xa < 0.5)
++  if (isless (xa, 0.5))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
+       t = xa + xa;
+       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0, 1))
++  else if (__builtin_expect (isless (xa, 1.0), 1))
+     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
+   else
+     {
+-      if (xa > 1.0)
++      if (isgreater (xa, 1.0))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0;
+diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
+index ee42587..b584ed8 100644
+--- a/sysdeps/ieee754/dbl-64/w_exp.c
++++ b/sysdeps/ieee754/dbl-64/w_exp.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
+ double
+ __exp (double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 6);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 7);
+diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
+index 75ed691..7af2f6c 100644
+--- a/sysdeps/ieee754/flt-32/e_atanhf.c
++++ b/sysdeps/ieee754/flt-32/e_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
+ {
+   float xa = fabsf (x);
+   float t;
+-  if (xa < 0.5f)
++  if (isless (xa, 0.5f))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28f, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
+       t = xa + xa;
+       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0f, 1))
++  else if (__builtin_expect (isless (xa, 1.0f), 1))
+     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
+   else
+     {
+-      if (xa > 1.0f)
++      if (isgreater (xa, 1.0f))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0f;
+diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
+index 5500872..bc3b2f6 100644
+--- a/sysdeps/ieee754/flt-32/w_expf.c
++++ b/sysdeps/ieee754/flt-32/w_expf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
+ float
+ __expf (float x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 106);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 107);
+diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
+index ec9d8a7..d61c0a3 100644
+--- a/sysdeps/ieee754/ldbl-96/w_expl.c
++++ b/sysdeps/ieee754/ldbl-96/w_expl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
+ long double
+ __expl (long double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 206);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 207);
diff --git a/core/glibc/glibc-2.15-revert-netlink-cache.patch b/core/glibc/glibc-2.15-revert-netlink-cache.patch
index f35f6c5f0..87d04c794 100644
--- a/core/glibc/glibc-2.15-revert-netlink-cache.patch
+++ b/core/glibc/glibc-2.15-revert-netlink-cache.patch
@@ -1,20 +1,3 @@
-From 2a3a38c03b6e376a9bc8a1937641e5dee979bcbf Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sat, 4 Feb 2012 15:28:54 +1000
-Subject: [PATCH] revert stuff
-
----
- include/ifaddrs.h                  |    5 -
- inet/check_pf.c                    |   18 +----
- nscd/connections.c                 |  119 ------------------------
- nscd/nscd-client.h                 |   18 +----
- nscd/nscd_gethst_r.c               |   23 +-----
- nscd/nscd_helper.c                 |   10 +-
- sysdeps/posix/getaddrinfo.c        |   10 +-
- sysdeps/unix/sysv/linux/Makefile   |    2 +-
- sysdeps/unix/sysv/linux/check_pf.c |  176 +++++++-----------------------------
- 9 files changed, 46 insertions(+), 335 deletions(-)
-
 diff --git a/include/ifaddrs.h b/include/ifaddrs.h
 index e1c6cac..50e4c48 100644
 --- a/include/ifaddrs.h
@@ -695,6 +678,3 @@ index 0738a70..d5ad7ea 100644
 -	}
 -    }
 -}
--- 
-1.7.9
-
diff --git a/core/glibc/glibc-2.15-rintf-rounding.patch b/core/glibc/glibc-2.15-rintf-rounding.patch
new file mode 100644
index 000000000..e0240ac6c
--- /dev/null
+++ b/core/glibc/glibc-2.15-rintf-rounding.patch
@@ -0,0 +1,158 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index 6243e1e..c8186c8 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -5037,6 +5037,22 @@ rint_test (void)
+   TEST_f_f (rint, 262142.75, 262143.0);
+   TEST_f_f (rint, 524286.75, 524287.0);
+   TEST_f_f (rint, 524288.75, 524289.0);
++  TEST_f_f (rint, 1048576.75, 1048577.0);
++  TEST_f_f (rint, 2097152.75, 2097153.0);
++  TEST_f_f (rint, -1048576.75, -1048577.0);
++  TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+   /* The result can only be represented in long double.  */
+   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5277,6 +5325,22 @@ rint_test_downward (void)
+       TEST_f_f (rint, -0.1, -1.0);
+       TEST_f_f (rint, -0.25, -1.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5347,6 +5411,22 @@ rint_test_upward (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
+index 9ea9b6f..9ba6b57 100644
+--- a/sysdeps/ieee754/flt-32/s_rintf.c
++++ b/sysdeps/ieee754/flt-32/s_rintf.c
+@@ -26,34 +26,22 @@ float
+ __rintf(float x)
+ {
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(j0==0x80) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	w = TWO23[sx]+x;
+ 	return w-TWO23[sx];
+ }
diff --git a/core/glibc/glibc-2.15-scanf.patch b/core/glibc/glibc-2.15-scanf.patch
index 7655ae5ab..a2561b232 100644
--- a/core/glibc/glibc-2.15-scanf.patch
+++ b/core/glibc/glibc-2.15-scanf.patch
@@ -1,13 +1,3 @@
-From 20b38e0301279a37a3f1e769843933bcc0d5f736 Mon Sep 17 00:00:00 2001
-From: Paul Pluzhnikov <ppluzhnikov@google.com>
-Date: Sun, 8 Jan 2012 20:13:35 -0500
-Subject: [PATCH 1/1] sscanf always calls realloc
-
----
- ChangeLog              |    5 +++++
- stdio-common/vfscanf.c |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
 diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
 index 0e71deb..e18a6c3 100644
 --- a/stdio-common/vfscanf.c
@@ -27,6 +17,3 @@ index 0e71deb..e18a6c3 100644
  	    {								    \
  	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
  	      if (wp == NULL)						    \
--- 
-1.7.3.4
-
diff --git a/core/glibc/glibc-2.15-vdso.patch b/core/glibc/glibc-2.15-vdso.patch
new file mode 100644
index 000000000..7fd394f90
--- /dev/null
+++ b/core/glibc/glibc-2.15-vdso.patch
@@ -0,0 +1,40 @@
+diff --git a/elf/Makefile b/elf/Makefile
+index 8234ba7..25ffc57 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
+ $(objpfx)tst-relsort1mod2.so: $(libm)
+ $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
+ 			   $(objpfx)tst-relsort1mod2.so
++
++tests: $(objpfx)tst-unused-dep.out
++
++$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
++	LD_TRACE_LOADED_OBJECTS=1 \
++	LD_DEBUG=unused \
++	LD_PRELOAD= \
++	$(elf-objpfx)${rtld-installed-name} \
++	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
++	  $< > $@
++	cmp $@ /dev/null > /dev/null
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 2e4f97f..3e15447 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -1,5 +1,5 @@
+ /* Run time dynamic linker.
+-   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ 	  _dl_setup_hash (l);
+ 	  l->l_relocated = 1;
+ 
++	  /* The vDSO is always used.  */
++	  l->l_used = 1;
++
+ 	  /* Initialize l_local_scope to contain just this map.  This allows
+ 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
+ 	     So we create a single entry list pointing to l_real as its only
diff --git a/core/glibc/glibc-2.15-vfprintf-nargs.patch b/core/glibc/glibc-2.15-vfprintf-nargs.patch
new file mode 100644
index 000000000..6a37bde68
--- /dev/null
+++ b/core/glibc/glibc-2.15-vfprintf-nargs.patch
@@ -0,0 +1,174 @@
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index a847b28..080badc 100644
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+ 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
+ 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
+ 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
+-	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
++	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
++	 bug-vfprintf-nargs
+ 
+ test-srcs = tst-unbputc tst-printf
+ 
+diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
+new file mode 100644
+index 0000000..13c66c0
+--- /dev/null
++++ b/stdio-common/bug-vfprintf-nargs.c
+@@ -0,0 +1,78 @@
++/* Test for vfprintf nargs allocation overflow (BZ #13656).
++   Copyright (C) 2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Kees Cook <keescook@chromium.org>, 2012.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <unistd.h>
++#include <inttypes.h>
++#include <string.h>
++#include <signal.h>
++
++static int
++format_failed (const char *fmt, const char *expected)
++{
++  char output[80];
++
++  printf ("%s : ", fmt);
++
++  memset (output, 0, sizeof output);
++  /* Having sprintf itself detect a failure is good.  */
++  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
++      && strcmp (output, expected) != 0)
++    {
++      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
++      return 1;
++    }
++  puts ("ok");
++  return 0;
++}
++
++static int
++do_test (void)
++{
++  int rc = 0;
++  char buf[64];
++
++  /* Regular positionals work.  */
++  if (format_failed ("%1$d", "1") != 0)
++    rc = 1;
++
++  /* Regular width positionals work.  */
++  if (format_failed ("%1$*2$d", " 1") != 0)
++    rc = 1;
++
++  /* Positional arguments are constructed via read_int, so nargs can only
++     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
++     allocate a giant amount of memory and possibly crash, which is the
++     expected situation.  Since the 64-bit behavior is arch-specific, only
++     test this on 32-bit systems.  */
++  if (sizeof (long int) == 4)
++    {
++      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
++      if (format_failed (buf, "1 %$d") != 0)
++        rc = 1;
++    }
++
++  return rc;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+index 863cd5d..022e72b 100644
+--- a/stdio-common/vfprintf.c
++++ b/stdio-common/vfprintf.c
+@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+      0 if unknown.  */
+   int readonly_format = 0;
+ 
++  /* For the argument descriptions, which may be allocated on the heap.  */
++  void *args_malloced = NULL;
++
+   /* This table maps a character into a number representing a
+      class.  In each step there is a destination label for each
+      class.  */
+@@ -1647,9 +1650,10 @@ do_positional:
+        determine the size of the array needed to store the argument
+        attributes.  */
+     size_t nargs = 0;
+-    int *args_type;
+-    union printf_arg *args_value = NULL;
++    size_t bytes_per_arg;
++    union printf_arg *args_value;
+     int *args_size;
++    int *args_type;
+ 
+     /* Positional parameters refer to arguments directly.  This could
+        also determine the maximum number of arguments.  Track the
+@@ -1698,13 +1702,33 @@ do_positional:
+ 
+     /* Determine the number of arguments the format string consumes.  */
+     nargs = MAX (nargs, max_ref_arg);
++    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
++                    + sizeof (*args_type);
++
++    /* Check for potential integer overflow.  */
++    if (nargs > SIZE_MAX / bytes_per_arg)
++      {
++         done = -1;
++         goto all_done;
++      }
+ 
+     /* Allocate memory for the argument descriptions.  */
+-    args_type = alloca (nargs * sizeof (int));
++    if (__libc_use_alloca (nargs * bytes_per_arg))
++        args_value = alloca (nargs * bytes_per_arg);
++    else
++      {
++        args_value = args_malloced = malloc (nargs * bytes_per_arg);
++        if (args_value == NULL)
++          {
++            done = -1;
++            goto all_done;
++          }
++      }
++
++    args_size = &args_value[nargs].pa_int;
++    args_type = &args_size[nargs];
+     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
+-	    nargs * sizeof (int));
+-    args_value = alloca (nargs * sizeof (union printf_arg));
+-    args_size = alloca (nargs * sizeof (int));
++	    nargs * sizeof (*args_type));
+ 
+     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
+        still zero after this loop, format is invalid.  For now we
+@@ -1973,8 +1997,8 @@ do_positional:
+   }
+ 
+ all_done:
+-  if (__builtin_expect (workstart != NULL, 0))
+-    free (workstart);
++  free (args_malloced);
++  free (workstart);
+   /* Unlock the stream.  */
+   _IO_funlockfile (s);
+   _IO_cleanup_region_end (0);
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index b7e30775f..34c43a1f8 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150337 2012-02-16 23:38:08Z allan $
+# $Id: PKGBUILD 151831 2012-03-03 08:49:06Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.10
-pkgrel=3
+pkgver=2.11
+pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('709915434d09f5db655e5ebd7fd6bb7f'
-         '9ad5c390a6ad7f566c58db28ddb06aed')
+md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
+         'e4fea5e355973c951f93f48bc86f92fa')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 027fc7e23..4653a030d 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -9,7 +9,7 @@ arch=("i686" "x86_64" 'mips64el')
 url="http://wireless.kernel.org/en/users/Documentation/iw"
 license=("GPL")
 depends=("libnl")
-makedepends=("linux-api-headers" "pkg-config")
+makedepends=("kernel-headers")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60')
 
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 19065a8a0..803f5adc0 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.19-checkpw.c.patch
         cyrus-sasl-2.1.22-crypt.patch
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index 65dc24970..2d079db10 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149936 2012-02-11 23:29:39Z allan $
+# $Id: PKGBUILD 151927 2012-03-04 10:58:09Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libtool"
@@ -20,7 +20,10 @@ md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  [ "$CARCH" = "mips64el" ] && patch -Np1 -i "${srcdir}/nopic.patch"
+
+  # fix test failure on mips64el (from Debian)
+  patch -Np1 -i "${srcdir}/nopic.patch"
+
   ./configure --prefix=/usr
   make
 }
@@ -31,7 +34,7 @@ check() {
 }
 
 package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
+  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.3')
   groups=('base-devel')
   install=libtool.install
 
diff --git a/core/mkinitcpio/PKGBUILD b/core/mkinitcpio/PKGBUILD
deleted file mode 100644
index faed61e50..000000000
--- a/core/mkinitcpio/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=mkinitcpio
-pkgver=0.7.5
-pkgrel=1
-pkgdesc="Modular initramfs image creation utility"
-arch=('mips64el')
-url="http://www.archlinux.org/"
-license=('GPL')
-depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
-         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip')
-optdepends=('xz: Use lzma or xz compression for the initramfs image'
-            'bzip2: Use bzip2 compression for the initramfs image'
-            'lzop: Use lzo compression for the initramfs image'
-            'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
-replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
-          'klibc-module-init-tools' 'klibc-udev')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	'patch.patch')
-backup=(etc/mkinitcpio.conf)
-sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
-	    'abf6bb9d692838cc2f97f12f0901f0209dbf6f437f9590accd26dbcfc48f1b16')
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch install/base ../patch.patch
-
-  make DESTDIR="$pkgdir" install
-}
-sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
-            'bb6517e0497cc43aea1287e43b0be2892b7af74add5eca3f3740b091f997729e')
diff --git a/core/mkinitcpio/patch.patch b/core/mkinitcpio/patch.patch
deleted file mode 100644
index 62dadac32..000000000
--- a/core/mkinitcpio/patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- install/base	2011-10-22 12:37:45.000000000 -0300
-+++ install/base.orig	2011-11-03 19:54:45.574991740 -0300
-@@ -1,7 +1,7 @@
- #!/bin/bash
- 
- build() {
--    for dir in new_root proc sys dev run usr/{bin,sbin}; do
-+    for dir in new_root proc sys dev run usr/{bin,sbin} lib32; do
-         add_dir "/$dir"
-     done
- 
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index f51d9e2a0..055e4aeb3 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -8,7 +8,6 @@ _patchlevel=p3
 pkgver=${_pkgver}.${_patchlevel}
 pkgrel=1
 pkgdesc="Multiple-precision floating-point library"
-license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mpfr.org/"
 license=('LGPL')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 32a6acafe..06fe1c2c3 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'groff')
+makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd slapd.default ntlm.patch)
 sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD
index 193da1a19..42cfddddb 100644
--- a/core/ppl/PKGBUILD
+++ b/core/ppl/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 135914 2011-08-20 07:14:11Z allan $
+# $Id: PKGBUILD 151929 2012-03-04 10:58:12Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: ezzetabi <ezzetabi at gawab dot com>
 
 pkgname=ppl
-pkgver=0.11.2
-pkgrel=2
+pkgver=0.12
+pkgrel=1
 pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cs.unipr.it/ppl"
+url="http://bugseng.com/products/ppl"
 license=('GPL3')
 depends=('gmp>=5.0')
 options=('!docs' '!libtool')
-source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz)
-md5sums=('ce014f153a28006009db207ca953a984')
+source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
+md5sums=('47a5548d4e3d98cf6b97e4fd3e5db513'
+         '41869f374e70d0a4d2faa61566365b9d')
 
 build() {
   cd $srcdir/ppl-$pkgver
diff --git a/core/sqlite3/PKGBUILD.mips64el b/core/sqlite3/PKGBUILD.mips64el
deleted file mode 100644
index 98f925d56..000000000
--- a/core/sqlite3/PKGBUILD.mips64el
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 130058 2011-07-01 19:36:29Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl') 
-_amalgamationver=3070701
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-pkgver=${_amalgamationver2//0/.}
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('554026fe7fac47b1cf61c18d5fe43419'
-         'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-	--disable-static
-  make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 6ffcec0b9..fb410714b 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150974 2012-02-24 12:10:46Z allan $
+# $Id: PKGBUILD 151833 2012-03-03 08:49:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.4p1
+_ver=1.8.4p2
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('d7f9bf7675bbc6d75e6f9353a175317c'
-         '51bc933d386af08038349dd61aa243c3'
+md5sums=('c0cc9334246d4f34128660b6c5463e94'
+         'bb692de8ecb24d8bfab00c45292536c5'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/core/syslinux/.arch b/core/syslinux/.arch
deleted file mode 100644
index 9fe4d07f7..000000000
--- a/core/syslinux/.arch
+++ /dev/null
@@ -1 +0,0 @@
-mips64el=false
diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
index 53eb06d0b..adf769587 100644
--- a/core/syslinux/PKGBUILD
+++ b/core/syslinux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144967 2011-12-12 09:45:24Z thomas $
+# $Id: PKGBUILD 151789 2012-03-02 23:26:36Z pierre $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=syslinux
 pkgver=4.05
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
 url="http://syslinux.zytor.com/"
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
             'perl-digest-sha1: For sha1pass'
-            'mtools:           For mkdiskimage and syslinux'
+            'mtools:           For mkdiskimage and fat support'
            )
 makedepends=('nasm')
 backup=('boot/syslinux/syslinux.cfg')
@@ -23,8 +23,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux-install_update)
 md5sums=('82299242418385da1274c9479a778cb2'
          '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '4dc27d8ab3802f8e50f3dda28168ce6d'
-         'b5b4953c0a5a01cd16441402f6321765')
+         '832595501944fbcabcdc1207f4724fe7'
+         '680750f73dc2e587ac567d057d485813')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -46,4 +46,6 @@ package() {
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
+  # move extlinux binary to /usr/sbin
+  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
 }
diff --git a/core/syslinux/syslinux-install_update b/core/syslinux/syslinux-install_update
index f7cd123e1..cd1baa572 100644
--- a/core/syslinux/syslinux-install_update
+++ b/core/syslinux/syslinux-install_update
@@ -28,7 +28,7 @@ shopt -s nullglob
 
 libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
-extlinux="/sbin/extlinux"
+extlinux="/usr/sbin/extlinux"
 
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
 com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
@@ -357,12 +357,6 @@ update() {
     fi
 }
 
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-    echo "This script must be run as root" 1>&2
-    exit 1
-fi
-
 if (( $# == 0 )); then
     usage
     exit 1
@@ -378,8 +372,7 @@ while getopts "c:uihmas" opt; do
             fi
             ;;
         h)
-            usage
-            exit 0
+            USAGE="True"
             ;;
         i)
             INSTALL="True"
@@ -408,6 +401,17 @@ while getopts "c:uihmas" opt; do
     esac
 done
 
+if [[ $USAGE ]]; then
+    usage
+    exit 0
+fi
+
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
 # Display Usage Information if both Install and Update are passed
 if [[ $INSTALL && $UPDATE ]]; then
     usage
diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg
index 02127d21d..5a588f58c 100644
--- a/core/syslinux/syslinux.cfg
+++ b/core/syslinux/syslinux.cfg
@@ -20,7 +20,7 @@
 # The wiki provides further configuration examples
 
 DEFAULT arch
-PROMPT 0        # Change to 1 if you do not want to use a menu
+PROMPT 0        # Set to 1 if you always want to display the boot: prompt 
 TIMEOUT 50
 # You can create syslinux keymaps with the keytab-lilo tool
 #KBDMAP de.ktl
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index 8572d79b1..ae5cfc9e0 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=acpid
 pkgver=2.0.14
 pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://tedfelix.com/linux/acpid-netlink.html"
 license=('GPL')
 depends=('bash')
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index f2180a340..0caa5fee1 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $
+# $Id: PKGBUILD 152198 2012-03-05 08:55:37Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('804309dca70ede35b4a654ab764e9079')
+md5sums=('54e0556d73c22c7b3393069071e0b717')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/alex/PKGBUILD b/extra/alex/PKGBUILD
index 5135f5709..c4e4df5f8 100644
--- a/extra/alex/PKGBUILD
+++ b/extra/alex/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 150499 2012-02-18 11:26:02Z pierre $
+# $Id: PKGBUILD 151870 2012-03-03 16:05:52Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Philip Nilsson <pnilsson@nullref.se>
 
 pkgname=alex
-pkgver=2.3.5
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc='a lexical analyser generator for Haskell'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.haskell.org/alex/'
 license=('custom:BSD3')
 depends=('gmp')
-makedepends=('ghc=7.0.3')
+makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5e08c688ded0dcff98eaad6fc03a9402')
+md5sums=('5dec239c89165d159faa2154bc0724cd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 213182d62..171dc0620 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $
+# $Id: PKGBUILD 151749 2012-03-02 07:36:36Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
 pkgver=1.0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
@@ -14,15 +14,13 @@ makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
         alsa
-        alsaconf.patch
         alsa.conf.d
         90alsa)
 backup=(etc/conf.d/alsa)
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../alsaconf.patch
-  ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system
+  ./configure --prefix=/usr --disable-alsaconf --with-systemdsystemunitdir=/lib/systemd/system
   make
 }
 
@@ -37,6 +35,5 @@ package() {
 }
 md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9'
          '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '7521bf20f5b3501a510ec4462ae4a934'
          '4c8ae9f976c7df5e271a4cb91ccc7767'
          '529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index aabcdf9f5..ec0e13eb9 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -10,7 +10,8 @@ license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libva')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
 sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
@@ -39,7 +40,8 @@ build() {
 
 package_avidemux-cli() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
+  [ "$CARCH" != "mips64el" ] && depends+=('libva')
   optdepends=('lame: for the corresponding audio encoder plugin'
               'faac: for the corresponding audio encoder plugin'
               'faad2: for the corresponding audio decoder plugin'
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index aad64d103..4bfc687b4 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144043 2011-12-02 20:54:10Z ibiru $
+# $Id: PKGBUILD 152200 2012-03-05 08:55:44Z ibiru $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
@@ -15,15 +15,18 @@ makedepends=('cmake' 'boost')
 install=avogadro.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch')
+        'fix-boost.patch'
+        'fix-opengl-headers.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
          'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec')
+         '46282e4709429447e44a0a54d51ad2ec'
+         'f420bfd22e3d5d8fcddc625cf5e711f6')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
   patch -p1 -i "${srcdir}"/fix-boost.patch
+  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
 
   cd "${srcdir}"
   mkdir build
diff --git a/extra/avogadro/fix-opengl-headers.patch b/extra/avogadro/fix-opengl-headers.patch
new file mode 100644
index 000000000..e6e8bc3b5
--- /dev/null
+++ b/extra/avogadro/fix-opengl-headers.patch
@@ -0,0 +1,53 @@
+--- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
++++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
+@@ -25,6 +25,8 @@
+ #include "camera.h"
+ #include "glwidget.h"
+ #include <avogadro/molecule.h>
++#include <Eigen/LU>
++#include <GL/glu.h>
+ 
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
++++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
+@@ -42,6 +42,7 @@
+ #include <QColor>
+ #include <QVarLengthArray>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
++++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
+@@ -70,6 +70,8 @@
+ 
+ #include <openbabel/mol.h>
+ 
++#include <GL/glu.h>
++
+ using namespace OpenBabel;
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
++++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
+@@ -36,6 +36,7 @@
+ #include <QFile>
+ #include <QDebug>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
++++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
+@@ -44,6 +44,8 @@
+ #include <QComboBox>
+ #include <QDebug>
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index b9acf0d7d..04e2f16cd 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142846 2011-11-16 23:53:56Z ibiru $
+# $Id: PKGBUILD 151738 2012-03-01 21:58:23Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,19 +6,18 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.1.P1
-_pkgver=9.8.1-P1
+pkgver=9.9.0
+_pkgver=9.9.0
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
+depends=('openssl' 'krb5' 'libxml2')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
-        'so_bsdcompat.patch'
+        'root.hint::http://www.internic.net/zones/named.root'
         'remove-tools.patch'
         'named'
         'named.conf'
@@ -26,9 +25,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('1cff6594aa185d84942edd2f3cc06dff9cebb04b'
+sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
           '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
@@ -48,7 +46,6 @@ build() {
 	cd "${srcdir}/bind-${_pkgver}"
 
 	patch -p1 -i ../remove-tools.patch
-	patch -p1 -i ../so_bsdcompat.patch
 
 	./configure \
 		--prefix=/usr \
@@ -60,9 +57,6 @@ build() {
 		--with-libxml2 \
 		--with-libtool \
 
-	# temporary fix for issue reported upstream
-	ln -s .libs/driver.o bin/tests/system/dlzexternal/
-
 	make
 }
 
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 565602ac1..a238c1f23 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150898 2012-02-23 13:54:59Z allan $
-# Maintainer:
+# $Id: PKGBUILD 152235 2012-03-05 13:54:25Z andrea $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.98
-pkgrel=3
+pkgrel=4
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,28 +13,32 @@ license=('GPL2')
 depends=('dbus-core')
 makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
 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"
-	"libusb-compat: USB adapters support"
-        "cups: CUPS backend")
+            "alsa-lib: Audio bluetooth devices support"
+            "dbus-python: to run bluez-simple-agent"
+            "pygobject: to run bluez-simple-agent"
+            "libusb-compat: USB adapters support"
+            "cups: CUPS backend")
 conflicts=('bluez-libs' 'bluez-utils')
 provides=('bluez-libs' 'bluez-utils')
 replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool' 'emptydirs')
+options=('!libtool')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch')
+        'bluetooth.conf.d' 'rc.bluetooth'
+        'fix-a2dp.patch'
+        'fix-compile-issue.patch')
 md5sums=('4aca8a0929250212e9a75fb60dd75b05'
          '7412982b440f29fa7f76a41a87fef985'
          '8f9498707f809506928b2e480d3b6789'
-         'd6a34317e56b7c2bd990791d89d6c3cb')
+         'd6a34317e56b7c2bd990791d89d6c3cb'
+         'd81860cd0d7c3ddd2515591453a85e65')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/fix-a2dp.patch"
+  patch -p1 -i "${srcdir}/fix-a2dp.patch"
+  patch -p1 -i "${srcdir}/fix-compile-issue.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch
new file mode 100644
index 000000000..ddb5d94e8
--- /dev/null
+++ b/extra/bluez/fix-compile-issue.patch
@@ -0,0 +1,50 @@
+From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
+From: Patrick Ohly <patrick.ohly@intel.com>
+Date: Mon, 16 Jan 2012 11:11:55 +0100
+Subject: [PATCH] lib: Fix compile issue when using in C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The compiler error is:
+ /usr/include/bluetooth/bluetooth.h::131:9: error: invalid conversion from 'void*' to 'bt_get_le64(void*)::<anonymous struct>*'
+ ...
+
+The reason is that C++, in contrast to C, does not allow conversion of
+void * to anything, and this code gets compiled as C++ when the app is
+written in C++. The macro with the assignment itself is older, but only
+recent Bluez starts to use it in inline functions, thus triggering the
+problem.
+
+This patch keeps the "struct __attribute__((packed))" magic and merely
+changes the typecast so that it works in C and C++. Like the existing
+macro this patch relies on support for typeof.
+---
+ lib/bluetooth.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bluetooth.h b/lib/bluetooth.h
+index ea7373d..0541842 100644
+--- a/lib/bluetooth.h
++++ b/lib/bluetooth.h
+@@ -141,7 +141,7 @@ enum {
+ ({						\
+ 	struct __attribute__((packed)) {	\
+ 		typeof(*(ptr)) __v;		\
+-	} *__p = (void *) (ptr);		\
++	} *__p = (typeof(__p)) (ptr);		\
+ 	__p->__v;				\
+ })
+ 
+@@ -149,7 +149,7 @@ enum {
+ do {						\
+ 	struct __attribute__((packed)) {	\
+ 		typeof(*(ptr)) __v;		\
+-	} *__p = (void *) (ptr);		\
++	} *__p = (typeof(__p)) (ptr);		\
+ 	__p->__v = (val);			\
+ } while(0)
+ 
+-- 
+1.7.6.5
+
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index d55e68456..8725a3c5a 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144045 2011-12-02 20:54:13Z ibiru $
+# $Id: PKGBUILD 152202 2012-03-05 08:55:53Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,19 +6,17 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.48.0
+pkgver=1.49.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        exceptions.patch
-        BOOST_FOREACH.patch)
+        exceptions.patch)
 license=('custom')
-md5sums=('313a11e97eb56eb7efd18325354631be'
-         '9b44c28b36303152050c8c82469569c5'
-         '2db6098a1a39bced4c6162eb46418320')
+md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
+         '9b44c28b36303152050c8c82469569c5')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -32,8 +30,6 @@ build() {
   cd "${srcdir}"/${pkgbase}_${_boostver}
   # https://svn.boost.org/trac/boost/ticket/5731
   patch -p0 -i "${srcdir}/exceptions.patch"
-  # https://svn.boost.org/trac/boost/ticket/6131
-  patch -p2 -i "${srcdir}/BOOST_FOREACH.patch"
 
 
   # build bjam
@@ -87,7 +83,8 @@ package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
     optdepends=('python: for python bindings'
-                'python2: for python2 bindings')
+                'python2: for python2 bindings'
+		'boost-build: to use boost jam for building your project.')
 
     install -d "${pkgdir}"/usr/{include,lib,share}
     # headers/source files
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index f4fb29451..8c9b3dcf8 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 148030 2012-01-30 07:42:40Z tpowa $
+# $Id: PKGBUILD 151756 2012-03-02 08:44:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
 pkgver=5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
 source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-# deinstall smbclient first!
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index 70cf6825d..27d2ec122 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -1,24 +1,45 @@
-# $Id: PKGBUILD 149335 2012-02-06 20:45:16Z stephane $
+# $Id: PKGBUILD 151779 2012-03-02 17:28:27Z dan $
 # Maintainer:
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cvsps
-pkgver=2.1
-pkgrel=4
+pkgver=2.2b1
+pkgrel=1
 pkgdesc="Generating 'patchset' information from a CVS repository"
 url="http://www.cobite.com/cvsps/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
-source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
+source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        call-cvs-q-option.patch
+        cvsps-2.2b1-bufferoverflow.patch
+        cvsps-2.2b1-dynamic-logbuf.patch
+        cvsps-2.2b1-man.patch
+        seperate-CPPFLAGS.patch
+        use-INADDR_NONE-define.patch
+        use-__linux__-define.patch
+        use-offsetof-macro.patch)
+md5sums=('997580e8e283034995b9209076858c68'
+         '06324c5e3c321126b76dc97fc6c00b34'
+         '2910012a11a24d5e4192cf9eae7dd259'
+         '970566460e72cb159426965d6e5763b3'
+         'f9d2ee40e52ecd5096fa9a885418eee1'
+         '6baafbd7512aa52e1b83ed0bead32a6e'
+         'a3a81481c07dcc676f5a82ae07e8ee89'
+         '9e2763315cbda02665c47827d38df459'
+         '8f7e6f09f42f76deeefe24bbfa509150')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+  for file in ${source[@]}; do
+      if [[ $file == *.patch ]]; then
+          patch -Np1 < ../$file
+      fi
+  done
   make prefix=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" install
 }
diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch
new file mode 100644
index 000000000..a754b7c60
--- /dev/null
+++ b/extra/cvsps/call-cvs-q-option.patch
@@ -0,0 +1,34 @@
+From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <ydirson@altern.org>
+Date: Thu, 15 Jun 2006 09:48:08 +0200
+Subject: [PATCH] Call cvs with -q flag when fetching the log
+
+This gets rid of the neverending output polution cvs sends to stderr,
+which is mostly useless and has a strong potential to hide real problem
+reports
+---
+ cvsps.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cvsps.c b/cvsps.c
+index d94dfe0..be700ba 100644
+--- a/cvsps.c
++++ b/cvsps.c
+@@ -301,12 +301,12 @@ static void load_from_cvs()
+ 	 * which is necessary to fill in the pre_rev stuff for a 
+ 	 * PatchSetMember
+ 	 */
+-	snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
++	snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
+     }
+     else
+     {
+ 	date_str[0] = 0;
+-	snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff);
++	snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff);
+     }
+     
+     debug(DEBUG_STATUS, "******* USING CMD %s", cmd);
+-- 
+1.6.5.GIT
+
diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
new file mode 100644
index 000000000..2a82cd4e0
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
@@ -0,0 +1,65 @@
+--- cvsps-2.2b1/cvsps.c	2010-09-07 18:13:42.760727491 +0200
++++ cvsps-2.2b1_/cvsps.c	2010-09-07 18:05:11.083729441 +0200
+@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char *
+ {
+     CvsFile * retval;
+     char fn[PATH_MAX];
+-    int len = strlen(buff + 10);
++    size_t len = strlen(buff + 10);
+     char * p;
+ 
+     /* once a single file has been parsed ok we set this */
+     static int path_ok;
+-    
++
+     /* chop the ",v" string and the "LF" */
+     len -= 3;
+     memcpy(fn, buff + 10, len);
+     fn[len] = 0;
+-    
+     if (strncmp(fn, strip_path, strip_path_len) != 0)
+     {
+ 	/* if the very first file fails the strip path,
+@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char *
+ 
+ 	    while ((p = strstr(p, repository_path)))
+ 		lastp = p++;
+-      
++
+ 	    if (lastp)
+ 	    {
+-		int len = strlen(repository_path);
++		size_t len = strlen(repository_path);
+ 		memcpy(strip_path, fn, lastp - fn + len + 1);
+ 		strip_path_len = lastp - fn + len + 1;
+ 		strip_path[strip_path_len] = 0;
+@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char *
+ 	 *
+ 	 * For now just ignore such files
+ 	 */
+-	debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", 
++	debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
+ 	      fn, strip_path);
+ 	return NULL;
+     }
+ 
+  ok:
+-    path_ok = 1;
+-
++     /*
++     fix for rhbz#576076
++     ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS
++     */
++    if(len <= strip_path_len)
++    {
++        debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
++	      fn, strip_path);
++        return NULL;
++    }
+     /* remove from beginning the 'strip_path' string */
+     len -= strip_path_len;
++    path_ok = 1;
++
+     memmove(fn, fn + strip_path_len, len);
+     fn[len] = 0;
+ 
diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
new file mode 100644
index 000000000..03e4e7672
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
@@ -0,0 +1,133 @@
+# From: http://ydirson.free.fr/soft/git/cvsps.git
+
+commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50
+Author: David D. Kilzer <ddkilzer@kilzer.net>
+Date:   Mon Jun 20 01:04:34 2005 +0200
+
+    Dynamically allocate the log buffer to prevent warning messages
+    
+    On anoncvs.opensource.apple.com (Apple's anonymous CVS server for
+    WebKit), some very long log entries were included in CVS.  I got tired
+    of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be
+    dynamically allocated.
+
+diff --git i/cache.c w/cache.c
+index 4c51cf7..01a8ed3 100644
+--- i/cache.c
++++ w/cache.c
+@@ -108,10 +108,19 @@ time_t read_cache()
+     int tag_flags = 0;
+     char branchbuff[LOG_STR_MAX] = "";
+     int branch_add = 0;
+-    char logbuff[LOG_STR_MAX] = "";
++    int logbufflen = LOG_STR_MAX + 1;
++    char * logbuff = malloc(logbufflen);
+     time_t cache_date = -1;
+     int read_version;
+ 
++    if (logbuff == NULL)
++    {
++	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
++	exit(1);
++    }
++
++    logbuff[0] = 0;
++
+     if (!(fp = cache_open("r")))
+ 	goto out;
+ 
+@@ -299,8 +308,19 @@ time_t read_cache()
+ 	    else
+ 	    {
+ 		/* Make sure we have enough in the buffer */
+-		if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
+-		    strcat(logbuff, buff);
++		int len = strlen(buff);
++		if (strlen(logbuff) + len >= LOG_STR_MAX)
++		{
++		    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
++		    char * newlogbuff = realloc(logbuff, logbufflen);
++		    if (newlogbuff == NULL)
++		    {
++			debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
++			exit(1);
++		    }
++		    logbuff = newlogbuff;
++		}
++		strcat(logbuff, buff);
+ 	    }
+ 	    break;
+ 	case CACHE_NEED_PS_MEMBERS:
+@@ -332,6 +352,7 @@ time_t read_cache()
+  out_close:
+     fclose(fp);
+  out:
++    free(logbuff);
+     return cache_date;
+ }
+ 
+diff --git i/cvsps.c w/cvsps.c
+index f0e7d29..db28d7c 100644
+--- i/cvsps.c
++++ w/cvsps.c
+@@ -269,7 +269,8 @@ static void load_from_cvs()
+     PatchSetMember * psm = NULL;
+     char datebuff[26];
+     char authbuff[AUTH_STR_MAX];
+-    char logbuff[LOG_STR_MAX + 1];
++    int logbufflen = LOG_STR_MAX + 1;
++    char * logbuff = malloc(logbufflen);
+     int loglen = 0;
+     int have_log = 0;
+     char cmd[BUFSIZ];
+@@ -277,6 +278,12 @@ static void load_from_cvs()
+     char use_rep_buff[PATH_MAX];
+     char * ltype;
+ 
++    if (logbuff == NULL)
++    {
++	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
++	exit(1);
++    }
++
+     if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
+     {
+ 	ltype = "rlog";
+@@ -484,25 +491,22 @@ static void load_from_cvs()
+ 		 */
+ 		if (have_log || !is_revision_metadata(buff))
+ 		{
+-		    /* if the log buffer is full, that's it.  
+-		     * 
+-		     * Also, read lines (fgets) always have \n in them
+-		     * (unless truncation happens)
+-		     * which we count on.  So if truncation happens,
+-		     * be careful to put a \n on.
+-		     * 
+-		     * Buffer has LOG_STR_MAX + 1 for room for \0 if
+-		     * necessary
+-		     */
+-		    if (loglen < LOG_STR_MAX)
++		    /* If the log buffer is full, try to reallocate more. */
++		    if (loglen < logbufflen)
+ 		    {
+ 			int len = strlen(buff);
+ 			
+-			if (len >= LOG_STR_MAX - loglen)
++			if (len >= logbufflen - loglen)
+ 			{
+-			    debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
+-			    len = LOG_STR_MAX - loglen;
+-			    buff[len - 1] = '\n';
++			    debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
++			    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
++			    char * newlogbuff = realloc(logbuff, logbufflen);
++			    if (newlogbuff == NULL)
++			    {
++				debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
++				exit(1);
++			    }
++			    logbuff = newlogbuff;
+ 			}
+ 
+ 			debug(DEBUG_STATUS, "appending %s to log", buff);
diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch
new file mode 100644
index 000000000..3e6816fd5
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-man.patch
@@ -0,0 +1,29 @@
+diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1
+--- cvsps-2.2b1/cvsps.1~	2008-04-02 04:18:44.000000000 +0300
++++ cvsps-2.2b1/cvsps.1	2010-05-18 21:10:39.000000000 +0300
+@@ -11,7 +11,7 @@ to a collection of files, and all commit
+ single 'cvs commit' command).  This information is valuable to seeing the
+ big picture of the evolution of a cvs project.  While cvs tracks revision
+ information, it is often difficult to see what changes were committed
+-'atomically' to the repository.
++\'atomically' to the repository.
+ .SH OPTIONS
+ .TP
+ .B \-h
+@@ -83,7 +83,7 @@ some hacks which are not generally appli
+ disable the use of rlog internally.  Note: rlog is
+ required for stable PatchSet numbering.  Use with care.
+ .TP
+-.B \-\-diffs\-opts <option string>
++.B \-\-diff\-opts <option string>
+ send a custom set of options to diff, for example to increase
+ the number of context lines, or change the diff format.
+ .TP
+@@ -103,6 +103,7 @@ Override the setting of CVSROOT (overrid
+ .TP
+ .B \-q
+ Be quiet about warnings.
++.TP
+ .B \-A
+ Show ancestor branch when a new branch is found.
+ .TP
diff --git a/extra/cvsps/seperate-CPPFLAGS.patch b/extra/cvsps/seperate-CPPFLAGS.patch
new file mode 100644
index 000000000..a29923b49
--- /dev/null
+++ b/extra/cvsps/seperate-CPPFLAGS.patch
@@ -0,0 +1,29 @@
+From 5991e8b0acf1dbe3487c1f246a1d215b346a61f0 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <ydirson@altern.org>
+Date: Sat, 17 Jun 2006 00:03:41 +0200
+Subject: [PATCH] Separate CPPFLAGS from CFLAGS
+
+This allows to set CGLAGS on command-line without interfering with
+preprocessor options
+---
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2e34ec6..05ca856 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ MAJOR=2
+ MINOR=1
+ CC?=gcc
+-CFLAGS?=-g -O2 -Wall 
+-CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
++CFLAGS?=-g -O2 -Wall
++CPPFLAGS?=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
+ prefix?=/usr/local
+ OBJS=\
+ 	cbtcommon/debug.o\
+-- 
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-INADDR_NONE-define.patch b/extra/cvsps/use-INADDR_NONE-define.patch
new file mode 100644
index 000000000..a1a529187
--- /dev/null
+++ b/extra/cvsps/use-INADDR_NONE-define.patch
@@ -0,0 +1,28 @@
+From c498733b4283b3987bdca6949a5e304244b64cfc Mon Sep 17 00:00:00 2001
+From: Pavel Roskin <proski@gnu.org>
+Date: Tue, 13 Jun 2006 00:32:33 -0400
+Subject: [PATCH] Use INADDR_NONE instead of -1 to check inet_addr() result
+
+INADDR_NONE is not equal to -1 on 64-bit systems.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+ cbtcommon/tcpsocket.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
+index a174007..f31060e 100644
+--- a/cbtcommon/tcpsocket.c
++++ b/cbtcommon/tcpsocket.c
+@@ -198,7 +198,7 @@ convert_address(long *dest, const char *addr_str)
+     memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
+   }
+ #else
+-  if ( (*dest = inet_addr(addr_str)) != -1)
++  if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
+   {
+     /* nothing */
+   }
+-- 
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-__linux__-define.patch b/extra/cvsps/use-__linux__-define.patch
new file mode 100644
index 000000000..132629593
--- /dev/null
+++ b/extra/cvsps/use-__linux__-define.patch
@@ -0,0 +1,36 @@
+From 4598349e81068d4af9a893c6433958cf9b4fa835 Mon Sep 17 00:00:00 2001
+From: Pavel Roskin <proski@gnu.org>
+Date: Tue, 13 Jun 2006 00:32:31 -0400
+Subject: [PATCH] Use __linux__ conditional, not LINUX.
+
+__linux__ is defined automatically, LINUX is not.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+ cbtcommon/tcpsocket.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
+index 27cc13a..a174007 100644
+--- a/cbtcommon/tcpsocket.c
++++ b/cbtcommon/tcpsocket.c
+@@ -185,14 +185,14 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port)
+ int
+ convert_address(long *dest, const char *addr_str)
+ {
+-#ifdef LINUX
++#ifdef __linux__
+   struct in_addr ip;
+ #endif
+   int retval = 0;
+   char errstr[256];
+   
+   /* first try converting "numbers and dots" notation */
+-#ifdef LINUX
++#ifdef __linux__
+   if ( inet_aton(addr_str, &ip) )
+   {
+     memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
+-- 
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-offsetof-macro.patch b/extra/cvsps/use-offsetof-macro.patch
new file mode 100644
index 000000000..ff2961f07
--- /dev/null
+++ b/extra/cvsps/use-offsetof-macro.patch
@@ -0,0 +1,32 @@
+From 4fad63b82746ea571edc2ec1100ad3208cf5af08 Mon Sep 17 00:00:00 2001
+From: Eric Hopper <hopper@omnifarious.org>
+Date: Fri, 29 Jun 2007 01:30:09 -0700
+Subject: [PATCH] Use offsetof macro instead of unportable pointer arithmetic.
+
+---
+ cbtcommon/list.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cbtcommon/list.h b/cbtcommon/list.h
+index 4ee245d..cf4b3ed 100644
+--- a/cbtcommon/list.h
++++ b/cbtcommon/list.h
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "inline.h"
++#include <stddef.h>
+ 
+ struct list_head {
+         struct list_head *next, *prev;
+@@ -107,6 +108,6 @@ static INLINE void list_splice(struct list_head *list, struct list_head *head)
+ }
+ 
+ #define list_entry(ptr, type, member) \
+-        ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
++   ((type *)((char *)(ptr)-offsetof(type, member)))
+ 
+ #endif /* _COMMON_LIST_H */
+-- 
+1.6.5.GIT
+
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index fb52d4dfc..d2a485aeb 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.19-checkpw.c.patch
         cyrus-sasl-2.1.22-crypt.patch
diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD
index 0fa067a16..6f5e9ceba 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dmidecode
 pkgver=2.11
 pkgrel=2
 pkgdesc="Desktop Management Interface table related utilities"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.nongnu.org/dmidecode"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index d310e6c2a..dec627639 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $
+# $Id: PKGBUILD 152257 2012-03-06 04:01:25Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.59
-pkgrel=2.1
+pkgver=2.60
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'dbus-core')
-makedepends=('libcap>=2.16')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf'
         'etc/conf.d/dnsmasq')
@@ -19,24 +18,27 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+md5sums=('5a09908e02724d759ac60d9cafd27de8'
          '66479e99123faeab83ebaed709ef95b5'
-         '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+         '819fbdf6440d710616e6df5f8ca9cdba'
+         '631d8349acbed1b01d4e11d9f42fdb7d')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # link against dbus
-  echo '#define HAVE_DBUS' >> src/config.h
+  # link against dbus. this ugliness is needed to ensure that the
+  # compile time opts report properly on startup. yuck.
+  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ {
+    i#define HAVE_DBUS
+  }' src/config.h
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
 
   install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
   install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service
index b09cb24b9..05a1f0b69 100644
--- a/extra/dnsmasq/dnsmasq.service
+++ b/extra/dnsmasq/dnsmasq.service
@@ -4,8 +4,8 @@ Description=A lightweight DHCP and caching DNS server
 [Service]
 Type=dbus
 BusName=uk.org.thekelleys.dnsmasq
-ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
index 0ce736ba9..4030c2896 100755
--- a/extra/dnsmasq/rc.dnsmasq
+++ b/extra/dnsmasq/rc.dnsmasq
@@ -7,7 +7,7 @@
 checkconfig() {
   local testout
 
-  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+  if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
     echo "$testout"
     return 1
   fi
@@ -29,7 +29,7 @@ case $1 in
   start)
     stat_busy "Starting DNS/DHCP daemon"
     if [[ -z $PID ]] && checkconfig &&
-        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
+        /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
                           "--pid-file=$pidfile" \
                           "${DNSMASQ_OPTS[@]}"; then
       add_daemon dnsmasq
@@ -56,7 +56,7 @@ case $1 in
     ;;
   checkconfig)
     # diagnostics will be printed, with zero/non-zero exit
-    /usr/sbin/dnsmasq --test
+    /usr/bin/dnsmasq --test
     ;;
   *)
     echo "usage: $0 <start|stop|restart|checkconfig>"
diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD
new file mode 100644
index 000000000..9917297d0
--- /dev/null
+++ b/extra/dnsutils/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 151740 2012-03-01 22:01:16Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: kevin <kevin@archlinux.org>
+# Contributor: mario <mario_vazq@hotmail.com>
+
+pkgname=dnsutils
+
+# Use a period and not a hyphen before the patch level for proper versioning.
+pkgver=9.9.0
+_pkgver=9.9.0
+pkgrel=1
+
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64')
+options=('!makeflags')
+depends=('openssl' 'krb5' 'idnkit')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'remove-bind.patch'
+        'trusted-key.key')
+sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
+          'b465ef6160b004838f04de9978fe1be8422af777'
+          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
+
+replaces=('bind-tools' 'host')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-bind.patch
+	export STD_CDEFINES='-DDIG_SIGCHASE'
+
+	# hack to remove unused bloat from the binaries
+	CFLAGS+=' -fdata-sections -ffunction-sections'
+	LDFLAGS+=' -Wl,--gc-sections'
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-idn \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd bin; make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/dnsutils/remove-bind.patch b/extra/dnsutils/remove-bind.patch
new file mode 100644
index 000000000..19d650964
--- /dev/null
+++ b/extra/dnsutils/remove-bind.patch
@@ -0,0 +1,25 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
+@@ -19,8 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-		check confgen @PKCS11_TOOLS@
++SUBDIRS =	dig
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
++++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
+@@ -23,7 +23,7 @@
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	isc dns isccfg bind9 lwres
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/extra/dnsutils/trusted-key.key b/extra/dnsutils/trusted-key.key
new file mode 100644
index 000000000..866cadda2
--- /dev/null
+++ b/extra/dnsutils/trusted-key.key
@@ -0,0 +1,2 @@
+.			172800	IN	DNSKEY	256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
+.			172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 9e7d3be38..9ce3fafeb 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -15,16 +15,13 @@ sha1sums=('7f4348418dc3efefd357b32a2b5c8010211ab284')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-# mips64el doesn't have qt yet
-  [ "$CARCH" != "mips64el" ] && ./configure --prefix /usr --with-doxywizard #QTDIR=/usr 
-  [ "$CARCH" = "mips64el" ] && ./configure --prefix /usr
+  QTDIR=/usr ./configure --prefix /usr --with-doxywizard
   make
 }
 
 package_doxygen() {
   pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
   depends=('gcc-libs')
-  [ "$CARCH" = "mips64el" ] || \
   optdepends=('graphviz: for caller/callee graph generation'
               'qt: for doxywizard')
 
@@ -36,5 +33,11 @@ package_doxygen-docs() {
   pkgdesc="Developer documentation for doxygen"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Needs fonts removed from our TeXLive.
+  sed -i -e 's;$(MAKE) -C latex;:;' \
+      -e 's;$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR);:;' \
+      Makefile
+
   make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install_docs
 }
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index fd8d3201d..5775005be 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 150477 2012-02-18 02:02:31Z allan $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 151923 2012-03-04 10:46:24Z andrea $
+# Maintainer:
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.1.6
-pkgrel=4
+pkgver=2.1.7
+pkgrel=1
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://easytag.sourceforge.net/"
+url='http://easytag.sourceforge.net/'
 depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'libmp4v2' 'speex' 'wavpack')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'mp4v2-1.9.patch')
-md5sums=('6c5b9dc2bf1f3b0a11bd4efc81aaa9ee'
-         '912d9baa362c4d9e5aee0436b4ccb5a2')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9df3e800d80e754670642f2ba5e03539')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/mp4v2-1.9.patch
   ./configure --prefix=/usr
   make
 }
@@ -29,6 +27,6 @@ package() {
   make DESTDIR=${pkgdir} install
 
   # Remove directory mimetype
-  sed '/^MimeType=/ s@;x-directory/normal;@;@' \
-    -i ${pkgdir}/usr/share/applications/easytag.desktop
+#  sed '/^MimeType=/ s@;x-directory/normal;@;@' \
+#    -i ${pkgdir}/usr/share/applications/easytag.desktop
 }
diff --git a/extra/easytag/easytag.install b/extra/easytag/easytag.install
index b1b79e6b3..93908edac 100644
--- a/extra/easytag/easytag.install
+++ b/extra/easytag/easytag.install
@@ -1,12 +1,11 @@
 post_install() {
-  update-desktop-database -q
+    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
 }
 
 post_upgrade() {
-  update-desktop-database -q
+    post_install
 }
 
 post_remove() {
-  update-desktop-database -q
+    post_install
 }
-
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 94f34be2c..2bef35dd2 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151492 2012-02-26 17:43:00Z ibiru $
+# $Id: PKGBUILD 151734 2012-03-01 20:07:28Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -7,7 +7,7 @@
 
 pkgname=eclipse
 pkgver=3.7.2
-pkgrel=1
+pkgrel=2
 _date=201202080800
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,6 +15,7 @@ url="http://eclipse.org"
 depends=('java-environment' 'gtk2' 'unzip' 'libwebkit')
 install=${pkgname}.install
 makedepends=('zip')
+conflicts=('xulrunner')
 license=("EPL/1.1")
 source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
 	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index 62eef8fc0..d1a44c69e 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=efibootmgr
 pkgver=0.5.4
 pkgrel=2
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://linux.dell.com/efibootmgr/"
 license=('GPL2')
 depends=('zlib' 'pciutils')
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
index dfb974f82..19ac5cb8a 100644
--- a/extra/eject/PKGBUILD
+++ b/extra/eject/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=eject
 pkgver=2.1.5
 pkgrel=7
-pkgdesc="A program for ejecting removable media under software control"
+pkgdesc="A program for ejecting removable media under software control."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eject.sourceforge.net/"
 license=('GPL')
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index ceb8b10c5..f9f40ced3 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 144047 2011-12-02 20:54:17Z ibiru $
+# $Id: PKGBUILD 152204 2012-03-05 08:55:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64 mips64el)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index bc3e5920b..af4269387 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -10,12 +10,11 @@ pkgdesc="Complete and free Internet live audio and video broadcasting solution f
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
-if [ "${CARCH}" = "mips64el" ] ; then
-    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-    makedepends=('git')
-else
-    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-    makedepends=('yasm' 'git' 'libvdpau')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('git')
+if [ "${CARCH}" != "mips64el" ]; then
+    depends+=('libva')
+    makedepends+=('yasm' 'libvdpau')
 fi
 #git clone git://git.videolan.org/ffmpeg.git
 source=(http://mirrors.kernel.org/archlinux/other/ffmpeg/$pkgname-$pkgver.tar.xz)
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index 7ad4067b5..d57d2bf5d 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=foobillard++
 pkgver=3.42beta
 pkgrel=3
 pkgdesc="An OpenGL billiard game"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
 depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 8d9b014e1..7348036c1 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150925 2012-02-23 21:04:37Z bisson $
+# $Id: PKGBUILD 152120 2012-03-04 22:38:13Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.7.4
+pkgver=2.7.5
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -17,16 +17,16 @@ optdepends=('qt: support for qt4 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
-        'qt4-lib64.patch')
-sha1sums=('d580c772b670ccb34f510dce5535628dd22dd6cb'
-          '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
+        'qt4.patch')
+sha1sums=('5b480965985616beb972d8fc32f90cc173c72264'
+          '1c6cdcaa218615e53869bb9d67d7f9d2141e86fe')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../qt4-lib64.patch
+	patch -p1 -i ../qt4.patch
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
 		LDFLAGS+='"${LDFLAGS}"' \
diff --git a/extra/gcin/qt4.patch b/extra/gcin/qt4.patch
new file mode 100644
index 000000000..0f3e7876f
--- /dev/null
+++ b/extra/gcin/qt4.patch
@@ -0,0 +1,10 @@
+diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile	2012-03-05 09:22:46.732614803 +1100
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+ 
diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
index 87cc99e47..a6b0033a1 100644
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ b/extra/gecko-sharp-2.0/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gecko-sharp-2.0
 pkgver=0.13
 pkgrel=4
 pkgdesc="C# bindings for gtkmozembed"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
 url="http://www.mono-project.com/"
 depends=('xulrunner' 'gtk-sharp-2')
diff --git a/extra/gettext-mono/PKGBUILD b/extra/gettext-mono/PKGBUILD
index 5741a1640..9e89644a8 100644
--- a/extra/gettext-mono/PKGBUILD
+++ b/extra/gettext-mono/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gettext-mono
 pkgver=0.18.1.1
 pkgrel=1
 pkgdesc="mono assemblies for GNU internationalization library"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gettext"
 license=('GPL')
 depends=('mono>=2.10.6')
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 11a545a29..548a16f84 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $
+# $Id: PKGBUILD 151872 2012-03-03 16:05:55Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
 #   ghc places a unique hash for each library when it is built.
@@ -6,74 +7,106 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 #   Also, due to dependency loop problems, haskell-ghc-paths and haddock
 #   do not carry version dependencies. You will have to remember to build them too.
+
 pkgname=ghc
-pkgver=7.0.3
+pkgver=7.4.1
 pkgrel=2
-pkgdesc="The Glasgow Haskell Compiler"
-arch=(i686 x86_64 'mips64el')
-url="http://www.haskell.org/ghc/"
-license=("custom")
-depends=('perl' 'gmp>=5.0' gcc)
-makedepends=(ghc happy perl libxslt docbook-xsl)
-provides=("haskell-array=0.3.0.2"
-          "haskell-bytestring=0.9.1.10"
-          "haskell-cabal=1.10.1.0"
-          "haskell-containers=0.4.0.0"
-          "haskell-directory=1.1.0.0"       
-          "haskell-extensible-exceptions=0.1.1.2"
-          "haskell-filepath=1.2.0.0"
-          "haskell-haskell98=1.1.0.1"
-          "haskell-hpc=0.5.0.6"
-          "haskell-old-locale=1.0.0.2"
-          "haskell-old-time=1.0.0.6"
-          "haskell-pretty=1.0.1.2"
-          "haskell-process=1.0.1.5"
-          "haskell-random=1.0.0.3"
-          "haskell-template-haskell=2.5.0.0"
-          "haskell-time=1.2.0.3"
-          "haskell-unix=2.4.2.0"
+pkgdesc='The Glasgow Haskell Compiler'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://www.haskell.org/ghc/'
+license=('custom')
+depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
+makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
+checkdepends=('python2')
+install='ghc.install'
+groups=('haskell')
+provides=('haskell-array=0.4.0.0'
+          'haskell-base=4.5.0.0'
+          'haskell-binary=0.5.1.0'
+          'haskell-bin-package-db=0.0.0.0'
+          'haskell-bytestring=0.9.2.1'
+          'haskell-containers=0.4.2.1'
+          'haskell-deepseq=1.3.0.0'
+          'haskell-directory=1.1.0.2'
+          'haskell-extensible-exceptions=0.1.1.4'
+          'haskell-filepath=1.3.0.0'
+          'haskell-ghc-prim=0.2.0.0'
+          'haskell-haskell2010=1.1.0.1'
+          'haskell-haskell98=2.0.0.1'
+          'haskell-hoopl=3.8.7.3'
+          'haskell-hpc=0.5.1.1'
+          'haskell-integer-gmp=0.4.0.0'
+          'haskell-old-locale=1.0.0.4'
+          'haskell-old-time=1.1.0.0'
+          'haskell-pretty=1.1.1.0'
+          'haskell-process=1.1.0.1'
+          'haskell-template-haskell=2.7.0.0'
+          'haskell-time=1.4'
+          'haskell-unix=2.5.1.0'
+          'haskell-cabal=1.14.0'
          )
-replaces=("haskell-array<0.3.0.2" 
-          "haskell-bytestring<0.9.1.10"
-          "haskell-cabal<1.10.1.0"
-          "haskell-containers<0.4.0.0"
-          "haskell-directory<1.1.0.0"
-          "haskell-extensible-exceptions<0.1.1.2"
-          "haskell-filepath<1.2.0.0"
-          "haskell-haskell98<1.1.0.1"
-          "haskell-hpc<0.5.0.6"
-          "haskell-old-locale<1.0.0.2"
-          "haskell-old-time<1.0.0.6"
-          "haskell-pretty<1.0.1.2"
-          "haskell-process<1.0.1.5"
-          "haskell-random<1.0.0.3"
-          "haskell-template-haskell<2.5.0.0"
-          "haskell-time<1.2.0.3"
-          "haskell-unix<2.4.2.0"
+replaces=('haskell-array<0.4.0.0'
+          'haskell-base<4.5.0.0'
+          'haskell-binary<0.5.1.0'
+          'haskell-bin-package-db<0.0.0.0'
+          'haskell-bytestring<0.9.2.1'
+          'haskell-containers<0.4.2.1'
+          'haskell-deepseq<1.3.0.0'
+          'haskell-directory<1.1.0.2'
+          'haskell-extensible-exceptions<0.1.1.4'
+          'haskell-filepath<1.3.0.0'
+          'haskell-ghc-prim<0.2.0.0'
+          'haskell-haskell2010<1.1.0.1'
+          'haskell-haskell98<2.0.0.1'
+          'haskell-hoopl<3.8.7.3'
+          'haskell-hpc<0.5.1.1'
+          'haskell-integer-gmp<0.4.0.0'
+          'haskell-old-locale<1.0.0.4'
+          'haskell-old-time<1.1.0.0'
+          'haskell-pretty<1.1.1.0'
+          'haskell-process<1.1.0.1'
+          'haskell-template-haskell<2.7.0.0'
+          'haskell-time<1.4'
+          'haskell-unix<2.5.1.0'
+          'haskell-cabal<1.14.0'
          )
-
-install=ghc.install
-options=(!strip)
-source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2"
-        build.mk)
+source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
+        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
+        'build.mk')
+md5sums=('5d86c420978b49cc60edea9bd4c36703'
+         '54bc9405c14c3226b6e3de3cd61e2777'
+         '82b67cdd24a2e434a4399f30f14b21a3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ghc-${pkgver}
+
+  cp ${srcdir}/build.mk mk/build.mk
 
-  cp $srcdir/build.mk mk/build.mk
+  ./configure \
+    --prefix=/usr
 
-  ./configure --prefix=/usr 
-  make -j1 || return 1
+  make -j4 -l8
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  make DESTDIR=$pkgdir install
+check() {
+  cd ghc-${pkgver}
+
+  # python2 rename
+  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
+  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
-  install -d $pkgdir/usr/share/haskell
+  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
+  make THREADS=9 test
+  # might be some failures
+  #make fulltest
 }
 
-md5sums=('10bc5e9ae1b581404376efb85f260ff3'
-         '5a3e0880c80b1dcecf779ff2e63a9c0d')
+package() {
+  cd ghc-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  install -d ${pkgdir}/usr/share/licenses/ghc
+  install -m644 LICENSE \
+    ${pkgdir}/usr/share/licenses/ghc
+}
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index f918a0f16..bc26a21fe 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -7,15 +7,17 @@
 
 # Uncomment one of these to select a build profile below:
 
-# Full build with max optimisation (slow build)
+# Full build with max optimisation and everything enabled (very slow build)
 BuildFlavour = perf
 
-# Fastest build (libs unoptimised):
-#BuildFlavour = quickest
-
-# Fast build with optimised libraries:
+# Fast build with optimised libraries, no profiling (RECOMMENDED):
 #BuildFlavour = quick
 
+# Even faster build.  NOT RECOMMENDED: the libraries will be
+# completely unoptimised, so any code built with this compiler
+# (including stage2) will run very slowly:
+#BuildFlavour = quickest
+
 # Profile the stage2 compiler:
 #BuildFlavour = prof
 
@@ -25,6 +27,9 @@ BuildFlavour = perf
 # A development build, working on the stage 2 compiler:
 #BuildFlavour = devel2
 
+# An unregisterised, optimised build of ghc, for porting:
+#BuildFlavour = unreg
+
 GhcLibWays = v
 
 # -------- 1. A Performance/Distribution build--------------------------------
@@ -37,7 +42,7 @@ SRC_HC_OPTS     = -O -H64m
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2 -XGenerics
+GhcLibHcOpts    = -O2
 GhcLibWays     += p
 
 ifeq "$(PlatformSupportsSharedLibs)" "YES"
@@ -112,6 +117,7 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
 
 endif
 
@@ -128,23 +134,42 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
+
+# After stage 1 and the libraries have been built, you can uncomment this line:
+
+# stage=2
+
+# Then stage 1 will not be touched by the build system, until
+# you comment the line again.  This is a useful trick for when you're
+# working on stage 2 and want to freeze stage 1 and the libraries for
+# a while.
 
 endif
 
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
+# -------- A Unregisterised build) -------------------------------------------
 
-# profiled RTS
-#GhcRtsCcOpts =  -pg -g
+ifeq "$(BuildFlavour)" "unreg"
 
-# Optimised/profiled RTS
-#GhcRtsCcOpts = -O2 -pg
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
 
-#GhcRtsWithFrontPanel = YES
-#SRC_HC_OPTS += `gtk-config --libs`
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O2
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O2
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
 
-# NoFib settings
-NoFibWays =
-STRIP=:
+endif
 
+# -----------------------------------------------------------------------------
+# Other settings that might be useful
 
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
diff --git a/extra/ghc/ghc.install b/extra/ghc/ghc.install
index 7d56083bc..c0200e4a6 100644
--- a/extra/ghc/ghc.install
+++ b/extra/ghc/ghc.install
@@ -1,19 +1,10 @@
-pkgname=ghc
-
 pre_upgrade() {
-    cat << EOF
-    ==> Unregistering cabalized packages...
-EOF
-    cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null )
-    cat << EOF
-    ==> Done.
-EOF
-    
+  echo '==> Unregistering cabalized packages...'
+  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
+  echo '==> Done.'
 }
 
 post_upgrade() {
-    cat << EOF
-    ==> All cabalized and yaourt-installed packages need to be reinstalled now.
-    ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.
-EOF
+  echo '==> All cabalized packages need to be reinstalled now.'
+  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
 }
diff --git a/extra/ghc/print-provides-replaces.sh b/extra/ghc/print-provides-replaces.sh
new file mode 100755
index 000000000..33d1da051
--- /dev/null
+++ b/extra/ghc/print-provides-replaces.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. PKGBUILD
+
+if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
+  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
+  exit 1
+fi
+
+declare -A exclude
+# no Win32 cause we're not building on windows
+exclude['Win32']=1
+# no integer-simple because we use integer-gmp
+exclude['integer-simple']=1
+# extract excluded libraries from ghc.mk
+for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
+  exclude[${exclude_pkg}]=1
+done
+
+cd src/ghc-${pkgver}/libraries
+
+# $1 is the name of the variable
+# $2 is the string for the test, either '=' or '<'
+print_var() {
+  printf "$1=("
+  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
+    [[ ${exclude[${pkg}]} ]] && continue
+    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
+    printf "'haskell-$pkg$2$version'\n          "
+  done
+  # also add cabal
+  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
+  printf "'haskell-cabal$2$version'\n          "
+  echo -e '\b)'
+}
+
+print_var 'provides' '='
+print_var 'replaces' '<'
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index 8342241c1..3a6309dc5 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnome-desktop-sharp
 pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
 pkgrel=8
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD
index fcd30024a..734c0e2fe 100644
--- a/extra/gnome-keyring-sharp/PKGBUILD
+++ b/extra/gnome-keyring-sharp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gnome-keyring-sharp
 pkgver=1.0.2
 pkgrel=3
 pkgdesc="A fully managed implementation of libgnome-keyring"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.mono-project.com/Libraries"
 license=('custom')
 depends=('ndesk-dbus>=0.4' 'libgnome-keyring')
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
index d98c53d73..04eec6472 100644
--- a/extra/gnuchess/PKGBUILD
+++ b/extra/gnuchess/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 137508 2011-09-08 07:31:10Z allan $
+# $Id: PKGBUILD 152136 2012-03-04 23:43:24Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuchess
-pkgver=6.0.1
+pkgver=6.0.2
 pkgrel=1
 pkgdesc="Lets most modern computers play a full game of chess"
 url="http://www.gnu.org/software/chess/chess.html"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'ncurses' 'readline')
-source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
-md5sums=('041888218f73886f146fa7fbf92190de')
+source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('566a145479c47f2f9d7d9b7b8119e1b0'
+         '044487606aa14ecb29ab9613f83918d9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 456c20c76..1ebf9c606 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151094 2012-02-24 20:55:22Z andyrtr $
+# $Id: PKGBUILD 151785 2012-03-02 19:31:37Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.14
+pkgver=3.0.15
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
 makedepends=('strace')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0d613985c867846ccb5cbaba8fa576ef'
-         '847af57e7d4702b176d1cbf157962f6e')
+md5sums=('37bdac12b5c039c7a8738b5d85eda968'
+         '594eb29cbc3147dc0b6b529ebe96bd33')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +23,7 @@ build() {
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--enable-valgrind-tests
+	--disable-valgrind-tests
   make
 }
 
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 4735dc772..880d36e5c 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150786 2012-02-22 09:57:59Z giovanni $
+# $Id: PKGBUILD 151860 2012-03-03 14:28:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index b1b19646b..41ddd2390 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.18
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 2ea27fe5a..d7049afb6 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gssdp
 pkgver=0.12.0
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=('LGPL')
 depends=('libsoup')
diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD
index 559d96c43..7adbebf17 100644
--- a/extra/gtk-sharp-2/PKGBUILD
+++ b/extra/gtk-sharp-2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk-sharp-2
 pkgver=2.12.11
 pkgrel=1
 pkgdesc="gtk2 bindings for C#"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('LGPL')
 url="http://gtk-sharp.sourceforge.net"
 depends=('mono' 'libglade' 'gtk2')
diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
index f9cb98065..2c4e7eec6 100644
--- a/extra/happy/PKGBUILD
+++ b/extra/happy/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 127724 2011-06-17 20:54:42Z eric $
-# Maintainer: simo <simo@archlinux.org>
+# $Id: PKGBUILD 151874 2012-03-03 16:05:59Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: simo <simo@archlinux.org>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
  
 pkgname=happy
-pkgver=1.18.6
-pkgrel=1
+pkgver=1.18.9
+pkgrel=4
 pkgdesc="The Parser Generator for Haskell"
 url="http://www.haskell.org/happy/"
 arch=('i686' 'x86_64' 'mips64el')
 license=("custom:BSD3")
-depends=(gmp)
-makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0)
-options=(strip)
+depends=('gmp')
+makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('7d4d1425f5068633cd477a2b2216880d')
+md5sums=('aeb565fe572f979f15a24db0df2de37d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,4 +27,3 @@ package() {
   runhaskell Setup.lhs copy --destdir="${pkgdir}"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
index 203bc1589..3c00810ba 100644
--- a/extra/haskell-html/PKGBUILD
+++ b/extra/haskell-html/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=9.1
+pkgrel=10
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index f0f33d5cb..cb9c79c0c 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.1.1
-pkgrel=3.1
+pkgver=4000.2.2
+pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('ddf23d46c4d6dc0048c454e3d01caa57')
+md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -37,4 +38,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 932f9360c..c8c1d9e62 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -1,15 +1,16 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=mtl
 pkgname=haskell-mtl
 pkgver=2.0.1.0
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('934fa813625ef7e88a6a96a09815ff95')
@@ -35,4 +36,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 2d1b78c75..03f6992d5 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.3.0.2
-pkgrel=2.1
+pkgver=2.3.0.11
+pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('a739fe9b75af744cfa1c05e39d41ac1f')
+md5sums=('cfe4922ac85685be9f86d4d34654f481')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index fe0fca0ab..8603734f0 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # As generated by cabal2arch 0.7.6
+
 _hkgname=parsec
 pkgname=haskell-parsec
-pkgver=3.1.1
-pkgrel=2.1
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('3d5500847cac09f6f658db825b6c5df8')
+md5sums=('c2a75dfd247ae4839e2602b62dc87487')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -36,4 +37,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
index 0a338c9b5..e9975e93d 100644
--- a/extra/haskell-quickcheck/PKGBUILD
+++ b/extra/haskell-quickcheck/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
+
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
-pkgver=2.4.0.1
-pkgrel=3.1
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('e8c86e95fd1fa4c58fc8e53e2853db5e')
+md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
new file mode 100644
index 000000000..3b929c3d6
--- /dev/null
+++ b/extra/haskell-random/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+
+_hkgname=random
+pkgname=haskell-random
+pkgver=1.0.1.1
+pkgrel=1
+pkgdesc="A basic random number generation library"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
+
diff --git a/extra/haskell-random/haskell-random.install b/extra/haskell-random/haskell-random.install
new file mode 100644
index 000000000..b6d807e1a
--- /dev/null
+++ b/extra/haskell-random/haskell-random.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-random
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
index dc920b63a..791cee2ca 100644
--- a/extra/haskell-regex-base/PKGBUILD
+++ b/extra/haskell-regex-base/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=4.1
+pkgrel=5
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
index 40812c431..1d77e99a6 100644
--- a/extra/haskell-regex-compat/PKGBUILD
+++ b/extra/haskell-regex-compat/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
-pkgver=0.93.1
-pkgrel=4.1
+pkgver=0.95.1
+pkgrel=1
 pkgdesc="Replaces and enhances Text.Regex"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('d6becec95ea8098cab663116fdce60a5')
+md5sums=('d0573ab4e2f3de5faa61380b67333320')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
index 230d09237..2bf21e05a 100644
--- a/extra/haskell-regex-posix/PKGBUILD
+++ b/extra/haskell-regex-posix/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
-pkgver=0.94.4
-pkgrel=2.1
+pkgver=0.95.1
+pkgrel=1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c28a13e8329e93a19bbb51708bf64abb')
+md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index a246e2abf..53e9644f0 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -1,18 +1,18 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.0.5
-pkgrel=2.1
+pkgver=0.11.1.13
+pkgrel=1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('516a6813a6b9061fabdc9f0c3bbb1592')
+md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 8ae36ebf1..112040d99 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $
+# $Id: PKGBUILD 151894 2012-03-03 16:06:32Z tdziedzic $
+
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Rémy Oudompheng <remy@archlinux.org>
 
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.2.2.0
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+depends=('ghc=7.4.1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
 md5sums=('3470ac66116900cd1ba84d3744474e49')
 
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 03a459007..de4aaee08 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package originally generated by cabal2arch 0.7.6
+
 _hkgname=zlib
 pkgname=haskell-zlib
-pkgver=0.5.3.1
-pkgrel=2.1
+pkgver=0.5.3.3
+pkgrel=3
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.3-2 'zlib' sh)
-options=('strip')
+depends=('ghc=7.4.1' 'zlib' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('8fb2988b112e38d04a527b892f770507')
+md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 72a1e9152..8ae439ed7 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146519 2012-01-12 10:34:00Z giovanni $
+# $Id: PKGBUILD 151902 2012-03-03 16:12:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.5
+pkgver=1.40.6
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('75a7d2f93765cd367aab98986a75f88c')
+md5sums=('f9ff9c6e65c74a0763596a7ca2b69aa7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
 	      --infodir=/usr/share/info \
-	      --libdir=/lib
+	      --libdir=/usr/lib
   make
 }
 
diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install
index ab6585b91..815a943e2 100644
--- a/extra/help2man/help2man.install
+++ b/extra/help2man/help2man.install
@@ -8,7 +8,7 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 9f1564f24..e3ec5fec3 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148780 2012-02-05 11:50:09Z ibiru $
+# $Id: PKGBUILD 152206 2012-03-05 08:55:59Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
@@ -14,12 +14,13 @@ depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
          'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
 makedepends=('zip' 'cmake' 'boost' 'tclap')
 install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
 
 build() {
   cd "${srcdir}"
-  mkdir build && cd build
+  mkdir build
+  cd build
   cmake "${srcdir}/${pkgname}-${pkgver}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 12d573ff3..6cdf95dfa 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151699 2012-02-29 23:23:35Z stephane $
+# $Id: PKGBUILD 152254 2012-03-06 02:06:32Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.4
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org/projects/hwloc/"
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023')
+sha1sums=('911d2ba77fa968c3c72caf75a9e21637f3677acc')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index ec068d19b..a4d84e5e3 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -28,7 +28,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
-  if [ "$CARCH" == "x86_64" -o "$CARCH" == "mips64el" ]; then
+  if [ "$CARCH" != "i686" ]; then
          yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1
     else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
   fi
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 8eadb0dce..0db17662d 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A JSON implementation in C"
 url="http://oss.metaparadigm.com/json-c/"
 license=("MIT")
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('3a13d264528dcbaf3931b0cede24abae')
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 1271bb791..1220f5a61 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147786 2012-01-28 10:32:55Z andrea $
+# $Id: PKGBUILD 152041 2012-03-04 14:22:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
@@ -10,7 +10,7 @@ url='http://kde.org/'
 license=('GPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('ac64d13f767c06bfcf2040fcdf94a78410ad035d')
 
 build() {
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 5545ff596..5b35332b0 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147806 2012-01-28 10:33:25Z andrea $
+# $Id: PKGBUILD 152051 2012-03-04 14:29:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/jovie-${pkgver}.tar.xz")
 sha1sums=('aef47e440183323c5a62d3f45aaece7215817917')
 
 build() {
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index ebff2eaf8..ed046abf0 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147808 2012-01-28 10:33:27Z andrea $
+# $Id: PKGBUILD 152052 2012-03-04 14:29:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kaccessible-${pkgver}.tar.xz")
 sha1sums=('16451b090fe1ed345b5c1d3426bf0123eda08859')
 
 build() {
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index cf29f82e5..de7afa86e 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147810 2012-01-28 10:33:29Z andrea $
+# $Id: PKGBUILD 152053 2012-03-04 14:30:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kmag-${pkgver}.tar.xz")
 sha1sums=('7f281e2ac07aeb8d31249e6e0b27661a87f98a0c')
 
 build() {
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index f1c08b54c..6127fe842 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147812 2012-01-28 10:33:32Z andrea $
+# $Id: PKGBUILD 152054 2012-03-04 14:30:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kmousetool-${pkgver}.tar.xz")
 sha1sums=('121fce8fd61772d044a48885918d2c0b500bb646')
 
 build() {
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index 07e0f3ead..9ab4d7009 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147814 2012-01-28 10:33:35Z andrea $
+# $Id: PKGBUILD 152055 2012-03-04 14:30:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kmouth-${pkgver}.tar.xz")
 sha1sums=('43ff583d0628005087c948362b1e64dc4d359d88')
 
 build() {
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 9b18fe122..c263ed52e 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147816 2012-01-28 10:33:39Z andrea $
+# $Id: PKGBUILD 152056 2012-03-04 14:31:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -14,7 +14,7 @@ url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
 sha1sums=('a7cf29130bd83615bdc01f54a465cef8c492c527'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index f958d10c1..6e47a02b3 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147818 2012-01-28 10:33:43Z andrea $
+# $Id: PKGBUILD 152057 2012-03-04 14:32:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -21,7 +21,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
              'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('08c6e127ad1931a13ea1dde25189a49de089fa89')
 
 build() {
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index c8c0684f8..9ab547ec9 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148039 2012-01-30 11:43:20Z andrea $
+# $Id: PKGBUILD 152058 2012-03-04 14:36:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/konsole-${pkgver}.tar.xz")
 sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7')
 
 build() {
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 20862d253..e9575564a 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147764 2012-01-28 10:32:14Z andrea $
+# $Id: PKGBUILD 152030 2012-03-04 14:16:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kde-runtime-${pkgver}.tar.xz")
 sha1sums=('5e1e98535529a67f8d20e8c76d051c81604d7064')
 
 build() {
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 0aee9dd41..585250fa5 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148794 2012-02-05 11:50:50Z ibiru $
+# $Id: PKGBUILD 152042 2012-03-04 14:23:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -31,7 +31,7 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5'
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index fee209b6b..2c1e0c4fc 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
+# $Id: PKGBUILD 152043 2012-03-04 14:25:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,7 +18,7 @@ url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kde-baseapps-${pkgver}.tar.xz"
         'fix-controlclick-selection.patch')
 sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
           'b29c42301b84475f95f19ff9edb22d2134df9c1c')
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 38cb4b6f8..6c2d03e53 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147822 2012-01-28 10:33:50Z andrea $
+# $Id: PKGBUILD 152059 2012-03-04 14:36:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
@@ -6,13 +6,13 @@ pkgver=4.8.0
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kimono-${pkgver}.tar.xz")
 sha1sums=('b46842ce2b3c1aa3620277a461c3d127843d6a4d')
 
 build() {
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index dc3f9e395..490edb361 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151088 2012-02-24 19:58:42Z tdziedzic $
+# $Id: PKGBUILD 152060 2012-03-04 14:37:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-ruby')
 options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/korundum-${pkgver}.tar.xz"
         'korundum-4.8.0-ruby19.patch')
 sha1sums=('635ebd224ec2775e93ddf395c2e4d2ba838130df'
           '73299f56a891d8a5475ac07dd485619859312f70')
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 471b4d919..e8ce825d2 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147824 2012-01-28 10:33:53Z andrea $
+# $Id: PKGBUILD 152061 2012-03-04 14:37:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kross-interpreters-${pkgver}.tar.xz")
 sha1sums=('2b2ac36b1597e180c1e3923c00f4ca465bd99a03')
 
 build() {
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 13ecaefae..0f7df2059 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147826 2012-01-28 10:33:56Z andrea $
+# $Id: PKGBUILD 152062 2012-03-04 14:38:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/perlkde-${pkgver}.tar.xz")
 sha1sums=('e9c46cec78f42a29befbc26dfa428d6a28027754')
 
 build() {
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index d8b5101c3..8903a9bc1 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147778 2012-01-28 10:32:42Z andrea $
+# $Id: PKGBUILD 152037 2012-03-04 14:20:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/perlqt-${pkgver}.tar.xz")
 sha1sums=('db11f9625d6c531d9b4cf0d50c36e405600a7717')
 
 build() {
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 979641624..52e017d8f 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150178 2012-02-14 07:57:40Z andrea $
+# $Id: PKGBUILD 152038 2012-03-04 14:20:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/pykde4-${pkgver}.tar.xz")
 sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
 
 build() {
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 0509dc18d..25deac21e 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150366 2012-02-17 08:04:44Z andrea $
+# $Id: PKGBUILD 152040 2012-03-04 14:21:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/qtruby-${pkgver}.tar.xz")
 sha1sums=('9b8e9ab4926929909861f6557dea908d328a1dd2')
 
 build() {
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 60ae3347c..e19b30471 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147782 2012-01-28 10:32:49Z andrea $
+# $Id: PKGBUILD 152039 2012-03-04 14:21:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/qyoto-${pkgver}.tar.xz")
 sha1sums=('3e5abc08b5a097e332449f15c50975402934d60a')
 
 build() {
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 7d848f9e5..60fbc4331 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147768 2012-01-28 10:32:21Z andrea $
+# $Id: PKGBUILD 152032 2012-03-04 14:17:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/smokegen-${pkgver}.tar.xz")
 sha1sums=('9b4f0af954e845eecea8e7ed388e01cffb8974d2')
 
 build() {
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 84f089109..54e191697 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147776 2012-01-28 10:32:39Z andrea $
+# $Id: PKGBUILD 152036 2012-03-04 14:19:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/smokekde-${pkgver}.tar.xz")
 sha1sums=('04f01d14cfc395fcf675b7a22202b41351f471f9')
 
 build() {
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 11e7ec795..68329b19f 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147770 2012-01-28 10:32:24Z andrea $
+# $Id: PKGBUILD 152033 2012-03-04 14:18:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/smokeqt-${pkgver}.tar.xz")
 sha1sums=('9ad56f1441c92b6d24b7e9ec19fe62da34820731')
 
 build() {
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index b61d7f774..b6ca497c0 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147804 2012-01-28 10:33:23Z andrea $
+# $Id: PKGBUILD 152050 2012-03-04 14:28:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/analitza-${pkgver}.tar.xz")
 sha1sums=('2681b114deab6f3fd215e0348e34c63116ddd31c')
 
 build() {
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index 663c60d9b..d40925e5c 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147828 2012-01-28 10:33:59Z andrea $
+# $Id: PKGBUILD 152063 2012-03-04 14:38:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/blinken-${pkgver}.tar.xz")
 sha1sums=('7283a49de949e15f9c9ab06dfa133012a4090a7c')
 
 build() {
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index f69667f36..47fa82c1e 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147830 2012-01-28 10:34:01Z andrea $
+# $Id: PKGBUILD 152064 2012-03-04 14:39:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
@@ -15,7 +15,7 @@ optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
             'r: R backend')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/cantor-${pkgver}.tar.xz")
 sha1sums=('b0ef9cb3c25e4909b6855317425e9d9f12697dff')
 
 build() {
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 4271da948..14127902b 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147832 2012-01-28 10:34:04Z andrea $
+# $Id: PKGBUILD 152065 2012-03-04 14:39:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kalgebra-${pkgver}.tar.xz")
 sha1sums=('45903803c0c0f3e05c30e7543ee3ebc891b60e4b')
 
 build() {
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index cd1c6f336..6d75678ec 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147834 2012-01-28 10:34:07Z andrea $
+# $Id: PKGBUILD 152066 2012-03-04 14:40:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kalzium-${pkgver}.tar.xz")
 sha1sums=('0d4f9d3a148052c93068d4c2c0ed22969ac05202')
 
 build() {
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index f38c8fbf9..b3424a73b 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147836 2012-01-28 10:34:10Z andrea $
+# $Id: PKGBUILD 152067 2012-03-04 14:40:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kanagram-${pkgver}.tar.xz")
 sha1sums=('85daff6309edf72f93fe0f692413216313c98dbd')
 
 build() {
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index acd759deb..162381e4c 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147838 2012-01-28 10:34:13Z andrea $
+# $Id: PKGBUILD 152068 2012-03-04 14:40:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kbruch-${pkgver}.tar.xz")
 sha1sums=('0f602d0dd1355dbf84c26f813458bdeb0508f4f8')
 
 build() {
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 4b6004ed6..a3964535e 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147840 2012-01-28 10:34:16Z andrea $
+# $Id: PKGBUILD 152069 2012-03-04 14:41:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kgeography-${pkgver}.tar.xz")
 sha1sums=('07d77cd5182e0594273aa713ad62134232868c08')
 
 build() {
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 90ca8fda1..543211a83 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147842 2012-01-28 10:34:18Z andrea $
+# $Id: PKGBUILD 152070 2012-03-04 14:42:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/khangman-${pkgver}.tar.xz")
 sha1sums=('2deaab70f8ed414a4ddb21aeb91627dac74986a6')
 
 build() {
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index b6e128dff..a5d2e849d 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147844 2012-01-28 10:34:21Z andrea $
+# $Id: PKGBUILD 152208 2012-03-05 08:56:03Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kig-${pkgver}.tar.xz")
 sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69')
 
 build() {
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index edd8dc6a3..51e571213 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147846 2012-01-28 10:34:25Z andrea $
+# $Id: PKGBUILD 152072 2012-03-04 14:42:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kiten-${pkgver}.tar.xz")
 sha1sums=('4068f2bcca69150a9b340a6d47ec4902d9dbacc9')
 
 build() {
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 2eba5cfc6..9a39d8800 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147848 2012-01-28 10:34:27Z andrea $
+# $Id: PKGBUILD 152073 2012-03-04 14:43:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/klettres-${pkgver}.tar.xz")
 sha1sums=('9d2c13dd14db79451db8afdc184f264b1ba29d81')
 
 build() {
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index b0b9f9cc3..c46592544 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147850 2012-01-28 10:34:32Z andrea $
+# $Id: PKGBUILD 152074 2012-03-04 14:44:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kmplot-${pkgver}.tar.xz")
 sha1sums=('914151c41fba93cb1d0cd659fb3e392c0de1b5f8')
 
 build() {
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 081b7b3f2..3d74e2a1c 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147852 2012-01-28 10:34:37Z andrea $
+# $Id: PKGBUILD 152075 2012-03-04 14:44:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kstars-${pkgver}.tar.xz")
 sha1sums=('249f80cdd5198c5c22ce75cea4d1718d5865a3c9')
 
 build() {
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index f10342c8e..f624ef8d4 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147854 2012-01-28 10:34:42Z andrea $
+# $Id: PKGBUILD 152076 2012-03-04 14:45:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/ktouch-${pkgver}.tar.xz")
 sha1sums=('e1e1338e67c0c02c4573a4aa95a721c8f674f2c6')
 
 build() {
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 5b18e0b37..baa162b28 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147856 2012-01-28 10:34:46Z andrea $
+# $Id: PKGBUILD 152077 2012-03-04 14:45:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kturtle-${pkgver}.tar.xz")
 sha1sums=('3da036991fed5840fb45d033efe0082570e804d9')
 
 build() {
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 64ad65dfc..9f8803e89 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147858 2012-01-28 10:34:51Z andrea $
+# $Id: PKGBUILD 152078 2012-03-04 14:46:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kwordquiz-${pkgver}.tar.xz")
 sha1sums=('34eec78fe68aef8b7166ca6cca84ed58290484b9')
 
 build() {
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 3c738d6ec..2a27710be 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149702 2012-02-09 14:11:37Z andrea $
+# $Id: PKGBUILD 152045 2012-03-04 14:26:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/marble-${pkgver}.tar.xz"
         'fix-with-qt48.patch')
 sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d'
           '3ec130564aa1b7a61a0c3cd51533c69c6c35bd0e')
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 5179212ef..d34068a8a 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147860 2012-01-28 10:34:57Z andrea $
+# $Id: PKGBUILD 152079 2012-03-04 14:46:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/parley-${pkgver}.tar.xz")
 sha1sums=('800eea4d6339da608cc720b5d6186de9a43b70ce')
 
 build() {
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index aea7b44fa..98d4cafba 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147862 2012-01-28 10:35:03Z andrea $
+# $Id: PKGBUILD 152210 2012-03-05 08:56:07Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/rocs-${pkgver}.tar.xz")
 sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969')
 options=('!makeflags')
 
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 356c75e9f..4c4b3c9bd 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147864 2012-01-28 10:35:09Z andrea $
+# $Id: PKGBUILD 152081 2012-03-04 14:47:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/step-${pkgver}.tar.xz")
 sha1sums=('08fff354effdc6f10e3b55ab011f8393a19de9fd')
 
 build() {
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 36288f1a7..9edf11b17 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147866 2012-01-28 10:35:26Z andrea $
+# $Id: PKGBUILD 152082 2012-03-04 14:49:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -51,7 +51,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python'
              'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('714a775811dae11ca85ce1113d673894b0afdcdd')
 
 build() {
@@ -144,7 +144,7 @@ package_kdegames-kbattleship() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kbattleship
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/xz/module.dsc \
 		$pkgdir/usr/share/ggz/kbattleship.dsc
 }
 
@@ -426,7 +426,7 @@ package_kdegames-ksquares() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/ksquares
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/xz/module.dsc \
 		$pkgdir/usr/share/ggz/ksquares.dsc
 }
 
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 5a7a1119e..746794b2c 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147868 2012-01-28 10:35:33Z andrea $
+# $Id: PKGBUILD 152083 2012-03-04 14:51:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
@@ -13,7 +13,7 @@ depends=('kdebase-lib' 'libkipi')
 makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/gwenview-${pkgver}.tar.xz")
 sha1sums=('ea1bc5dec79fb0810fc4629e8cf023c78f12ef0b')
 
 build() {
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index b64a860cb..e69a226b2 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147870 2012-01-28 10:35:37Z andrea $
+# $Id: PKGBUILD 152084 2012-03-04 14:51:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kamera-${pkgver}.tar.xz")
 sha1sums=('1693f435764124651d17579449aa4bfadff3701b')
 
 build() {
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 4e5161918..25d5d985d 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147872 2012-01-28 10:35:43Z andrea $
+# $Id: PKGBUILD 152085 2012-03-04 14:52:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kcolorchooser-${pkgver}.tar.xz")
 sha1sums=('84ab09ba2e0dbe8077a91d3496b6c65f54b636fc')
 
 build() {
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 790c122ea..1eeac2a9f 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147875 2012-01-28 10:35:49Z andrea $
+# $Id: PKGBUILD 152086 2012-03-04 14:52:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
@@ -14,7 +14,7 @@ groups=('kde' 'kdegraphics')
 #       but nvidia providing libgl does not depend on libxxf86vm
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kgamma-${pkgver}.tar.xz")
 sha1sums=('ff86fb416475aefa69d58c3c69f5426b32ea63ae')
 
 build() {
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 95437b40d..e2ace4bc1 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147877 2012-01-28 10:35:54Z andrea $
+# $Id: PKGBUILD 152087 2012-03-04 14:53:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kolourpaint-${pkgver}.tar.xz")
 sha1sums=('2d8c32fb16a8b4f479906557b5eb88c519e2c08e')
 
 build() {
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index cf0fbb878..f1ced629f 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147879 2012-01-28 10:35:59Z andrea $
+# $Id: PKGBUILD 152088 2012-03-04 14:53:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kruler-${pkgver}.tar.xz")
 sha1sums=('e453a29c327e13458c32abd86ce7b98454b859f2')
 
 build() {
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index c5ccd86bf..eccf9308e 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147881 2012-01-28 10:36:03Z andrea $
+# $Id: PKGBUILD 152089 2012-03-04 14:54:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
@@ -12,7 +12,7 @@ depends=('libksane')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/ksaneplugin-${pkgver}.tar.xz")
 sha1sums=('0110854a69395bc4402caf2b91fc3cf44a4200ad')
 
 build() {
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index 59fca5ec7..722c01cd1 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147883 2012-01-28 10:36:07Z andrea $
+# $Id: PKGBUILD 152090 2012-03-04 14:54:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
@@ -13,7 +13,7 @@ depends=('kdelibs' 'libkipi')
 makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/ksnapshot-${pkgver}.tar.xz")
 sha1sums=('a95584fd44401d130815c1ec79c21532197dbef8')
 
 build() {
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 2d5b7dd79..2269185b6 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147885 2012-01-28 10:36:10Z andrea $
+# $Id: PKGBUILD 152091 2012-03-04 14:54:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('86ae995f7278f14e1169335b24fe7a61069c39a2')
 
 build() {
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index b61876da7..07e72415a 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148796 2012-02-05 11:50:53Z ibiru $
+# $Id: PKGBUILD 152034 2012-03-04 14:18:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
@@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
 makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/okular-${pkgver}.tar.xz")
 sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c')
 
 build() {
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index a02069220..207b2186a 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148798 2012-02-05 11:50:57Z ibiru $
+# $Id: PKGBUILD 152092 2012-03-04 14:55:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b')
 
 build() {
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 917c947d0..b18a8b894 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147889 2012-01-28 10:36:16Z andrea $
+# $Id: PKGBUILD 152093 2012-03-04 14:55:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/svgpart-${pkgver}.tar.xz")
 sha1sums=('bd432a31976cb64c41035382a8133332aa184c2a')
 
 build() {
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 52ba40555..39bc877cf 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147891 2012-01-28 10:36:18Z andrea $
+# $Id: PKGBUILD 152094 2012-03-04 14:56:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
@@ -12,7 +12,7 @@ depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('acaf1e7f44c3e65619ece032b9165ade65e418b5')
 
 build() {
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index de5d8190d..5353f64ce 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147893 2012-01-28 10:36:21Z andrea $
+# $Id: PKGBUILD 152095 2012-03-04 14:56:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,7 +18,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
              'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
         'mplayerthumbs.config')
 sha1sums=('210bfd435c8e6f52aa78ab46f9487a159ab2ac83'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index b8ddcc867..97ece8730 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150224 2012-02-15 09:39:40Z andrea $
+# $Id: PKGBUILD 152096 2012-03-04 14:57:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('51ea55dbcbece59535af61f7450e8ac2aa1db28b')
 
 build() {
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index f84b2f109..34f903364 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147766 2012-01-28 10:32:18Z andrea $
+# $Id: PKGBUILD 152031 2012-03-04 14:17:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('1cf75a92ddd0c18891163cd9d7f2290afae17472')
 
 build() {
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 5148230c6..4824f004a 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147897 2012-01-28 10:36:28Z andrea $
+# $Id: PKGBUILD 152097 2012-03-04 14:58:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -27,7 +27,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356')
 
 build() {
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 71091e769..4f45534d5 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147761 2012-01-28 10:32:08Z andrea $
+# $Id: PKGBUILD 152028 2012-03-04 14:11:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL')
 depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('22409015a8047e3a78711093e3363775e8434fba')
 
 build() {
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 8287f3d6b..dbe7cef7a 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147899 2012-01-28 10:36:33Z andrea $
+# $Id: PKGBUILD 152098 2012-03-04 14:59:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -82,7 +82,7 @@ license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('0049d6977cb89f303468813811f3fde2807fd8db')
 
 build() {
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 9b10b1771..5b9853071 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147774 2012-01-28 10:32:36Z andrea $
+# $Id: PKGBUILD 152035 2012-03-04 14:19:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
@@ -9,7 +9,7 @@ pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
 sha1sums=('01cfffa6e905103c1b23d4006ba5a26844cc97aa'
           '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 0b112e0db..ad517e9e0 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150748 2012-02-21 19:37:17Z andrea $
+# $Id: PKGBUILD 152099 2012-03-04 15:01:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -30,7 +30,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
 sha1sums=('2c55ed17350cb5eba4213007614e4c587feb94b9'
           '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index 68f0b68bd..88829800f 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147903 2012-01-28 10:36:44Z andrea $
+# $Id: PKGBUILD 152100 2012-03-04 15:02:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('4d583cf52d10462a71df8eba907c07453f844cb2')
 
 build() {
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 7ae61758d..407111c2e 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147907 2012-01-28 10:36:49Z andrea $
+# $Id: PKGBUILD 152102 2012-03-04 15:02:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
@@ -14,7 +14,7 @@ groups=('kde' 'kdeutils')
 replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/filelight-${pkgver}.tar.xz")
 sha1sums=('d0e628ba95f60b7c67ad10e4f6ab14d0e24fc8f5')
 
 build() {
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index bec0cfd8a..26ec3b927 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147909 2012-01-28 10:36:52Z andrea $
+# $Id: PKGBUILD 152103 2012-03-04 15:03:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kcalc-${pkgver}.tar.xz")
 sha1sums=('b832aadd21906a7bdad323b8f1cbfb59bf1b7c63')
 
 build() {
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index 5aef74f1a..8c8c07556 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147911 2012-01-28 10:36:53Z andrea $
+# $Id: PKGBUILD 152104 2012-03-04 15:03:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kcharselect-${pkgver}.tar.xz")
 sha1sums=('0f4ffe3469c45317b7b76b66755e14df333835a3')
 
 build() {
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 7b6e9e79b..4f7b41c26 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147913 2012-01-28 10:36:56Z andrea $
+# $Id: PKGBUILD 152105 2012-03-04 15:04:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kdf-${pkgver}.tar.xz")
 sha1sums=('cc7b1450624b14ca740b64edd5b8fb54faca491e')
 
 build() {
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index 6ee4cf61b..6091c39db 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147915 2012-01-28 10:36:58Z andrea $
+# $Id: PKGBUILD 152107 2012-03-04 15:04:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kfloppy-${pkgver}.tar.xz")
 sha1sums=('5f1ea4bf5e145ce3eb8cc136ac36c57675ad489c')
 
 build() {
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index ae3f7c322..f60ab4177 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147917 2012-01-28 10:37:00Z andrea $
+# $Id: PKGBUILD 152108 2012-03-04 15:04:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
@@ -12,7 +12,7 @@ depends=('kdepim-runtime' 'kde-agent')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kgpg-${pkgver}.tar.xz")
 sha1sums=('4edbfa73c62fdd99f87b5b42dd7f1330dc8f5986')
 
 build() {
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index de9443d3e..b88e3a54c 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -14,7 +14,7 @@ groups=('kde' 'kdeutils')
 replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kremotecontrol-${pkgver}.tar.xz")
 sha1sums=('6a4d7eede9736aa14213db082ceec5a2132c89c5')
 
 build() {
diff --git a/extra/kdeutils-ksecrets/PKGBUILD b/extra/kdeutils-ksecrets/PKGBUILD
index 3e962db33..4a404e032 100644
--- a/extra/kdeutils-ksecrets/PKGBUILD
+++ b/extra/kdeutils-ksecrets/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147921 2012-01-28 10:37:05Z andrea $
+# $Id: PKGBUILD 152110 2012-03-04 15:05:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ksecrets
@@ -12,7 +12,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/ksecrets-${pkgver}.tar.xz")
 sha1sums=('13852c77b7aa76286f1108024650cb61fbc2d24e')
 
 build() {
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index fc406bf0e..c9f8625e0 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147923 2012-01-28 10:37:07Z andrea $
+# $Id: PKGBUILD 152111 2012-03-04 15:06:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/ktimer-${pkgver}.tar.xz")
 sha1sums=('647cd73338d3304efbd9bd5ce79f4b9d3e094836')
 
 build() {
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 38083f52a..30dbba64c 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147925 2012-01-28 10:37:09Z andrea $
+# $Id: PKGBUILD 152112 2012-03-04 15:06:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/kwallet-${pkgver}.tar.xz")
 sha1sums=('84828abdbaa0c0719adfc3829fb9decf1ec0f87b')
 
 build() {
diff --git a/extra/kdeutils-printer-applet/PKGBUILD b/extra/kdeutils-printer-applet/PKGBUILD
index e8b80ece4..a7a39cee6 100644
--- a/extra/kdeutils-printer-applet/PKGBUILD
+++ b/extra/kdeutils-printer-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147927 2012-01-28 10:37:11Z andrea $
+# $Id: PKGBUILD 152113 2012-03-04 15:07:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-printer-applet
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/printer-applet-${pkgver}.tar.xz")
 sha1sums=('6d6f6afb89ac43c6f1c9393592d8645480530662')
 
 build() {
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 88e5e6dd0..d0157f0b7 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147929 2012-01-28 10:37:13Z andrea $
+# $Id: PKGBUILD 152114 2012-03-04 15:07:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
@@ -12,7 +12,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/superkaramba-${pkgver}.tar.xz")
 sha1sums=('1b3375814012333ddbf7d9031647fc678ba1162a')
 
 build() {
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 05d12cb4c..f7189c0f3 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147931 2012-01-28 10:37:15Z andrea $
+# $Id: PKGBUILD 152115 2012-03-04 15:07:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/sweeper-${pkgver}.tar.xz")
 sha1sums=('213abfd1d192acf619603e66c2f6e83e323e22e6')
 
 build() {
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 1f6c0485a..7614471d1 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147933 2012-01-28 10:37:18Z andrea $
+# $Id: PKGBUILD 152116 2012-03-04 15:08:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -14,7 +14,7 @@ url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
 sha1sums=('8919c3a272a954c19a4c0a742e3e686e29650aa4')
 
 build() {
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index aee0abad5..43dd4017f 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcap-ng
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
diff --git a/extra/libdc1394/fix-videodev.h.patch b/extra/libdc1394/fix-videodev.h.patch
deleted file mode 100644
index 560337978..000000000
--- a/extra/libdc1394/fix-videodev.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
-From: David Moore <david.moore@gmail.com>
-Date: Sun, 27 Mar 2011 22:48:15 -0700
-Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-
----
- libdc1394/ChangeLog            |    3 +++
- libdc1394/configure.in         |    3 +++
- libdc1394/examples/Makefile.am |    2 ++
- 3 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
-index e1355de..536ccae 100644
---- a/libdc1394/ChangeLog
-+++ b/libdc1394/ChangeLog
-@@ -1,3 +1,6 @@
-+2011-03-27  David Moore  <david.moore@gmail.com>
-+	* Conditionally compile dc1394_vloopback only when linux/video.h exists
-+
- 2011-01-02  David Moore  <david.moore@gmail.com>
- 	* dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
- 	* Update NEWS, README, AUTHORS and version for release 2.1.3.
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/libdc1394/configure.in
-+++ b/libdc1394/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/libdc1394/examples/Makefile.am
-+++ b/libdc1394/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif
--- 
-1.7.0.1
-
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index dc9e71dde..efbb10cc6 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151268 2012-02-25 10:31:13Z allan $
+# $Id: PKGBUILD 151844 2012-03-03 13:37:37Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfontenc
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="X11 font encoding library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('zlib')
 makedepends=('pkgconfig' 'xproto>=7.0.18')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ba158e4c10a1aff2351ef632def03dec0e0ee11e')
+sha1sums=('90bdd53d75585dd0f06ad7bc23faccd8a01bb733')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index 66e380893..b7fdb2657 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151406 2012-02-26 10:29:26Z pierre $
+# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -12,7 +12,7 @@ depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
-sha1sums=('2b33fa17369605303ae70a7de1aa681879249c92')
+sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295')
 
 build() {
   cd "${srcdir}/libFS-${pkgver}"
diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD
index c5b1af1e6..a42648f7b 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151270 2012-02-25 10:36:47Z allan $
+# $Id: PKGBUILD 151848 2012-03-03 13:42:06Z andyrtr $
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libice
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -13,7 +13,7 @@ makedepends=('pkgconfig' 'xtrans>=1.2.5')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
 license=('custom')
-sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d')
+sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324')
 
 build() {
   cd "${srcdir}/libICE-${pkgver}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 644cc6570..6add1519e 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147796 2012-01-28 10:33:13Z andrea $
+# $Id: PKGBUILD 152046 2012-03-04 14:27:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('4c613177ec8cfe1436e5fb7f3b61bbb306d13f71')
 
 build() {
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 3e9bf09f0..1c852b71a 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147792 2012-01-28 10:33:07Z andrea $
+# $Id: PKGBUILD 152044 2012-03-04 14:25:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('ca40cfa3ac019ab986ca062a1c7a8be5c3b366af')
 
 build() {
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index e294e1c46..84e7e317a 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147798 2012-01-28 10:33:15Z andrea $
+# $Id: PKGBUILD 152047 2012-03-04 14:27:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('4536ffd3df63a8dcf68bf8ab221ba0c09be417c6')
 
 build() {
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index df55c631f..0ea31dd5a 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('1eccc5b6dda059eee10b2ae3e0ef6a47953eb084')
 
 build() {
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index e8f63c82d..33b8adf05 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147802 2012-01-28 10:33:20Z andrea $
+# $Id: PKGBUILD 152049 2012-03-04 14:28:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('417e0e65d3045548a29a9acdcbe1b0511a42295a')
 
 build() {
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index ce429f367..3af418eac 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 144053 2011-12-02 20:54:26Z ibiru $
+# $Id: PKGBUILD 152212 2012-03-05 08:56:10Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
-pkgver=20100913
-pkgrel=6
+pkgver=20110829
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
 makedepends=('doxygen' 'qt' 'boost')
 replaces=('liborigin')
 provides=('liborigin')
-source=(http://download.berlios.de/qtiplot/${pkgbase}-13092010.zip
+source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
 	liborigin.pro.archlinux
 	http://tree.phi-sci.com/tree.hh)
-md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375'
-         '2b19f7a4bd120f6d689edc327468e48e'
-         '966ef25cb42d192a694a71eedf484c1c')
+sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
+          '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d'
+          '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86')
 
 build() {
 	cd "${srcdir}/${pkgbase}"
 
-	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin.pro
+	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
         install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin.pro QMAKESPEC=linux-g++
+	qmake liborigin2.pro QMAKESPEC=linux-g++
   	make QTDIR=/usr/ QMAKESPEC=linux-g++
 
 	 # create documentation
diff --git a/extra/liborigin2/liborigin.pro.archlinux b/extra/liborigin2/liborigin.pro.archlinux
index d338a009c..f0eef7293 100644
--- a/extra/liborigin2/liborigin.pro.archlinux
+++ b/extra/liborigin2/liborigin.pro.archlinux
@@ -1,7 +1,7 @@
-TARGET  	 = origin2

+TARGET           = origin2

 TEMPLATE     = lib

 CONFIG      += warn_on release thread

-#CONFIG      += staticlib 

+#CONFIG      += staticlib

 MOC_DIR      = ./tmp

 OBJECTS_DIR  = ./tmp

 

@@ -11,31 +11,10 @@ DESTDIR      = ./
 LIBS        += -lboost_date_time

 LIBS        += -lboost_thread

 

-HEADERS += endianfstream.hh

-HEADERS += logging.hpp

-HEADERS += OriginObj.h

-HEADERS += OriginFile.h

-HEADERS += OriginParser.h

-HEADERS += OriginDefaultParser.h

-HEADERS += Origin600Parser.h

-HEADERS += Origin610Parser.h

-HEADERS += Origin700Parser.h

-HEADERS += Origin750Parser.h

-HEADERS += Origin800Parser.h

-HEADERS += Origin810Parser.h

-

-SOURCES += OriginFile.cpp

-SOURCES += OriginParser.cpp

-SOURCES += OriginDefaultParser.cpp

-SOURCES += Origin600Parser.cpp

-SOURCES += Origin610Parser.cpp

-SOURCES += Origin700Parser.cpp

-SOURCES += Origin750Parser.cpp

-SOURCES += Origin800Parser.cpp

-SOURCES += Origin810Parser.cpp

-

 headers.files = \$\$HEADERS

 headers.path = /usr/include/liborigin2

 target.path = /usr/lib

 INSTALLS = target headers

 

+include(liborigin2.pri)

+

diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index b9d706267..ba73780f0 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 144055 2011-12-02 20:54:29Z ibiru $
+# $Id: PKGBUILD 152214 2012-03-05 08:56:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.53
-pkgrel=2
+pkgver=0.6.54
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost')
 source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('b8e5972429091fd0e915fd3eb695b68adbe1f7cc')
+sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index 55c8d0270..bf317adf4 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151272 2012-02-25 10:40:09Z allan $
+# $Id: PKGBUILD 151850 2012-03-03 13:43:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsm
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="X11 Session Management library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -12,7 +12,7 @@ depends=('libice' 'util-linux-ng')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
-sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d')
+sha1sums=('8d354a165e330022ffd3606aba562b8c8154213d')
 
 build() {
   cd "${srcdir}/libSM-${pkgver}"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 7974c9390..6c03e97bc 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 144057 2011-12-02 20:54:34Z ibiru $
+# $Id: PKGBUILD 152216 2012-03-05 08:56:15Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.9
+pkgver=0.15.10
 pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-depends=('boost-libs' 'python2')
+depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('d86eb9d4452d07715a355d3a67312f162d6eff3a')
+sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-python-binding
+  export CFLAGS+=" -fvisibility=hidden"
+  export CXXFLAGS+=" -fvisibility=hidden"
+  ./configure --prefix=/usr \
+      --enable-python-binding \
+      --with-libgeoip=system
   make
 }
 
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 592f4a510..33d8d6bc6 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libva
 pkgver=1.0.15
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
 depends=('libgl' 'libdrm' 'libxfixes')
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index c23c73b79..bb012a83f 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvdpau
 pkgver=0.4.1
 pkgrel=2
 pkgdesc="Nvidia VDPAU library"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
 depends=('gcc-libs')
 conflicts=('nvidia-utils<190.42-2')
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 2040b2742..3a5a23418 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $
+# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64 'mips64el')
@@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
+sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXfont-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index b6b063e8a..8de87b701 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 150853 2012-02-23 12:53:44Z juergen $
+# $Id: PKGBUILD 152218 2012-03-05 08:56:28Z ibiru $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.6.0
-pkgrel=1
+pkgrel=4
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.licq.org"
 license=('GPL')
-depends=('libxss' 'qt' 'openssl')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt')
 makedepends=('cmake' 'boost')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index 7a897ad5a..d282ae30d 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151643 2012-02-29 07:23:23Z tpowa $
+# $Id: PKGBUILD 152026 2012-03-04 13:12:52Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=11
+pkgrel=12
 epoch=1
 _extramodules=extramodules-3.2-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index da40c768c..5a6ff4285 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150662 2012-02-19 16:50:59Z giovanni $
+# $Id: PKGBUILD 152226 2012-03-05 09:23:14Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.02.04
+pkgver=2012.02.29
 pkgrel=2
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,13 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('5c9753e027af08c065f156e2a0bec023')
+md5sums=('ee00b4f9ca4efaa1aeaf47b5c185fe93')
 
 build() {
   cd ${srcdir}/live
 
   sed \
-      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \
+      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
       -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
       -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
       -i config.linux
@@ -29,19 +29,12 @@ package() {
   cd ${srcdir}/live
 
   for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-    mkdir -p ${pkgdir}/usr/lib/
-    install -m644 ${dir}/*.a ${pkgdir}/usr/lib
+    install -dm755 ${pkgdir}/usr/{bin,lib,include/${dir}}
+    install -m644 ${dir}/*.a "${pkgdir}/usr/lib"
+    install -m644 ${dir}/include/*.h* "${pkgdir}/usr/include/${dir}"
   done
 
-  for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-    mkdir -p ${pkgdir}/usr/include/${dir}
-    install -m644 ${dir}/include/*.hh ${pkgdir}/usr/include/${dir}
-  done
-
-  install -m644 groupsock/include/*.h ${pkgdir}/usr/include/groupsock
-
-  mkdir -p ${pkgdir}/usr/bin
   for testprog in `find testProgs -type f -perm 755`; do
-    install ${testprog} ${pkgdir}/usr/bin
+    install ${testprog} "${pkgdir}/usr/bin"
   done
 }
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 366b4d4ad..9fb57713f 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151657 2012-02-29 20:04:42Z ronald $
+# $Id: PKGBUILD 152233 2012-03-05 13:38:37Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.3
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index b14b6b5af..409c2b1bc 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mash
 pkgver=0.1.0
 pkgrel=2
 pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 0d171589d..bca7147b7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151621 2012-02-28 20:53:00Z giovanni $
+# $Id: PKGBUILD 151766 2012-03-02 11:44:52Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.1
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mercurial.selenic.com/"
@@ -13,15 +13,13 @@ depends=('python2')
 optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
-        'mercurial.profile'
-        'mercurial-2.1-return-code.patch')
-md5sums=('d2ca44f8d0129ab50639143af99d9363'
-         '43e1d36564d4c7fbe9a091d3ea370a44'
-         '025e2ec8acc18a9b2a1b4f51f7bddbe3')
+        'mercurial.profile')
+md5sums=('368fab4705ebd4d1296fdd6bd2fe6272'
+         '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/mercurial-2.1-return-code.patch"
+
   python2 setup.py install --root="${pkgdir}/" --optimize=1
 
   sed -i -e 's#env python#env python2#' \
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index d29fdd372..994b35d5e 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149745 2012-02-09 23:48:35Z giovanni $
+# $Id: PKGBUILD 152222 2012-03-05 08:56:33Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/mod_mono/PKGBUILD b/extra/mod_mono/PKGBUILD
index ad9a29628..781714d14 100644
--- a/extra/mod_mono/PKGBUILD
+++ b/extra/mod_mono/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mod_mono
 pkgver=2.10
 pkgrel=2
 pkgdesc="The mono module to make ASP.NET running on top of apache"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('APACHE')
 depends=('apache>=2.2.11' 'xsp')
 url="http://www.go-mono.com"
diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD
index d3a44965d..ccaac768b 100644
--- a/extra/mono-addins/PKGBUILD
+++ b/extra/mono-addins/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mono-addins
 pkgver=0.6.2
 pkgrel=2
 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.mono-project.com/Mono.Addins"
 license=('custom:MIT')
 depends=('gtk-sharp-2>=2.12.8' 'mono>=2.10.5')
diff --git a/extra/mono-basic/PKGBUILD b/extra/mono-basic/PKGBUILD
index 06a3f3c38..b0552c5a1 100644
--- a/extra/mono-basic/PKGBUILD
+++ b/extra/mono-basic/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mono-basic
 pkgver=2.10
 pkgrel=2
 pkgdesc="Mono Visual Basic.NET compiler"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD
index 3658289a3..21946154d 100644
--- a/extra/mono-debugger/PKGBUILD
+++ b/extra/mono-debugger/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=mono-debugger
 pkgver=2.10
 pkgrel=2
 pkgdesc="The Mono Debugger"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD
index e1b29235a..a7dc49bf1 100644
--- a/extra/mono-tools/PKGBUILD
+++ b/extra/mono-tools/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=mono-tools
 pkgver=2.10
 pkgrel=2
 pkgdesc="collection of testing and development tools for use with mono (including monodoc browser)"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('libgnome-sharp' 'gtkhtml-sharp')
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 876cc084c..a53c4565c 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=monodevelop-debugger-gdb
 pkgver=2.8.6.5
 pkgrel=1
 pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://monodevelop.com"
 license=('GPL')
 depends=('monodevelop>=2.8.6.5' 'gdb')
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 9bed37472..c5cf289c1 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=monodevelop
 pkgver=2.8.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 arch=('i686' 'x86_64')
 url="http://www.monodevelop.com"
 license=('GPL')
-depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10')
+depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp')
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 1edfbdc3d..506aadda4 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151695 2012-02-29 21:30:41Z bisson $
+# $Id: PKGBUILD 151736 2012-03-01 21:37:06Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=5
+pkgrel=6
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
diff --git a/extra/ntp/install b/extra/ntp/install
index 7581ec12f..e6eddf8a4 100644
--- a/extra/ntp/install
+++ b/extra/ntp/install
@@ -25,6 +25,9 @@ EOF
 	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
 		post_install
 	fi
+	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
+		chown -R ntp /var/lib/ntp
+	fi
 }
 
 post_remove() {
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 11f2004e4..423532c37 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150232 2012-02-15 10:39:26Z andyrtr $
+# $Id: PKGBUILD 151907 2012-03-03 18:57:24Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -9,7 +9,7 @@ _icedteaver=1.11.1
 _openjdk_version=b24
 _openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -75,7 +75,8 @@ build() {
 	--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
   	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
 	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap
+	--disable-bootstrap \
+	--with-abs-install-dir=${_jvmdir}
   LD_PRELOAD="" make 
 }
 
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index 9b5699e24..8f3ea545b 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143925 2011-11-30 21:06:41Z giovanni $
+# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=parted
-pkgver=3.0
-pkgrel=4
+pkgver=3.1
+pkgrel=1
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -13,17 +13,12 @@ depends=('device-mapper' 'e2fsprogs')
 makedepends=('pkg-config')
 options=('!libtool')
 install=parted.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'linux.c.patch')
-md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7'
-         '08c942e212424e238271217f52c59706')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # FS#25307
-  patch -Np1 -i ${srcdir}/linux.c.patch
-
   ./configure --prefix=/usr \
               --disable-debug \
               --disable-rpath
diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD
index 9ed7695f3..6132269d2 100644
--- a/extra/pekwm/PKGBUILD
+++ b/extra/pekwm/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 148872 2012-02-05 11:53:39Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 151921 2012-03-04 10:39:20Z andrea $
+# Maintainer:
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Eddie Lozon <almostlucky@attbi.com>
 
 pkgname=pekwm
-pkgver=0.1.13
-pkgrel=2
+pkgver=0.1.14
+pkgrel=1
 pkgdesc="A small, fast, functional, and flexible window manager"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://pekwm.org/"
-depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm'
-'libxrandr')
+url='https://www.pekwm.org/projects/pekwm'
+depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
 backup=(etc/pekwm/config
   etc/pekwm/vars
   etc/pekwm/autoproperties
@@ -18,14 +18,13 @@ backup=(etc/pekwm/config
   etc/pekwm/keys
   etc/pekwm/mouse
   etc/pekwm/menu)
-source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2
-pekwm.desktop libpng-1.4.patch)
-md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5'
-         '075bf1b9d32bf94780329499e4fa40e3')
+source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2"
+        'pekwm.desktop')
+md5sums=('bb9c01c81fe47620bcd9be0e2e4a10e6'
+         '5a78fc6653fbb0b7282ecf7f1f81e2c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -p1 < ../libpng-1.4.patch || return 1
   # Default settings:
   #    --enable-shape --enable-xinerama --enable-menus \
   #    --enable-harbour --disable-debug --disable-pedantic \
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 58731bedc..cc75d6ae4 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.18.3
 pkgrel=2
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'libtool')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 6f9ca8e29..5f0c56680 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $
+# $Id: PKGBUILD 152250 2012-03-06 01:50:30Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('python2')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
+sha1sums=('6f56a301859b8f9513141fbeeca3e537e082aa53')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 694496b4f..6a0ab52a9 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148896 2012-02-05 11:54:40Z ibiru $
+# $Id: PKGBUILD 152196 2012-03-05 08:20:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.0
-pkgrel=3
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -29,9 +29,9 @@ build()
   cd "${srcdir}/"
   git clone git://git.seabios.org/seabios.git
   cd seabios
-  find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
   make clean
-  make
+  make PYTHON=python2
 }
 
 package() {
@@ -52,5 +52,5 @@ package() {
     done
 
 }
-md5sums=('a64b36067a191451323b0d34ebb44954'
+md5sums=('5efd1091f01e3bc31bfdec27b8edeb00'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 02dc5a056..c70baf064 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 95f039860..a45c9a0fc 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 148032 2012-01-30 07:48:01Z tpowa $
+# $Id: PKGBUILD 151755 2012-03-02 08:43:36Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
-pkgname=('smbclient' 'samba')
+pkgname=('libwbclient' 'smbclient' 'samba')
 pkgver=3.6.3
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.3
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
@@ -17,8 +17,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
         swat.xinetd
         samba.pam
-        samba.conf.d
-        fix-ipv6-mount.patch)
+        samba.conf.d)
 ### UNINSTALL dmapi package before building!!!
 
 build() {
@@ -48,13 +47,23 @@ build() {
   make
 }
 
+package_libwbclient () {
+pkgdesc="Samba winbind client library"
+depends=('glibc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/lib  
+  for i in libwbclient*; do
+      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  done
+}
+
 package_smbclient () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libnetapi* libsmbclient*;do
       cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
   done
   install -m755 script/smbtar ${pkgdir}/usr/bin/
@@ -137,9 +146,8 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
 md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
-         'a3da19515a234c703876cf850c44e996'
+         'dfc6f9018c556b9783c7140de183727f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828'
-         'c6a38a8c8fa24979e6217aed533358ea')
+         'f2f2e348acd1ccb566e95fa8a561b828')
diff --git a/extra/samba/samba b/extra/samba/samba
index 458eb8e2b..2a04bfec4 100755
--- a/extra/samba/samba
+++ b/extra/samba/samba
@@ -11,10 +11,10 @@ case "$1" in
 		rc=0
 		stat_busy "Starting Samba Server"
 		if [ ! -x /var/run/samba ] ; then
-			install -m755 -g 81 -o 81 -d /var/run/samba
+			install -m755 -d /var/run/samba
 		fi
                 if [ ! -x /var/log/samba ] ; then
-                        install -m755 -g 81 -o 81 -d /var/log/samba
+                        install -m755 -d /var/log/samba
                 fi
 		for d in ${SAMBA_DAEMONS[@]}; do
 			PID=`pidof -o %PPID /usr/sbin/$d`
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 7c5002ba5..48671d49a 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148914 2012-02-05 11:55:45Z ibiru $
+# $Id: PKGBUILD 152194 2012-03-05 07:53:46Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=5
+pkgrel=7
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
@@ -54,4 +54,8 @@ package () {
   
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+  
+  # Install the pkg-config file
+  install -D -m644 tools/sane-backends.pc \
+     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc "
 }
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 4258f1843..5fb0c37a5 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148399 2012-01-31 11:14:02Z ibiru $
+# $Id: PKGBUILD 151842 2012-03-03 11:22:09Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('qt' 'mplayer')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('e39ba5b54e6218d411ecd296002d77bb')
+md5sums=('e50046399ee918bb7b57e98971425c95')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index a095c431d..85a6e6d12 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146186 2012-01-05 14:57:13Z andrea $
+# $Id: PKGBUILD 151914 2012-03-04 09:57:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.4
-pkgrel=1.1
+pkgver=2.7.5
+pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://soprano.sourceforge.net/'
@@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('783fb07f9679f45e987aff7a17bef649')
+md5sums=('9d881ce405354da4f7c2eeee386e2859')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index be447b2ae..29d25d4b2 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145696 2011-12-28 00:18:26Z giovanni $
+# $Id: PKGBUILD 152224 2012-03-05 08:56:36Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index 25829ab9e..cead242c6 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 149091 2012-02-05 17:08:11Z daniel $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 151835 2012-03-03 09:21:08Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=taglib-sharp
-pkgver=2.0.3.7
-pkgrel=2
-pkgdesc="Free and Open Source library for the .NET 2.0 and Mono frameworks which will let you tag your software with as much or as little detail as you like without slowing you down."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.taglib-sharp.com/Main_Page"
+pkgver=2.0.4.0
+pkgrel=1
+pkgdesc="It's a library for reading and writing metadata in media files, including video, audio, and photo formats for Mono"
+arch=('i686' 'x86_64')
+url="https://github.com/mono/taglib-sharp"
 license=('LGPL2')
 depends=('mono')
 source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fa45d2519ca26b04716789fe4ac81f8b')
+md5sums=('b886a65083aafdfefa0675675bcbeb9a')
 
 build() {
   export MONO_SHARED_DIR="${startdir}/src/.wabi"
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-docs || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --disable-docs
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index f4fc586b5..613310cf1 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-farstream
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
-arch=(mips64el)
+arch=(i686 x86_64 mips64el)
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'farsight2')
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 93031c2d9..64bba79c6 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146535 2012-01-12 16:40:12Z tpowa $
+# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/tftp/"
@@ -11,10 +11,16 @@ license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
 backup=('etc/conf.d/tftpd')
-source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE)
+source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz 
+       tftpd.rc 
+       tftpd.conf 
+       LICENSE
+       tftp-hpa-0.49-fortify-strcpy-crash.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix #28103
+  patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
   ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers 
   make
 }
@@ -32,8 +38,5 @@ package() {
 md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
          '83fbb6f52205d95951a3c059e5351ca2'
          '414a79dc891bced056d99a9bb790fc9e'
-         '6ce21e27b6fdc1a1adf85c81e42aeecf')
-md5sums=('281eab4f4f628c910369ec231e4cae24'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         '414a79dc891bced056d99a9bb790fc9e'
-         '6ce21e27b6fdc1a1adf85c81e42aeecf')
+         '6ce21e27b6fdc1a1adf85c81e42aeecf'
+         '22e8629ef19bc276a102c5d4d284c1bd')
diff --git a/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch b/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch
new file mode 100644
index 000000000..e9b70d471
--- /dev/null
+++ b/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch
@@ -0,0 +1,26 @@
+diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
+--- tftp-hpa-0.49.orig/tftp/tftp.c	2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftp/tftp.c	2009-08-05 09:47:18.072585848 -0400
+@@ -279,15 +279,16 @@
+             struct tftphdr *tp, const char *mode)
+ {
+     char *cp;
++    size_t len;
+ 
+     tp->th_opcode = htons((u_short) request);
+     cp = (char *)&(tp->th_stuff);
+-    strcpy(cp, name);
+-    cp += strlen(name);
+-    *cp++ = '\0';
+-    strcpy(cp, mode);
+-    cp += strlen(mode);
+-    *cp++ = '\0';
++    len = strlen(name) + 1;
++    memcpy(cp, name, len);
++    cp += len;
++    len = strlen(mode) + 1;
++    memcpy(cp, mode, len);
++    cp += len;
+     return (cp - (char *)tp);
+ }
+ 
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 05f2acca4..12dbdf44f 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.12.10
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index b891e8a9f..90ccc23ca 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $
+# $Id: PKGBUILD 151862 2012-03-03 14:29:19Z giovanni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
new file mode 100644
index 000000000..c5e0b99ab
--- /dev/null
+++ b/extra/valgrind/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.7.0
+pkgrel=2
+pkgdesc="A tool to help find memory-management problems in programs"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://valgrind.org/"
+depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+         'f534b79b358cdced0319b375aafde4d5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000..fa400b953
--- /dev/null
+++ b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6422,7 +6433,7 @@
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 4a411d6ca..525f48584 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=varnish
 pkgver=3.0.2
 pkgrel=5
 pkgdesc="High-performance HTTP accelerator"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
diff --git a/extra/vdpau-video/PKGBUILD b/extra/vdpau-video/PKGBUILD
index 3c2c1e2e7..e1003f451 100644
--- a/extra/vdpau-video/PKGBUILD
+++ b/extra/vdpau-video/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=vdpau-video
 pkgver=0.7.3
 pkgrel=3
 pkgdesc="VDPAU backend for VA API"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://cgit.freedesktop.org/vaapi/vdpau-driver/"
 license=('GPL')
 depends=('libva' 'libvdpau')
diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD
index 715046f31..3bb034776 100644
--- a/extra/webkit-sharp/PKGBUILD
+++ b/extra/webkit-sharp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=webkit-sharp
 pkgver=0.3
 pkgrel=4
 pkgdesc="Mono/.NET bindings for the WebKit rendering engine"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.mono-project.com/"
 license=('custom:MIT')
 depends=('gtk-sharp-2' 'libwebkit>=1.4.0')
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index daf3477a9..9ab46fb6d 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 140171 2011-10-08 10:04:27Z tpowa $
+# $Id: PKGBUILD 152241 2012-03-05 19:12:45Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.570
+pkgver=1.580
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64 'mips64el')
@@ -210,7 +210,7 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('20b4f488637366c39458b9b93162eff3'
-         'da6bea412a5be8cf82a813078fec5847'
+md5sums=('2aa5378bc3ed6471c460d18e87a06fa3'
+         '43a77243acd519c4efe9577090b59912'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd')
diff --git a/extra/webmin/webmin-config.tar.bz2 b/extra/webmin/webmin-config.tar.bz2
index a51b43dcd..fa343772c 100644
--- a/extra/webmin/webmin-config.tar.bz2
+++ b/extra/webmin/webmin-config.tar.bz2
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 724d79bb1..5bfabe4b1 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('gettext' 'intltool')
+makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 6b47332c1..df2779e30 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -3,20 +3,21 @@
 
 pkgname=xine-lib
 pkgver=1.2.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'libmodplug'
              'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau')
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
+[ "$CARCH" = "mips64el" ] || makedepends+=('mesa' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'mesa: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
+            'vcdimager: for using the vcd plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('mesa: for using the opengl plugin')
+optdepends+=('wavpack: for using the wavpack plugin' \
             'faad2: for using the faad plugin' \
             'libmng: for using the mng plugin' \
             'aalib: for using the aalib plugin' \
@@ -27,15 +28,16 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libmpcdec: for using the musepack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin')
+            'gnome-vfs: for using the gnome-vfs plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
+  [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau
+  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf
   make
 }
 
diff --git a/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD
index dd26300c0..155c0a711 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 149063 2012-02-05 16:06:39Z bisson $
+# $Id: PKGBUILD 151743 2012-03-01 23:01:51Z bisson $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-font-util
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc='X.Org font utilities'
 url='http://xorg.freedesktop.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('xorg-util-macros')
 source=("${url}/releases/individual/font/font-util-${pkgver}.tar.bz2")
-sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146')
+sha1sums=('a015f4c5a35d98af72835797293697e0eb9cd506')
 
 replaces=('font-util')
 provides=('font-util')
diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
deleted file mode 100644
index 01ed040d4..000000000
--- a/extra/xorg-server/vbe-fix-malloc-size-bug.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 24 Feb 2011 21:06:34 +0000
-Subject: vbe: Fix malloc size bug
-
-v2: Slightly more obvious sizing math.
-
-==14882== Invalid write of size 2
-==14882==    at 0x6750267: VBEGetVBEInfo (vbe.c:400)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-==14882==  Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
-==14882==    at 0x4A0640D: malloc (vg_replace_malloc.c:236)
-==14882==    by 0x675024B: VBEGetVBEInfo (vbe.c:398)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
----
-diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
-index 7a64a4a..1d3775b 100644
---- a/hw/xfree86/vbe/vbe.c
-+++ b/hw/xfree86/vbe/vbe.c
-@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
-     i = 0;
-     while (modes[i] != 0xffff)
- 	i++;
--    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);
-+    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
-     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
-     block->VideoModePtr[i] = 0xffff;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
index 232ebdc94..a2c0b319e 100644
--- a/extra/xorg-xfs/PKGBUILD
+++ b/extra/xorg-xfs/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 151037 2012-02-24 13:49:47Z allan $
+# $Id: PKGBUILD 151783 2012-03-02 19:10:39Z andyrtr $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xfs
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="X.Org X11 xfs font server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2')
-makedepends=('pkgconfig' 'xtrans')
+depends=('xorg-font-utils' 'libxfont>=1.4.5' 'libfs>=1.0.2' 'libx11>=1.2.2')
+makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
 source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
         ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
         ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
         ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
         ${url}/releases/individual/app/showfont-1.0.3.tar.bz2
         xfs.rc)
-md5sums=('e02c6cae689c082b8c98a421df8f8670'
-         'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
-         '9b50d967ac6d4bae9bffb62a5e527a50'
-         'fc1f42aac16d6b76c79a1a3a0fb6a53b'
-         '50b466ab6ed4a5b8df5abf1ef844309a'
-         '251f5447f64151e9bb096ebc9f999c3f')
+sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
+          '21c5f544f34d9164797575da85727558f5e09d33'
+          '00177564597ac629207ca597f663b689902817df'
+          '5310493f53277fd196f93bbb7f2a204cad8997b7'
+          '161bf5f037db70dd75cb327648fbba559e821e76'
+          '21277375814e358ec16e8f8330f420e3d4df63e5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/xorg-xrdb/PKGBUILD b/extra/xorg-xrdb/PKGBUILD
index 3091c3aea..3c0125f31 100644
--- a/extra/xorg-xrdb/PKGBUILD
+++ b/extra/xorg-xrdb/PKGBUILD
@@ -12,7 +12,7 @@ depends=('libx11' 'libxmu' 'mcpp')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
-sha1sums=('9bfdd09a2b303b962439910f7bccaddd69b6ca8a')
+sha1sums=('efa5f2420411988d6a6e142934393fd272507857')
 
 build() {
   cd "${srcdir}/xrdb-${pkgver}"
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 134c34643..148a126c5 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 143826 2011-11-29 13:33:57Z stephane $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# $Id: PKGBUILD 151791 2012-03-03 01:11:12Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.26
-pkgrel=3
+pkgver=2.27
+pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/ypserv/'
 license=('GPL2')
 depends=('gdbm' 'openslp' 'inetutils')
+optdepends=('gawk: for printcap support')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	confpost.patch
         'yppasswd'
         'ypserv')
-sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
-          '96192b628afe36709496e4801d016c4bff343f0e'
-          'b625381bfa6cf62345377a7df30b8f45935206c5')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../confpost.patch
 	./configure --prefix=/usr
 	make
 }
@@ -35,3 +36,7 @@ package() {
 	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
 	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 }
+md5sums=('fd9c43aec932a92be07b723c647b02a4'
+         '8acb314f30d6e531ac9efa8655f68ccb'
+         '4bc84c48ed1bb9659698853acb5cfd76'
+         'c40befe5932f1b42efaced6b46809303')
diff --git a/extra/ypserv/confpost.patch b/extra/ypserv/confpost.patch
new file mode 100644
index 000000000..489e4368a
--- /dev/null
+++ b/extra/ypserv/confpost.patch
@@ -0,0 +1,14 @@
+diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
+--- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
++++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
+@@ -0,0 +1,10 @@
++/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
++ * libraries gdbm and qdbm have same symbol names. */
++#undef HAVE_COMPAT_LIBGDBM
++#ifdef HAVE_LIBGDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++#ifdef HAVE_LIBQDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD
new file mode 100644
index 000000000..9f5ef223b
--- /dev/null
+++ b/libre/apache-ant-libre/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+_pkgname=apache-ant
+pkgname=apache-ant-libre
+pkgver=1.8.2
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+pkgrel=3
+pkgdesc="A java-based build tool"
+arch=('any')
+license=('APACHE')
+url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('junit')
+optdepends=('junit: to have JUnit on the classpath in javac tasks')
+source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2
+        ${_pkgname}.sh ${_pkgname}.csh
+        ant_diagnostics.patch)
+
+build() {
+  # This directory is what becomes
+  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+  # which is what Arch uses
+  rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin
+  mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional
+  sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  # install profile.d script
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  # Get the ANT_HOME env var
+  source "${srcdir}"/${_pkgname}.sh
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}-bin
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
+
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
+
+  # Do not copy Windows .bat/.cmd files
+  find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
+
+  # symlink to junit so it's on the javac build path for ant
+  # matches behavior on ubuntu 9 and makes sense for compatibility
+  # http://bugs.archlinux.org/task/15229
+  ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
+
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
+  # The license says the NOTICE file should be redistributed for derivative
+  # works, so lets supply it.
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname}
+}
+
+md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+         '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
+         'cbaab423be40a6e63f0fde901b91eb50')
diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
new file mode 100644
index 000000000..38148b45c
--- /dev/null
+++ b/libre/apache-ant-libre/ant_diagnostics.patch
@@ -0,0 +1,23 @@
+--- a/src/main/org/apache/tools/ant/Diagnostics.java
++++ b/src/main/org/apache/tools/ant/Diagnostics.java
+@@ -179,7 +179,10 @@
+      * @param clazz the class to get the information from.

+      * @since Ant 1.8.0

+      */

+-    private static URL getClassLocation(Class clazz) {

++    private static URL getClassLocation(Class clazz) {
++		if (clazz.getProtectionDomain().getCodeSource() == null) {
++			return null;
++		}

+         return clazz.getProtectionDomain().getCodeSource().getLocation();

+     }

+ 

+@@ -241,7 +244,7 @@
+         }

+         Transformer transformer = null;

+         try {

+-            transformer = transformerFactory.newTransformer();

++            transformer = transformerFactory.newTransformer();
+         } catch (Exception e) {

+             // ignore

+             ignoreThrowable(e);

diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh
new file mode 100644
index 000000000..b6a6d5840
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.csh
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh
new file mode 100644
index 000000000..ab602fb28
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.sh
@@ -0,0 +1,3 @@
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+
diff --git a/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory
new file mode 100644
index 000000000..98ec279ed
--- /dev/null
+++ b/libre/icecat-i18n/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,2,21,19,19
diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile
new file mode 100644
index 000000000..d1aaf7bff
--- /dev/null
+++ b/libre/icecat-i18n/Makefile
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - grep
+#  - pacman
+#  - sed
+#  - wget
+
+# Variables:
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY PKGBUILD
+
+index.html: Makefile
+	rm -f $@
+	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
+langpacks.txt: index.html Makefile
+	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@_PKGVER@/$(_pkgver)/' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f index.html langpacks.txt *.xpi
+
+.PHONY: PHONY FORCE
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
index 36a55c0e6..f995939da 100644
--- a/libre/icecat-i18n/PKGBUILD
+++ b/libre/icecat-i18n/PKGBUILD
@@ -1,23 +1,24 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Contributor: emulatorman <andre.paulista@adinet.com.uy>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
-# - run the two commands below to get list of language packs
-# - change version in pkgver and _path
-# - replace md5sums with output of makepkg -g
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
 
-# wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-# echo $(egrep -o '[^>".]+\.xpi' index.html | sort -u | sed 's/\.xpi//')
 _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase='icecat-i18n'
 pkgname=($(for lang in ${_langpacks[@]}
         do echo icecat-i18n-$lang | tr A-Z a-z
         done))
-pkgver=6.0
-pkgrel=2
-pkgdesc="Language packs for IceCat"
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+pkgdesc="Language packs for GNUzilla IceCat."
 arch=('any')
 license=('MPL')
 url="http://www.gnu.org/software/gnuzilla/"
@@ -33,95 +34,97 @@ build() {
   cd "${srcdir}"
 }
 
-_path="/usr/lib/icecat-6.0/extensions/"
+_path="/usr/lib/icecat-$_pkgver/extensions/"
 
 for lang in ${_langpacks[@]}
 do
-    eval 'package_icecat-i18n-'$(echo $lang | tr A-Z a-z)'() {
-  install -Dm644 "'"$srcdir/$lang.xpi"'" "${pkgdir}'"${_path}langpack-$lang@firefox.mozilla.org.xpi"'"
-}'
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
 done
 
-md5sums=('591c7337853eedb77b86dede0c5bdf54'
-         '2b0c067f8387fb582b419dfca57d422e'
-         'f3f6870d4b01bd64d80ac4de1db513f0'
-         'd4f56954f7ad955481bda5503ecbc512'
-         '765d3c03355029434bbb65d121f67089'
-         '9e079762110ad2fcedc993bb87c44963'
-         '66a95194e65db2153e594fab871f5cd3'
-         '6ee12336d42c9ff23ec2b7864f44e38f'
-         '945f3c38961572b12148bc4f1c8bd283'
-         '9325c0178bff267cf4bb0583cf1d6c36'
-         '72c776ab5cd92cbaf7e3bda8d6f0d0d5'
-         '3e2a8386e6c56808a38ea749fd06d796'
-         '8a44d5a3c358bc510feccf917879baea'
-         '73574a44a75d52cfab87c3e10b2ebbb1'
-         '7486a690a30f348f07a2fec8478f3d1d'
-         '4c41dc44ff3e3b64e5a15aa2c1184660'
-         '6fde110c1244662eaf31d517ae2c9690'
-         'b37ce2233807458f5b3835114f04c6df'
-         '8fa56995459873b5dcd03b06ee4a179c'
-         'bfe86fdf0111d7d7d02fb689e197bdd3'
-         'e97fe3f85ac1fc9c1c61edd56527ab25'
-         '5a51f4072f1c7f43832ac1c41a7135fd'
-         'b13e8d2e54bbe35f9da43239cb4a2a16'
-         '71dd0c6257b419f986127db2600851a7'
-         '80a081a31a991fa63af8c26aebbaf8b3'
-         'db7a91026ba03d4bfaadf23c4508ecf2'
-         'a839ad07724553aefb76aa48c988ca3f'
-         'b1e6859da4b078530fa00783c2fc8621'
-         '40abf8376133162a9f7c7ec44e5e06e6'
-         'c4f62ffabe72ae87a096025998887bf9'
-         '1f58d2fbbaf449b4e05a83feddaa7f4e'
-         '9a54443791d8aa7004d085d79e4db1ea'
-         '948138c58a07b5fcb5c254bca5399e22'
-         '8889732de77e9e51bb43c744300a8b10'
-         'fcc0c92d1c1aae27881cba21cd81d15c'
-         'df3946f758bed44d30068bda21aa1af5'
-         'e8b8fbc055f64c0b23a1c5c0ff21c603'
-         'b358b06641cdfff8c8c500679aa632d3'
-         'f7e67fa44a737f9b3a80abb9c3915ce5'
-         '2ee78734669c9e92a103db8c41614cca'
-         'c0605e37d16869969b37b5936e28ff5e'
-         '51371731e61bc1369f47fd9ef263c63e'
-         '37eeb62381928a226472a916fec56844'
-         'a22816fda39678927ca34437da1519b9'
-         'd5910852f9ff4e142b5ad124f2135e59'
-         '3cbe3eb40bb57e6ff11d6377d966a8fc'
-         '64ce138c00140e553689d4265f018898'
-         'c37d831b598ac6e5b0e3e49ec605ff7b'
-         '546deebbe1f27122ff21fbe85dd9ecfd'
-         '1bcacee0782d62298883426a41830531'
-         '69584792a5d7eba4ff80e85456d647c6'
-         '4515b31f20fd2f20bce55f4a1f6c0ec8'
-         '6357aeaf62d7867506c20b38bd2478a3'
-         '54da09a50365fea562b804b4cf2be2c4'
-         '0a8750cc238982882c7872edf2989341'
-         '136d2c2b747e7227207ed7dbb79b294e'
-         '43ae45dae8693c119a8cf703a0bb132a'
-         '3627b7ab8670a3741a48786df22ed2c0'
-         'e4d3db69c334d1021b1982ab87a10d42'
-         '31c7e16225a379dc1fdabc211cd99079'
-         '142e02f1ab3db4f97b37adbf4e3a9138'
-         '617e895568a02588a168c54347f372e6'
-         '093b71d87d5e04311dab30b7a566d708'
-         'e30278d7ac6ca5d09cb688420a221cc0'
-         '3ba61614b3ddbcf3dda18279e199afcd'
-         'eaa1f41fa0ed45a5a3a0ab5b7b9e49d5'
-         '62999792ecd62689855651082d19d167'
-         '05a46c2dd966fd666f13e8db06441cf3'
-         'fdf997b09ab54da41fccc590dba5201e'
-         'bac1fc01d3bede7b4bb14a2290c33040'
-         '08c12984597bbe198329378fc59bacfb'
-         '587cb4938f8eac86e7ad05e7be4b0f9a'
-         '84914182cdb315e1a3a2062993f5cc00'
-         '15abeab9563a56bb0a061714f94bb1c5'
-         '05b190869d198992fda1624feb216a09'
-         '5885e96955025acf86f4186aaba5b794'
-         '37bddedad6898bac58987effeccadfad'
-         '49c0fbe9e0cbf66e24919eb99a612a43'
-         '9333d449ddbc8a3463d5aabacef39956'
-         'ede65b0a4ba01afc53ba8035dc6a054c'
-         'fe40e393535cc3106041592b626995f7'
-         'a5941ca6a2271e0e1b4de3f9e7df5571'
-         '84da1f02c05066fe779e4813befc062e')
+md5sums=('6d4c69921bbdfe92c0fd31873983d426'
+         '4e994c70c93e4d266d273d2358f7acf3'
+         'd783c592edfa96d6abecd1efa1aa1b5e'
+         '70b8badcddb6d5cf6b226c0f0141b463'
+         'bcfe52114b1c0f5346594452117bec5d'
+         '7d8900839fcf5972a91c4ce1a1bdd7c6'
+         'd9720bf726a8f6fde0dc94e6e73863a9'
+         'ce61734ab226dc041b55e95c9b6f9d92'
+         '965c2ec576ac41e7351e159f516ec65f'
+         '4feb78e0dd79606f416b8ab46432ad41'
+         '61989146fe89320c847e4de6261a06ff'
+         '260f3abb8612248493060e2dec6f0a22'
+         '6b49d830c47717001250236c9cc933a5'
+         '338137d425c8e6ae98796f3cc9a0550f'
+         '4ddf33cc1af9d3ad483d8fc47609aee3'
+         'e04918865a21260b8eaf27b3dc84ade5'
+         '59961e347c4fe3816f809f456bc9a2b8'
+         '262ad46f6c6e8a89eb29b590cc092eb9'
+         'e9452d83d914605f06c055c00325bf6b'
+         'ae652d7db9b3cd3cba85306d16a7a599'
+         '04fec5cd927a57ac6c9780a9f42444e1'
+         '70ba3ec972f01e75b144e106afacd8ac'
+         'f1ee7deccf3c73083b51c5741722b120'
+         'ca5566a24ee4fd38a3a907bfb5d72975'
+         'd4717e5c3e44fbaebe4eaf99f0195120'
+         '907c42bdaa3af02c39bef5d83198f8a9'
+         '7afa1ac8645657722cdf3415244e4686'
+         'd3d780b6c8d179c68065d9bec19dce48'
+         '09fae6ea53f5435ccfdbf41f660378ee'
+         '043306182ec497280b3ea78dcbd7b7d3'
+         '8a481d0d41f22d5bc65ed7844a0d7c27'
+         '2a8648998f2aafd307511e043cd8564d'
+         'e7fbc4b7364d151edac9840b90949f56'
+         'e2ea49277375825f612bcfb225dcb0a0'
+         '9fb2a20a2222a0d814a3f48d7208d820'
+         '88976bac6b9e647f4d17ab1638f12601'
+         'a6a39406914459deaefb3403e94dfa39'
+         'd3acecff63909d946fb549520785ef99'
+         'a8327a1a525330ca9ef8e3f9d50ca5f8'
+         'ba3ad9e8843b0de408a72896183985d6'
+         '3dfb48ecea5eda9f0e3e05295eb3c82b'
+         '95a1e7e2ec604409b54f1ded4ee7accf'
+         '69ebeb59c7ff4e0452c9f0998db65ef0'
+         '7bdf97288cef0d14ff1521db063cd20c'
+         '8f50cfa1e8c788b7b839273848dc2834'
+         '3aa0631dc6a53581cf53d559b27a0ee3'
+         '45e7238e0d0e427df04d3ba91ca045cd'
+         'b992cfa2b0440486cd70fd6ab9e32deb'
+         '3a9fac821e039556f7d009080daec643'
+         '6872abed4f4d4b81cf5f0b7b656846c7'
+         'eb44e902c6a6186c85dca8aff1d5b95f'
+         '21f5aeacbb233167218ab7f1b34efdce'
+         'b97e29d866ae1ed422d0a1c4327cfd49'
+         '5cce41015e73c36944224f827ac5a8d1'
+         'a13ac7293acc75015f0034d77ddb0f30'
+         '38c84e214af65ed6f059ad524c923dc9'
+         '66c8d82875f55f67167048e3d6888d8f'
+         '4ec423b8e34a4de058b115fd5918e0b2'
+         '0026e20db1bad1eaf692bd0b2043c038'
+         '31f029a6665ccae9b4c8cac9eda06c6f'
+         'e72ffe020543ca0ad4f8be2aad9e90a9'
+         '7b75e8fb1cd8ae34023b312d2214029a'
+         '88b1a96268e08f65579b2fe6d7677b73'
+         '4418d687e4dcb313fd59247844eab93c'
+         'b200a045163b7c09cde85b82013fec98'
+         '263f6ff19491b68865bcab4309dff0a8'
+         '80d0fb352eb1f252c355d3b8388d3513'
+         'dd79b0c4d959f46852e1e23b0cc984af'
+         'db51a6767331bb3a8c0a1e0f5f35d968'
+         '3155d4cafe5f90ec83336ddd07183629'
+         'b9246693498e1ec3c5b4dffa8145d04e'
+         '770bf78f2a0c6522e641e61e44617b40'
+         'aadf3a6f9517c76e2b37867cb1a654c6'
+         '3530c75b3c2311d8127f20df7bd724da'
+         'ef3bfc5db8197edb095da10390d8e058'
+         '46b701b2db7415b30b82023bb707e1dc'
+         '24da3bee4042e31da5781b02dc089499'
+         'b3faadcabfd6d738a41ee4c12696adcd'
+         '9938f231ce13202d040c24783c95c35b'
+         '04894f460b81525d29367f1ed1504f5e'
+         'c6049613b48eaaa71c45df2e44db1087'
+         '7e7e81ca9c6d44913d37159b4627967c'
+         '1a80a20da9cc26e2edd942d77a35c824')
diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in
new file mode 100644
index 000000000..90c901e31
--- /dev/null
+++ b/libre/icecat-i18n/PKGBUILD.in
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=@LANGPACKS@
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=@_PKGVER@
+pkgver=@PKGVER@
+pkgrel=@PKGREL@
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD
new file mode 100644
index 000000000..9f42e977d
--- /dev/null
+++ b/libre/java-asm2/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm2
+pkgver=2.2.3
+pkgrel=1
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+arch=('any')
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  mkdir -p test/lib
+  echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties
+  ant dist
+}
+
+mvn-install() {
+  group=$1
+  pkg=$2
+  ver=$3
+
+  dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver
+  install -d "$dir"
+  cp $pkg-$pkgver.* "$dir"
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd output/dist
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
+  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
+  
+  # Install Apache Maven modules
+  cd lib
+  mvn-install asm asm $pkgver
+  mvn-install asm asm-analysis $pkgver
+  mvn-install asm asm-attrs $pkgver
+  mvn-install asm asm-commons $pkgver
+  mvn-install asm asm-tree $pkgver
+  mvn-install asm asm-util $pkgver
+  mvn-install asm asm-xml $pkgver
+  cd all
+  mvn-install asm asm-all $pkgver
+
+  # Synlink Maven modules to /usr/share/java
+  install -d "$pkgdir"/usr/share/java/asm
+  cd "$pkgdir"
+  find usr/share/maven/repository/asm \
+    -type f -name '*.jar' -printf '/%p\n' | while read jar; do
+    ln -s "$jar" "$pkgdir"/usr/share/java/asm
+  done
+  
+  # Put the finishing touches on /usr/share/java
+  ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-2.jar
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD
new file mode 100644
index 000000000..2c6a7f933
--- /dev/null
+++ b/libre/java-asm3/PKGBUILD
@@ -0,0 +1,83 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm3
+pkgver=3.3.1
+pkgrel=3
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+arch=('any')
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  rm cobertura.ser # We regenerate this
+  rm examples/jasmin/test/jasmin.jar
+
+  echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties
+  ant dist
+}
+
+# Tests have more dependencies, and I can't be bothered to package them.
+#check() {
+#  cd "$srcdir/$_pkgname-$pkgver"
+#  ant test
+#}
+
+mvn-install() {
+  group=$1
+  pkg=$2
+  ver=$3
+
+  dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver
+  install -d "$dir"
+  cp $pkg-$pkgver.* "$dir"
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd output/dist
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
+  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
+  
+  # Install Apache Maven modules
+  cd lib
+  mvn-install asm asm $pkgver
+  mvn-install asm asm-analysis $pkgver
+  mvn-install asm asm-commons $pkgver
+  mvn-install asm asm-parent $pkgver
+  mvn-install asm asm-tree $pkgver
+  mvn-install asm asm-util $pkgver
+  mvn-install asm asm-xml $pkgver
+  cd all
+  mvn-install asm asm-all $pkgver
+  mvn-install asm asm-debug-all $pkgver
+
+  # Synlink Maven modules to /usr/share/java
+  install -d "$pkgdir"/usr/share/java/asm
+  cd "$pkgdir"
+  find usr/share/maven/repository/asm \
+    -type f -name '*.jar' -printf '/%p\n' | while read jar; do
+    ln -s "$jar" "$pkgdir"/usr/share/java/asm
+  done
+  
+  # Put the finishing touches on /usr/share/java
+  ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-3.jar
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('433024df8176f09922646316e415631c')
diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD
new file mode 100644
index 000000000..023048188
--- /dev/null
+++ b/libre/java-ow-util-ant-tasks/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-ow-util-ant-tasks
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="ObjectWeb utility Ant tasks library"
+arch=('any')
+url="http://forge.ow2.org/projects/monolog"
+license=('LGPL')
+depends=('java-environment')
+makedepends=('apache-ant' 'xalan-java' 'java-asm2')
+source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ln -s /usr/share/java/asm-2.jar externals
+  ln -s /usr/share/java/xalan.jar externals
+  ant jar
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/share/java
+  install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
+}
+
+md5sums=('339b3eb4b2960473a42f5f781afbeca6')
diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD
new file mode 100644
index 000000000..01241907d
--- /dev/null
+++ b/libre/java-ow-util-ant-tasks/SRCBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-ow-util-ant-tasks
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="ObjectWeb utility Ant tasks library"
+arch=('any')
+url="http://forge.ow2.org/projects/monolog"
+license=('LGPL')
+source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
+noextract=("ow_util_ant_tasks_$pkgver.zip")
+
+build() {
+  cd "$srcdir"
+  mkdir $pkgname-$pkgver
+  cd $pkgname-$pkgver
+  bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip
+  rm -rf output
+  rm externals/*
+}
+
+
+package() {
+  PKGEXT=${SRCEXT}
+  PKGDEST=${SRCDEST}
+  cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/"
+}
+
+md5sums=('cd602bf75a0feab480fa97739955b84e')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0c9e95b83..63463cc0a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -8,7 +8,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
-pkgver=${_basekernel}.22
+_sublevel=23
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.22 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -17,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -27,10 +28,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch')
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'ddc0925df01b70f6eef95e9b4160f28a'
-         '248d057fd2341d315ada5e844cdbdc1f'
+         '5b6f929403ddad35a65b934ed5df2f8a'
          '054af37f538b74a8090fc3e783a2edfa'
          'e195768d5b8cbe788dbe615561d4314f'
          'd2c0701480bce49fd4b40dc46b9863f1'
@@ -39,7 +40,13 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '74d2b710d6c97aee441d7566f8f68815')
+         '74d2b710d6c97aee441d7566f8f68815'
+         '248d057fd2341d315ada5e844cdbdc1f')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -71,16 +78,22 @@ build() {
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -114,7 +127,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -123,13 +141,19 @@ build() {
 package_linux-libre-lts() {
   pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26-lts' "linux-lts=$pkgver")
   conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -144,6 +168,7 @@ package_linux-libre-lts() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -195,7 +220,7 @@ package_linux-libre-lts-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -229,7 +254,7 @@ package_linux-libre-lts-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cf57ce44..2de3804e6 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.22-1-LIBRE-LTS
+KERNEL_VERSION=3.0.23-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
@@ -17,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3cb6108d5..5b8430f86 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -4,14 +4,17 @@
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
-pkgver=${_basekernel}.7
-pkgrel=1
+_sublevel=9
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -19,7 +22,6 @@ makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -29,19 +31,27 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'i915-gpu-finish.patch')
+        'i915-gpu-finish.patch'
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '37a0fdc7ad19c9489faf09925b4fae5b'
-         '690e6201d219638544d2fba3996dc822'
-         '79db8a444fd149e409f706830d8cee9a'
-         'e26dbcb367a2b48f5ed09560e2ae8fa0'
+         '8e601878ccdd37111cc84500ebd81387'
+         '921f108c7a4985f7f8b41d72ca9bf915'
+         'f18ac3f790b0daa43f21dda04cceb90b'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '4cd79aa147825837dc8bc9f6b736c0a0')
+         '4cd79aa147825837dc8bc9f6b736c0a0'
+         'f36222e7ce20c8e4dc27376f9be60f6c'
+         '690e6201d219638544d2fba3996dc822')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -71,21 +81,28 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix ext4 module to mount ext3/2 correct
+  # https://bugs.archlinux.org/task/28653
+  patch -Np1 -i "${srcdir}/ext4-options.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
-
-    sed -e "s|# \(CONFIG_BATMAN_ADV\) is not set|\1=m\n\1_DEBUG=n|" \
-        -i ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -119,7 +136,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -128,13 +150,19 @@ build() {
 package_linux-libre() {
   pkgdesc="The Linux-libre Kernel and modules"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=$pkgver")
   conflicts=('kernel26' 'kernel26-libre' 'linux')
   replaces=('kernel26' 'kernel26-libre' 'linux')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -149,6 +177,7 @@ package_linux-libre() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -200,7 +229,7 @@ package_linux-libre-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-${_basekernel}
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -234,8 +263,7 @@ package_linux-libre-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -r "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -r "arch/${KARCH}/loongson1" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index d2d688197..5a50c4e04 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -4053,7 +4053,7 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 80ea3030f..441d23e6f 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -3880,7 +3880,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch
new file mode 100644
index 000000000..ef1b2417d
--- /dev/null
+++ b/libre/linux-libre/ext4-options.patch
@@ -0,0 +1,49 @@
+Report: https://bbs.archlinux.org/profile.php?id=33804
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Cc: Thomas Baechler <thomas@archlinux.org>
+Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
+Cc: Dave Reisner <d@falconindy.com>
+---
+ fs/ext4/super.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 502c61f..30de9cd 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,6 +1333,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_reservation, "reservation"},
++	{Opt_noreservation, "noreservation"},
++	{Opt_journal_inum, "journal=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1904,6 +1909,16 @@ set_qf_format:
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
++#ifdef CONFIG_EXT4_USE_FOR_EXT23
++		case Opt_nocheck:
++		case Opt_reservation:
++		case Opt_noreservation:
++		case Opt_journal_inum:
++			ext4_msg(sb, KERN_WARNING,
++			       "ext3 mount option \"%s\" ignored "
++			       "by ext4 module", p);
++			break;
++#endif
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6e3e16986..ea00c881c 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,14 +2,16 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.2.7-1-LIBRE
+KERNEL_VERSION=3.2.9-1-LIBRE
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 
   # compat symlinks for the official kernels only
   if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -50,8 +52,10 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  if command -v mkinitcpio 2>&1 > /dev/null; then
+    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+    mkinitcpio -p linux-libre${KERNEL_NAME}
+  fi
 }
 
 post_remove() {
diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD
new file mode 100644
index 000000000..2bd99940e
--- /dev/null
+++ b/libre/maven-libre/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+_pkgname=maven
+pkgname=maven-libre
+pkgver=3.0.4
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+pkgrel=1
+pkgdesc="A Java project management and project comprehension tool"
+arch=('any')
+url="http://maven.apache.org"
+license=('Apache')
+depends=('java-environment')
+makedepends=('apache-ant')
+backup=('etc/maven/settings.xml')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz
+	maven.sh maven.csh)
+
+_M2_LOCALREPO="/usr/share/maven/repository"
+
+# FIXME: This also does tasks for package()
+build() {
+  cd $srcdir/apache-maven-$pkgver
+
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+
+  export MAVEN_OPTS=-Xmx512m
+  export M2_HOME="$pkgdir"/opt/maven
+  export PATH="$PATH:$M2_HOME/bin"
+
+  # FIXME: Downloads many deps from Internet. They should be
+  #        packaged separately and added to depends=()
+  install -d "$pkgdir`dirname $_M2_LOCALREPO`"
+  cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO"
+  install -d "$pkgdir"/opt
+  ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO"
+  rm "$pkgdir"/opt/maven/*.txt
+}
+
+package() {
+  install -d "$pkgdir$_M2_LOCALREPO"
+
+  # Install config file in /etc
+  #  Unlike the other directories, we symlink from the system to /opt/maven
+  #  because that way all conf files stay in /etc
+  install -d "$pkgdir"/etc/maven
+  sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
+    < "$pkgdir"/opt/maven/conf/settings.xml \
+    > "$pkgdir"/etc/maven/settings.xml
+  rm -rf "$pkgdir"/opt/maven/conf
+  ln -s /etc/maven "$pkgdir"/opt/maven/conf
+
+  # Install profile.d settings
+  install -d "$pkgdir"/etc/profile.d
+  install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
+
+  # Link executables to /usr/bin
+  install -d "$pkgdir"/usr/bin
+  ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
+
+  # Link jar files to appropriate place in /usr/share
+  install -d "$pkgdir"/usr/share/java
+  ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
+}
+
+md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
+         '58820067a4d7384477daa134023d9b57'
+         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh
new file mode 100644
index 000000000..f5750cfc8
--- /dev/null
+++ b/libre/maven-libre/maven.csh
@@ -0,0 +1,2 @@
+setenv MAVEN_OPTS -Xmx512m
+setenv M2_HOME=/opt/maven
diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh
new file mode 100644
index 000000000..b6655cc22
--- /dev/null
+++ b/libre/maven-libre/maven.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+export MAVEN_OPTS=-Xmx512m
+export M2_HOME=/opt/maven
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 65fc932ef..fd3ebc7c1 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -7,31 +7,21 @@ pkgver=$(date +%Y%m%d)
 pkgrel=1
 pkgdesc="Parabola GNU/Linux mirror list for use by pacman"
 arch=('any')
-url="http://repo.parabolagnulinux.org/files/mirrorlist"
+url="http://repo.parabolagnulinux.org/mirrorlist.txt"
 license=('GPL')
 groups=('base')
-#backup=(etc/pacman.d/mirrorlist)
-source=(mirrorlist)
+backup=(etc/pacman.d/mirrorlist)
+source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
+md5sums=('e070f8d2639fdb742d0bfb21d27820d1')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
-# NOTE on building this package:
-# * Go to the trunk/ directory
-# * Run bash -c ". PKGBUILD; updatelist"
-# * Update the checksums, update pkgver
-# * Build the package
-
-updatelist() {
-  wget -O mirrorlist http://repo.parabolagnulinux.org/files/mirrorlist
-}
-
 build() {
   mkdir -p $pkgdir/etc/pacman.d
   install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
 }
 
-md5sums=('6440731bd17b4b6da3927e4882783946')
diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD
new file mode 100644
index 000000000..d306b77bd
--- /dev/null
+++ b/social/uci/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+pkgname=uci
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="OpenWRT's Unified Configuration Interface"
+arch=('i686' 'mips64el')
+url="https://openwrt.org"
+license=('GPL2')
+makedepends=('git' 'cmake' 'lua')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+md5sums=('135bf6c4188b72c7fd7954f592b1e4e4')
+
+# source PKGBUILD; mksource
+mksource() {
+
+  if [ -d uci/.git ]; then
+    pushd uci;  git pull; popd
+  else
+     git clone git://nbd.name/uci.git
+  fi
+
+  cd uci/
+  git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \
+    gzip -9 > ../${pkgname}-${pkgver}.tar.gz
+  cd ..
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  cmake .
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir}/ install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~lukeshu/parabolaweb-git/PKGBUILD b/~lukeshu/parabolaweb-git/PKGBUILD
index 9b2614ed8..962b1c977 100644
--- a/~lukeshu/parabolaweb-git/PKGBUILD
+++ b/~lukeshu/parabolaweb-git/PKGBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# This does not follow normal package guidelines; it is not a normal package.
 
 pkgname=parabolaweb-git
-pkgver=20111204
-pkgrel=1
+pkgver=20120228
+pkgrel=2
 pkgdesc="The Parabola website, fork of archweb"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
-depends=('python2' 'git'
-    'django=1.3.1'
-    'python-markdown=2.0.3'
-    'python-south=0.7.3'
-    'python2-pyinotify=0.9.2'
-    'python-memcached=1.47'
-    'python2-pytz>=2011n'
 
-    'python2-psycopg2'
-)
+_requirements=https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt
+depends=('python2' 'git'
+    `curl -s "$_requirements" | sed -r -e 's/.*/\L&/' -e 's/==/=/' \
+      -e 's/^(south)/python-&/' \
+      -e 's/^(markdown|psycopg2|pyinotify|pytz)/python2-&/'`)
 install=parabolaweb.install
 
 # These will make it install into /http/srv/web
@@ -38,5 +35,3 @@ build() {
 package() {
     install -d "${pkgdir}/${_install_dir}"
 }
-
-# vim:set ts=2 sw=2 et: