Mon Oct 22 01:08:14 PDT 2012

66 files changed, 2008 insertions, 202 deletions

diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
index 504d2be6f..9fbef1989 100644
--- a/community-staging/luminancehdr/PKGBUILD
+++ b/community-staging/luminancehdr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74576 2012-07-30 19:16:15Z jlichtblau $
+# $Id: PKGBUILD 78606 2012-10-21 23:08:13Z ebelanger $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
 pkgver=2.3.0
-pkgrel=2
+pkgrel=4
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64')
 url='http://qtpfsgui.sourceforge.net/'
@@ -20,14 +20,14 @@ source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/lumin
 sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
 
 build() {
-  cd ${srcdir}/luminance-hdr-${pkgver}
+  cd "${srcdir}/luminance-hdr-${pkgver}"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/luminance-hdr-${pkgver}
+  cd "${srcdir}/luminance-hdr-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community-staging/luxrays/PKGBUILD b/community-staging/luxrays/PKGBUILD
index 89e7088fb..16859c63f 100644
--- a/community-staging/luxrays/PKGBUILD
+++ b/community-staging/luxrays/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 77407 2012-10-09 16:46:51Z stativ $
+# $Id: PKGBUILD 78588 2012-10-21 14:58:02Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=luxrays
 pkgver=1.1
 _pkgver=589aa5dac899
-pkgrel=1
-epoch=0
+pkgrel=3
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'opencl-headers')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
 md5sums=('7513d71148fa14bc1779b816816580b9')
 
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
index 93a60466c..a2b04e269 100644
--- a/community-staging/luxrender/PKGBUILD
+++ b/community-staging/luxrender/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77421 2012-10-09 18:45:01Z stativ $
+# $Id: PKGBUILD 78592 2012-10-21 16:37:34Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Initial contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 pkgname=luxrender
 pkgver=1.1
 _pkgver=4b4289cda943
-pkgrel=1
+pkgrel=3
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
@@ -16,7 +16,7 @@ optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
             'nvidia-utils: OpenCL support for nVidia GPUs' \
             'amdstream: OpenCL support for AMD GPUs' \
             'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
 md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
 
diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD
new file mode 100644
index 000000000..a8e7d7245
--- /dev/null
+++ b/community-staging/supertux/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 78608 2012-10-22 02:52:34Z ebelanger $
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+# Contributor: Eric Bélanger <eric@archlinux.org>
+# Contributor: vande198
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=supertux
+pkgver=0.3.3
+pkgrel=7
+pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
+arch=('i686' 'x86_64')
+url="http://super-tux.sourceforge.net/"
+license=('GPL')
+depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
+makedepends=('cmake' 'boost' 'mesa')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
+        supertux2-0.3.3-squirrel-gcc47.patch)
+md5sums=('f3f803e629ee51a9de0b366a036e393d'
+         'eb06315514be4f200428f14b927beb66')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
+  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
+  sed -i '/types\.h/d' src/addon/addon_manager.cpp
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch
new file mode 100644
index 000000000..16781b610
--- /dev/null
+++ b/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch
@@ -0,0 +1,36 @@
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));
diff --git a/community-testing/activity-log-manager/PKGBUILD b/community-testing/activity-log-manager/PKGBUILD
new file mode 100644
index 000000000..0b27128a4
--- /dev/null
+++ b/community-testing/activity-log-manager/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 78598 2012-10-21 19:12:44Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ner0
+
+pkgname=activity-log-manager
+pkgver=0.9.4
+pkgrel=2
+pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/activity-log-manager"
+license=('GPL2')
+depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('vala' 'intltool')
+install=$pkgname.install
+source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz)
+md5sums=('cf85aecdaa6c0188a53d659709e1f8cd'
+         '6167df74ce44659aa94a89f31ff4d351')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Fix docdir location
+  sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in}
+
+  # Update language files
+  echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  rename $pkgname- '' ../po/$pkgname-*.po
+  mv -f -t po ../po/*
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # We don't have Whoopsie on Arch Linux
+  rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1}
+}
diff --git a/community-testing/activity-log-manager/activity-log-manager.install b/community-testing/activity-log-manager/activity-log-manager.install
new file mode 100644
index 000000000..2c455e952
--- /dev/null
+++ b/community-testing/activity-log-manager/activity-log-manager.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD
new file mode 100644
index 000000000..44dc262a0
--- /dev/null
+++ b/community-testing/gedit-plugins/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 78582 2012-10-21 11:43:49Z ibiru $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Sergej Chodarev <sergejx@centrum.sk>
+# Contributor: zhuqin <zhuqin83@gmail.com>
+
+pkgname=gedit-plugins
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="Plugins for gedit"
+arch=('x86_64' 'i686')
+license=('GPL')
+url="http://live.gnome.org/GeditPlugins"
+depends=('gedit' 'dbus-python')
+optdepends=('gucharmap: for charmap plugin'
+            'vte3: for embedded terminal')
+makedepends=('intltool' 'gnome-doc-utils' 'vte3')
+options=('!libtool' '!emptydirs')
+install=gedit-plugins.install
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
+sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install
new file mode 100644
index 000000000..d5bcc00ae
--- /dev/null
+++ b/community-testing/gedit-plugins/gedit-plugins.install
@@ -0,0 +1,23 @@
+pkgname=gedit-plugins
+
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+post_remove() {
+  post_install $1
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gnote/PKGBUILD b/community-testing/gnote/PKGBUILD
new file mode 100644
index 000000000..10875eac1
--- /dev/null
+++ b/community-testing/gnote/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 78578 2012-10-21 10:46:20Z ibiru $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Contributor: uastasi <uastasi@archlinux.us>
+pkgname=gnote
+pkgver=3.6.0
+pkgrel=1
+pkgdesc="A note taking application."
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/Gnote"
+license=('GPL3')
+depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'libsecret')
+makedepends=('intltool' 'itstool' 'boost')
+options=('!libtool')
+install=gnote.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ac61c84a4fe8eeae613af76bb11cb481f2f44c8bc64ef4b7aac90b8e68e94957')
+
+build() {
+    cd $pkgname-$pkgver
+    ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --libexecdir=/usr/lib/gnote \
+        --disable-scrollkeeper \
+        --disable-schemas-compile \
+        --disable-static
+    make
+}
+
+package() {
+    cd $pkgname-$pkgver
+    make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/gnote/gnote.install b/community-testing/gnote/gnote.install
new file mode 100644
index 000000000..0f8eb1012
--- /dev/null
+++ b/community-testing/gnote/gnote.install
@@ -0,0 +1,21 @@
+pkgname=gnote
+
+post_install() {
+    glib-compile-schemas usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+pre_upgrade() {
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community-testing/zeitgeist-datahub/PKGBUILD b/community-testing/zeitgeist-datahub/PKGBUILD
new file mode 100644
index 000000000..35bb0fa68
--- /dev/null
+++ b/community-testing/zeitgeist-datahub/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 78600 2012-10-21 20:21:55Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Leontius Adhika Pradhana <leon@leapon.net>
+# Contributor: Ner0
+
+pkgname=zeitgeist-datahub
+pkgver=0.9.5
+pkgrel=2
+pkgdesc="Provides passive plugins which insert events into Zeitgeist"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/zeitgeist-datahub"
+license=('GPL3')
+depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist')
+makedepends=('intltool' 'vala')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('b2b76b82b67363c45e5fe4f39a172775')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 311d94ec8..7f6a5d1a1 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 76167 2012-09-12 12:38:26Z lcarlier $
+# $Id: PKGBUILD 78574 2012-10-21 09:16:19Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
 pkgver=1.99.13
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
@@ -22,7 +22,7 @@ build() {
   cd ${srcdir}/jungleji-chmsee-*/src
 
   cp Makefile.arch Makefile
-  #sed -i -e 's/12.*/13.*/g' ../application.ini
+  sed -i -e 's/15.*/16.*/g' ../application.ini
 
   make
 }
diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD
index 3932c12dd..eab4eed68 100644
--- a/community/python-pyxattr/PKGBUILD
+++ b/community/python-pyxattr/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 78249 2012-10-17 10:26:58Z allan $
+# $Id: PKGBUILD 78604 2012-10-21 22:13:35Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Jon Bergli Heier <snakebite@jvnv.net>
 
 pkgname=('python2-pyxattr' 'python-pyxattr')
 pkgbase=python-pyxattr
 _pkgname=pyxattr
-pkgver=0.5.0
-pkgrel=4
+pkgver=0.5.1
+pkgrel=1
 pkgdesc='A python extension module that allows you to manipulate the extended attributes.'
 arch=('i686' 'x86_64')
-url='http://pyxattr.sourceforge.net/'
+url='http://pyxattr.k1024.org/'
 license=('GPL')
 makedepends=('python2' 'python' 'python2-distribute' 'python-distribute')
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('0f7ab1e185087329e40f7de218517c84')
+source=("https://github.com/downloads/iustin/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('bb9560510b17625015aa45f2fbc3b520')
 
 package_python2-pyxattr() {
   depends=('python2')
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index a0328043a..b422b8403 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165653 2012-08-28 08:48:01Z ibiru $
+# $Id: PKGBUILD 169444 2012-10-21 10:28:57Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Martin Kemp <mdkemp@elys.com>
 
 pkgname=ethtool
-pkgver=3.5
+pkgver=3.6
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
@@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
 source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('021b5785f65637a04d65c2d44d6c2250')
+md5sums=('b897aa2e7eeafb5d69a571b48a1b354f')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index fad0f3a75..cf7b93bd6 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 164030 2012-07-24 16:52:28Z ibiru $
+# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.12
-_apngver=1.5.12
+pkgver=1.5.13
+_apngver=1.5.13
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0fd51add1da6a0e470e0c726c59171b9'
-         '7f2924b1fe0cca9080e18b8720443716')
+md5sums=('0b607a685da977f1bfc96e1c47055183'
+         '23c8765aa6ca188c0575386d5ea8fe70')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index de1b90f06..ddf0e8d0c 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165655 2012-08-28 09:42:38Z ibiru $
+# $Id: PKGBUILD 169448 2012-10-21 11:01:54Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.3
+pkgver=0.16.4
 pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('72788037bdf6a0a4796b4d74e543528cbfe9899b')
+sha1sums=('f8695373c574a6801b4dfe7030e0a0c4bb610abd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 1131f7885..83e5fa89a 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 166148 2012-09-04 22:30:41Z eric $
+# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.29
+pkgver=1.4.30
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('6db88d6c5093b3958b0285b5010f2677b05e0348')
+sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 3813f64e2..212415bf2 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $
+# $Id: PKGBUILD 169465 2012-10-21 16:43:35Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.2.1
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
 source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+        postgresql-run-socket.patch
         postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
-        postgresql.service postgresql-check-db-dir)
+        postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
 md5sums=('c0b4799ea9850eae3ead14f0a60e9418'
+         '75c579eed03ffb2312631f0b649175b4'
          '1ddd1df8010549f237e7983bb326025e'
          'a54d09a20ab1672adf08f037df188d53'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137'
          '89b48774b0dae7c37fbb0e907c3c1db8'
+         'd34e4ab6d589aa819a1e2829290a3b7c'
          '505e0e4abfc746cae9558584d471a03c')
 sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
+            '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
             '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
             'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
+            'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
             '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
 
+  patch -Np1 < ../postgresql-run-socket.patch
+
   ./configure --prefix=/usr \
   --mandir=/usr/share/man \
   --datadir=/usr/share/postgresql \
+  --sysconfdir=/etc \
   --with-krb5 \
   --with-libxml \
   --with-openssl \
@@ -137,18 +145,20 @@ package_postgresql() {
 
   # install launch script
   install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
+  install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
+    "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
   install -D -m644 "${srcdir}/postgresql.service" \
     "${pkgdir}/usr/lib/systemd/system/postgresql.service"
   install -D -m755 "${srcdir}/postgresql-check-db-dir" \
     "${pkgdir}/usr/bin/postgresql-check-db-dir"
 
   # install conf file
-  install -D -m644 ${srcdir}/postgresql.confd \
+  install -D -m644 "${srcdir}/postgresql.confd" \
     "${pkgdir}/etc/conf.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.pam \
+  install -D -m644 "${srcdir}/postgresql.pam" \
     "${pkgdir}/etc/pam.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.logrotate \
+  install -D -m644 "${srcdir}/postgresql.logrotate" \
     "${pkgdir}/etc/logrotate.d/postgresql"
 }
diff --git a/extra/postgresql/postgresql-run-socket.patch b/extra/postgresql/postgresql-run-socket.patch
new file mode 100644
index 000000000..b558c7b74
--- /dev/null
+++ b/extra/postgresql/postgresql-run-socket.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
+--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h	2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/src/include/pg_config_manual.h	2012-09-06 18:13:18.183092471 -0400
+@@ -144,7 +144,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index 7b73f6fa9..263bccb25 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -18,6 +18,10 @@ post_upgrade() {
   if [ "$postgres_shell" = "/sbin/nologin" ]; then
     chsh -s /bin/bash postgres
   fi
+  if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then
+    echo "Note: The Unix domain socket location has changed; be sure to"
+    echo "      restart any local applications using libpq.so."
+  fi
 }
 
 post_remove() {
diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf
new file mode 100644
index 000000000..6c48e34ed
--- /dev/null
+++ b/extra/postgresql/postgresql.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index ac0ce2db4..04dbfaa20 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167235 2012-09-29 06:58:03Z ibiru $
+# $Id: PKGBUILD 169450 2012-10-21 11:25:20Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.71
+pkgver=2.73
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
@@ -14,7 +14,7 @@ source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmission.tmpfiles)
 
 build() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-2.72"
 
   ./configure --prefix=/usr
   make
@@ -28,7 +28,7 @@ package_transmission-cli() {
   backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-2.72"
 
   for dir in daemon cli web utils
   do
@@ -50,7 +50,7 @@ package_transmission-gtk() {
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-2.72"
 
   make -C gtk DESTDIR="$pkgdir" install
   make -C po DESTDIR="$pkgdir" install
@@ -63,7 +63,7 @@ package_transmission-qt() {
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-2.72"
 
   make -C qt INSTALL_ROOT="$pkgdir"/usr install
 
@@ -71,7 +71,7 @@ package_transmission-qt() {
   install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
   install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
 }
-md5sums=('26d24de210076a7625e5fe37e3252f2a'
+md5sums=('86479f9bb378b793ce7a8a71f5b15904'
          '7d6186ee2a852ae3d44980f05063e194'
          'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install
index 8ab275e61..94a829f5c 100644
--- a/extra/transmission/transmission-cli.install
+++ b/extra/transmission/transmission-cli.install
@@ -1,8 +1,8 @@
 post_install() {
   cat << _EOF
 
-  If you want to run the Transmission daemon at boot,
-  add transmissiond to the DAEMONS array in /etc/rc.conf.
+  If you want to run the Transmission daemon at boot do:
+  systemctl enable transmissiond
 _EOF
 
 post_upgrade
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index 093b7007d..e131c153f 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -1,25 +1,38 @@
-# $Id: PKGBUILD 143990 2011-12-01 15:29:15Z giovanni $
+# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=usbview
 pkgver=1.1
-pkgrel=3
-pkgdesc="USB Viewer"
+pkgrel=4
+pkgdesc="Display the topology of devices on the USB bus"
 arch=('i686' 'x86_64')
 url="http://www.kroah.com/linux-usb/"
 license=('GPL')
-depends=('gtk2')
-makedepends=('pkg-config')
-source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8bf5e66351156356f3ad07454123affa')
+depends=('gtk3' 'desktop-file-utils')
+makedepends=('pkg-config' 'gendesk')
+install=${pkgname}.install
+source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz"
+        'usbview-1.1-gtk3-port.patch'
+        'usbview-1.1-missing-usbfs.patch')
+md5sums=('8bf5e66351156356f3ad07454123affa'
+         '578ed1099228f205b728ee2d46ed6f56'
+         '02e4313887423d0057a7f4f15b7f37d4')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
+  gendesk -n
+  sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop
+
+  cd "${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch"
+  patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch"
 
+  autoreconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-	      --localstatedir=/var
+              --localstatedir=/var
   make
 }
 
@@ -29,4 +42,10 @@ package() {
   make prefix="${pkgdir}/usr" \
        sysconfdir="${pkgdir}/etc" \
        localstatedir="${pkgdir}/var" install
+
+  install -Dm0644 "${srcdir}"/${pkgname}.desktop \
+    "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+
+  install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \
+    "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm
 }
diff --git a/extra/usbview/usbview-1.1-gtk3-port.patch b/extra/usbview/usbview-1.1-gtk3-port.patch
new file mode 100644
index 000000000..9462dcf43
--- /dev/null
+++ b/extra/usbview/usbview-1.1-gtk3-port.patch
@@ -0,0 +1,802 @@
+--- a/Makefile.am	2009-03-11 03:25:46.000000000 +0100
++++ b/Makefile.am	2012-06-14 20:33:10.641639573 +0200
+@@ -16,10 +16,8 @@
+ 	interface.c		\
+ 	callbacks.c		\
+ 	usbtree.c usbtree.h	\
+-	showmessage.c		\
+ 	usbparse.c usbparse.h	\
+ 	configure-dialog.c      \
+-	about-dialog.c		\
+ 	usbview_logo.xpm	\
+ 	usbview_logo.xcf	\
+ 	usb_icon.xpm		\
+--- a/callbacks.c	2008-06-25 23:03:13.000000000 +0200
++++ b/callbacks.c	2012-06-14 21:06:05.000523489 +0200
+@@ -23,13 +23,13 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-
+ #include "usbtree.h"
++#include "usbview_logo.xpm"	/* logo */
+ 
+ 
+ void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
+ {
+-	gtk_exit(0);
++	gtk_main_quit();
+ }
+ 
+ 
+@@ -55,7 +55,21 @@
+ 
+ void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
+ {
+-	about_dialog ();
++	GdkPixbuf *logo;
++	gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL };
++
++	logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
++	gtk_show_about_dialog (GTK_WINDOW (windowMain),
++		"logo", logo,
++		"program-name", "usbview",
++		"version", VERSION,
++		"comments", "Display information on USB devices",
++		"website-label", "http://www.kroah.com/linux-usb/",
++		"website", "http://www.kroah.com/linux-usb/",
++		"copyright", "Copyright © 1999-2012",
++		"authors", authors,
++		NULL);
++	g_object_unref (logo);
+ }
+ 
+ 
+--- a/configure-dialog.c	2009-03-11 02:40:28.000000000 +0100
++++ b/configure-dialog.c	2012-06-14 21:06:05.000523489 +0200
+@@ -24,264 +24,78 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+ #include <string.h>
+-#include <ctype.h>
+-
+ #include "usbtree.h"
+ #include "usbparse.h"
+ 
+-
+-
+-
+ static	GtkWidget	*fileEntry;
+-static	GtkWidget	*filew;
+-static	char		*sFilename;
+-
+-/* 
+- * Get the selected filename and print it to the console 
+- */
+-static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+-	const char *sTempFile;
+-
+-	/* --- Get the name --- */
+-	sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
+-
+-	/* --- Allocate space and save it. --- */
+-	sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
+-	strcpy (sFilename, sTempFile);
+-
+-	/* --- Destroy the file selection --- */
+-	gtk_widget_destroy (filew);
+-}
+-
+-
+-static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+-	/* --- Destroy the file selection --- */
+-	gtk_widget_destroy (filew);
+-}
+-
+-
+-/*
+- * DestroyDialog
+- *
+- * Destroy the dialog (obvious, eh?) but also remove the
+- * grab and close the modal. 
+- */
+-static int DestroyDialog (GtkWidget *widget, gpointer *data)
+-{
+-	gtk_grab_remove (widget);
+-	gtk_main_quit ();
+-	return(FALSE);
+-}
+-
+-
+-/*
+- * GetFilename 
+- */
+-static char *GetFilename (char *sTitle, char *initialFilename)
+-{
+-	sFilename = NULL;
+-
+-	/* --- Create a new file selection widget --- */
+-	filew = gtk_file_selection_new (sTitle);
+-
+-	/* --- If it's destroyed --- */
+-	gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew);
+-
+-	/* --- Connect the ok_button to file_ok_sel function  --- */
+-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew );
+-
+-	/* --- Connect the cancel_button to destroy the widget  --- */
+-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew);
+-
+-	/* --- Lets set the filename --- */
+-	gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename);
+-
+-	/* --- Turn off the file operation buttons --- */
+-	gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew));
+-
+-	/* --- Of course, we show it --- */
+-	gtk_widget_show (filew);
+-
+-	/* --- Make sure we keep the focus --- */
+-	gtk_grab_add (filew);
+-
+-	gtk_main ();
+-
+-	return(sFilename);
+-}
+-
+-
+-static void ClearShowMessage (GtkWidget *widget, gpointer data)
+-{
+-	gtk_grab_remove (widget);
+-}
+-
+-static void CancelConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+-	GtkWidget *dialogWidget = (GtkWidget *) data;
+-
+-	gtk_grab_remove (dialogWidget);
+-
+-	/* --- Close the widget --- */
+-	gtk_widget_destroy (dialogWidget);
+-}
+-
+-static void OkConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+-	GtkWidget       *dialogWidget = (GtkWidget *) data;
+-	gchar           *editString;
+-
+-	editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1);
+-
+-	gtk_grab_remove (dialogWidget);
+-
+-	/* --- Close the widget --- */
+-	gtk_widget_destroy (dialogWidget);
+-
+-	strcpy (devicesFile, editString);
+-	g_free (editString);
+-	LoadUSBTree(0);
+-}
+-
+ 
+ static void fileSelectButtonClick (GtkWidget *widget, gpointer data)
+ {
+-	gchar   *newFilename;
++	GtkWidget *dialog;
++	gchar *filename;
+ 
+-	newFilename = GetFilename ("locate usbdevfs devices file", devicesFile);
+-
+-	if (newFilename != NULL) {
+-		gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename);
+-		gtk_widget_show (fileEntry);
+-		g_free (newFilename);
++	dialog = gtk_file_chooser_dialog_new (
++				"locate usbdevfs devices file",
++				GTK_WINDOW (windowMain),
++				GTK_FILE_CHOOSER_ACTION_OPEN,
++				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++				NULL);
++
++	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
++	{
++		filename = gtk_file_chooser_get_filename(
++						GTK_FILE_CHOOSER (dialog));
++		gtk_entry_set_text (GTK_ENTRY (fileEntry), filename);
++		g_free (filename);
+ 	}
++			  
++	gtk_widget_destroy (dialog);
+ }
+ 
+-
+ void configure_dialog (void)
+ {
+-	GtkWidget *configDialog;
+-	GtkWidget *dialog_vbox2;
++	GtkWidget *dialog, *content_area;
+ 	GtkWidget *hbox1;
+ 	GtkWidget *label1;
+-	GtkWidget *label41;
+-	GtkWidget *label42;
+-	GtkWidget *label43;
+-	GtkWidget *vbox1;
+-	GtkWidget *dialog_action_area2;
+-	GtkWidget *hbuttonbox2;
+-	GtkWidget *okButton;
+-	GtkWidget *cancelButton;
+ 	GtkWidget *fileSelectButton;
++	gchar *editString;
++	gint result;
+ 
+-	configDialog = gtk_dialog_new ();
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog);
+-	gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration");
+-	gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE);
+-
+-	dialog_vbox2 = GTK_DIALOG (configDialog)->vbox;
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2);
+-	gtk_widget_show (dialog_vbox2);
+-
+-	vbox1 = gtk_vbox_new (FALSE, 0);
+-	gtk_widget_ref (vbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (vbox1);
+-	gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0);
+-
+-	label41 = gtk_label_new ("");
+-	gtk_widget_ref (label41);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label41);
+-	gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0);
+-
+-	hbox1 = gtk_hbox_new (FALSE, 0);
+-	gtk_widget_ref (hbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (hbox1);
+-//	gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0);
+-	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
+-
+-	label42 = gtk_label_new ("");
+-	gtk_widget_ref (label42);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label42);
+-	gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0);
+-
+-
+-	label1 = gtk_label_new ("  Location of usbdevfs devices file");
+-	gtk_widget_ref (label1);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label1);
++	dialog = gtk_dialog_new_with_buttons (
++				"USB View Configuration",
++				GTK_WINDOW (windowMain),
++				GTK_DIALOG_DESTROY_WITH_PARENT,
++				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++				NULL);
++
++	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++
++	hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++	gtk_container_add (GTK_CONTAINER (content_area), hbox1);
++
++	label1 = gtk_label_new ("Location of usbdevfs devices file");
+ 	gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
+ 
+ 	fileEntry = gtk_entry_new ();
+-	gtk_widget_ref (fileEntry);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile);
+-	gtk_widget_show (fileEntry);
+ 	gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0);
+ 
+-	dialog_action_area2 = GTK_DIALOG (configDialog)->action_area;
+-	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2);
+-	gtk_widget_show (dialog_action_area2);
+-	gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1);
+-
+-	hbuttonbox2 = gtk_hbutton_box_new ();
+-	gtk_widget_ref (hbuttonbox2);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (hbuttonbox2);
+-	gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11);
+-
+-	okButton = gtk_button_new_with_label ("  OK  ");
+-	gtk_widget_ref (okButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (okButton);
+-	gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton);
+-	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+-
+-	cancelButton = gtk_button_new_with_label ("  Cancel  ");
+-	gtk_widget_ref (cancelButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (cancelButton);
+-	gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton);
+-	GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT);
+-
+ 	fileSelectButton = gtk_button_new_with_label ("...");
+-	gtk_widget_ref (fileSelectButton);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (fileSelectButton);
+-
++	g_signal_connect (G_OBJECT (fileSelectButton), "clicked",
++			  G_CALLBACK (fileSelectButtonClick), NULL);
+ 	gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1);
+ 
+-	label43 = gtk_label_new ("    ");
+-	gtk_widget_ref (label43);
+-	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (label43);
+-	gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0);
+-	
+-	gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog);
+-	gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog);
+-	gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog);
+-
+-	/* --- Default the "Ok" button --- */
+-	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+-	gtk_widget_grab_default (okButton);
+-
+-	gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL);
+-
+-	/* --- Show the dialog --- */
+-	gtk_widget_show (configDialog);
+-
+-	/* --- Only this window can have actions done. --- */
+-	gtk_grab_add (configDialog);
+-
+-	return;
++	gtk_widget_show_all (dialog);
++	result = gtk_dialog_run(GTK_DIALOG (dialog));
++	if (result == GTK_RESPONSE_ACCEPT) {
++		editString = gtk_editable_get_chars (
++					GTK_EDITABLE (fileEntry), 0, -1);
++		strcpy (devicesFile, editString);
++		g_free (editString);
++		LoadUSBTree (0);
++	}
++	gtk_widget_destroy (dialog);
+ }
+-
+-
+--- a/configure.in	2007-10-23 02:03:36.000000000 +0200
++++ b/configure.in	2012-06-14 20:25:16.629667442 +0200
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(usbview, 1.0)
++AM_INIT_AUTOMAKE(usbview, 1.1)
+ AM_CONFIG_HEADER(config.h)
+ 
+ # required versions of other packages
+@@ -12,33 +12,10 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
++PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+ AC_SUBST(GTK_FLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-
+-dnl Set PACKAGE_LOCALE_DIR in config.h.
+-if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+-fi
+-
+-dnl Set PACKAGE_DATA_DIR in config.h.
+-if test "x${datadir}" = 'x${prefix}/share'; then
+-  if test "x${prefix}" = "xNONE"; then
+-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+-  else
+-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+-  fi
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+-fi
+-
+-dnl Set PACKAGE_SOURCE_DIR in config.h.
+-packagesrcdir=`cd $srcdir && pwd`
+-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+-
+ dnl Use -Wall if we have gcc.
+ changequote(,)dnl
+ if test "x$GCC" = "xyes"; then
+--- a/interface.c	2009-03-11 03:11:47.000000000 +0100
++++ b/interface.c	2012-06-14 21:06:05.000523489 +0200
+@@ -32,15 +32,16 @@
+ #include "usb_icon.xpm"
+ 
+ GtkWidget *treeUSB;
++GtkTreeStore *treeStore;
+ GtkTextBuffer *textDescriptionBuffer;
+ GtkWidget *textDescriptionView;
++GtkWidget *windowMain;
+ 
+ int timer;
+ 
+ GtkWidget*
+ create_windowMain ()
+ {
+-	GtkWidget *windowMain;
+ 	GtkWidget *vbox1;
+ 	GtkWidget *hpaned1;
+ 	GtkWidget *scrolledwindow1;
+@@ -50,68 +51,61 @@
+ 	GtkWidget *buttonClose;
+ 	GtkWidget *buttonAbout;
+ 	GdkPixbuf *icon;
++	GtkCellRenderer *treeRenderer;
++	GtkTreeViewColumn *treeColumn;
+ 
+ 	windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ 	gtk_widget_set_name (windowMain, "windowMain");
+-	gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain);
+ 	gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
+-	gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300);
++	gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
+ 
+ 	icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
+ 	gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
+ 
+-	vbox1 = gtk_vbox_new (FALSE, 0);
++	vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ 	gtk_widget_set_name (vbox1, "vbox1");
+-	gtk_widget_ref (vbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (vbox1);
+ 	gtk_container_add (GTK_CONTAINER (windowMain), vbox1);
+ 
+-	hpaned1 = gtk_hpaned_new ();
++	hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ 	gtk_widget_set_name (hpaned1, "hpaned1");
+-	gtk_widget_ref (hpaned1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (hpaned1);
+ 	gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
+-	gtk_paned_set_position (GTK_PANED (hpaned1), 200);
+ 
+-	treeUSB = gtk_ctree_new_with_titles (1, 0, NULL);
++	treeStore = gtk_tree_store_new (N_COLUMNS,
++				G_TYPE_STRING,	/* NAME_COLUMN */
++				G_TYPE_INT,	/* DEVICE_ADDR_COLUMN */
++				G_TYPE_STRING	/* COLOR_COLUMN */);
++	treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore));
++	treeRenderer = gtk_cell_renderer_text_new ();
++	treeColumn = gtk_tree_view_column_new_with_attributes (
++					"USB devices",
++					treeRenderer,
++					"text", NAME_COLUMN,
++					"foreground", COLOR_COLUMN,
++					NULL);
++	gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn);
+ 	gtk_widget_set_name (treeUSB, "treeUSB");
+-	gtk_widget_ref (treeUSB);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (treeUSB);
+-	gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB);
+-	gtk_widget_set_usize (treeUSB, 200, -2);
++	gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE);
+ 
+ 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ 	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
+-	gtk_widget_ref (scrolledwindow1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+-	gtk_widget_show (scrolledwindow1);
+-	gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1);
+ 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
++	gtk_widget_show (scrolledwindow1);
++	gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE);
+ 
+ 	textDescriptionBuffer = gtk_text_buffer_new(NULL);
+ 	//textDescription = gtk_text_new (NULL, NULL);
+ 	textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer);
+ 	gtk_widget_set_name (textDescriptionView, "textDescription");
+-	gtk_widget_ref (textDescriptionView);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ 	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ 	gtk_widget_show (textDescriptionView);
+ 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView);
+ 
+-	hbuttonbox1 = gtk_hbutton_box_new ();
++	hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ 	gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
+-	gtk_widget_ref (hbuttonbox1);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (hbuttonbox1);
+ 	gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5);
+ 	//gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10);
+@@ -120,58 +115,46 @@
+ 
+ 	buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ 	gtk_widget_set_name (buttonRefresh, "buttonRefresh");
+-	gtk_widget_ref (buttonRefresh);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonRefresh);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonRefresh, TRUE);
+ 
+ 	buttonConfigure = gtk_button_new_with_label ("Configure...");
+ 	gtk_widget_set_name (buttonConfigure, "buttonConfigure");
+-	gtk_widget_ref (buttonConfigure);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonConfigure);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonConfigure, TRUE);
+ 
+ 	buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
+ 	gtk_widget_set_name (buttonAbout, "buttonAbout");
+-	gtk_widget_ref (buttonAbout);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonAbout);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonAbout, TRUE);
+ 
+ 	buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+ 	gtk_widget_set_name (buttonClose, "buttonClose");
+-	gtk_widget_ref (buttonClose);
+-	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose,
+-				  (GtkDestroyNotify) gtk_widget_unref);
+ 	gtk_widget_show (buttonClose);
+ 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose);
+ 	gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4);
+-	GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default (buttonClose, TRUE);
+ 
+-	gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event",
+-			    GTK_SIGNAL_FUNC (on_window1_delete_event),
++	g_signal_connect (G_OBJECT (windowMain), "delete_event",
++			    G_CALLBACK (on_window1_delete_event),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonRefresh_clicked),
++	g_signal_connect (G_OBJECT (buttonRefresh), "clicked",
++			    G_CALLBACK (on_buttonRefresh_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonConfigure_clicked),
++	g_signal_connect (G_OBJECT (buttonConfigure), "clicked",
++			    G_CALLBACK (on_buttonConfigure_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonAbout_clicked),
++	g_signal_connect (G_OBJECT (buttonAbout), "clicked",
++			    G_CALLBACK (on_buttonAbout_clicked),
+ 			    NULL);
+-	gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked",
+-			    GTK_SIGNAL_FUNC (on_buttonClose_clicked),
++	g_signal_connect (G_OBJECT (buttonClose), "clicked",
++			    G_CALLBACK (on_buttonClose_clicked),
+ 			    NULL);
+ 
+ 	/* create our timer */
+--- a/main.c	2008-06-25 23:03:27.000000000 +0200
++++ b/main.c	2012-06-14 21:06:05.000523489 +0200
+@@ -30,7 +30,6 @@
+ {
+ 	GtkWidget *window1;
+ 
+-	gtk_set_locale ();
+ 	gtk_init (&argc, &argv);
+ 
+ 	initialize_stuff();
+--- a/usbparse.h	2008-06-25 23:03:47.000000000 +0200
++++ b/usbparse.h	2012-06-14 21:06:05.000523489 +0200
+@@ -166,7 +166,7 @@
+ 	struct Device	*child[MAX_CHILDREN];
+ 	DeviceBandwidth	*bandwidth;
+ 	GtkWidget	*tree;
+-	GtkCTreeNode	*leaf;
++	GtkTreeIter	leaf;
+ } Device;
+ 
+ 
+--- a/usbtree.c	2012-06-14 21:08:11.672516042 +0200
++++ b/usbtree.c	2012-06-14 21:06:05.000523489 +0200
+@@ -45,7 +45,7 @@
+ 
+ 	/* blow away the tree if there is one */
+ 	if (rootDevice != NULL) {
+-		gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf));
++		gtk_tree_store_clear (treeStore);
+ 	}
+ 
+ 	/* clean out the text box */
+@@ -208,32 +208,37 @@
+ }
+ 
+ 
+-void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData)
++void SelectItem (GtkTreeSelection *selection, gpointer userData)
+ {
+-	int     data;
+-	data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
+-
+-	PopulateListBox ((int)data);
+-
+-	return;
++	GtkTreeIter iter;
++	GtkTreeModel *model;
++	gint deviceAddr;
++
++	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
++		gtk_tree_model_get (model, &iter,
++				DEVICE_ADDR_COLUMN, &deviceAddr,
++				-1);
++		PopulateListBox (deviceAddr);
++	}
+ }
+ 
+ 
+ static void DisplayDevice (Device *parent, Device *device)
+ {
+ 	int		i;
+-	gchar		*text[1];
+ 	int		configNum;
+ 	int		interfaceNum;
+ 	gboolean	driverAttached = TRUE;
++	gint		deviceAddr;
++	const gchar	*color = "black";
+ 
+ 	if (device == NULL)
+ 		return;
+ 
+ 	/* build this node */
+-	text[0] = device->name;
+-	device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE);
+-	gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber)));
++	deviceAddr = (device->deviceNumber << 8) | device->busNumber;
++	gtk_tree_store_append (treeStore, &device->leaf,
++			       (device->level != 0) ? &parent->leaf : NULL);
+ 
+ 	/* determine if this device has drivers attached to all interfaces */
+ 	for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) {
+@@ -252,15 +257,14 @@
+ 	}
+ 
+ 	/* change the color of this leaf if there are no drivers attached to it */
+-	if (driverAttached == FALSE) {
+-		GdkColor        red;
+-		 
+-		red.red = 56000;
+-		red.green = 0;
+-		red.blue = 0;
+-		red.pixel = 0;
+-		gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red);
+-	}
++	if (driverAttached == FALSE)
++		color = "red";
++
++	gtk_tree_store_set (treeStore, &device->leaf,
++			    NAME_COLUMN, device->name,
++			    DEVICE_ADDR_COLUMN, deviceAddr,
++			    COLOR_COLUMN, color,
++			    -1);
+ 
+ 	/* create all of the children's leafs */
+ 	for (i = 0; i < MAX_CHILDREN; ++i) {
+@@ -283,11 +287,16 @@
+ 
+ static void FileError (void)
+ {
+-	gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50);
+-	sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage);
+-	ShowMessage ("USBView Error", tempString, FALSE);
+-	g_free (tempString);
+-	return;
++	GtkWidget *dialog;
++
++	dialog = gtk_message_dialog_new (
++				    GTK_WINDOW (windowMain),
++				    GTK_DIALOG_DESTROY_WITH_PARENT,
++				    GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
++				    "Can not open the file %s\n\n%s",
++				    devicesFile, verifyMessage);
++	gtk_dialog_run (GTK_DIALOG (dialog));
++	gtk_widget_destroy (dialog);
+ }
+ 
+ 
+@@ -328,10 +337,6 @@
+ 	int             finished;
+ 	int             i;
+ 
+-	if (MessageShown() == TRUE) {
+-		return;
+-	}
+-
+ 	/* if refresh is selected, then always do a refresh, otherwise look at the file first */
+ 	if (!refresh) {
+ 		if (!FileHasChanged()) {
+@@ -368,11 +373,5 @@
+ 	usb_name_devices ();
+ 
+-	/* set up our tree */
+-	gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED);
+-	gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE);
+-	gtk_ctree_set_indent (GTK_CTREE(treeUSB),10);
+-	gtk_clist_column_titles_passive (GTK_CLIST(treeUSB));
+-
+ 	/* build our tree */
+ 	for (i = 0; i < rootDevice->maxChildren; ++i) {
+ 		DisplayDevice (rootDevice, rootDevice->child[i]);
+@@ -380,11 +386,14 @@
+ 
+ 	gtk_widget_show (treeUSB);
+ 
+-	gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL);
++	gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB));
+ 
+ 	/* hook up our callback function to this tree if we haven't yet */
+ 	if (!signal_connected) {
+-		gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL);
++		GtkTreeSelection *select;
++		select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB));
++		g_signal_connect (G_OBJECT (select), "changed",
++				  G_CALLBACK (SelectItem), NULL);
+ 		signal_connected = TRUE;
+ 	}
+ 
+--- a/usbtree.h	2008-06-25 23:03:52.000000000 +0200
++++ b/usbtree.h	2012-06-14 21:06:05.000523489 +0200
+@@ -21,16 +21,24 @@
+ #ifndef __USB_TREE_H
+ #define __USB_TREE_H
+ 
++enum {
++	NAME_COLUMN,
++	DEVICE_ADDR_COLUMN,
++	COLOR_COLUMN,
++	N_COLUMNS
++};
++
+ extern gchar		devicesFile[1000];
++extern GtkTreeStore	*treeStore;
+ extern GtkWidget	*treeUSB;
+ extern GtkWidget	*textDescriptionView;
+ extern GtkTextBuffer	*textDescriptionBuffer;
++extern GtkWidget	*windowMain;
+ 
+ extern void	LoadUSBTree		(int refresh);
+ extern void	initialize_stuff	(void);
+ extern GtkWidget * create_windowMain	(void);
+ extern void	configure_dialog	(void);
+-extern void	about_dialog		(void);
+ 
+ extern void	on_buttonClose_clicked		(GtkButton *button, gpointer user_data);
+ extern gboolean	on_window1_delete_event		(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+@@ -39,8 +47,4 @@
+ extern void	on_buttonAbout_clicked		(GtkButton *button, gpointer user_data);
+ extern gint	on_timer_timeout		(gpointer user_data);
+ 
+-extern void	ShowMessage	(gchar *title, gchar *message, gboolean centered);
+-extern gboolean	MessageShown	(void);
+-
+-
+ #endif	/* __USB_TREE_H */
diff --git a/extra/usbview/usbview-1.1-missing-usbfs.patch b/extra/usbview/usbview-1.1-missing-usbfs.patch
new file mode 100644
index 000000000..7da2f0ca0
--- /dev/null
+++ b/extra/usbview/usbview-1.1-missing-usbfs.patch
@@ -0,0 +1,11 @@
+--- a/usbtree.c	2012-10-21 08:21:35.000000000 +0200
++++ b/usbtree.c	2012-10-21 08:21:12.000000000 +0200
+@@ -397,7 +397,7 @@
+ 
+ void initialize_stuff (void)
+ {
+-	strcpy (devicesFile, "/proc/bus/usb/devices");
++	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
+ 	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
+ 	previousChange = 0;
+ 
diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/extra/usbview/usbview.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index f5a047404..52ed7381d 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166660 2012-09-15 04:03:40Z tdziedzic $
+# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=661
-__hgrev=5884d056e1d1
+_patchlevel=709
+__hgrev=06e088d016ad
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,12 +21,12 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-sha1sums=('989e907fe9858647e762bddc927f656a03fb5226'
-          '195c7fc5163fca966ea331d8160bf2d307c1533c'
-          '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
-          '3494baf53a63581ba69f86a81293640ff681c5c5'
-          '25dd3c2ce436e73a367c8f73b68f7f6889682437'
-          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
+md5sums=('7a42c72b07e8bfe6795197a303b21d53'
+         '5c5723f3c39aaa716bd868d7edf9f563'
+         '6e7adfbd5d26c1d161030ec203a7f243'
+         'e57777374891063b9ca48a1fe392ac05'
+         '10353a61aadc3f276692d0e17db1478e'
+         'd90413bd21f400313a785bb4010120cd')
 
 # source PKGBUILD && mksource
 mksource() {
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7fee32771..d54ca33fa 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169077 2012-10-17 18:09:33Z giovanni $
+# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
              'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
              'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -49,7 +49,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'smbclient: for SMB access plugin'
             'libcdio: for audio CD playback support'
             'ttf-freefont: for subtitle font '
-            'ttf-dejavu: for subtitle font')
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -78,7 +79,8 @@ build() {
               --enable-xosd \
               --enable-aa \
               --enable-vcdx \
-              --enable-upnp
+              --enable-upnp \
+              --enable-opus
   make
 }
 
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index c643205da..239d5a1b0 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169365 2012-10-20 06:35:06Z andyrtr $
+# $Id: PKGBUILD 169469 2012-10-21 18:59:02Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.10
+pkgver=2.20.12
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd')
+sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 54c15d0e0..692363280 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 163675 2012-07-17 16:58:02Z andyrtr $
+# $Id: PKGBUILD 169436 2012-10-21 08:18:01Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-nv
 pkgver=2.1.20
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org nv video driver"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index 24b8d9fed..f5da6633b 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 162048 2012-06-19 07:36:41Z andrea $
+# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=zeitgeist
-pkgver=0.9.0.1
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
 arch=('i686' 'x86_64')
 url="http://zeitgeist-project.com/"
 license=('GPL')
-depends=('python2-dbus' 'python2-gobject2' 'pyxdg' 'xapian-core')
+depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core')
 makedepends=('intltool' 'raptor' 'python2-rdflib')
 checkdepends=('vala')
-source=("https://launchpad.net/$pkgname/${pkgver%.*.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2"{,.asc})
-md5sums=('08f2eb384824e8458f18e10db7654965'
-         '64486b3e6bec080c447c94f3ac2ff8e8')
+source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2")
+md5sums=('5841e4624b07ba74866fb177f1c9aae7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,10 +24,10 @@ build() {
   make
 }
 
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#  make check
-#}
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 check
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index cfb39d703..9c6da333a 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,12 +8,18 @@
 
 pkgname=parabolaweb-utils
 pkgver=`_get_pkgver`
-pkgrel=2
+pkgrel=3
 pkgdesc="Utils for the Parabola website"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
-depends=('python2' 'python2-flup' 'git' 'libretools' `_get_depends`)
+depends=(
+    'python2'      # duh
+    'python2-flup' # for fcgi
+    'postgresql'   # for database
+    'git'          # used in parabolaweb-update
+    'libretools'   # used in parabolaweb-update
+    `_get_depends`)
 backup=('etc/conf.d/parabolaweb')
 
 export pkgver
@@ -42,5 +48,5 @@ md5sums=('SKIP'
          'dd05d6a4ea7cff7fdd789f59aeb9059a'
          '520e20b8bbca64042b3afa76b0bec55f'
          '1bce8fb832ad9e61cf8b96426ce843b5'
-         'c7e292d2d1c3e846e5cfcd7283de0fe4'
+         '80ee438224b4d67677d0980d5bc57005'
          'fb291168d3f57a85f82216c4e74c9ccf')
diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service
index d145e53d8..4c3fb8c7f 100644
--- a/libre/parabolaweb-utils/parabolaweb.service
+++ b/libre/parabolaweb-utils/parabolaweb.service
@@ -1,4 +1,6 @@
 [Unit]
+Requires=postgresql.service
+After=postgresql.service
 Description=ParabolaWeb
 
 [Service]
diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD
index 56f45bace..fd551c764 100644
--- a/multilib/lib32-libpng/PKGBUILD
+++ b/multilib/lib32-libpng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74327 2012-07-24 16:56:36Z ibiru $
+# $Id: PKGBUILD 78580 2012-10-21 10:51:35Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
@@ -6,8 +6,8 @@
 
 _pkgbasename=libpng
 pkgname=lib32-$_pkgbasename
-pkgver=1.5.12
-_apngver=1.5.12
+pkgver=1.5.13
+_apngver=1.5.13
 _libversion=15
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
@@ -19,8 +19,8 @@ makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('0fd51add1da6a0e470e0c726c59171b9'
-         '7f2924b1fe0cca9080e18b8720443716')
+md5sums=('0b607a685da977f1bfc96e1c47055183'
+         '23c8765aa6ca188c0575386d5ea8fe70')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
index 865d57ddd..ef31d5ee2 100644
--- a/multilib/lib32-util-linux/PKGBUILD
+++ b/multilib/lib32-util-linux/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78451 2012-10-18 20:54:12Z dreisner $
+# $Id: PKGBUILD 78568 2012-10-21 05:11:47Z ebelanger $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -16,7 +16,7 @@ conflicts=('lib32-util-linux-ng')
 replaces=('lib32-util-linux-ng')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
-source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$pkgver/util-linux-$pkgver.tar.xz")
+source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-$pkgver.tar.xz")
 md5sums=('730cf9932531ed09b53a04ca30fcb4c9')
 
 shopt -s extglob
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
new file mode 100644
index 000000000..163c320db
--- /dev/null
+++ b/pcr/etckeeper/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Buce <dmbuce@gmail.com>
+# Contributor: Danie Roux <accounts@danieroux.com>
+
+# This requires makepkg newer than 4.0.3, which at this time means from git
+
+pkgname=etckeeper
+pkgver=0.64
+pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
+url="http://kitenet.net/~joey/code/etckeeper/"
+license=('GPL2')
+
+pkgrel=1
+arch=('any')
+depends=('inetutils' 'python2')
+makedepends=('bzr') # bzr must be there at compile time to have bzr support
+optdepends=('git' 'hg' 'bzr' 'darcs')
+backup=(etc/etckeeper/etckeeper.conf)
+source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
+        etckeeper-pacman.patch
+        etckeeper-archlinux.conf)
+
+build() {
+  cd "$srcdir/etckeeper-$pkgver"
+
+  # add pacman support to list-to `list-installed`
+  patch -p0 -i "$srcdir/etckeeper-pacman.patch"
+
+  # use python2
+  sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
+
+  make CONFFILE="$srcdir/etckeeper-archlinux.conf" build
+}
+
+package() {
+  cd "$srcdir/etckeeper-$pkgver"
+
+  make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install
+}
+
+md5sums=('SKIP'
+         'f1f00bf9331d1ef7f29b0ac29cdfcbda'
+         '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/pcr/etckeeper/etckeeper-archlinux.conf b/pcr/etckeeper/etckeeper-archlinux.conf
new file mode 100644
index 000000000..83e2c577d
--- /dev/null
+++ b/pcr/etckeeper/etckeeper-archlinux.conf
@@ -0,0 +1,38 @@
+# The VCS to use.
+#VCS="hg"
+VCS="git"
+#VCS="bzr"
+#VCS="darcs"
+
+# Options passed to git commit when run by etckeeper.
+GIT_COMMIT_OPTIONS=""
+
+# Options passed to hg commit when run by etckeeper.
+HG_COMMIT_OPTIONS=""
+
+# Options passed to bzr commit when run by etckeeper.
+BZR_COMMIT_OPTIONS=""
+
+# Options passed to darcs record when run by etckeeper.
+DARCS_COMMIT_OPTIONS="-a"
+
+# Uncomment to avoid etckeeper committing existing changes
+# to /etc automatically once per day.
+#AVOID_DAILY_AUTOCOMMITS=1
+
+# Uncomment the following to avoid special file warning
+# (the option is enabled automatically by cronjob regardless).
+#AVOID_SPECIAL_FILE_WARNING=1
+
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
+# The high-level package manager that's being used.
+# (apt, pacman-g2, yum etc)
+HIGHLEVEL_PACKAGE_MANAGER=pacman
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman-g2, etc)
+LOWLEVEL_PACKAGE_MANAGER=pacman
diff --git a/pcr/etckeeper/etckeeper-pacman.patch b/pcr/etckeeper/etckeeper-pacman.patch
new file mode 100644
index 000000000..1fb4acb62
--- /dev/null
+++ b/pcr/etckeeper/etckeeper-pacman.patch
@@ -0,0 +1,9 @@
+--- list-installed.d/50list-installed.orig	2012-10-21 23:45:30.000000000 -0400
++++ list-installed.d/50list-installed	2012-10-21 23:45:39.000000000 -0400
+@@ -7,4 +7,6 @@
+ 		egrep '(ok installed|ok config-files)' | cut -f2,3
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ 	rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
++elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
++	{ pacman -Qd|sed 's/.*/& (dep)/'; pacman -Qe|sed 's/.*/& (explicit)/'; } |sort
+ fi
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 64c3f94b0..e5e54537b 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,39 +8,75 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=19
+pkgrel=20
 pkgdesc='Capture, analyse, record and monitor video security cameras'
-arch=(i686 x86_64 mips64el)
-backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf)
-url=http://www.$pkgname.com
-license=(GPL)
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+backup=(
+  etc/zm.conf
+)
+url="http://www.$pkgname.com"
+license=(
+  GPL
+)
 depends=(
-  apache cambozola ffmpeg-static gnutls mysql perl-archive-zip perl-date-manip
-  perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite
-  perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap
-  perl-time-modules perl-x10 php php-apache php-gd php-mcrypt
+  apache
+  cambozola
+  ffmpeg-static
+  gnutls
+  mysql
+  perl-archive-zip
+  perl-date-manip
+  perl-dbd-mysql
+  perl-dbi
+  perl-expect
+  perl-libwww
+  perl-mime-lite
+  perl-mime-tools
+  perl-php-serialization
+  perl-net-sftp-foreign
+  perl-sys-mmap
+  perl-time-modules
+  perl-x10
+  php
+  php-apache
+  php-gd
+  php-mcrypt
+)
+makedepends=(
+  netpbm
+)
+optdepends=(
+  netpbm
 )
-makedepends=(netpbm)
 install=$pkgname.install
 source=(
   http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
-  httpd-zm.conf
-  zm.rc.d
+  httpd-$pkgname.conf
+  $pkgname
   $pkgname.service
   patch-ffmpeg-0.11.patch
 )
-md5sums=(
-  eaefa14befd482154970541252aa1a39
-  72380d8793a784ec24cb6809aea4a739
-  034b61cda8849fc3001849e76ef26041
-  7487cc72ead82aea0bc78f2e4106ae1a
-  81c8be870260142e2633eedf73c72040
+sha512sums=(
+  3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
+  4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
+  ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
+  cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024
 )
+
 build() {
   cd $srcdir/ZoneMinder-$pkgver
 
+  # ZM_RUNDIR need change to run dir
   export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    ZM_SSL_LIB=gnutls
+    ZM_LOGDIR=/var/log/$pkgname\
+    ZM_RUNDIR=/tmp/$pkgname\
+    ZM_SSL_LIB=gnutls\
+    ZM_TMPDIR=/tmp/$pkgname
 
   # Patch for GCC 4.7.x
   sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
@@ -61,13 +97,15 @@ build() {
     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
-  # Patch for change path
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/tmp\/zm/run/;
-    /ZM_PATH_LOGS/,+1 s/zm/zonemider/;
-    /ZM_PATH_SWAP/,+1 s/zm/zonemider/'\
+  # Patch for change path run dir
+  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+
+  # Patch for change ZM name to ZoneMinder
+  sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
-  # Patch for v4l1 compat
+  # Patch for v4l1 compat support
   sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l1compat.so\' ;/"\
     scripts/zmdc.pl.in || read
 
@@ -139,11 +177,12 @@ build() {
 package() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  make DESTDIR=$pkgdir RUNDIR=$pkdir/run ZM_RUNDIR=$pkgdir/run install
+  make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
 
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}}
+  chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
     mv    $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
@@ -153,9 +192,9 @@ package() {
   ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
   ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
-  install -D -m 644 $srcdir/httpd-zm.conf    $pkgdir/etc/httpd/conf/extra
-  install -D -m 644 $srcdir/zm.rc.d          $pkgdir/etc/rc.d/${pkgname}d
-  install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
-  install -D -m 644 COPYING                  $pkgdir/usr/share/license/$pkgname
-  install -D -m 644 db/zm*.sql               $pkgdir/usr/share/$pkgname/db
+  install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra
+  install -D -m 644 $srcdir/$pkgname            $pkgdir/etc/rc.d
+  install -D -m 644 $srcdir/$pkgname.service    $pkgdir/usr/lib/systemd/system
+  install -D -m 644 COPYING                     $pkgdir/usr/share/license/$pkgname
+  install -D -m 644 db/zm*.sql                  $pkgdir/usr/share/$pkgname/db
 }
diff --git a/pcr/zoneminder/httpd-zoneminder.conf b/pcr/zoneminder/httpd-zoneminder.conf
new file mode 100644
index 000000000..aeb089bc1
--- /dev/null
+++ b/pcr/zoneminder/httpd-zoneminder.conf
@@ -0,0 +1,20 @@
+# /etc/httpd/conf/extra/httpd-zm.conf
+# Config for zoneminder web app
+
+Alias /zm "/srv/http/zoneminder"
+<Directory "/srv/http/zoneminder">
+  Options -Indexes MultiViews FollowSymLinks
+  AllowOverride None
+  Order allow,deny
+  Allow from all
+  # The code unfortunately uses short tags in many places
+  php_value short_open_tag On
+</Directory>
+
+ScriptAlias /cgi-bin "/srv/http/cgi-bin"
+<Directory "/srv/http/cgi-bin">
+  AllowOverride None
+  Options ExecCGI FollowSymLinks
+  Order allow,deny
+  Allow from all
+</Directory>
diff --git a/pcr/zoneminder/zoneminder b/pcr/zoneminder/zoneminder
new file mode 100644
index 000000000..c4cbf4d3f
--- /dev/null
+++ b/pcr/zoneminder/zoneminder
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+daemon_name=zm
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting Zoneminder"
+    /usr/bin/zmfix -a
+    if /usr/bin/zmpkg.pl start >/dev/null ; then
+      add_daemon $daemon_name
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping Zoneminder"
+    if /usr/bin/zmpkg.pl stop >/dev/null ; then
+      rm_daemon $daemon_name
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  reload)
+    stat_busy "Reloading Zoneminder"
+    if /usr/bin/zmpkg.pl graceful >/dev/null ; then
+      add_daemon $daemon_name
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  restart)
+    stat_busy "Restarting Zoneminder"
+    if /usr/bin/zmpkg.pl restart >/dev/null ; then
+      add_daemon $daemon_name
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  status)
+    stat_busy "Checking Zoneminder status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|reload|restart|status}"
+esac
+
+exit 0
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 5e62cc23e..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -8,7 +8,7 @@ pre_install() {
     fi
   fi
   if [ -L /srv/http/zoneminder/images ]; then
-    l=$(readlink /srv/http/zoneminder/images )
+    l=$(readlink /srv/http/zoneminder/images)
     if [ $l != /var/cache/zoneminder/images ]; then
         abort=true
     fi
@@ -26,23 +26,73 @@ EOF
 }
 
 post_install() {
-  if [ -d /var/log/zoneminder ]; then
-    mkdir -m 0755 /var/log/zoneminder
+  if [[ -d /var/log/zoneminder ]]; then
+    chmod 0755 /var/log/zoneminder
     chown http.http /var/log/zoneminder
   else
-    chmod 0755 /var/log/zoneminder
+    mkdir -m 0755 /var/log/zoneminder
     chown http.http /var/log/zoneminder
   fi
+  if [[ -d /tmp/zoneminder ]]; then
+    chmod 0700 /tmp/zoneminder
+    chown http.http /tmp/zoneminder
+  else
+    mkdir -m 0700 /tmp/zoneminder
+    chown http.http /tmp/zoneminder
+  fi
+  sed -i -e '
+    /^;extension=mysql.so/ s/^;//;
+    /^#extension=mysql.so/ s/^#//;
+    /^;extension=mysqli.so/ s/^;//;
+    /^#extension=mysqli.so/ s/^#//;
+    /^;extension=gd.so/ s/^;//;
+    /^#extension=gd.so/ s/^#//;
+    /^;extension=gettext.so/ s/^;//;
+    /^#extension=gettext.so/ s/^#//;
+    /^;extension=mcrypt.so/ s/^;//;
+    /^#extension=mcrypt.so/ s/^#//;
+    /^;extension=session.so/ s/^;//;
+    /^#extension=session.so/ s/^#//;
+    /^;extension=sockets.so/ s/^;//;
+    /^#extension=sockets.so/ s/^#//;
+    /^;extension=openssl.so/ s/^;//;
+    /^#extension=openssl.so/ s/^#//;
+    /^;extension=ftp.so/ s/^;//;
+    /^#extension=ftp.so/ s/^#//;
+    /^;extension=zip.so/ s/^;//;
+    /^#extension=zip.so/ s/^#//;
+    /^;open_basedir/ s/^;//;
+    /^#open_basedir/ s/^#//;
+    /^open_basedir/ s/:\/etc//;
+    /^open_basedir/ s/:\/etc\///;
+    /^open_basedir/ s/$/:\/etc/;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
+    /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
+    ' /etc/php/php.ini || read
+  sed -i -e '
+    /^LoadModule php5_module modules\/libphp5.so/d;
+    /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
+    /^# PHP 5/d;
+    /^# ZoneMinder/d;
+    /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
+    /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
+    /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
+    ' /etc/httpd/conf/httpd.conf || read
   cat << EOF
-Note:
+Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
 ==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
-==> and add Zoneminder database typing:
+==> and add Zoneminder database typing (with passsword):
 ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
 ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
 ==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
+==> (or without passsword):
+==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload"
+==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
+==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
 
-Note:
+Note for php:
 ==> You must uncomment that line in /etc/php/php.ini:
 ==> "extension=mysql.so"
 ==> check and make sure these are uncommented:
@@ -52,55 +102,59 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-
-==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and
-==> "/usr/share/zoneminder" like so
+==> "extension=openssl.so"
+==> "extension=ftp.so"
+==> "extension=zip.so"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
 ==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
-==> Otherwise ZoneMinder will be unable to read /etc/zm.conf
-==> or display its own web directory
-==> And set your timezone in php.ini: date.timezone = <my_country>/<my_city>
+==> and set your timezone in php.ini:
+==> "date.timezone = <your_country>/<your_city>"
 
-Note:
+Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
 ==> "LoadModule php5_module modules/libphp5.so"
 ==> and:
 ==> "Include /etc/httpd/conf/extra/php5_module.conf"
-==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
+==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
 EOF
 }
 
 post_upgrade() {
+  post_install
   /usr/bin/zmupdate.pl -f >/dev/null
-  if [ -d /var/log/zoneminder ]; then
-    mkdir -m 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
-  else
-    chmod 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
-  fi
 }
 
 post_remove() {
-  if [ -d /run/zoneminder ]; then
-    rm -vr /run/zoneminder
-  fi
-  if [ -d /tmp/zoneminder ]; then
+  if [[ -d /tmp/zoneminder ]]; then
     rm -vr /tmp/zoneminder
   fi
+  sed -i -e '
+    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
+    ' /etc/php/php.ini || read
+  sed -i -e '
+    /^# ZoneMinder/d;
+    /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
+    ' /etc/httpd/conf/httpd.conf || read
   cat << EOF
 Note:
-==> To clean Zoneminder mysql database, run as root:
+==> To clean Zoneminder mysql database, run as root (with password):
 ==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
 ==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
 ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm"
+==> (or without password):
+==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
+==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
+==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm"
 
 ==> Disable http with php if it isn't needed with others servers, 
 ==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
 ==> "LoadModule php5_module modules/libphp5.so"
 ==> "Include /etc/httpd/conf/extra/php5_module.conf"
 
-==> Remove
-==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
+==> Remove line in /etc/httpd/conf/httpd.conf:
+==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
 
 ==> Disable php with mysql if it isn't needed with others servers, 
 ==> comment that lines in /etc/php/php.ini:
@@ -113,11 +167,11 @@ Note:
 ==> "extension=sockets.so"
 ==> "date.timezone = <my_country>/<my_city>"
 
-==> Edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www"
-==> in the open_basedir.
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
+==> in the "open_basedir".
 
-==> Remove log files and 'zonemider' directory in "/var/log/zoneminder"
+==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
 
-==> Backup and remove events images and temp dirs in "/var/cache/zoneminder"
+==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder".
 EOF
 }
diff --git a/pcr/zoneminder/zoneminder.service b/pcr/zoneminder/zoneminder.service
index ba41e8926..05cae6f91 100644
--- a/pcr/zoneminder/zoneminder.service
+++ b/pcr/zoneminder/zoneminder.service
@@ -5,7 +5,6 @@ Required=mysqld.service
 
 [Service]
 Type=forking
-PIDFile=/run/zm.pid
 ExecStart=/usr/bin/zmpkg.pl start
 ExecRestart=/usr/bin/zmpkg.pl restart
 ExecStop=/usr/bin/zmpkg.pl stop
diff --git a/staging/bzflag/PKGBUILD b/staging/bzflag/PKGBUILD
index 1fd447b0a..f85dd2996 100644
--- a/staging/bzflag/PKGBUILD
+++ b/staging/bzflag/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 164239 2012-07-28 04:20:09Z bisson $
+# $Id: PKGBUILD 169489 2012-10-22 02:45:00Z bisson $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
-pkgver=2.4.0
-pkgrel=4
+pkgver=2.4.2
+pkgrel=2
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'mesa' 'sdl')
+depends=('curl' 'glew' 'glu' 'sdl')
+makedepends=('mesa') # glu requires <GL/gl.h>
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
+sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD
new file mode 100644
index 000000000..3fa2f0677
--- /dev/null
+++ b/staging/emacs/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 169485 2012-10-22 00:40:50Z eric $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
+pkgname=emacs
+pkgver=24.2
+pkgrel=2
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+install=emacs.install
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
+md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
+
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # fix all the 777 perms on directories
+  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}
diff --git a/staging/emacs/emacs.install b/staging/emacs/emacs.install
new file mode 100644
index 000000000..d84f1de14
--- /dev/null
+++ b/staging/emacs/emacs.install
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
index bec6b0836..2dfb0e8c7 100644
--- a/staging/inkscape/PKGBUILD
+++ b/staging/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168926 2012-10-16 15:19:57Z bisson $
+# $Id: PKGBUILD 169480 2012-10-21 23:53:47Z bisson $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD
new file mode 100644
index 000000000..c8cfb6c43
--- /dev/null
+++ b/staging/pstoedit/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 169481 2012-10-21 23:53:55Z eric $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Tobias Powalowski <t.powa@gmx.de>
+
+pkgname=pstoedit
+pkgver=3.60
+pkgrel=3
+pkgdesc="Translates PostScript and PDF graphics into other vector formats"
+arch=('i686' 'x86_64')
+url="http://www.pstoedit.net/"
+license=('GPL')
+depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
+makedepends=('ghostscript')
+options=('!libtool' '!makeflags')
+source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
+	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
+sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
+          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
+          '54bbe019de66eb4cb8525371462595d21fbd074e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's/-pedantic//' configure
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch
new file mode 100644
index 000000000..4f1f73b04
--- /dev/null
+++ b/staging/pstoedit/pstoedit-3.50-parallel.patch
@@ -0,0 +1,47 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d6178df..66f377b 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
+         $(sample_drivers_src)                   
+ libp2edrvstd_la_LIBADD=-L. libpstoedit.la
+ libp2edrvstd_la_LDFLAGS=-no-undefined -module
++libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
+ 
+ #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
+ #libp2edrvplugins_la_LIBADD=
+@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
+ libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
+ libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
+ libp2edrvlplot_la_LDFLAGS=-no-undefined -module
++libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
+ 
+ libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
+ libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
+ libp2edrvswf_la_LDFLAGS=-no-undefined -module
++libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
+ 
+ # note the __ stand for ++ - automake treats all no alphanums chars as _
+ libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
+ libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
+ libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
++libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
+ # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
+ 
+ if USE_EMFBYSOURCE
+@@ -113,6 +117,7 @@ else
+ libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
+ libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
+ endif
++libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
+ 
+ libpstoedit_la_SOURCES =			\
+ 	dynload.cpp dynload.h			\
+@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
+ pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
++pstoedit_DEPENDENCIES = libpstoedit.la
+ 
+ pkginclude_HEADERS =				\
+ 	pstoedit.h				\
diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch
new file mode 100644
index 000000000..6787d6aef
--- /dev/null
+++ b/staging/pstoedit/pstoedit-3.50-plugin-close.patch
@@ -0,0 +1,14 @@
+http://bugzilla.redhat.com/507035
+
+diff --git a/src/dynload.cpp b/src/dynload.cpp
+index c0db355..7c073ef 100644
+--- a/src/dynload.cpp
++++ b/src/dynload.cpp
+@@ -147,7 +147,6 @@ void DynLoader::close()
+ 
+ DynLoader::~DynLoader()
+ {
+-	close();
+ 	libname=0;
+ }
+ 
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
index 045e5e038..ee0a1bf57 100644
--- a/testing/btrfs-progs/PKGBUILD
+++ b/testing/btrfs-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $
+# $Id: PKGBUILD 169471 2012-10-21 19:56:53Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.19.20120904
-pkgrel=6
+pkgver=0.19.20121005
+pkgrel=2
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -16,7 +16,10 @@ license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
-install=btrfs.install
+install=btrfs-progs.install
+md5sums=('7fb014324954ee073b039dc0066de960'
+         'd7ad825b0b25f2be73289a20e7afcdb7'
+         'b09688a915a0ec8f40e2f5aacbabc9ad')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -38,6 +41,3 @@ package() {
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 }
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         '2d3df276f80bb09813f56a56d6f93ddd'
-         '9fb35142755b477a96cb7292f3d64839')
diff --git a/testing/btrfs-progs/btrfs-progs.install b/testing/btrfs-progs/btrfs-progs.install
new file mode 100644
index 000000000..d6c0698a0
--- /dev/null
+++ b/testing/btrfs-progs/btrfs-progs.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
+    echo "btrfs multi-device support now relies on linux 3.6 or later"
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
index 913cec528..7965d0a8a 100644
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ b/testing/btrfs-progs/initcpio-hook-btrfs
@@ -1,10 +1,7 @@
 #!/usr/bin/ash
 
 run_hook() {
-    # if udevd is running, this is done async by add/change events
-    if [ "$udevd_running" -ne 1 ]; then
-        btrfs device scan
-    fi
+    btrfs device scan
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
index fb64f12e2..aa06e55ac 100644
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ b/testing/btrfs-progs/initcpio-install-btrfs
@@ -8,7 +8,8 @@ build() {
 
 help() {
     cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes, in the absence of udev.
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
 HELPEOF
 }
 
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
index 3c814c345..3e619e29b 100644
--- a/testing/empathy/PKGBUILD
+++ b/testing/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169262 2012-10-18 19:29:01Z jgc $
+# $Id: PKGBUILD 169460 2012-10-21 14:03:14Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.6.0.2
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3c27db67236249e60ee0439d6a1098729939731ce597b724a058c8ce2eb659f9')
+sha256sums=('12d936a39182500da7541bdd42327949c241b454fde462be52d137aae3c56183')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
index 29e0ffaac..53b80d6b3 100644
--- a/testing/glibmm/PKGBUILD
+++ b/testing/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169241 2012-10-18 19:27:44Z jgc $
+# $Id: PKGBUILD 169462 2012-10-21 15:00:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.33.14
+pkgver=2.34.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('5bf9e9338a8e50cf46e637abed9c62cba41cccecb6610f5bba2830d9afc4e6ed')
+sha256sums=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
index c5b2f7937..c0f1b1005 100644
--- a/testing/gtkglext/PKGBUILD
+++ b/testing/gtkglext/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 168484 2012-10-12 16:59:46Z andyrtr $
-# Maintainer:
+# $Id: PKGBUILD 169440 2012-10-21 08:31:13Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=8
+pkgrel=9
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu')
+depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
 makedepends=('mesa')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
@@ -31,6 +31,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
 }
diff --git a/testing/ibus/PKGBUILD b/testing/ibus/PKGBUILD
index 79bf2f9b3..a0aeebf1a 100644
--- a/testing/ibus/PKGBUILD
+++ b/testing/ibus/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id$
+# $Id: PKGBUILD 169430 2012-10-21 04:52:25Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.4.99.20120822
+pkgver=1.4.99.20121006
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
 license=('LGPL')
 makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3')
+depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('46d836b68733953b443859f47ad6991f4584658d')
+sha1sums=('e324382caa8dde8e4ea9c3d60a6ec5c96a313a86')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -28,7 +28,7 @@ build() {
     --disable-gconf \
     --enable-dconf \
     --disable-memconf \
-    --disable-ui
+    --enable-ui
   make
 }
 
diff --git a/testing/udisks2/PKGBUILD b/testing/udisks2/PKGBUILD
index 263e32349..176ef15f3 100644
--- a/testing/udisks2/PKGBUILD
+++ b/testing/udisks2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169147 2012-10-18 19:22:22Z jgc $
+# $Id: PKGBUILD 169452 2012-10-21 11:36:14Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=1.99.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176')
+sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb')
 
 build() {
   cd "udisks-$pkgver"
diff --git a/testing/usermin/PKGBUILD b/testing/usermin/PKGBUILD
new file mode 100644
index 000000000..6e5eb6289
--- /dev/null
+++ b/testing/usermin/PKGBUILD
@@ -0,0 +1,134 @@
+# $Id: PKGBUILD 169457 2012-10-21 13:56:26Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=usermin
+pkgver=1.520
+pkgrel=2
+pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
+arch=(i686 x86_64)
+license=('custom:usermin')
+url="http://www.webmin.com/"
+depends=('perl' 'webmin')
+makedepends=('perl-net-ssleay')
+backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
+'etc/usermin/at/config' \
+'etc/usermin/man/config' \
+'etc/usermin/ssh/config' \
+'etc/usermin/chfn/config' \
+'etc/usermin/cron/config' \
+'etc/usermin/file/config' \
+'etc/usermin/plan/config' \
+'etc/usermin/proc/config' \
+'etc/usermin/spam/config' \
+'etc/usermin/htaccess/config' \
+'etc/usermin/cshrc/config' \
+'etc/usermin/gnupg/config' \
+'etc/usermin/mysql/config' \
+'etc/usermin/quota/config' \
+'etc/usermin/shell/config' \
+'etc/usermin/theme/config' \
+'etc/usermin/mailbox/config' \
+'etc/usermin/schedule/config' \
+'etc/usermin/config' \
+'etc/usermin/commands/config' \
+'etc/usermin/htaccess-htpasswd/config' \
+'etc/usermin/forward/config' \
+'etc/usermin/telnet/config' \
+'etc/usermin/tunnel/config' \
+'etc/usermin/updown/config' \
+'etc/usermin/procmail/config' \
+'etc/usermin/fetchmail/config' \
+'etc/usermin/changepass/config' \
+'etc/usermin/language/config' \
+'etc/usermin/postgresql/config' \
+'etc/usermin/usermount/config' \
+)
+install=usermin.install
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
+	usermin.rc 
+	usermin.service
+	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+    
+  # remove modules we do not support
+
+  #remove config files from other distros
+  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
+  
+  # remove caldera theme
+  rm -rf caldera
+
+  # remove init-scripts from other distros
+  rm usermin-init
+  rm usermin-daemon
+
+  # setting perl path
+  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+  
+  # create dirs
+  mkdir -p $startdir/pkg/opt/usermin
+  mkdir -p $startdir/pkg/var/log/usermin
+  mkdir -p $startdir/pkg/etc/usermin
+  
+  # install pam stuff
+  install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin
+  
+  # remove other distros and add only Archlinux don't change next line else it will not work!
+  rm os_list.txt
+  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
+  
+  # copy stuff to right dirs
+  cd $startdir/src/$pkgname-$pkgver
+  cp -rp * $startdir/pkg/opt/usermin
+  cd $startdir/src/usermin-config
+  cp -rfp * $startdir/pkg/opt/usermin
+
+  # define parameters for setup.sh
+  config_dir=$startdir/pkg/etc/usermin
+  var_dir=$startdir/pkg/var/log/usermin
+  perl=/usr/bin/perl
+  autoos=1
+  port=20000
+  login=root
+  crypt="XXX"
+  ssl=1
+  atboot=0
+  nostart=1
+  nochown=1
+  autothird=1
+  nouninstall=1
+  noperlpath=1
+  atbootyn=n
+  tempdir=$startdir/pkg/tmp
+  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
+  
+  # Fix setup.sh
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh
+  $startdir/pkg/opt/usermin/setup.sh
+  
+  # Fixup the config files to use their real locations
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf
+  find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
+  
+  # make it only accessible by localhost
+  echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf
+  
+  # enable user and password login
+  sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
+
+  #install systemd service file
+  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
+ 
+ #install rc file
+  install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
+
+  # delete temp dir
+  rm -r $startdir/pkg/tmp
+  #install license
+  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
+}
+md5sums=('5819ba87796d9373a92116e90d1a35d4'
+         'cfef4490cd1ef9517c0b39a7bd75c968'
+         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
+         'ec37a79f948f778224550930d2a7ca07')
diff --git a/testing/usermin/usermin-config.tar.bz2 b/testing/usermin/usermin-config.tar.bz2
new file mode 100644
index 000000000..056bb6298
--- /dev/null
+++ b/testing/usermin/usermin-config.tar.bz2
diff --git a/testing/usermin/usermin.install b/testing/usermin/usermin.install
new file mode 100644
index 000000000..3ace10ea2
--- /dev/null
+++ b/testing/usermin/usermin.install
@@ -0,0 +1,34 @@
+# arg 1:  the new package version
+post_install() {
+  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+  crypt=${crypt//\\/\\\\}
+  crypt=${crypt//\//\\\/}
+  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
+cat << EOF
+Note:
+==> It is not allowed to install 3rd party modules, or delete existing modules.
+==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
+Setup:
+==> To make usermin start at boot time, add usermin to rc.conf daemons
+==> Point your web browser to http://localhost:20000 to use usermin.
+==> To change the modules setup please use webmin.
+
+==> The access is restricted to localhost, if you want to connect from other locations
+==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
+==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
+EOF
+# fix man module
+  cd /opt/usermin/man
+  gzip -df $(find . -name '*.gz')
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  # uninstall unzipped files
+  rm -r /opt/usermin/man
+}
diff --git a/testing/usermin/usermin.rc b/testing/usermin/usermin.rc
new file mode 100644
index 000000000..af365780a
--- /dev/null
+++ b/testing/usermin/usermin.rc
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+start=/etc/usermin/start
+stop=/etc/usermin/stop
+lockfile=/var/lock/usermin
+
+case "$1" in
+'start')
+     stat_busy "Starting Usermin daemon"
+     $start >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     touch $lockfile >/dev/null 2>&1
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'stop')
+     stat_busy "Stopping Usermin daemon"
+     $stop >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     rm -f $lockfile
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'restart')
+     $stop && $start
+     RETVAL=$?
+;;
+*)
+echo "Usage: $0 { start | stop | restart }"
+RETVAL=1
+;;
+esac
+exit $RETVAL
\ No newline at end of file
diff --git a/testing/usermin/usermin.service b/testing/usermin/usermin.service
new file mode 100644
index 000000000..e91164c63
--- /dev/null
+++ b/testing/usermin/usermin.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Usermin
+
+[Service]
+Type=forking
+ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
+
+[Install]
+WantedBy=multi-user.target