Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts: abs/core/tzdata/PKGBUILD
author: Cecil <knoppmyth@gmail.com> 2011-08-06 19:10:30 (GMT)
committer: Cecil <knoppmyth@gmail.com> 2011-08-06 19:10:30 (GMT)
commit: ad58e3033f6bb5137b8dcb0e7eca12d50d888402 (patch)
tree: 9321335a68173bc3e4c1d237c19c8880411fa676 /abs/extra
parent: 998faf16b1b62493b39aa13b3cb53dfac266ef4c (diff)
parent: 9709ca528ca5dfbdb6ec6ea283ac6670e8f33b9d (diff)
download: linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.zip
linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.gz
linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.bz2
105 files changed, 2013 insertions, 2789 deletions
diff --git a/abs/extra/apache-ant/PKGBUILD b/abs/extra/apache-ant/PKGBUILD
index 663cc19..eaafed4 100644
--- a/abs/extra/apache-ant/PKGBUILD
+++ b/abs/extra/apache-ant/PKGBUILD
@@ -1,41 +1,53 @@
-# $Id: PKGBUILD 24082 2009-01-12 21:42:39Z paul $
+# $Id$
 # Contributor: Andrew Wright <andreww@photism.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=apache-ant
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="Ant is a java-based build tool."
-arch=(i686 x86_64)
+pkgver=1.8.2
+pkgrel=2
+pkgdesc="A java-based build tool"
+arch=('any')
 license=('APACHE')
 url="http://ant.apache.org/"
-depends=('java-runtime')
-makedepends=('java-environment')
-noextract=('junit3.8.1.zip')
-source=(http://archive.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
-        http://heanet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip)
-md5sums=('0d68db4a1ada5c91bcbf53cefd0c2fd7' '5110326e4b7f7497dfa60ede4b626751')
-
-build() {
-  cd ${startdir}/src || return 1
-  unzip junit3.8.1.zip || return 1
-
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f /etc/profile.d/java-gcj-compat.sh ]; then
-    . /etc/profile.d/java-gcj-compat.sh
-  elif [ -f /etc/profile.d/jdk.sh ]; then
-    . /etc/profile.d/jre.sh
-    . /etc/profile.d/jdk.sh
-  fi
-
-   # we need the junit jar in the classpath to build ant
-  export CLASSPATH="${startdir}/src/junit3.8.1/junit.jar"
-
-  # build
-  mkdir dist || return 1
-  ./build.sh -Ddist.dir=dist/ dist || return 1
-
-  # install
-  export ANT_HOME="${startdir}/pkg/usr"
-  ./build.sh install-lite || return 1
+depends=('java-environment')
+optdepends=('junit: to jave junit on the classpath in javac tasks')
+source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+        ${pkgname}.sh ${pkgname}.csh
+        ant_diagnostics.patch)
+md5sums=('9e9ae9fc7352960191489a1286fb0928'
+         '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
+         'cbaab423be40a6e63f0fde901b91eb50')
+
+package() {
+  # install profile.d script
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  # Get the ANT_HOME env var
+  source "${srcdir}"/${pkgname}.sh
+
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
+
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
+
+  # Do not copy Windows .bat/.cmd files
+  find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
+
+  # symlink to junit so it's on the javac build path for ant
+  # matches behavior on ubuntu 9 and makes sense for compatibility
+  # http://bugs.archlinux.org/task/15229
+  ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
+
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
+  # The license says the NOTICE file should be redistributed for derivative
+  # works, so lets supply it.
+  cd "${srcdir}"/${pkgname}-${pkgver} 
+  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}
 }
diff --git a/abs/extra/apache-ant/ant_diagnostics.patch b/abs/extra/apache-ant/ant_diagnostics.patch
new file mode 100644
index 0000000..38148b4
--- /dev/null
+++ b/abs/extra/apache-ant/ant_diagnostics.patch
@@ -0,0 +1,23 @@
+--- a/src/main/org/apache/tools/ant/Diagnostics.java
++++ b/src/main/org/apache/tools/ant/Diagnostics.java
+@@ -179,7 +179,10 @@
+      * @param clazz the class to get the information from.
+      * @since Ant 1.8.0
+      */
+-    private static URL getClassLocation(Class clazz) {
++    private static URL getClassLocation(Class clazz) {
++		if (clazz.getProtectionDomain().getCodeSource() == null) {
++			return null;
++		}
+         return clazz.getProtectionDomain().getCodeSource().getLocation();
+     }
+ 
+@@ -241,7 +244,7 @@
+         }
+         Transformer transformer = null;
+         try {
+-            transformer = transformerFactory.newTransformer();
++            transformer = transformerFactory.newTransformer();
+         } catch (Exception e) {
+             // ignore
+             ignoreThrowable(e);
diff --git a/abs/extra/apache-ant/apache-ant.csh b/abs/extra/apache-ant/apache-ant.csh
new file mode 100644
index 0000000..b6a6d58
--- /dev/null
+++ b/abs/extra/apache-ant/apache-ant.csh
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/abs/extra/apache-ant/apache-ant.sh b/abs/extra/apache-ant/apache-ant.sh
new file mode 100644
index 0000000..ab602fb
--- /dev/null
+++ b/abs/extra/apache-ant/apache-ant.sh
@@ -0,0 +1,3 @@
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+
diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD
index c9d7fcf..37bb2de 100644
--- a/abs/extra/boost/PKGBUILD
+++ b/abs/extra/boost/PKGBUILD
@@ -1,74 +1,81 @@
-# $Id: PKGBUILD 89256 2010-08-30 13:49:46Z remy $
+# $Id$
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# TU: Kritoke <kritoke@gamebox.net>
+# Contributor: Kritoke <kritoke@gamebox.net>
 # Contributor: Luca Roccia <little_rock@users.sourceforge.net>
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.44.0
-_boostver=1_44_0
+pkgver=1.47.0
+_boostver=${pkgver//./_}
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
-makedepends=('python2' 'bzip2' 'zlib')
+makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
 license=('custom')
-options=('!ccache')
 
 _stagedir="${srcdir}/stagedir"
 
 build() {
   # set python path for bjam
   cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  echo "using python : 2.6 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using mpi ;" >> build/v2/user-config.jam
 
   # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/jam/src"
-  ./build.sh cc || return 1
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
+  ./build.sh cc
 
   _bindir="bin.linuxx86"
   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
 
-  install -m755 -d "${_stagedir}"/usr/bin
-  install -m755 ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam || return 1
+  install -d "${_stagedir}"/usr/bin
+  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
 
-  # build bcp
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp"
-  ../jam/src/${_bindir}/bjam --toolset=gcc || return 1
-  install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \
-                ${_stagedir}/usr/bin/bcp || return 1
+  # build tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
+  "${_stagedir}"/usr/bin/bjam --toolset=gcc
+
+  # copy the tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
+  for i in *;do
+      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
+  done
+
+  #boostbook needed by quickbook
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
+  cp -r share "${_stagedir}"
 
   # build libs
   cd "${srcdir}/${pkgbase}_${_boostver}"
+
   # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=multi"
+  # runtime-link=shared threading=single,multi"
   # --layout=tagged will add the "-mt" suffix for multithreaded libraries
   # and installs includes in /usr/include/boost.
   # --layout=system no longer adds the -mt suffix for multi-threaded libs.
   # install to ${_stagedir} in preparation for split packaging
 
-  ./tools/jam/src/${_bindir}/bjam \
-            release debug-symbols=off threading=single,multi \
-            runtime-link=shared link=shared,static \
-            cflags=-fno-strict-aliasing \
-            toolset=gcc \
-            --prefix="${_stagedir}" \
-            -sTOOLS=gcc \
-            --layout=tagged \
-            install || return 1
-
-  # build pyste
-  cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
-  python2 setup.py install --root=${_stagedir} || return 1
+  "${_stagedir}"/usr/bin/bjam \
+      release debug-symbols=off threading=multi \
+      runtime-link=shared link=shared,static \
+      cflags=-fno-strict-aliasing \
+      toolset=gcc \
+      --prefix="${_stagedir}" \
+      -sTOOLS=gcc \
+      --layout=system \
+      ${MAKEFLAGS} \
+      install
 }
 
 package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
-    optdepends=('python2: for python bindings')
+    optdepends=('python2: for python2 bindings')
 
-    install -dm 755 "${pkgdir}"/usr/{include,lib}
+    install -d "${pkgdir}"/usr/{include,lib,share}
     # headers/source files
     cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
 
@@ -78,21 +85,25 @@ package_boost() {
     # utilities (bjam, bcp, pyste)
     cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
 
+    #boostbook
+    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+
     # license
     install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt || return 1
+        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
 }
 
 package_boost-libs() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib')
+    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
+    optdepends=('openmpi: for mpi support')
 
-    install -dm 755 "${pkgdir}/usr/lib"
+    install -d "${pkgdir}/usr/lib"
     #shared libs
     cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
 
     # license
     install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt || return 1
+        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
-md5sums=('085fce4ff2089375105d72475d730e15')
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
diff --git a/abs/extra/boost/__changelog b/abs/extra/boost/__changelog
new file mode 100644
index 0000000..f0c532d
--- /dev/null
+++ b/abs/extra/boost/__changelog
@@ -0,0 +1,3 @@
+* remove 'python' dep (aka python3)
+* change python 2.7 refrence to 2.6
+* remove python optdep for the libs package
diff --git a/abs/extra/celt-0.7/PKGBUILD b/abs/extra/celt-0.7/PKGBUILD
new file mode 100644
index 0000000..59b9e9c
--- /dev/null
+++ b/abs/extra/celt-0.7/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Lauri Niskanen <ape@ape3000.com>
+
+pkgname=celt-0.7
+_realname=celt
+pkgver=0.7.1
+pkgrel=2
+pkgdesc="Low-latency audio communication codec"
+arch=('i686' 'x86_64')
+url="http://www.celt-codec.org"
+license=('BSD')
+depends=('libogg')
+provides=('celt=$pkgver')
+conflicts=('celt')
+options=('!libtool')
+source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz)
+md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0')
+
+build() {
+  cd "$srcdir/$_realname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="$pkgdir/" install
+}
+
+package() {
+	cd "$srcdir/$_realname-$pkgver"
+
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/BSD"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/community/cksfv/PKGBUILD b/abs/extra/community/cksfv/PKGBUILD
index b82aa60..da4ba00 100644
--- a/abs/extra/community/cksfv/PKGBUILD
+++ b/abs/extra/community/cksfv/PKGBUILD
@@ -2,15 +2,15 @@
 # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl>
 
 pkgname=cksfv
-pkgver=1.3.12
+pkgver=1.3.14
 pkgrel=1
 pkgdesc="SFV (Simple File Verification) Checker"
 arch=('i686' 'x86_64')
 url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/"
 license=('GPL')
 depends=('glibc')
-source=(http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('1d277da8bafaec9ddadb92ece4999590')
+source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz)
+md5sums=('2e15289753ea0b90b6ea86993f93b383')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
diff --git a/abs/extra/community/enca/PKGBUILD b/abs/extra/community/enca/PKGBUILD
index 1bbd7db..e398023 100644
--- a/abs/extra/community/enca/PKGBUILD
+++ b/abs/extra/community/enca/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD,v 1.7 2009/02/27 12:40:33 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Filip Dvorak <fila@pruda.com>
 
 pkgname=enca
-pkgver=1.9
-pkgrel=4
+pkgver=1.13
+pkgrel=1
 pkgdesc="Charset analyser and converter"
-arch=(i686 x86_64)
-url="http://trific.ath.cx/software/enca"
+arch=('i686' 'x86_64')
+url="http://freshmeat.net/projects/enca/"
 options=('!libtool')
-license=("GPL")
-depends=()
-source=(http://archlinux-stuff.googlecode.com/files/enca-$pkgver.tar.bz2)
-md5sums=('b3581e28d68d452286fb0bfe58bed3b3')
+license=('GPL')
+depends=('recode' 'sh')
+source=(http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('762bead5d9a0a5e55024e1102baaa89d')
 
 build() {
-  cd $startdir/src/enca-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/enca
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --mandir=/usr/share/man \
+              --with-librecode=/usr \
+              --enable-external
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-
diff --git a/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz b/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz
deleted file mode 120000
index 9a73c20..0000000
--- a/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/gpac-0.4.5-7.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/community/js/js-1.8.5-3.src.tar.gz b/abs/extra/community/js/js-1.8.5-3.src.tar.gz
deleted file mode 120000
index c86d2e3..0000000
--- a/abs/extra/community/js/js-1.8.5-3.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/js-1.8.5-3.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/community/libmodplug/PKGBUILD b/abs/extra/community/libmodplug/PKGBUILD
index 12c67db..3065783 100644
--- a/abs/extra/community/libmodplug/PKGBUILD
+++ b/abs/extra/community/libmodplug/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
 
 pkgname=libmodplug
-pkgver=0.8.4
+pkgver=0.8.8.3
 pkgrel=1
 pkgdesc="A MOD playing library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://modplug-xmms.sourceforge.net/"
-license=('GPL')
-depends=(gcc-libs)
-source=(http://downloads.sf.net/sourceforge/modplug-xmms/libmodplug-${pkgver}.tar.gz)
-md5sums=('091bd1168a524a4f36fc61f95209e7e4')
+license=('custom')
+depends=('gcc-libs')
 options=('!libtool')
+source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz")
+md5sums=('8a9c713f0f56894163ddc61f9a0d1f71')
 
 build() {
-  cd ${startdir}/src/libmodplug-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make
 }
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/extra/community/libnetfilter_queue/PKGBUILD b/abs/extra/community/libnetfilter_queue/PKGBUILD
index 986c916..0240b96 100644
--- a/abs/extra/community/libnetfilter_queue/PKGBUILD
+++ b/abs/extra/community/libnetfilter_queue/PKGBUILD
@@ -1,7 +1,10 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 # Maintainer: Filip Wojciechowski, filip at loka dot pl
+
 pkgname=libnetfilter_queue
-pkgver=0.0.16
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter"
 arch=('i686' 'x86_64')
@@ -11,11 +14,11 @@ depends=(libnfnetlink)
 makedepends=(pkgconfig)
 options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('b36664e6cd39edbfe46b416a86118add')
+md5sums=('af6a9ea350f63a13609bc3b47b5c395c')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
 }
diff --git a/abs/extra/community/libnfnetlink/PKGBUILD b/abs/extra/community/libnfnetlink/PKGBUILD
index 2e0242e..7577f65 100644
--- a/abs/extra/community/libnfnetlink/PKGBUILD
+++ b/abs/extra/community/libnfnetlink/PKGBUILD
@@ -1,5 +1,9 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
+# Maintainer: Filip Wojciechowski, filip at loka dot pl
 pkgname=libnfnetlink
-pkgver=0.0.40
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 depends=(glibc)
@@ -8,7 +12,7 @@ license=('GPL')
 arch=('i686' 'x86_64')
 options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('3fe19dc4b05ba7e7e6216123097c2819')
+md5sums=('016fdec8389242615024c529acc1adb8')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
diff --git a/abs/extra/community/mediatomb/PKGBUILD b/abs/extra/community/mediatomb/PKGBUILD
index aaf4d58..606314a 100644
--- a/abs/extra/community/mediatomb/PKGBUILD
+++ b/abs/extra/community/mediatomb/PKGBUILD
@@ -1,57 +1,49 @@
-# Orginal Contributor: William Rea <sillywilly@gmail.com>
+# $Id$
+# Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Nikhil Bysani <nikron@gmail.com>
-# Contributor: Mika Hynnä <igheax@gmail.com>
-
-# 20090525: 
-#	+ makedepends=('gcc' 'patch' 'make')
-#	+ mediatomb-0.11.0+glibc-2.10.patch
+# Contributor: Mika HynnÃ¤ <igheax@gmail.com>
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=mediatomb
-pkgver=0.11.0
-pkgrel=10
-pkgdesc="A UPnP mediaserver"
+pkgver=0.12.1
+pkgrel=5
+pkgdesc="Free UPnP/DLNA media server"
 arch=('i686' 'x86_64')
-url="http://mediatomb.sourceforge.net"
+url="http://mediatomb.cc/"
 license=('GPL')
-depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg')
-makedepends=('gcc' 'patch' 'make')
-backup=(etc/conf.d/mediatomb)
-source=(
-	http://mesh.dl.sourceforge.net/sourceforge/mediatomb/mediatomb-$pkgver.tar.gz \
-	mediatomb.rc \
-	mediatomb.conf \
-	http://kapsi.fi/~ighea/arch/mediatomb-gcc-4.3.patch
-	mediatomb-0.11.0+glibc-2.10.patch
-)
-
-build()
-{
-	cd $startdir/src/mediatomb-$pkgver || return 1
-	patch -Np1 < ../mediatomb-gcc-4.3.patch || return 1
-	patch -Np0 < ../mediatomb-0.11.0+glibc-2.10.patch || return 1
-	
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure.ac
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i src/metadata/ffmpeg_handler.cc
-	
-
-	./configure --prefix=/usr --enable-mysql=no --enable-libmagic=yes \
-	 --enable-libjs=yes --enable-ffmpeg --with-ffmpeg-h=/usr/include/ || return 1
-
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
+depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib')
+backup=('etc/conf.d/mediatomb')
+install=mediatomb.install
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'mediatomb.rc'
+        'mediatomb.conf'
+        'gcc46.patch'
+	'tonewjs.patch')
+md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
+         'aa1191ec508d8bd4b3b9a5fe48efc079'
+         'bec297e4178332a26b42bbde873b94cd'
+         '0ae34c0d73b76e3d215887834c3c08cf'
+	 'd9e02a9956eecf5ff645bddf6dac0331')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/gcc46.patch
+  patch -Np1 -i $srcdir/tonewjs.patch
+
+  ./configure --prefix=/usr \
+              --disable-mysql \
+              --enable-libmagic \
+              --enable-libjs \
+              --enable-ffmpeg
+  make
+}
 
-	# rc-script
-	mkdir -p $startdir/pkg/etc/rc.d/ || return 1
-	install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
 
-	# config-file
-	mkdir -p $startdir/pkg/etc/conf.d/ || return 1
-	install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1
+  make DESTDIR="$pkgdir/" install
 
+  install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb"
+  install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
+  install -d "$pkgdir/var/lib/mediatomb"
 }
-md5sums=('661f08933830d920de21436fe122fb15'
-         'a7ff197d5760b20b04675ba67bfd9e86'
-         'a4cbd08c32c93f116363a29bef60e21d'
-         'eda28d01e035b3237566da5b1aad7712'
-         '3b895eabee88a0697b4fd0c30af6cab2')
diff --git a/abs/extra/community/mediatomb/gcc46.patch b/abs/extra/community/mediatomb/gcc46.patch
new file mode 100644
index 0000000..0f4fe49
--- /dev/null
+++ b/abs/extra/community/mediatomb/gcc46.patch
@@ -0,0 +1,10 @@
+--- a/src/zmm/object.h
++++ b/src/zmm/object.h
+@@ -33,6 +33,7 @@
+ #define __ZMM_OBJECT_H__
+ 
+ #include <new> // for size_t
++#include <cstddef>
+ #include "atomic.h"
+ 
+ namespace zmm
diff --git a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch b/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch
deleted file mode 100644
index b1436c1..0000000
--- a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/tools.cc	(revisione 2018)
-+++ src/tools.cc	(copia locale)
-@@ -303,8 +303,8 @@
-     Ref<StringBuffer> buf(new StringBuffer(len / 2));
-     for (int i = 0; i < len; i += 2)
-     {
--        char *chi = strchr(HEX_CHARS, ptr[i]);
--        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+        const char *chi = strchr(HEX_CHARS, ptr[i]);
-+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-         int hi, lo;
-         
-         if (chi)
-@@ -397,7 +397,7 @@
-             char clo = data[i++];
-             int hi, lo;
- 
--            char *pos;
-+            const char *pos;
- 
-             pos = strchr(hex, chi);
-             if (!pos)
-
diff --git a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch b/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch
deleted file mode 100644
index 9440bec..0000000
--- a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# GCC-4.3 compatibility patch by Mika Hynnä (ighea) <igheaxATgmailDOTcom>
-#
---- mediatomb-0.11.0/src/url.cc	2008-03-02 00:48:36.000000000 +0200
-+++ mediatomb-0.11.0.new/src/url.cc	2008-04-14 00:53:21.000000000 +0300
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY,0);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
---- mediatomb-0.11.0/src/metadata/id3_handler.cc	2008-03-02 00:48:36.000000000 +0200
-+++ mediatomb-0.11.0.new/src/metadata/id3_handler.cc	2008-04-14 01:22:36.000000000 +0300
-@@ -36,6 +36,8 @@
- 
- #ifdef HAVE_ID3
- 
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
-     #undef HAVE_CONFIG_H // else utils.h from the id3 library tries to import "config.h"
- 
diff --git a/abs/extra/community/mediatomb/mediatomb.conf b/abs/extra/community/mediatomb/mediatomb.conf
index 339bd9e..798018d 100644
--- a/abs/extra/community/mediatomb/mediatomb.conf
+++ b/abs/extra/community/mediatomb/mediatomb.conf
@@ -1,5 +1,23 @@
-# User to run the mediatomb as:
-USER=""
-# Extra parameters to pass to the daemon:
-PARAMS=""
+#
+# Parameters to be passed to mediatomb
+#
 
+# Port to listen on
+MT_PORT='50500'
+
+# User and group to run as
+MT_USER='nobody'
+MT_GROUP='nobody'
+
+# Location of the PID file
+MT_PIDFILE='/var/run/mediatomb.pid'
+
+# Location of the log file
+MT_LOGFILE='/var/log/mediatomb.log'
+
+# Location of the config file/database
+MT_HOME='/var/lib/mediatomb'
+MT_CFGDIR='.mediatomb'
+
+# User defined command line options
+MT_OPTIONS=''
diff --git a/abs/extra/community/mediatomb/mediatomb.install b/abs/extra/community/mediatomb/mediatomb.install
new file mode 100644
index 0000000..56f6ef9
--- /dev/null
+++ b/abs/extra/community/mediatomb/mediatomb.install
@@ -0,0 +1,9 @@
+post_install() {
+  echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
+  echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
+}
+
+post_upgrade() {
+  # TODO: disable next update
+  post_install
+}
diff --git a/abs/extra/community/mediatomb/mediatomb.rc b/abs/extra/community/mediatomb/mediatomb.rc
index b3333cc..7b93012 100755..100644
--- a/abs/extra/community/mediatomb/mediatomb.rc
+++ b/abs/extra/community/mediatomb/mediatomb.rc
@@ -1,58 +1,54 @@
 #!/bin/bash
 
-DESC="MediaTomb UPnP A/V Media Server"
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/mediatomb
 
-USER=""
+MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \
+            -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS"
 
-if [ "$(whoami)" != "root" ];then
- echo "You must be root to start/restart/stop services."
- exit 1
-fi
+case "$1" in
+    start)
+        stat_busy "Starting Mediatomb UPnP Media Server"
 
-. /etc/rc.conf
-. /etc/rc.d/functions
+        chown "$MT_USER:$MT_GROUP" "$MT_HOME"
 
-[ -r "/etc/conf.d/mediatomb" ] && . /etc/conf.d/mediatomb
+        if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then
+            rm -f "$MT_PIDFILE"
+        fi
 
-PID=`pidof -o %PPID /usr/bin/mediatomb`
+        PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
 
-case "$1" in
-  start)
-    stat_busy "Starting $DESC"
-    if [ -z "$PID" ]; then
-	if [ -n "$USER" ]; then
-		echo -n "Starting as user: $USER"
-		su - $USER -c "/usr/bin/mediatomb -d $PARAMS &> /dev/null" || stat_fail
-	else
-		/usr/bin/mediatomb -d $PARAMS &> /dev/null || stat_fail
-	fi
-	PID=`pidof -o %PPID /usr/bin/mediatomb`
-	if [ -z "$PID" ]; then exit 1;fi
-	echo $PID > /var/run/mediatomb.pid
-	add_daemon mediatomb
-        stat_done
-    else    
-		echo -n "Already running!"
-		stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $DESC"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      echo -n "Not started!"
-      stat_fail
-    else
-      rm /var/run/mediatomb.pid
-      rm_daemon mediatomb
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
+        if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then
+            add_daemon mediatomb
+            stat_done
+        else
+            stat_fail
+        fi
+        ;;
+
+    stop)
+        stat_busy "Stopping Mediatomb UPnP Media Server"
+
+        PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
+
+        if [ -n "$PID" ] && kill "$PID" &> /dev/null; then
+            rm -f "$MT_PIDFILE"
+            rm_daemon mediatomb
+            stat_done
+        else
+            stat_fail
+        fi
+        ;;
+
+    restart)
+        "$0" stop
+        sleep 1
+        "$0" start
+        ;;
+
+    *)
+        echo "usage: $0 {start|stop|restart}"
+        ;;
 esac
+exit 0
diff --git a/abs/extra/community/mediatomb/tonewjs.patch b/abs/extra/community/mediatomb/tonewjs.patch
new file mode 100644
index 0000000..1159685
--- /dev/null
+++ b/abs/extra/community/mediatomb/tonewjs.patch
@@ -0,0 +1,564 @@
+diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
+--- mediatomb-0.12.1-back/build/Makefile.in.tonewjs	2010-04-08 00:40:15.000000000 +0200
++++ mediatomb-0.12.1-back/build/Makefile.in	2011-04-19 17:17:01.343509944 +0200
+@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = -fpermissive @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
+ DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
+diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
+--- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs	2011-04-18 13:10:48.000000000 +0200
++++ mediatomb-0.12.1-back/src/scripting/import_script.cc	2011-04-18 13:29:36.000000000 +0200
+@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> 
+     try 
+     {
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "ImportScript");
++        root = JS_NewObject(cx, NULL, script, NULL);
++        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
+     }
+     catch (Exception ex)
+     {
+@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
+ #endif
+     
+     if (root)
+-        JS_RemoveRoot(cx, &root);
++        JS_RemoveObjectRoot(cx, &root);
+ 
+ #ifdef JS_THREADSAFE
+     JS_EndRequest(cx);
+diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
+--- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs	2011-04-18 13:29:55.000000000 +0200
++++ mediatomb-0.12.1-back/src/scripting/js_functions.cc	2011-04-19 16:48:04.009229611 +0200
+@@ -49,7 +49,7 @@ using namespace zmm;
+ extern "C" {
+ 
+ JSBool 
+-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_print(JSContext *cx, uintN argc, jsval *argv)
+ {
+     uintN i;
+     JSString *str;
+@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
+         if (!str)
+             return JS_TRUE;
+         argv[i] = STRING_TO_JSVAL(str);
+-        log_js("%s\n", JS_GetStringBytes(str));
++        char * log_str = JS_EncodeString(cx, str);
++        log_js("%s\n", log_str);
++        JS_free(cx, log_str);
+     }
+     return JS_TRUE;
+ }
+ 
+ JSBool
+-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_copyObject(JSContext *cx, uintN argc, jsval *argv)
+ {
+     jsval arg;
+     JSObject *js_cds_obj;
+     JSObject *js_cds_clone_obj;
+ 
+-    Script *self = (Script *)JS_GetPrivate(cx, obj);
++    Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ 
+     try
+     {
+@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
+ 
+         self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
+ 
+-        *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
++        JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
+ 
+         return JS_TRUE;
+ 
+@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
+ }
+ 
+ JSBool
+-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
+ {
+     try
+     {
+@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject 
+         Ref<StringConverter> p2i;
+         Ref<StringConverter> i2i;
+ 
+-        Script *self = (Script *)JS_GetPrivate(cx, obj);
++        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ 
+         if (self == NULL)
+         {
+@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject 
+         if (!str)
+             path = _("/");
+         else
+-            path = JS_GetStringBytes(str);
++            path = JS_EncodeString(cx, str);
+ 
+         JSString *cont = JS_ValueToString(cx, argv[2]);
+         if (cont)
+         {
+-            containerclass = JS_GetStringBytes(cont);
++            containerclass = JS_EncodeString(cx, cont);
+             if (!string_ok(containerclass) || containerclass == "undefined")
+                 containerclass = nil;
+         }
+ 
+         if (self->whoami() == S_PLAYLIST)
+-            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
++            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
+         else if (self->whoami() == S_IMPORT)
+-            js_orig_obj = self->getObjectProperty(obj, _("orig"));
++            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
+         
+         if (js_orig_obj == NULL)
+         {
+@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject 
+         JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
+         if (!str2)
+             return JS_TRUE;
+-        *rval = STRING_TO_JSVAL(str2);
+-
++        JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); 
+         return JS_TRUE;
+     }
+     catch (ServerShutdownException se)
+@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject 
+     return JS_TRUE;
+ }
+ 
+-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
++static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
+ {
+     try
+     {
+@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
+         {
+             str = JS_ValueToString(cx, argv[0]);
+             if (str)
+-                result = JS_GetStringBytes(str);
++                result = JS_EncodeString(cx, str);
+         }
+ 
+         if (result != nil)
+@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
+             JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
+             if (!str2)
+                 return JS_TRUE;
+-            *rval = STRING_TO_JSVAL(str2);
++            JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
+         }
+     }
+     catch (ServerShutdownException se)
+@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
+ }
+ 
+ 
+-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
+ }
+ 
+-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
+-}
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
+ 
+-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
+ }
+ 
+-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
+ }
+ 
+ } // extern "C"
+diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
+--- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs	2010-03-25 15:58:05.000000000 +0100
++++ mediatomb-0.12.1-back/src/scripting/js_functions.h	2011-04-18 13:59:29.000000000 +0200
+@@ -40,18 +40,18 @@
+ extern "C" {
+ 
+ /// \brief Log output.
+-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
+ 
+ /// \brief Adds an object to the database.
+-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
+ 
+ /// \brief Makes a copy of an CDS object.
+-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
+ 
+-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
+ 
+ } // extern "C"
+ 
+diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
+--- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs	2011-04-18 13:34:14.000000000 +0200
++++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc	2011-04-18 13:51:59.000000000 +0200
+@@ -46,9 +46,9 @@ using namespace zmm;
+ extern "C" {
+ 
+ static JSBool
+-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_readln(JSContext *cx, uintN argc, jsval *argv)
+ {
+-    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
++    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ 
+     String line;
+     
+@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, 
+ 
+     JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
+ 
+-    *rval = STRING_TO_JSVAL(jsline);
++    JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
+   
+     return JS_TRUE;
+ }
+@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "PlaylistScript");
++        root = JS_NewObject(cx, NULL, script, NULL);
++        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
+     }
+     catch (Exception ex)
+     {
+@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
+ #endif
+ 
+     if (root)
+-        JS_RemoveRoot(cx, &root);
++        JS_RemoveObjectRoot(cx, &root);
+ 
+ #ifdef JS_THREADSAFE
+     JS_EndRequest(cx);
+diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
+--- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs	2011-04-18 13:53:07.000000000 +0200
++++ mediatomb-0.12.1-back/src/scripting/script.cc	2011-04-19 18:26:34.460338804 +0200
+@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
+     str = JS_ValueToString(cx, val);
+     if (! str)
+         return nil;
+-    return JS_GetStringBytes(str);
++    return JS_EncodeString(cx, str);
+ }
+ 
+ int Script::getBoolProperty(JSObject *obj, String name)
+@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
+         try
+         {
+             common_script = _load(common_scr_path);
+-            common_root = JS_NewScriptObject(cx, common_script);
+-            JS_AddNamedRoot(cx, &common_root, "common-script");
++            common_root = JS_NewObject(cx, NULL, common_script, NULL);
++            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
+             _execute(common_script);
+         }
+         catch (Exception e)
+         {
+             if (common_root)
+-                JS_RemoveRoot(cx, &common_root);
++                JS_RemoveObjectRoot(cx, &common_root);
+ 
+             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
+                     e.getMessage().c_str());
+@@ -460,7 +460,7 @@ Script::~Script()
+     JS_BeginRequest(cx);
+ #endif
+     if (common_root)
+-        JS_RemoveRoot(cx, &common_root);
++        JS_RemoveObjectRoot(cx, &common_root);
+ 
+ /*
+  * scripts are unrooted and will be cleaned up by GC
+@@ -504,11 +504,11 @@ void Script::initGlobalObject()
+     static JSClass global_class =
+     {
+         "global",                                   /* name */
+-        JSCLASS_HAS_PRIVATE,                        /* flags */
++        JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
+         JS_PropertyStub,                            /* add property */
+         JS_PropertyStub,                            /* del property */
+         JS_PropertyStub,                            /* get property */
+-        JS_PropertyStub,                            /* set property */
++        JS_StrictPropertyStub,                      /* set property */
+         JS_EnumerateStandardClasses,                /* enumerate */
+         JS_ResolveStub,                             /* resolve */
+         JS_ConvertStub,                             /* convert */
+@@ -517,7 +517,7 @@ void Script::initGlobalObject()
+     };
+ 
+     /* create the global object here */
+-    glob = JS_NewObject(cx, &global_class, NULL, NULL);
++    glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
+     if (! glob)
+         throw _Exception(_("Scripting: could not initialize glboal class"));
+ 
+@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
+         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
+ }
+ 
+-JSScript *Script::_load(zmm::String scriptPath)
++JSObject *Script::_load(zmm::String scriptPath)
+ {
+     if (glob == NULL)
+         initGlobalObject();
+ 
+-    JSScript *scr;
++    JSObject *scr;
+ 
+     String scriptText = read_text_file(scriptPath);
+ 
+@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
+ 
+ void Script::load(zmm::String scriptPath)
+ {
+-    if (script)
+-        JS_DestroyScript(cx, script);
+-
+     script = _load((scriptPath));
+ }
+ 
+ 
+-void Script::_execute(JSScript *scr)
++void Script::_execute(JSObject *scr)
+ {
+     jsval ret_val;
+ 
+@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+     JSObject *js_meta = getObjectProperty(js, _("meta"));
+     if (js_meta)
+     {
+-        JS_AddNamedRoot(cx, &js_meta, "meta");
++        JS_AddNamedObjectRoot(cx, &js_meta, "meta");
+         /// \todo: only metadata enumerated in MT_KEYS is taken
+         for (int i = 0; i < M_MAX; i++)
+         {
+@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+                 }
+             }
+         }
+-        JS_RemoveRoot(cx, &js_meta);
++        JS_RemoveObjectRoot(cx, &js_meta);
+     }
+     
+     // stuff that has not been exported to js
+diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
+--- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs	2011-04-18 12:56:14.000000000 +0200
++++ mediatomb-0.12.1-back/src/scripting/script.h	2011-04-18 12:56:51.000000000 +0200
+@@ -66,8 +66,8 @@ public:
+     JSRuntime *rt;
+     JSContext *cx;
+     JSObject  *glob;
+-    JSScript *script;
+-    JSScript *common_script;
++    JSObject  *script;
++    JSObject  *common_script;
+     
+ public:
+     Script(zmm::Ref<Runtime> runtime);
+@@ -115,8 +115,8 @@ private:
+     JSObject *common_root;
+ 
+     void initGlobalObject();
+-    JSScript *_load(zmm::String scriptPath);
+-    void _execute(JSScript *scr);
++    JSObject *_load(zmm::String scriptPath);
++    void _execute(JSObject *scr);
+     zmm::Ref<StringConverter> _p2i;
+     zmm::Ref<StringConverter> _j2i;
+     zmm::Ref<StringConverter> _f2i;
+--- mediatomb-0.12.1/configure.tonewjs	2011-07-04 20:20:00.290227110 +1200
++++ mediatomb-0.12.1/configure	2011-07-04 20:20:28.186894644 +1200
+@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
+ 
+ else
+ 
+-                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
+-                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
+-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
++                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
++                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmozjs  $LIBS"
++LIBS="-lmozjs185  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_lib_mozjs_JS_NewObject=yes
++  ac_cv_lib_mozjs185_JS_NewObject=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_mozjs_JS_NewObject=no
++	ac_cv_lib_mozjs185_JS_NewObject=no
+ fi
+ 
+ rm -rf conftest.dSYM
+@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
+-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
+ 
+-                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
+-                                    MOZLIB=mozjs
++                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
++                                    MOZLIB=mozjs185
+ 
+ else
+ 
+@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
+ else
+ 
+                     unset ac_cv_lib_smjs_JS_NewObject
+-                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
+-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
++                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmozjs  $LIBS"
++LIBS="-lmozjs185  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_lib_mozjs_JS_NewObject=yes
++  ac_cv_lib_mozjs185_JS_NewObject=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_mozjs_JS_NewObject=no
++	ac_cv_lib_mozjs185_JS_NewObject=no
+ fi
+ 
+ rm -rf conftest.dSYM
+@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
+-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
+ 
+-                            MOZLIB=mozjs
+-                            JS_LIBS="-lmozjs"
++                            MOZLIB=mozjs185
++                            JS_LIBS="-lmozjs185"
+ 
+ else
+ 
+@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
+ 
+ else
+ 
+-                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
+-                                            unset ac_cv_lib_mozjs_JS_NewObject
+-                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
+-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
++                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
++                                            unset ac_cv_lib_mozjs185_JS_NewObject
++                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmozjs  $LIBS"
++LIBS="-lmozjs185  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_lib_mozjs_JS_NewObject=yes
++  ac_cv_lib_mozjs185_JS_NewObject=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_mozjs_JS_NewObject=no
++	ac_cv_lib_mozjs185_JS_NewObject=no
+ fi
+ 
+ rm -rf conftest.dSYM
+@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
+-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
+ 
+-                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
+-                                                    MOZLIB=mozjs
++                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
++                                                    MOZLIB=mozjs185
+ 
+ else
+ 
diff --git a/abs/extra/community/ncdu/PKGBUILD b/abs/extra/community/ncdu/PKGBUILD
index fb61b63..a9f83e6 100644
--- a/abs/extra/community/ncdu/PKGBUILD
+++ b/abs/extra/community/ncdu/PKGBUILD
@@ -1,6 +1,7 @@
 # Contributor: lp76 <l.peduto@gmail.com>
+# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 pkgname=ncdu
-pkgver=1.4
+pkgver=1.7
 pkgrel=1
 pkgdesc="An NCurses version of the famous old 'du' unix command"
 arch=('i686' 'x86_64')
@@ -8,12 +9,13 @@ url="http://dev.yorhel.nl/ncdu/"
 license=('MIT')
 depends=('ncurses')
 source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz)
-md5sums=('07f01579f7c9852033139ae9fa2414c9')
+md5sums=('172047c29d232724cc62e773e82e592a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+
+  ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=$pkgdir install || return 1
-  install -D COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/abs/extra/community/smplayer/ChangeLog b/abs/extra/community/smplayer/ChangeLog
index a40f9a4..e8397b3 100644
--- a/abs/extra/community/smplayer/ChangeLog
+++ b/abs/extra/community/smplayer/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-23  Ionut Biru <ibiru@archlinux.org>
+	* smplayer 0.6.9-2
+	* changed exec argument from %U to %F in smplayer.desktop
+
+2010-02-22  Ionut Biru <ibiru@archlinux.org>
+	* smplayer 0.6.9-1
+	* Upstream update
+
+2009-07-25  Allan McRae <allan@archlinux.org>
+	* smplayer 0.6.8-1
+	* Upstream update
+
 2009-03-13  Allan McRae <allan@archlinux.org>
 	* smplayer 0.6.7-1
 	* Upstream update
diff --git a/abs/extra/community/smplayer/PKGBUILD b/abs/extra/community/smplayer/PKGBUILD
index 3aa1d3d..0928e4b 100644
--- a/abs/extra/community/smplayer/PKGBUILD
+++ b/abs/extra/community/smplayer/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 29947 2009-03-14 00:58:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
- 
+
 pkgname=smplayer
-pkgver=0.6.7
-pkgrel=2
-pkgdesc="A complete front-end for MPlayer" 
+pkgver=0.6.9
+pkgrel=3
+pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net/" 
+url="http://smplayer.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'mplayer')
+depends=('qt>=4.7.1' 'mplayer')
 source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('306b99374ad89cee93f1ad6fa94dea71')
+md5sums=('dfe874b386509de5df78537489f95004')
 
-build() { 
+build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # remove broken translation
   sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro
 
-  make PREFIX=/usr || return 1 
-  make PREFIX=${pkgdir}/usr install || return 1
+  make PREFIX=/usr
+  make PREFIX=${pkgdir}/usr install
 
   install -dm755 ${pkgdir}/usr/share/pixmaps
   ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
         ${pkgdir}/usr/share/pixmaps/
+
+  sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop
+  sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \
+  	${pkgdir}/usr/share/applications/smplayer_enqueue.desktop
 }
 
diff --git a/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz b/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz
deleted file mode 120000
index 62ea8f8..0000000
--- a/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/transmission-cli-2.33-1.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/community/vsftpd/PKGBUILD b/abs/extra/community/vsftpd/PKGBUILD
index 32a4007..78ba1c5 100644
--- a/abs/extra/community/vsftpd/PKGBUILD
+++ b/abs/extra/community/vsftpd/PKGBUILD
@@ -1,52 +1,44 @@
-# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
-pkgver=2.1.0
-pkgrel=4
+pkgver=2.3.4
+pkgrel=2
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
-license=('GPL')
-backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
-url="http://vsftpd.beasts.org/"
-#makedepends=('vim')
-depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16')
+url="https://security.appspot.com/vsftpd.html"
+license=('GPL2')
+depends=('openssl')
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
-source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
-        vsftpd.xinetd vsftpd.d run)
-md5sums=('7890b54e7ffa6106ffbdfda53f47fa41'
-         'b07fd4609c70063c1d6b20142910c1a6'
-         'e46ed8e4c4a6e6a3de59f60b98e4f569'
-	 '8abbed7cc75f9a9d2944e0e83c8dd90d')
+source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
+        'vsftpd.xinetd' 'vsftpd.d' 'run')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # build-time config
   sed \
-    -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
-  make CFLAGS="${CFLAGS}" || return 1
-  install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1
-  install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1
-  install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1
-  install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1
-  install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd  || return 1
-  install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1
-  mkdir -p $startdir/pkg/usr/share/empty
-#  ex ${pkgdir}/etc/vsftpd.conf <<_EOF
-#2
-#i
-##
-## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd
-##listen=YES
-#.
-#w
-#q
-#_EOF
-#}
 # Below added for LinHES
   mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise
   install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/
+  make CFLAGS="${CFLAGS}"
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
+  install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
+  install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
+  install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
+  install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
+  install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
+
+  install -d -m755 "${pkgdir}/usr/share/empty"
+}
+md5sums=('2ea5d19978710527bb7444d93b67767a'
+         'b07fd4609c70063c1d6b20142910c1a6'
+         '60060a6c7db3b3b7baa1561a302e6923'
+         '8abbed7cc75f9a9d2944e0e83c8dd90d')
diff --git a/abs/extra/community/vsftpd/__changelog b/abs/extra/community/vsftpd/__changelog
new file mode 100644
index 0000000..82615f6
--- /dev/null
+++ b/abs/extra/community/vsftpd/__changelog
@@ -0,0 +1 @@
+-Add back run file and modify PKGBUILD to install run
diff --git a/abs/extra/community/vsftpd/vsftpd.d b/abs/extra/community/vsftpd/vsftpd.d
index b43a6d0..2731085 100644
--- a/abs/extra/community/vsftpd/vsftpd.d
+++ b/abs/extra/community/vsftpd/vsftpd.d
@@ -1,40 +1,67 @@
 #!/bin/bash
 
+daemon_name=vsftpd
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/vsftpd`
+get_pid() {
+	pidof -o %PPID $daemon_name
+}
+
 case "$1" in
-	start)
-		stat_busy "Starting vsftpd FTP Daemon"
-		if [ -z "$PID" ]; then 
-			/usr/sbin/vsftpd &
-			PID=`pidof -o %PPID /usr/sbin/vsftpd`
-			if [ -z $PID ]; then
-				stat_fail
-			else
-				add_daemon vsftpd
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-	;;
-	stop)
-		stat_busy "Stopping vsftpd FTP Daemon"
-		[ ! -z "$PID" ]  && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon vsftpd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"  
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=$(get_pid)
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name &
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo $(get_pid) > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=$(get_pid)
+    # KILL
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
 esac
+
+exit 0
diff --git a/abs/extra/community/vsftpd/vsftpd.install b/abs/extra/community/vsftpd/vsftpd.install
index 3bbb2cc..48f134e 100644
--- a/abs/extra/community/vsftpd/vsftpd.install
+++ b/abs/extra/community/vsftpd/vsftpd.install
@@ -9,14 +9,9 @@ post_install() {
     echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
     echo ">>> it will be activated automatically at boot-up."
   fi
-# Below added for LinHES
-  add_service.sh vsftpd
 }
 
 post_upgrade() {
   post_install $1
 }
 
-post_remove() {
-	remove_service.sh vsftpd
-}
diff --git a/abs/extra/community/zvbi/PKGBUILD b/abs/extra/community/zvbi/PKGBUILD
index f638f29..9bc150c 100644
--- a/abs/extra/community/zvbi/PKGBUILD
+++ b/abs/extra/community/zvbi/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# $Id$
+# Maintainer: 
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 pkgname=zvbi
-pkgver=0.2.26
-pkgrel=1
-pkgdesc="zvbi is needed for zapping"
+pkgver=0.2.33
+pkgrel=3
+pkgdesc="VBI capture and decoding library"
+url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
 arch=(i686 x86_64)
-depends=('libpng')
+depends=('libpng' 'libx11')
 license=('GPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/zapping/$pkgname-$pkgver.tar.bz2)
-url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
+source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2
+        fix-includes.patch)
+md5sums=('1741a6045c3eedfb611d645f2da69ac8'
+         '38766bc59e1571133d0399f0102da653')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-includes.patch"
+  ./configure --prefix=/usr --disable-static --mandir=/usr/share/man
+  make
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('82805319ca61f6ffd7b7bb64d7433448')
diff --git a/abs/extra/community/zvbi/fix-includes.patch b/abs/extra/community/zvbi/fix-includes.patch
new file mode 100644
index 0000000..2825264
--- /dev/null
+++ b/abs/extra/community/zvbi/fix-includes.patch
@@ -0,0 +1,36 @@
+Add proper #includes so that we do not get undef errors to S_ISCHR
+during linking.
+
+Signed-off-by: Alex Chiang <achiang@canonical.com>
+---
+--- zvbi-0.2.33.orig/src/io-dvb.c
++++ zvbi-0.2.33/src/io-dvb.c
+@@ -29,6 +29,8 @@
+ #include <errno.h>
+ #include <sys/select.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #ifndef HAVE_S64_U64
+   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
+--- zvbi-0.2.33.orig/src/io-v4l.c
++++ zvbi-0.2.33/src/io-v4l.c
+@@ -42,6 +42,7 @@ static const char rcsid [] =
+ #include <assert.h>
+ #include <sys/time.h>		/* timeval */
+ #include <sys/types.h>		/* fd_set, uid_t */
++#include <sys/stat.h>		/* S_ISCHR */
+ #include <sys/ioctl.h>		/* for (_)videodev.h */
+ #include <pthread.h>
+ 
+--- zvbi-0.2.33.orig/contrib/ntsc-cc.c
++++ zvbi-0.2.33/contrib/ntsc-cc.c
+@@ -34,6 +34,7 @@
+ #include <locale.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #ifdef HAVE_GETOPT_LONG
+ #  include <getopt.h>
diff --git a/abs/extra/conky/PKGBUILD b/abs/extra/conky/PKGBUILD
index 0b27d0b..d542937 100644
--- a/abs/extra/conky/PKGBUILD
+++ b/abs/extra/conky/PKGBUILD
@@ -1,29 +1,47 @@
-# $Id: PKGBUILD 15346 2008-10-12 21:48:59Z giovanni $
-# Maintainer: James Rayner <james@archlinux.org>
-# Contributor: MrGreen <mrgreen.linuxuser@gmail.com>
+# $Id$
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: James Rayner <james@archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=conky
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo"
+pkgver=1.8.1
+pkgrel=3
+pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
-url="http://conky.sourceforge.net/"
+url='http://conky.sourceforge.net/'
 license=('custom')
 replaces=('torsmo')
-depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
+makedepends=('pkg-config')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
+backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'current-power.patch')
+
+sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
+          '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
-  --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/etc/xdg/
-  mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/
-  rmdir $startdir/pkg/usr/etc
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 < ../current-power.patch # See FS#21984
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-ibm \
+		--enable-curl \
+		--enable-rss \
+		--enable-weather-xoap \
+		--enable-imlib2 \
+		--disable-lua \
+		--enable-wlan \
+
+	make
 }
 
-md5sums=('494cbaf1108cfdb977fc80454d9b13e2')
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/extra/conky/current-power.patch b/abs/extra/conky/current-power.patch
new file mode 100644
index 0000000..1e7cf5a
--- /dev/null
+++ b/abs/extra/conky/current-power.patch
@@ -0,0 +1,12 @@
+diff -aur old/src/linux.c new/src/linux.c
+--- old/src/linux.c	2010-10-05 23:29:36.000000000 +0200
++++ new/src/linux.c	2010-12-06 22:18:59.346667183 +0100
+@@ -1671,6 +1671,8 @@
+  			the tradition! */
+  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
+  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
++ 			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
++ 				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
+  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD
index 8468c92..8ae9657 100644
--- a/abs/extra/dcraw/PKGBUILD
+++ b/abs/extra/dcraw/PKGBUILD
@@ -1,41 +1,48 @@
-# $Id: PKGBUILD 84664 2010-07-03 05:41:46Z allan $
+# $Id$
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
-# Note for rebuilders:
-# dcraw.c  is released as pure C file, not as a package with a changing version
-# number in the name. The name of the file to be downloaded is always the same!
-# So if you are a bad boy (Santa knows everything!) and build as root, this file
-# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version
-# likely will fail due to an MD5 error. If so, delete the files from the cache
-# to force a new download.
-
 pkgname=dcraw
-pkgver=1.438
+pkgver=9.08
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64')
 url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms')
-source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.c
-        http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.1 
+source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
+md5sums=('eb1d365c27495a513c0768b2f696ba66'
+         '110b4604a6dacd5537339c4082e9e12a')
+sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e'
+          '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
-  cd "${srcdir}"
-  gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms
+  cd "${srcdir}/${pkgname}"
+  gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
-  cd "${srcdir}"
-  install -Dm755  ${pkgname} "${pkgdir}"/usr/bin/${pkgname}
-  
-  # install a manpage, provided separately on authors homepage
-  install -Dm644 ${pkgname}.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1
+  cd "${srcdir}/${pkgname}"
+  install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
+  install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
   
-  install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+  for langchar in \
+    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \
+    ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \
+    zh_TW.big5 zh_CN.gb2312
+  do
+    lang=$(echo $langchar | cut -d. -f1)
+    char=$(echo $langchar | cut -d. -f2-)
+    if [ -f dcraw_${lang}.1 ]; then
+      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
+      iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
+      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
+      cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
+    fi
+    mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
+    msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
+  done
+
+  install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
-md5sums=('108f0c14a5be4d092c7ffa8460044fb3'
-         '6ba2a797c4ad698589f83171d6b36396'
-         '110b4604a6dacd5537339c4082e9e12a')
diff --git a/abs/extra/dcraw/dcraw.install b/abs/extra/dcraw/dcraw.install
index 0b3d1bf..2635964 100644
--- a/abs/extra/dcraw/dcraw.install
+++ b/abs/extra/dcraw/dcraw.install
@@ -1,7 +1,7 @@
 post_install() {
   cat << EOF
 
-NOTE for drcaw:
+NOTE for dcraw:
 ----
   ==> dcraw provides the simple commandline tools for raw conversion. If you
   ==> are looking for a more sophisticated way consider gimp-ufraw, which
@@ -11,7 +11,3 @@ NOTE for drcaw:
 
 EOF
 }
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/abs/extra/ffmpegthumbnailer/PKGBUILD b/abs/extra/ffmpegthumbnailer/PKGBUILD
new file mode 100644
index 0000000..8be79eb
--- /dev/null
+++ b/abs/extra/ffmpegthumbnailer/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: boromil@gmail.com
+
+pkgname=ffmpegthumbnailer
+pkgver=2.0.6
+pkgrel=1
+pkgdesc="Lightweight video thumbnailer that can be used by file managers."
+url="http://code.google.com/p/ffmpegthumbnailer/"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('ffmpeg' 'libjpeg' 'libpng')
+optdepends=('gvfs: support for gio uris')
+source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+options=(!libtool)
+md5sums=('5003ceaadc1c5a1be1dbb34739a12bab')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --enable-gio
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+
diff --git a/abs/extra/geoip/PKGBUILD b/abs/extra/geoip/PKGBUILD
index 9ae74ba..936aa57 100644
--- a/abs/extra/geoip/PKGBUILD
+++ b/abs/extra/geoip/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=(i686 x86_64)
@@ -13,13 +13,22 @@ depends=('zlib')
 backup=(etc/geoip/GeoIP.conf)
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('cb14b1beeb40631a12676b11ca0c309a')
 
 build() {
-  cd ${startdir}/src/GeoIP-${pkgver}
+  cd ${srcdir}/GeoIP-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
   make || return 1
+}
+
+check() {
+
+  cd ${srcdir}/GeoIP-${pkgver}
   make check || return 1
-  make DESTDIR=${startdir}/pkg install
+
 }
 
+package() {
+  cd ${srcdir}/GeoIP-${pkgver}
+  make DESTDIR=${startdir}/pkg install
+}
+md5sums=('a802175d5b7e2b57b540a7dd308d9205')
diff --git a/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz b/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz
deleted file mode 120000
index 2c17669..0000000
--- a/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/gptfdisk-0.7.2-1.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/help2man/PKGBUILD b/abs/extra/help2man/PKGBUILD
index c9dc9fb..fff2829 100644
--- a/abs/extra/help2man/PKGBUILD
+++ b/abs/extra/help2man/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 83522 2010-06-21 22:45:22Z giovanni $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.38.2
+pkgver=1.40.4
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/help2man/"
 license=('GPL')
 depends=('perl-locale-gettext')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('426671c6fe79e5ef2233303367eab5a6')
+install=help2man.install
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('4d79dc7cb7c20019c2a3650d35259c45')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +21,11 @@ build() {
               --mandir=/usr/share/man \
 	      --infodir=/usr/share/info \
 	      --libdir=/lib
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch
deleted file mode 100644
index a314c27..0000000
--- a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2009-11-14 07:21:34.000000000 +0100
-+++ b/Makefile.in	2010-02-10 12:23:35.000000000 +0100
-@@ -103,7 +103,7 @@
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
diff --git a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 b/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1
deleted file mode 100644
index 2f886ba..0000000
--- a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1
+++ /dev/null
@@ -1,56 +0,0 @@
-checking for perl... perl
-checking for module Locale::gettext... yes
-checking for msgfmt... /usr/bin/msgfmt
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking for library containing dlsym... -ldl
-checking for library containing bindtextdomain... none required
-checking for a BSD-compatible install... /bin/install -c
-checking for makeinfo... /usr/bin/makeinfo
-checking for install-info... /usr/bin/install-info
-configure: creating ./config.status
-config.status: creating Makefile
-perl help2man.PL --with-gettext
-gcc -march=i686 -mtune=generic -O2 -pipe -o bindtextdomain.so -fPIC -shared bindtextdomain.c -ldl 
-Extracting help2man (with variable substitutions)
-./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin
-/bin/install -c bindtextdomain.so /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-for lang in de fi fr pl pt_BR ru sv vi; \
-	do \
-	    ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES; \
-	    /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' po/$lang.gmo) \
-		/data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES/help2man.mo; \
-	    ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1; \
-	    /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' help2man.$lang.1) \
-		/data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1/help2man.1; \
-	done
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin
-./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/de/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-mkdir: cannot create directory `/data/linhes_pkgbuild/abs/extra/help2man/pkg/lib': File exists
-make: *** [install_base] Error 1
-make: *** Waiting for unfinished jobs....
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/de/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fi/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fi/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fr/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fr/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pl/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pl/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pt_BR/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pt_BR/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/ru/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/ru/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/sv/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/sv/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/vi/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/vi/man1
-[1m    Aborting...(B[m
diff --git a/abs/extra/htop/ChangeLog b/abs/extra/htop/ChangeLog
index 7d77d0b..ea57762 100644
--- a/abs/extra/htop/ChangeLog
+++ b/abs/extra/htop/ChangeLog
@@ -1,8 +1,17 @@
+2011-05-17  Angel Velasquez <angvp@archlinux.org>
+	* Added patch to fix --sort-key (closes FS#23224)
+
+2009-09-21  Eric Belanger  <eric@archlinux.org>
+
+	* htop 0.8.3-1
+	* Upstream update
+	* Built with vserver and openvz support (close FS#12755)
+
 2008-12-09  Alexander Fehr  <pizzapunk gmail com>
 
-  * htop-0.8.1-1:
-  New upstream release.
-  New maintainer.
-  Added patch to fix FS#12235.
-  Enabled Unicode support.
-  Added ChangeLog.
+	* htop-0.8.1-1:
+	* New upstream release
+	* New maintainer
+	* Added patch to fix FS#12235
+	* Enabled Unicode support
+	* Added ChangeLog
diff --git a/abs/extra/htop/PKGBUILD b/abs/extra/htop/PKGBUILD
index 95b9660..05c8826 100644
--- a/abs/extra/htop/PKGBUILD
+++ b/abs/extra/htop/PKGBUILD
@@ -1,22 +1,35 @@
-# $Id: PKGBUILD 21081 2008-12-09 17:41:11Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id$
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
-pkgver=0.8.3
-pkgrel=1
+pkgver=0.9
+pkgrel=2
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64')
 url="http://htop.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
+makedepends=('python2')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz)
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
+        htop.c.patch)
+md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
+         '750e8ad8476c5d9738da2a2bc7a7c2b6')
 
 build() {
-  cd "$srcdir/htop-$pkgver"
-  sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c || return 1
-  ./configure --prefix=/usr --enable-unicode || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+	cd ${srcdir}/${pkgname}-${pkgver}
+	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
+	sed -i 's|python|python2|' scripts/MakeHeader.py
+    patch -Np0 -i $srcdir/htop.c.patch
+	./configure --prefix=/usr --enable-unicode --enable-openvz \
+	    --enable-vserver 
+	make 
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	make DESTDIR=${pkgdir} install 
 }
-md5sums=('5c9f093f9eaddf6e77aa6d54c2116d0c')
diff --git a/abs/extra/htop/htop-treeview.patch b/abs/extra/htop/htop-treeview.patch
deleted file mode 100644
index bcf6334..0000000
--- a/abs/extra/htop/htop-treeview.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
---- htop-0.8.1.orig/ProcessList.c	2008-09-23 08:23:14.000000000 +0200
-+++ htop-0.8.1/ProcessList.c	2008-12-09 15:14:56.000000000 +0100
-@@ -331,7 +331,7 @@
- 
-    for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
-       Process* process = (Process*) (Vector_get(this->processes, i));
--      if (process->tgid == pid || (process->tgid == process->pid && process->ppid == pid)) {
-+      if (process->tgid == pid || process->ppid == pid) {
-          Process* process = (Process*) (Vector_take(this->processes, i));
-          Vector_add(children, process);
-       }
diff --git a/abs/extra/hwloc/PKGBUILD b/abs/extra/hwloc/PKGBUILD
new file mode 100644
index 0000000..d8023b9
--- /dev/null
+++ b/abs/extra/hwloc/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
+# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
+
+pkgname=hwloc
+pkgver=1.2
+pkgrel=1
+pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
+arch=('i686' 'x86_64')
+url="http://www.open-mpi.org/projects/hwloc/"
+license=('BSD')
+depends=('sh')
+makedepends=('pkg-config')
+optdepends=('cairo: Graphical output' 'libxml2: XML export')
+options=('!libtool' '!docs')
+source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b')
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure --prefix=/usr
+   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+
+   install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/abs/extra/libass/PKGBUILD b/abs/extra/libass/PKGBUILD
new file mode 100644
index 0000000..508e232
--- /dev/null
+++ b/abs/extra/libass/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
+
+pkgname=libass
+pkgver=0.9.13
+pkgrel=1
+pkgdesc="A portable library for SSA/ASS subtitles rendering"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libass/"
+license=('BSD')
+depends=('enca' 'fontconfig' 'libpng')
+makedepends=('pkgconfig')
+options=(!libtool)
+source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+md5sums=('d99381922dcbeb7a766d2e7825cca193')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/extra/libbonobo/PKGBUILD b/abs/extra/libbonobo/PKGBUILD
index de48e25..c061ba4 100644
--- a/abs/extra/libbonobo/PKGBUILD
+++ b/abs/extra/libbonobo/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 29425 2009-03-08 17:32:56Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonobo
-pkgver=2.24.3
+pkgver=2.32.1
 pkgrel=1
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('orbit2>=2.14.17' 'libxml2>=2.7.3' 'dbus-glib>=0.78')
+depends=('orbit2' 'libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig' 'flex')
 options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
-replaces=('bonobo-activation')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-${pkgver}.tar.bz2
 	bonobo-activation-config.xml)
 install=libbonobo.install
+sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b'
+            '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-	      --libexecdir=/usr/lib/bonobo || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1
+	      --libexecdir=/usr/lib/bonobo
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/"
 }
-md5sums=('b217cef6a187505290c66c5bf8225d38'
-         '6392efaca30a26f826eafc4b8ccbc01f')
diff --git a/abs/extra/libbonobo/bonobo-activation-config.xml b/abs/extra/libbonobo/bonobo-activation-config.xml
index 65ee75f..3db19f7 100644
--- a/abs/extra/libbonobo/bonobo-activation-config.xml
+++ b/abs/extra/libbonobo/bonobo-activation-config.xml
@@ -5,7 +5,6 @@
 <searchpath>
     <!-- Examples: -->
     <item>/usr/lib/bonobo/servers</item>
-    <item>/opt/gnome/lib/bonobo/servers</item>
     <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> -->
     <!-- <item>/usr/local/lib/bonobo/servers</item> -->
     <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> -->
diff --git a/abs/extra/libbonobo/libbonobo.install b/abs/extra/libbonobo/libbonobo.install
index 1794e4a..5cc04eb 100644
--- a/abs/extra/libbonobo/libbonobo.install
+++ b/abs/extra/libbonobo/libbonobo.install
@@ -1,7 +1,3 @@
-post_install() {
-  /bin/true
-}
-
 post_upgrade() {
   ldconfig -r .
   PID=`pidof bonobo-activation-server`
@@ -9,15 +5,3 @@ post_upgrade() {
     killall -HUP bonobo-activation-server 2>&1
   fi
 }
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/libbonoboui/PKGBUILD b/abs/extra/libbonoboui/PKGBUILD
index 7118102..fd99d28 100644
--- a/abs/extra/libbonoboui/PKGBUILD
+++ b/abs/extra/libbonoboui/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 29428 2009-03-08 17:35:50Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonoboui
-pkgver=2.24.3
+pkgver=2.24.5
 pkgrel=1
 pkgdesc="User Interface library for Bonobo"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('libgnomecanvas>=2.20.1.1' 'libgnome>=2.24.1')
-makedepends=('perlxml' 'pkgconfig')
+depends=('libgnomecanvas' 'libgnome')
+makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --localstatedir=/var --disable-static
+  make
+  make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
 }
-md5sums=('3a754b1df0a4d5fd4836a05020a0bb4a')
diff --git a/abs/extra/libgnomecanvas/PKGBUILD b/abs/extra/libgnomecanvas/PKGBUILD
index 7e419ed..9a5fac2 100644
--- a/abs/extra/libgnomecanvas/PKGBUILD
+++ b/abs/extra/libgnomecanvas/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 30223 2009-03-17 18:18:11Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomecanvas
-pkgver=2.26.0
+pkgver=2.30.3
 pkgrel=1
 pkgdesc="The GNOME Canvas library"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20')
+depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9bbc635e5ae70e63af071af74ba7e72f')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --disable-static \
+      --enable-glade
+  make
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/extra/libidl2/PKGBUILD b/abs/extra/libidl2/PKGBUILD
index 488909a..3e78a0b 100644
--- a/abs/extra/libidl2/PKGBUILD
+++ b/abs/extra/libidl2/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 30208 2009-03-17 17:59:14Z jgc $
+# $Id$
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=libidl2
-pkgver=0.8.13
+pkgver=0.8.14
 pkgrel=1
 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.20.0' 'texinfo')
+depends=('glib2>=2.24.0' 'texinfo')
 makedepends=('pkgconfig')
 install=libidl2.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2)
 url="http://www.gnome.org"
-md5sums=('b43b289a859eb38a710f70622c46e571')
+sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220')
 
 build() {
   cd "${srcdir}/libIDL-${pkgver}"
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  
+
   rm -f "${pkgdir}/usr/share/info/dir"
   gzip -9nf "${pkgdir}/usr/share/info/"*
 }
diff --git a/abs/extra/libmms/PKGBUILD b/abs/extra/libmms/PKGBUILD
index 230b082..d0101a6 100644
--- a/abs/extra/libmms/PKGBUILD
+++ b/abs/extra/libmms/PKGBUILD
@@ -2,20 +2,24 @@
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmms
-pkgver=0.5
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="MMS stream protocol library"
 arch=(i686 x86_64)
-url="https://launchpad.net/libmms"
+url="http://sourceforge.net/projects/libmms/"
 license=(LGPL)
-depends=('glib2>=2.16.4')
+depends=('glib2')
 options=('!libtool')
-source=(http://launchpad.net/libmms/trunk/${pkgver}/+download/libmms-${pkgver}.tar.gz)
+source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9f63aa363deb4874e072a45850161bff')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('cf83053ec891f14e73a04c84d9de08ee')
diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD
index dcd999f..18c2971 100644
--- a/abs/extra/libva/PKGBUILD
+++ b/abs/extra/libva/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 pkgname=libva
-pkgver=1.0.7
+pkgver=1.0.14
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
@@ -11,14 +11,11 @@ depends=('libgl' 'libdrm>=2.4.23' 'libxfixes')
 makedepends=('mesa')
 optdepends=('vdpau-video: VDPAU backend for VA API')
 options=('!libtool')
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2
-        libva-dont-install-tests.patch)
-md5sums=('3903b0463e2892f8afbd631daa5619ae'
-         '0a9bd14c36545c0e9819dfe32ea80f41')
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch"
   ./autogen.sh
   ./configure --prefix=/usr  \
     --enable-i965-driver \
@@ -33,4 +30,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-
diff --git a/abs/extra/libva/libva-dont-install-tests.patch b/abs/extra/libva/libva-dont-install-tests.patch
deleted file mode 100644
index 43e4cba..0000000
--- a/abs/extra/libva/libva-dont-install-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Don't install some useeless tests programs
-
-
---- test/basic/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
-+++ test/basic/Makefile.am	2010-03-10 13:36:50.449834525 -0500
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
-+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
- 		test_07 test_08 test_09 test_10 test_11
- 
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
---- test/decode/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
-+++ test/decode/Makefile.am	2010-03-10 13:37:09.636843464 -0500
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--bin_PROGRAMS = mpeg2vldemo
-+check_PROGRAMS = mpeg2vldemo
- 
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
- 
---- test/encode/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
-+++ test/encode/Makefile.am	2010-03-10 13:37:26.701846294 -0500
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--bin_PROGRAMS = h264encode
-+check_PROGRAMS = h264encode
- 
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
- 
---- test/putsurface/Makefile.am~	2010-03-10 13:18:55.270697040 -0500
-+++ test/putsurface/Makefile.am	2010-03-10 13:38:08.106713556 -0500
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--bin_PROGRAMS = putsurface
-+check_PROGRAMS = putsurface
- 
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
- 
diff --git a/abs/extra/libva/patch1.patch b/abs/extra/libva/patch1.patch
deleted file mode 100644
index b455857..0000000
--- a/abs/extra/libva/patch1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/basic/Makefile.am.orig	2010-11-10 00:34:13.000000000 +0000
-+++ test/basic/Makefile.am	2010-11-10 00:34:54.000000000 +0000
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
-+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
- 		test_07 test_08 test_09 test_10 test_11
- 
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
diff --git a/abs/extra/libwnck/PKGBUILD b/abs/extra/libwnck/PKGBUILD
deleted file mode 100644
index f7e8baa..0000000
--- a/abs/extra/libwnck/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 99757 2010-11-17 12:00:58Z ibiru $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-pkgname=libwnck
-pkgver=2.30.6
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk2>=2.22.0' 'startup-notification>=0.10' 'libxres' 'gdk-pixbuf2')
-makedepends=('libxt>=1.0.6' 'intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make || return 1
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra/libxfce4util/PKGBUILD b/abs/extra/libxfce4util/PKGBUILD
deleted file mode 100644
index dea44e6..0000000
--- a/abs/extra/libxfce4util/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 80806 2010-05-22 12:57:44Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfce4util
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="Basic utility non-GUI functions for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-depends=("glib2>=2.24.1")
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9c3129d827d480f0906c575e7a13f1e9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/libxfcegui4/PKGBUILD b/abs/extra/libxfcegui4/PKGBUILD
deleted file mode 100644
index c947d2f..0000000
--- a/abs/extra/libxfcegui4/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 80816 2010-05-22 13:17:01Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfcegui4
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="Various gtk widgets for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-depends=('startup-notification' "xfconf>=4.6.2" "libglade>=2.6.4" 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88de59b222cb9977f93a4c61011c1e1f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static # --enable-xinerama
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/libxfcegui4/libxfcegui4.install b/abs/extra/libxfcegui4/libxfcegui4.install
deleted file mode 100644
index fee9e5d..0000000
--- a/abs/extra/libxfcegui4/libxfcegui4.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/abs/extra/miro/PKGBUILD b/abs/extra/miro/PKGBUILD
index df3e83c..e0a8d7f 100644
--- a/abs/extra/miro/PKGBUILD
+++ b/abs/extra/miro/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=3.5
+pkgver=4.0.2
 pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'gnome-python'
 makedepends=('pkgconfig')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('a5e72b39e3a1bb5ec918bd8fddeb6b079f44c9b3')
+sha1sums=('22342897ca748fa19738c9c1c510510f314fa7eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/linux"
diff --git a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz b/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz
deleted file mode 120000
index fd34bee..0000000
--- a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/mkvtoolnix-4.9.1-1.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz b/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz
deleted file mode 120000
index 8b28405..0000000
--- a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/packages/mkvtoolnix-4.9.1-2.src.tar.gz
-\ No newline at end of file
diff --git a/abs/extra/mpd/PKGBUILD b/abs/extra/mpd/PKGBUILD
deleted file mode 100644
index 302126b..0000000
--- a/abs/extra/mpd/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 98460 2010-11-09 13:34:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.15.15
-pkgrel=1
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'libsamplerate' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag')
-makedepends=('pkgconfig')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd')
-md5sums=('af0972af6237771acc420d2452fa627a'
-         'e5669c2bff4031928531e52475addeb1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lastfm \
-    --disable-cue \
-    --disable-sidplay \
-    --disable-pulse
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # set ours dirs in mpd.conf file
-  sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
-  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
-  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
-  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
-  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
-  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
-  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
-  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
-  install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example
-
-  install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd
-  install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd}
-}
diff --git a/abs/extra/mpd/mpd b/abs/extra/mpd/mpd
deleted file mode 100755
index 6134e2e..0000000
--- a/abs/extra/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/mpd/mpd.install b/abs/extra/mpd/mpd.install
deleted file mode 100644
index 885505a..0000000
--- a/abs/extra/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/abs/extra/mythexport/PKGBUILD b/abs/extra/mythexport/PKGBUILD
index 3cd04f3..6fd3000 100644
--- a/abs/extra/mythexport/PKGBUILD
+++ b/abs/extra/mythexport/PKGBUILD
@@ -2,16 +2,40 @@
 # Maintainer: Cecil Watson<knoppmyth@gmail.com>
 
 pkgname=mythexport
-pkgver=2.0.71
-pkgrel=5
-pkgdesc="Script to export recordings for portable devices."
+pkgver=2.2.3
+pkgrel=1
+pkgdesc="Export MythTV recording to portable media players"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' 'perl-proc-daemon' 'perl-proc-pid-file')
-url="http://linhes.org/"
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythexport.tar.bz2)
+depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp'
+         'perl-proc-daemon' 'perl-proc-pid-file')
+optdepends=('lighttpd: For web based interaction')
+url="http://www.ubuntuupdates.org/mythexport"
+source=(https://launchpad.net/ubuntu/natty/+source/${pkgname}/${pkgver}-0ubuntu1/+files/${pkgname}_${pkgver}.orig.tar.gz
+        mythexport.lighttpd.include)
 install=mythexport.install
 
 build() {
-  cp -a mythexport/* $startdir/pkg
+
+  /bin/true
+
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  cp -a ./usr ${pkgdir}/ || return 1
+
+  # Install lighttpd include file
+  install -D -m644 ${srcdir}/mythexport.lighttpd.include ${pkgdir}/etc/mythexport/mythexport.lighttpd.include
+
+  # Compress man pages
+  gzip -9 *.1
+  install -D -m644 mythexport.1.gz ${pkgdir}/usr/share/man/man1/mythexport.1.gz || return 1
+  install -D -m644 mythimport.1.gz ${pkgdir}/usr/share/man/man1/mythimport.1.gz || return 1
+
+  # Standard GPL3 license text already in distro
+  rm -f ${pkgdir}/COPYING
+
 }
+md5sums=('a780c00536a4680ce7d79057658971c8'
+         'b08404255abcc99a35e9c1ab8e0dec57')
diff --git a/abs/extra/mythexport/mythexport.install b/abs/extra/mythexport/mythexport.install
index edd60f5..a6a2085 100644
--- a/abs/extra/mythexport/mythexport.install
+++ b/abs/extra/mythexport/mythexport.install
@@ -3,8 +3,73 @@ post_install() {
 	mysql -u root mythconverg < /usr/share/mythtv/mythexport.sql
 	ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs/
 	ln -s /myth/archive /usr/share/mythtv/mythexport/video
+
+  COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include`
+
+  if [ $COUNT == 0 ] ; then
+    echo "==> Adding mythexport.lighttpd.include to conf.include"
+    echo "include \"/etc/mythexport/mythexport.lighttpd.include\"" >> \
+         /etc/lighttpd/conf.include
+  fi
+
+  echo ""
+  echo "==> Forcing a re-read of lighttpd's configuration file."
+  echo ""
+    /sbin/sv hup /service/lighttpd
+
+  echo ""
+  echo "==> Add the mythexport service to start the mythexport daemon"
+  echo "==> $ sudo add_service.sh mythexport"
+  echo ""
+
+  echo ""
+  echo "==> For move information on setup and configuration:"
+  echo "==> http://www.linhes.org/bugs/projects/linhes/wiki/HOWTO_Setup_MythExport_for_iPod"
+  echo ""
+
+}
+
+post_upgrade() {
+
+  COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include`
+
+  if [ $COUNT == 0 ] ; then
+    echo "==> Adding mythexport.lighttpd.include to conf.include"
+    echo "include \"/etc/mythexport/mythexport.lighttpd.include\"" >> \
+         /etc/lighttpd/conf.include
+  fi
+
+  echo ""
+  echo "==> Forcing a re-read of lighttpd's configuration file."
+  echo ""
+    /sbin/sv hup /service/lighttpd
+
 }
 
+pre_remove() {
+
+  remove_service.sh mythexport
+
+}
+
+post_remove() {
+
+  COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include`
+
+  if [ $COUNT -gt 0 ] ; then
+    echo "==> Removing mythexport.lighttpd.include from conf.include"
+    sed -e 's#include \"/etc/mythexport/mythexport.lighttpd.include\"##' -i \
+         /etc/lighttpd/conf.include
+  fi
+
+  echo ""
+  echo "==> Forcing re-read of lighttpd's configuration file."
+  echo ""
+    /sbin/sv hup /service/lighttpd
+}
+
+
+
 op=$1
 shift
 $op $*
diff --git a/abs/extra/mythexport/mythexport.lighttpd.include b/abs/extra/mythexport/mythexport.lighttpd.include
new file mode 100644
index 0000000..b846507
--- /dev/null
+++ b/abs/extra/mythexport/mythexport.lighttpd.include
@@ -0,0 +1,3 @@
+$HTTP["url"] =~ "/mythexport/" {
+        cgi.assign = ( ".cgi" => "/usr/bin/perl" )
+      }
diff --git a/abs/extra/openmpi/PKGBUILD b/abs/extra/openmpi/PKGBUILD
new file mode 100644
index 0000000..7dd1084
--- /dev/null
+++ b/abs/extra/openmpi/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+pkgname=openmpi
+pkgver=1.5.3
+pkgrel=4
+pkgdesc="High performance message passing library (MPI)"
+arch=('i686' 'x86_64')
+url="http://www.open-mpi.org"
+license=('custom')
+depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
+makedepends=('net-tools')
+options=(!libtool)
+source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('669565c708deab82ad4069d82675b2020eb0e0c6')
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --mandir=/usr/share/man \
+               --enable-mpi-f90 \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-mpi-threads \
+               --enable-smp-locks \
+               --with-valgrind \
+               --enable-memchecker \
+               --enable-debug \
+               --enable-pretty-print-stacktrace \
+               --without-slurm \
+               --with-hwloc=external \
+               --with-libltdl=/usr \
+               FC=/usr/bin/gfortran \
+               LDFLAGS='-Wl,-z,noexecstack'
+
+   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+
+   # Openmpi's otfinfo conflicts with the one from texlive
+   mv "${pkgdir}"/usr/bin/otfinfo "${pkgdir}"/usr/bin/otfinfompi
+
+   # Openmpi's otfdump conflicts with the one from libotf
+   mv "${pkgdir}"/usr/bin/otfdump "${pkgdir}"/usr/bin/otfdumpompi
+
+   # Symlink points to non-existing ortec++.1
+   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
+
+   install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d
+   echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
+
+   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/abs/extra/polkit-gnome/PKGBUILD b/abs/extra/polkit-gnome/PKGBUILD
deleted file mode 100644
index f9b3607..0000000
--- a/abs/extra/polkit-gnome/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=polkit-gnome
-pkgver=0.97
-pkgrel=1
-pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-license=('LGPL')
-depends=('polkit>=0.98' 'gtk2>=2.21.8')
-makedepends=('intltool')
-replaces=('policykit-gnome')
-options=(!libtool !makeflags)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('17a75ee1aafa19ae4f79052c8cde75b6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/OnlyShowIn=GNOME/NotShowIn=KDE/' src/polkit-gnome-authentication-agent-1.desktop.in.in
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \
-      --disable-static --disable-introspection
-  make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra/polkit/PKGBUILD b/abs/extra/polkit/PKGBUILD
index 62f3f8b..3a55ddc 100644
--- a/abs/extra/polkit/PKGBUILD
+++ b/abs/extra/polkit/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 90717 2010-09-15 14:26:53Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.98
-pkgrel=1
+pkgver=0.101
+pkgrel=2
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2>=2.25.15' 'pam' 'expat>=2.0.1')
-makedepends=('intltool>=0.41.1' 'gtk-doc>=1.15' 'gobject-introspection>=0.9.5')
+depends=('glib2' 'pam' 'expat')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 replaces=('policykit')
 options=('!libtool')
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        polkit-git-fixes.patch
+        CVE-2011-1485.patch
         polkit.pam)
-md5sums=('96e583a1177ba5436f034a2fee55f5fa'
-         'c5aaa13d6eeda5cec224b273acba9420'
+md5sums=('f925ac93aba3c072977370c1e27feb7f'
+         '4d858b8ab602614d7db2bc8574f6fd29'
          '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/polkit-git-fixes.patch"
-  libtoolize --force
-  autoreconf
+  patch -Np1 -i "${srcdir}/CVE-2011-1485.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
       --disable-static --enable-gtk-doc
diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.1 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.1
deleted file mode 100644
index 3d40277..0000000
--- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.1
+++ /dev/null
@@ -1,403 +0,0 @@
-patching file src/polkit/polkitcheckauthorizationflags.h
-patching file src/polkit/polkiterror.h
-patching file src/polkit/polkitimplicitauthorization.h
-patching file src/polkitagent/Makefile.am
-patching file src/polkitagent/polkitagenthelperprivate.c
-patching file src/polkitbackend/polkitbackendsessionmonitor.c
-libtoolize: putting auxiliary files in `.'.
-libtoolize: linking file `./ltmain.sh'
-libtoolize: You should add the contents of the following files to `aclocal.m4':
-libtoolize:   `/usr/share/aclocal/libtool.m4'
-libtoolize:   `/usr/share/aclocal/ltoptions.m4'
-libtoolize:   `/usr/share/aclocal/ltversion.m4'
-libtoolize:   `/usr/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
-libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
-libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
-/usr/share/aclocal/libxosd.m4:9:   run info '(automake)Extending aclocal'
-/usr/share/aclocal/libxosd.m4:9:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
-checking for a BSD-compatible install... /bin/install -c
-checking whether build environment is sane... yes
-checking for a thread-safe mkdir -p... /bin/mkdir -p
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking whether to enable maintainer-specific portions of Makefiles... no
-checking for style of include used by make... GNU
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking dependency style of gcc... gcc3
-checking for library containing strerror... none required
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /bin/grep
-checking for egrep... /bin/grep -E
-checking for ANSI C header files... yes
-checking build system type... i686-pc-linux-gnu
-checking host system type... i686-pc-linux-gnu
-checking how to print strings... printf
-checking for a sed that does not truncate output... /bin/sed
-checking for fgrep... /bin/grep -F
-checking for ld used by gcc... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
-checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
-checking the name lister (/usr/bin/nm -B) interface... BSD nm
-checking whether ln -s works... yes
-checking the maximum length of command line arguments... 1572864
-checking whether the shell understands some XSI constructs... yes
-checking whether the shell understands "+="... yes
-checking for /usr/bin/ld option to reload object files... -r
-checking for objdump... objdump
-checking how to recognize dependent libraries... pass_all
-checking for ar... ar
-checking for strip... strip
-checking for ranlib... ranlib
-checking command to parse /usr/bin/nm -B output from gcc object... ok
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking for dlfcn.h... yes
-checking for objdir... .libs
-checking if gcc supports -fno-rtti -fno-exceptions... no
-checking for gcc option to produce PIC... -fPIC -DPIC
-checking if gcc PIC flag -fPIC -DPIC works... yes
-checking if gcc static flag -static works... yes
-checking if gcc supports -c -o file.o... yes
-checking if gcc supports -c -o file.o... (cached) yes
-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
-checking whether -lc should be explicitly linked in... no
-checking dynamic linker characteristics... GNU/Linux ld.so
-checking how to hardcode library paths into programs... immediate
-checking whether stripping libraries is possible... yes
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-checking whether make sets $(MAKE)... (cached) yes
-checking whether ln -s works... yes
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... 64
-checking whether gcc and cc understand -c and -o together... yes
-checking for xsltproc... /usr/bin/xsltproc
-checking for pkg-config... /usr/bin/pkg-config
-checking pkg-config is at least version 0.9.0... yes
-checking for gtkdoc-check... /usr/bin/gtkdoc-check
-checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
-checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
-checking whether to build gtk-doc documentation... yes
-checking for GLIB... yes
-checking expat.h usability... yes
-checking expat.h presence... yes
-checking for expat.h... yes
-checking for XML_ParserCreate in -lexpat... yes
-checking for clearenv... yes
-checking for pam_start in -lpam... yes
-checking for sigtimedwait in -lc... yes
-checking how to call pam_strerror... two arguments
-checking security/pam_modutil.h usability... yes
-checking security/pam_modutil.h presence... yes
-checking for security/pam_modutil.h... yes
-checking security/pam_ext.h usability... yes
-checking security/pam_ext.h presence... yes
-checking for security/pam_ext.h... yes
-checking for pam_vsyslog in -lpam... yes
-checking for /etc/redhat-release... no
-checking for /etc/SuSE-release... no
-checking for /etc/gentoo-release... no
-checking for /etc/pardus-release... no
-Linux distribution autodetection failed, specify the distribution to target using --with-os-type=
-checking for INTROSPECTION... yes
-checking whether NLS is requested... yes
-checking for intltool >= 0.40.0... 0.41.1 found
-checking for intltool-update... /usr/bin/intltool-update
-checking for intltool-merge... /usr/bin/intltool-merge
-checking for intltool-extract... /usr/bin/intltool-extract
-checking for xgettext... /usr/bin/xgettext
-checking for msgmerge... /usr/bin/msgmerge
-checking for msgfmt... /usr/bin/msgfmt
-checking for gmsgfmt... /usr/bin/msgfmt
-checking for perl... /usr/bin/perl
-checking for perl >= 5.8.1... 5.12.1
-checking for XML::Parser... ok
-checking locale.h usability... yes
-checking locale.h presence... yes
-checking for locale.h... yes
-checking for LC_MESSAGES... yes
-checking libintl.h usability... yes
-checking libintl.h presence... yes
-checking for libintl.h... yes
-checking for ngettext in libc... yes
-checking for dgettext in libc... yes
-checking for bind_textdomain_codeset... yes
-checking for msgfmt... (cached) /usr/bin/msgfmt
-checking for dcgettext... yes
-checking if msgfmt accepts -c... yes
-checking for gmsgfmt... (cached) /usr/bin/msgfmt
-checking for xgettext... (cached) /usr/bin/xgettext
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating actions/Makefile
-config.status: creating data/Makefile
-config.status: creating data/polkit-1
-config.status: creating data/polkit-gobject-1.pc
-config.status: creating data/polkit-backend-1.pc
-config.status: creating data/polkit-agent-1.pc
-config.status: creating src/Makefile
-config.status: creating src/polkit/Makefile
-config.status: creating src/polkitbackend/Makefile
-config.status: creating src/polkitagent/Makefile
-config.status: creating src/polkitd/Makefile
-config.status: creating src/programs/Makefile
-config.status: creating src/examples/Makefile
-config.status: creating src/nullbackend/Makefile
-config.status: creating docs/version.xml
-config.status: creating docs/extensiondir.xml
-config.status: creating docs/Makefile
-config.status: creating docs/polkit/Makefile
-config.status: creating docs/man/Makefile
-config.status: creating po/Makefile.in
-config.status: creating config.h
-config.status: executing depfiles commands
-config.status: executing libtool commands
-config.status: executing default-1 commands
-config.status: executing po/stamp-it commands
-
-                  polkit 0.98
-                =================
-
-        prefix:                     /usr
-        libdir:                     ${exec_prefix}/lib
-        libexecdir:                 /usr/lib/polkit-1
-        bindir:                     ${exec_prefix}/bin
-        sbindir:                    ${exec_prefix}/sbin
-        datadir:                    ${datarootdir}
-        sysconfdir:                 /etc
-        localstatedir:              /var
-        docdir:                     ${datarootdir}/doc/${PACKAGE_TARNAME}
-
-        compiler:                   gcc
-        cflags:                     -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security
-        cppflags:                   
-        xsltproc:                   /usr/bin/xsltproc
-	introspection:		    yes
-
-        Distribution/OS:            unknown
-        authentication framework:   pam
-        PAM support:                yes
-
-        PAM file auth:              system-auth
-        PAM file account:           system-auth
-        PAM file password:          system-auth
-        PAM file session:           system-auth
-
-        Maintainer mode:            no
-        Building verbose mode:      no
-        Building api docs:          yes
-        Building man pages:         yes
-
-
-NOTE: The directory /etc/polkit-1/localauthority must be owned
-      by root and have mode 700
-
-NOTE: The directory /var/lib/polkit-1 must be owned
-      by root and have mode 700
-
-NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned
-      by root and have mode 4755 (setuid root binary)
-
-NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and
-      have mode 4755 (setuid root binary)
-
-make  all-recursive
-make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-Making all in actions
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy
-Generating and caching the translation database
-Merging translations into org.freedesktop.policykit.policy.
-CREATED org.freedesktop.policykit.policy
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-Making all in data
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-Making all in src
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-  CC     libpolkit_gobject_1_la-polkitenumtypes.lo
-  CC     libpolkit_gobject_1_la-polkitactiondescription.lo
-  CC     libpolkit_gobject_1_la-polkitauthorityfeatures.lo
-  CC     libpolkit_gobject_1_la-polkitdetails.lo
-  CC     libpolkit_gobject_1_la-polkitauthority.lo
-  CC     libpolkit_gobject_1_la-polkiterror.lo
-  CC     libpolkit_gobject_1_la-polkitsubject.lo
-  CC     libpolkit_gobject_1_la-polkitunixprocess.lo
-  CC     libpolkit_gobject_1_la-polkitunixsession.lo
-  CC     libpolkit_gobject_1_la-polkitsystembusname.lo
-  CC     libpolkit_gobject_1_la-polkitidentity.lo
-  CC     libpolkit_gobject_1_la-polkitunixuser.lo
-  CC     libpolkit_gobject_1_la-polkitunixgroup.lo
-  CC     libpolkit_gobject_1_la-polkitauthorizationresult.lo
-  CC     libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo
-  CC     libpolkit_gobject_1_la-polkitimplicitauthorization.lo
-  CC     libpolkit_gobject_1_la-polkittemporaryauthorization.lo
-  CC     libpolkit_gobject_1_la-polkitpermission.lo
-  CCLD   libpolkit-gobject-1.la
-/usr/bin/g-ir-scanner -v 					\
-		--namespace Polkit 				\
-		--nsversion=1.0 				\
-		--include=Gio-2.0 				\
-		--library=polkit-gobject-1 			\
-		--output Polkit-1.0.gir 					\
-		--pkg=glib-2.0 					\
-		--pkg=gobject-2.0 				\
-		--pkg=gio-2.0 					\
-		--libtool=../../libtool		\
-                -I../../src	 			\
-	        -D_POLKIT_COMPILATION                   	\
-		./polkit.h 				\
-		./polkittypes.h 			\
-		./polkitactiondescription.h 		\
-		./polkitauthority.h 			\
-		./polkitauthorizationresult.h 		\
-		./polkitcheckauthorizationflags.h 	\
-		./polkitdetails.h 			\
-		./polkitenumtypes.h 			\
-		./polkiterror.h 			\
-		./polkitidentity.h 			\
-		./polkitimplicitauthorization.h 	\
-		./polkitsubject.h 			\
-		./polkitsystembusname.h 		\
-		./polkittemporaryauthorization.h 	\
-		./polkitunixgroup.h 			\
-		./polkitunixprocess.h 			\
-		./polkitunixsession.h 			\
-		./polkitunixuser.h 			\
-		./polkitpermission.h 			\
-		
-g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.c
-g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.o
-/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-Making all in polkitbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-  CC     libpolkit_backend_1_la-polkitbackendauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionpool.lo
-  CC     libpolkit_backend_1_la-polkitbackendsessionmonitor.lo
-  CC     libpolkit_backend_1_la-polkitbackendconfigsource.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionlookup.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo
-  CCLD   libpolkit-backend-1.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-Making all in polkitagent
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitagentenumtypes.c.template polkitagentlistener.h) > \
-	   polkitagentenumtypes.c.tmp && mv polkitagentenumtypes.c.tmp polkitagentenumtypes.c
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitagentenumtypes.h.template polkitagentlistener.h) > \
-	   polkitagentenumtypes.h.tmp && mv polkitagentenumtypes.h.tmp polkitagentenumtypes.h
-(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
-touch marshal.stamp
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-  CC     libpolkit_agent_1_la-polkitagentenumtypes.lo
-  CC     libpolkit_agent_1_la-polkitagentmarshal.lo
-  CC     libpolkit_agent_1_la-polkitagentsession.lo
-  CC     libpolkit_agent_1_la-polkitagenttextlistener.lo
-  CC     libpolkit_agent_1_la-polkitagentlistener.lo
-  CC     polkit_agent_helper_1-polkitagenthelperprivate.o
-  CC     polkit_agent_helper_1-polkitagenthelper-pam.o
-  CCLD   libpolkit-agent-1.la
-  CCLD   polkit-agent-helper-1
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-Making all in polkitd
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-  CC     polkitd-main.o
-  CC     polkitd-gposixsignal.o
-  CCLD   polkitd
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-Making all in nullbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-  CC     libnullbackend_la-nullbackend.lo
-  CC     libnullbackend_la-polkitbackendnullauthority.lo
-  CCLD   libnullbackend.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-Making all in programs
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-  CC     libpkexec_action_lookup_la-pkexec-action-lookup.lo
-  CC     pkexec-pkexec.o
-  CC     pkcheck-pkcheck.o
-  CC     pkaction-pkaction.o
-  CCLD   pkaction
-  CCLD   pkcheck
-  CCLD   libpkexec-action-lookup.la
-  CCLD   pkexec
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[3]: Nothing to be done for `all-am'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in docs
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-Making all in man
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl polkit.xml
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl polkitd.xml
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pklocalauthority.xml
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkexec.xml
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkcheck.xml
-Note: Writing polkitd.8
-Note: Writing pkcheck.1
-/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkaction.xml
-Note: Writing pkexec.1
-Note: Writing polkit.8
-Note: Writing pklocalauthority.8
-Note: Writing pkaction.1
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-gtk-doc: Scanning header files
-Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44.
-make[3]: *** [scan-build.stamp] Error 2
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-make[2]: *** [all-recursive] Error 1
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-make: *** [all] Error 2
-[1m    Aborting...(B[m
diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.2 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.2
deleted file mode 100644
index 5368acc..0000000
--- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.2
+++ /dev/null
@@ -1,386 +0,0 @@
-patching file src/polkit/polkitcheckauthorizationflags.h
-patching file src/polkit/polkiterror.h
-patching file src/polkit/polkitimplicitauthorization.h
-patching file src/polkitagent/Makefile.am
-patching file src/polkitagent/polkitagenthelperprivate.c
-patching file src/polkitbackend/polkitbackendsessionmonitor.c
-libtoolize: putting auxiliary files in `.'.
-libtoolize: linking file `./ltmain.sh'
-libtoolize: You should add the contents of the following files to `aclocal.m4':
-libtoolize:   `/usr/share/aclocal/libtool.m4'
-libtoolize:   `/usr/share/aclocal/ltoptions.m4'
-libtoolize:   `/usr/share/aclocal/ltversion.m4'
-libtoolize:   `/usr/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
-libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
-libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
-/usr/share/aclocal/libxosd.m4:9:   run info '(automake)Extending aclocal'
-/usr/share/aclocal/libxosd.m4:9:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
-checking for a BSD-compatible install... /bin/install -c
-checking whether build environment is sane... yes
-checking for a thread-safe mkdir -p... /bin/mkdir -p
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking whether to enable maintainer-specific portions of Makefiles... no
-checking for style of include used by make... GNU
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking dependency style of gcc... gcc3
-checking for library containing strerror... none required
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /bin/grep
-checking for egrep... /bin/grep -E
-checking for ANSI C header files... yes
-checking build system type... i686-pc-linux-gnu
-checking host system type... i686-pc-linux-gnu
-checking how to print strings... printf
-checking for a sed that does not truncate output... /bin/sed
-checking for fgrep... /bin/grep -F
-checking for ld used by gcc... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
-checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
-checking the name lister (/usr/bin/nm -B) interface... BSD nm
-checking whether ln -s works... yes
-checking the maximum length of command line arguments... 1572864
-checking whether the shell understands some XSI constructs... yes
-checking whether the shell understands "+="... yes
-checking for /usr/bin/ld option to reload object files... -r
-checking for objdump... objdump
-checking how to recognize dependent libraries... pass_all
-checking for ar... ar
-checking for strip... strip
-checking for ranlib... ranlib
-checking command to parse /usr/bin/nm -B output from gcc object... ok
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking for dlfcn.h... yes
-checking for objdir... .libs
-checking if gcc supports -fno-rtti -fno-exceptions... no
-checking for gcc option to produce PIC... -fPIC -DPIC
-checking if gcc PIC flag -fPIC -DPIC works... yes
-checking if gcc static flag -static works... yes
-checking if gcc supports -c -o file.o... yes
-checking if gcc supports -c -o file.o... (cached) yes
-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
-checking whether -lc should be explicitly linked in... no
-checking dynamic linker characteristics... GNU/Linux ld.so
-checking how to hardcode library paths into programs... immediate
-checking whether stripping libraries is possible... yes
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-checking whether make sets $(MAKE)... (cached) yes
-checking whether ln -s works... yes
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... 64
-checking whether gcc and cc understand -c and -o together... yes
-checking for xsltproc... /usr/bin/xsltproc
-checking for pkg-config... /usr/bin/pkg-config
-checking pkg-config is at least version 0.9.0... yes
-checking for gtkdoc-check... /usr/bin/gtkdoc-check
-checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
-checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
-checking whether to build gtk-doc documentation... yes
-checking for GLIB... yes
-checking expat.h usability... yes
-checking expat.h presence... yes
-checking for expat.h... yes
-checking for XML_ParserCreate in -lexpat... yes
-checking for clearenv... yes
-checking for pam_start in -lpam... yes
-checking for sigtimedwait in -lc... yes
-checking how to call pam_strerror... two arguments
-checking security/pam_modutil.h usability... yes
-checking security/pam_modutil.h presence... yes
-checking for security/pam_modutil.h... yes
-checking security/pam_ext.h usability... yes
-checking security/pam_ext.h presence... yes
-checking for security/pam_ext.h... yes
-checking for pam_vsyslog in -lpam... yes
-checking for /etc/redhat-release... no
-checking for /etc/SuSE-release... no
-checking for /etc/gentoo-release... no
-checking for /etc/pardus-release... no
-Linux distribution autodetection failed, specify the distribution to target using --with-os-type=
-checking for INTROSPECTION... yes
-checking whether NLS is requested... yes
-checking for intltool >= 0.40.0... 0.41.1 found
-checking for intltool-update... /usr/bin/intltool-update
-checking for intltool-merge... /usr/bin/intltool-merge
-checking for intltool-extract... /usr/bin/intltool-extract
-checking for xgettext... /usr/bin/xgettext
-checking for msgmerge... /usr/bin/msgmerge
-checking for msgfmt... /usr/bin/msgfmt
-checking for gmsgfmt... /usr/bin/msgfmt
-checking for perl... /usr/bin/perl
-checking for perl >= 5.8.1... 5.12.1
-checking for XML::Parser... ok
-checking locale.h usability... yes
-checking locale.h presence... yes
-checking for locale.h... yes
-checking for LC_MESSAGES... yes
-checking libintl.h usability... yes
-checking libintl.h presence... yes
-checking for libintl.h... yes
-checking for ngettext in libc... yes
-checking for dgettext in libc... yes
-checking for bind_textdomain_codeset... yes
-checking for msgfmt... (cached) /usr/bin/msgfmt
-checking for dcgettext... yes
-checking if msgfmt accepts -c... yes
-checking for gmsgfmt... (cached) /usr/bin/msgfmt
-checking for xgettext... (cached) /usr/bin/xgettext
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating actions/Makefile
-config.status: creating data/Makefile
-config.status: creating data/polkit-1
-config.status: creating data/polkit-gobject-1.pc
-config.status: creating data/polkit-backend-1.pc
-config.status: creating data/polkit-agent-1.pc
-config.status: creating src/Makefile
-config.status: creating src/polkit/Makefile
-config.status: creating src/polkitbackend/Makefile
-config.status: creating src/polkitagent/Makefile
-config.status: creating src/polkitd/Makefile
-config.status: creating src/programs/Makefile
-config.status: creating src/examples/Makefile
-config.status: creating src/nullbackend/Makefile
-config.status: creating docs/version.xml
-config.status: creating docs/extensiondir.xml
-config.status: creating docs/Makefile
-config.status: creating docs/polkit/Makefile
-config.status: creating docs/man/Makefile
-config.status: creating po/Makefile.in
-config.status: creating config.h
-config.status: config.h is unchanged
-config.status: executing depfiles commands
-config.status: executing libtool commands
-config.status: executing default-1 commands
-config.status: executing po/stamp-it commands
-
-                  polkit 0.98
-                =================
-
-        prefix:                     /usr
-        libdir:                     ${exec_prefix}/lib
-        libexecdir:                 /usr/lib/polkit-1
-        bindir:                     ${exec_prefix}/bin
-        sbindir:                    ${exec_prefix}/sbin
-        datadir:                    ${datarootdir}
-        sysconfdir:                 /etc
-        localstatedir:              /var
-        docdir:                     ${datarootdir}/doc/${PACKAGE_TARNAME}
-
-        compiler:                   gcc
-        cflags:                     -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security
-        cppflags:                   
-        xsltproc:                   /usr/bin/xsltproc
-	introspection:		    yes
-
-        Distribution/OS:            unknown
-        authentication framework:   pam
-        PAM support:                yes
-
-        PAM file auth:              system-auth
-        PAM file account:           system-auth
-        PAM file password:          system-auth
-        PAM file session:           system-auth
-
-        Maintainer mode:            no
-        Building verbose mode:      no
-        Building api docs:          yes
-        Building man pages:         yes
-
-
-NOTE: The directory /etc/polkit-1/localauthority must be owned
-      by root and have mode 700
-
-NOTE: The directory /var/lib/polkit-1 must be owned
-      by root and have mode 700
-
-NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned
-      by root and have mode 4755 (setuid root binary)
-
-NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and
-      have mode 4755 (setuid root binary)
-
-make  all-recursive
-make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-Making all in actions
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy
-Found cached translation database
-Merging translations into org.freedesktop.policykit.policy.
-CREATED org.freedesktop.policykit.policy
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-Making all in data
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-Making all in src
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-  CC     libpolkit_gobject_1_la-polkitenumtypes.lo
-  CC     libpolkit_gobject_1_la-polkitactiondescription.lo
-  CC     libpolkit_gobject_1_la-polkitauthorityfeatures.lo
-  CC     libpolkit_gobject_1_la-polkitdetails.lo
-  CC     libpolkit_gobject_1_la-polkitauthority.lo
-  CC     libpolkit_gobject_1_la-polkiterror.lo
-  CC     libpolkit_gobject_1_la-polkitsubject.lo
-  CC     libpolkit_gobject_1_la-polkitunixprocess.lo
-  CC     libpolkit_gobject_1_la-polkitunixsession.lo
-  CC     libpolkit_gobject_1_la-polkitsystembusname.lo
-  CC     libpolkit_gobject_1_la-polkitidentity.lo
-  CC     libpolkit_gobject_1_la-polkitunixuser.lo
-  CC     libpolkit_gobject_1_la-polkitunixgroup.lo
-  CC     libpolkit_gobject_1_la-polkitauthorizationresult.lo
-  CC     libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo
-  CC     libpolkit_gobject_1_la-polkitimplicitauthorization.lo
-  CC     libpolkit_gobject_1_la-polkittemporaryauthorization.lo
-  CC     libpolkit_gobject_1_la-polkitpermission.lo
-  CCLD   libpolkit-gobject-1.la
-/usr/bin/g-ir-scanner -v 					\
-		--namespace Polkit 				\
-		--nsversion=1.0 				\
-		--include=Gio-2.0 				\
-		--library=polkit-gobject-1 			\
-		--output Polkit-1.0.gir 					\
-		--pkg=glib-2.0 					\
-		--pkg=gobject-2.0 				\
-		--pkg=gio-2.0 					\
-		--libtool=../../libtool		\
-                -I../../src	 			\
-	        -D_POLKIT_COMPILATION                   	\
-		./polkit.h 				\
-		./polkittypes.h 			\
-		./polkitactiondescription.h 		\
-		./polkitauthority.h 			\
-		./polkitauthorizationresult.h 		\
-		./polkitcheckauthorizationflags.h 	\
-		./polkitdetails.h 			\
-		./polkitenumtypes.h 			\
-		./polkiterror.h 			\
-		./polkitidentity.h 			\
-		./polkitimplicitauthorization.h 	\
-		./polkitsubject.h 			\
-		./polkitsystembusname.h 		\
-		./polkittemporaryauthorization.h 	\
-		./polkitunixgroup.h 			\
-		./polkitunixprocess.h 			\
-		./polkitunixsession.h 			\
-		./polkitunixuser.h 			\
-		./polkitpermission.h 			\
-		
-g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.c
-g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.o
-/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-Making all in polkitbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-  CC     libpolkit_backend_1_la-polkitbackendauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionpool.lo
-  CC     libpolkit_backend_1_la-polkitbackendsessionmonitor.lo
-  CC     libpolkit_backend_1_la-polkitbackendconfigsource.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionlookup.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo
-  CCLD   libpolkit-backend-1.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-Making all in polkitagent
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
-(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
-touch marshal.stamp
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-  CC     libpolkit_agent_1_la-polkitagentenumtypes.lo
-  CC     libpolkit_agent_1_la-polkitagentmarshal.lo
-  CC     libpolkit_agent_1_la-polkitagentsession.lo
-  CC     libpolkit_agent_1_la-polkitagentlistener.lo
-  CC     libpolkit_agent_1_la-polkitagenttextlistener.lo
-  CC     polkit_agent_helper_1-polkitagenthelperprivate.o
-  CC     polkit_agent_helper_1-polkitagenthelper-pam.o
-  CCLD   libpolkit-agent-1.la
-  CCLD   polkit-agent-helper-1
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-Making all in polkitd
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-  CC     polkitd-main.o
-  CCLD   polkitd
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-Making all in nullbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-  CC     libnullbackend_la-nullbackend.lo
-  CC     libnullbackend_la-polkitbackendnullauthority.lo
-  CCLD   libnullbackend.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-Making all in programs
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-  CC     libpkexec_action_lookup_la-pkexec-action-lookup.lo
-  CC     pkexec-pkexec.o
-  CC     pkcheck-pkcheck.o
-  CC     pkaction-pkaction.o
-  CCLD   pkaction
-  CCLD   pkcheck
-  CCLD   libpkexec-action-lookup.la
-  CCLD   pkexec
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[3]: Nothing to be done for `all-am'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in docs
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-Making all in man
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-gtk-doc: Scanning header files
-Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44.
-make[3]: *** [scan-build.stamp] Error 2
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-make[2]: *** [all-recursive] Error 1
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-make: *** [all] Error 2
-[1m    Aborting...(B[m
diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.3 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.3
deleted file mode 100644
index ffa5596..0000000
--- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.3
+++ /dev/null
@@ -1,386 +0,0 @@
-patching file src/polkit/polkitcheckauthorizationflags.h
-patching file src/polkit/polkiterror.h
-patching file src/polkit/polkitimplicitauthorization.h
-patching file src/polkitagent/Makefile.am
-patching file src/polkitagent/polkitagenthelperprivate.c
-patching file src/polkitbackend/polkitbackendsessionmonitor.c
-libtoolize: putting auxiliary files in `.'.
-libtoolize: linking file `./ltmain.sh'
-libtoolize: You should add the contents of the following files to `aclocal.m4':
-libtoolize:   `/usr/share/aclocal/libtool.m4'
-libtoolize:   `/usr/share/aclocal/ltoptions.m4'
-libtoolize:   `/usr/share/aclocal/ltversion.m4'
-libtoolize:   `/usr/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
-libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
-libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
-/usr/share/aclocal/libxosd.m4:9:   run info '(automake)Extending aclocal'
-/usr/share/aclocal/libxosd.m4:9:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
-checking for a BSD-compatible install... /bin/install -c
-checking whether build environment is sane... yes
-checking for a thread-safe mkdir -p... /bin/mkdir -p
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking whether to enable maintainer-specific portions of Makefiles... no
-checking for style of include used by make... GNU
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking dependency style of gcc... gcc3
-checking for library containing strerror... none required
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /bin/grep
-checking for egrep... /bin/grep -E
-checking for ANSI C header files... yes
-checking build system type... i686-pc-linux-gnu
-checking host system type... i686-pc-linux-gnu
-checking how to print strings... printf
-checking for a sed that does not truncate output... /bin/sed
-checking for fgrep... /bin/grep -F
-checking for ld used by gcc... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
-checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
-checking the name lister (/usr/bin/nm -B) interface... BSD nm
-checking whether ln -s works... yes
-checking the maximum length of command line arguments... 1572864
-checking whether the shell understands some XSI constructs... yes
-checking whether the shell understands "+="... yes
-checking for /usr/bin/ld option to reload object files... -r
-checking for objdump... objdump
-checking how to recognize dependent libraries... pass_all
-checking for ar... ar
-checking for strip... strip
-checking for ranlib... ranlib
-checking command to parse /usr/bin/nm -B output from gcc object... ok
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking for dlfcn.h... yes
-checking for objdir... .libs
-checking if gcc supports -fno-rtti -fno-exceptions... no
-checking for gcc option to produce PIC... -fPIC -DPIC
-checking if gcc PIC flag -fPIC -DPIC works... yes
-checking if gcc static flag -static works... yes
-checking if gcc supports -c -o file.o... yes
-checking if gcc supports -c -o file.o... (cached) yes
-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
-checking whether -lc should be explicitly linked in... no
-checking dynamic linker characteristics... GNU/Linux ld.so
-checking how to hardcode library paths into programs... immediate
-checking whether stripping libraries is possible... yes
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-checking whether make sets $(MAKE)... (cached) yes
-checking whether ln -s works... yes
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... 64
-checking whether gcc and cc understand -c and -o together... yes
-checking for xsltproc... /usr/bin/xsltproc
-checking for pkg-config... /usr/bin/pkg-config
-checking pkg-config is at least version 0.9.0... yes
-checking for gtkdoc-check... /usr/bin/gtkdoc-check
-checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
-checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
-checking whether to build gtk-doc documentation... yes
-checking for GLIB... yes
-checking expat.h usability... yes
-checking expat.h presence... yes
-checking for expat.h... yes
-checking for XML_ParserCreate in -lexpat... yes
-checking for clearenv... yes
-checking for pam_start in -lpam... yes
-checking for sigtimedwait in -lc... yes
-checking how to call pam_strerror... two arguments
-checking security/pam_modutil.h usability... yes
-checking security/pam_modutil.h presence... yes
-checking for security/pam_modutil.h... yes
-checking security/pam_ext.h usability... yes
-checking security/pam_ext.h presence... yes
-checking for security/pam_ext.h... yes
-checking for pam_vsyslog in -lpam... yes
-checking for /etc/redhat-release... no
-checking for /etc/SuSE-release... no
-checking for /etc/gentoo-release... no
-checking for /etc/pardus-release... no
-Linux distribution autodetection failed, specify the distribution to target using --with-os-type=
-checking for INTROSPECTION... yes
-checking whether NLS is requested... yes
-checking for intltool >= 0.40.0... 0.41.1 found
-checking for intltool-update... /usr/bin/intltool-update
-checking for intltool-merge... /usr/bin/intltool-merge
-checking for intltool-extract... /usr/bin/intltool-extract
-checking for xgettext... /usr/bin/xgettext
-checking for msgmerge... /usr/bin/msgmerge
-checking for msgfmt... /usr/bin/msgfmt
-checking for gmsgfmt... /usr/bin/msgfmt
-checking for perl... /usr/bin/perl
-checking for perl >= 5.8.1... 5.12.1
-checking for XML::Parser... ok
-checking locale.h usability... yes
-checking locale.h presence... yes
-checking for locale.h... yes
-checking for LC_MESSAGES... yes
-checking libintl.h usability... yes
-checking libintl.h presence... yes
-checking for libintl.h... yes
-checking for ngettext in libc... yes
-checking for dgettext in libc... yes
-checking for bind_textdomain_codeset... yes
-checking for msgfmt... (cached) /usr/bin/msgfmt
-checking for dcgettext... yes
-checking if msgfmt accepts -c... yes
-checking for gmsgfmt... (cached) /usr/bin/msgfmt
-checking for xgettext... (cached) /usr/bin/xgettext
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating actions/Makefile
-config.status: creating data/Makefile
-config.status: creating data/polkit-1
-config.status: creating data/polkit-gobject-1.pc
-config.status: creating data/polkit-backend-1.pc
-config.status: creating data/polkit-agent-1.pc
-config.status: creating src/Makefile
-config.status: creating src/polkit/Makefile
-config.status: creating src/polkitbackend/Makefile
-config.status: creating src/polkitagent/Makefile
-config.status: creating src/polkitd/Makefile
-config.status: creating src/programs/Makefile
-config.status: creating src/examples/Makefile
-config.status: creating src/nullbackend/Makefile
-config.status: creating docs/version.xml
-config.status: creating docs/extensiondir.xml
-config.status: creating docs/Makefile
-config.status: creating docs/polkit/Makefile
-config.status: creating docs/man/Makefile
-config.status: creating po/Makefile.in
-config.status: creating config.h
-config.status: config.h is unchanged
-config.status: executing depfiles commands
-config.status: executing libtool commands
-config.status: executing default-1 commands
-config.status: executing po/stamp-it commands
-
-                  polkit 0.98
-                =================
-
-        prefix:                     /usr
-        libdir:                     ${exec_prefix}/lib
-        libexecdir:                 /usr/lib/polkit-1
-        bindir:                     ${exec_prefix}/bin
-        sbindir:                    ${exec_prefix}/sbin
-        datadir:                    ${datarootdir}
-        sysconfdir:                 /etc
-        localstatedir:              /var
-        docdir:                     ${datarootdir}/doc/${PACKAGE_TARNAME}
-
-        compiler:                   gcc
-        cflags:                     -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security
-        cppflags:                   
-        xsltproc:                   /usr/bin/xsltproc
-	introspection:		    yes
-
-        Distribution/OS:            unknown
-        authentication framework:   pam
-        PAM support:                yes
-
-        PAM file auth:              system-auth
-        PAM file account:           system-auth
-        PAM file password:          system-auth
-        PAM file session:           system-auth
-
-        Maintainer mode:            no
-        Building verbose mode:      no
-        Building api docs:          yes
-        Building man pages:         yes
-
-
-NOTE: The directory /etc/polkit-1/localauthority must be owned
-      by root and have mode 700
-
-NOTE: The directory /var/lib/polkit-1 must be owned
-      by root and have mode 700
-
-NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned
-      by root and have mode 4755 (setuid root binary)
-
-NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and
-      have mode 4755 (setuid root binary)
-
-make  all-recursive
-make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-Making all in actions
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy
-Found cached translation database
-Merging translations into org.freedesktop.policykit.policy.
-CREATED org.freedesktop.policykit.policy
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-Making all in data
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-Making all in src
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-  CC     libpolkit_gobject_1_la-polkitenumtypes.lo
-  CC     libpolkit_gobject_1_la-polkitactiondescription.lo
-  CC     libpolkit_gobject_1_la-polkitdetails.lo
-  CC     libpolkit_gobject_1_la-polkitauthorityfeatures.lo
-  CC     libpolkit_gobject_1_la-polkitauthority.lo
-  CC     libpolkit_gobject_1_la-polkiterror.lo
-  CC     libpolkit_gobject_1_la-polkitsubject.lo
-  CC     libpolkit_gobject_1_la-polkitunixprocess.lo
-  CC     libpolkit_gobject_1_la-polkitunixsession.lo
-  CC     libpolkit_gobject_1_la-polkitsystembusname.lo
-  CC     libpolkit_gobject_1_la-polkitidentity.lo
-  CC     libpolkit_gobject_1_la-polkitunixuser.lo
-  CC     libpolkit_gobject_1_la-polkitunixgroup.lo
-  CC     libpolkit_gobject_1_la-polkitauthorizationresult.lo
-  CC     libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo
-  CC     libpolkit_gobject_1_la-polkitimplicitauthorization.lo
-  CC     libpolkit_gobject_1_la-polkittemporaryauthorization.lo
-  CC     libpolkit_gobject_1_la-polkitpermission.lo
-  CCLD   libpolkit-gobject-1.la
-/usr/bin/g-ir-scanner -v 					\
-		--namespace Polkit 				\
-		--nsversion=1.0 				\
-		--include=Gio-2.0 				\
-		--library=polkit-gobject-1 			\
-		--output Polkit-1.0.gir 					\
-		--pkg=glib-2.0 					\
-		--pkg=gobject-2.0 				\
-		--pkg=gio-2.0 					\
-		--libtool=../../libtool		\
-                -I../../src	 			\
-	        -D_POLKIT_COMPILATION                   	\
-		./polkit.h 				\
-		./polkittypes.h 			\
-		./polkitactiondescription.h 		\
-		./polkitauthority.h 			\
-		./polkitauthorizationresult.h 		\
-		./polkitcheckauthorizationflags.h 	\
-		./polkitdetails.h 			\
-		./polkitenumtypes.h 			\
-		./polkiterror.h 			\
-		./polkitidentity.h 			\
-		./polkitimplicitauthorization.h 	\
-		./polkitsubject.h 			\
-		./polkitsystembusname.h 		\
-		./polkittemporaryauthorization.h 	\
-		./polkitunixgroup.h 			\
-		./polkitunixprocess.h 			\
-		./polkitunixsession.h 			\
-		./polkitunixuser.h 			\
-		./polkitpermission.h 			\
-		
-g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.c
-g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.o
-/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-Making all in polkitbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-  CC     libpolkit_backend_1_la-polkitbackendauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionpool.lo
-  CC     libpolkit_backend_1_la-polkitbackendsessionmonitor.lo
-  CC     libpolkit_backend_1_la-polkitbackendconfigsource.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionlookup.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo
-  CCLD   libpolkit-backend-1.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-Making all in polkitagent
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
-(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
-touch marshal.stamp
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-  CC     libpolkit_agent_1_la-polkitagentenumtypes.lo
-  CC     libpolkit_agent_1_la-polkitagentmarshal.lo
-  CC     libpolkit_agent_1_la-polkitagentsession.lo
-  CC     libpolkit_agent_1_la-polkitagentlistener.lo
-  CC     libpolkit_agent_1_la-polkitagenttextlistener.lo
-  CC     polkit_agent_helper_1-polkitagenthelperprivate.o
-  CC     polkit_agent_helper_1-polkitagenthelper-pam.o
-  CCLD   libpolkit-agent-1.la
-  CCLD   polkit-agent-helper-1
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-Making all in polkitd
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-  CC     polkitd-main.o
-  CCLD   polkitd
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-Making all in nullbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-  CC     libnullbackend_la-nullbackend.lo
-  CC     libnullbackend_la-polkitbackendnullauthority.lo
-  CCLD   libnullbackend.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-Making all in programs
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-  CC     libpkexec_action_lookup_la-pkexec-action-lookup.lo
-  CC     pkexec-pkexec.o
-  CC     pkcheck-pkcheck.o
-  CC     pkaction-pkaction.o
-  CCLD   pkaction
-  CCLD   pkcheck
-  CCLD   libpkexec-action-lookup.la
-  CCLD   pkexec
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[3]: Nothing to be done for `all-am'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in docs
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-Making all in man
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-gtk-doc: Scanning header files
-Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44.
-make[3]: *** [scan-build.stamp] Error 2
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-make[2]: *** [all-recursive] Error 1
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-make: *** [all] Error 2
-[1m    Aborting...(B[m
diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.4 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.4
deleted file mode 100644
index f390773..0000000
--- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.4
+++ /dev/null
@@ -1,386 +0,0 @@
-patching file src/polkit/polkitcheckauthorizationflags.h
-patching file src/polkit/polkiterror.h
-patching file src/polkit/polkitimplicitauthorization.h
-patching file src/polkitagent/Makefile.am
-patching file src/polkitagent/polkitagenthelperprivate.c
-patching file src/polkitbackend/polkitbackendsessionmonitor.c
-libtoolize: putting auxiliary files in `.'.
-libtoolize: linking file `./ltmain.sh'
-libtoolize: You should add the contents of the following files to `aclocal.m4':
-libtoolize:   `/usr/share/aclocal/libtool.m4'
-libtoolize:   `/usr/share/aclocal/ltoptions.m4'
-libtoolize:   `/usr/share/aclocal/ltversion.m4'
-libtoolize:   `/usr/share/aclocal/lt~obsolete.m4'
-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
-libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
-libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
-/usr/share/aclocal/libxosd.m4:9:   run info '(automake)Extending aclocal'
-/usr/share/aclocal/libxosd.m4:9:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
-checking for a BSD-compatible install... /bin/install -c
-checking whether build environment is sane... yes
-checking for a thread-safe mkdir -p... /bin/mkdir -p
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking whether to enable maintainer-specific portions of Makefiles... no
-checking for style of include used by make... GNU
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking dependency style of gcc... gcc3
-checking for library containing strerror... none required
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking for gcc... (cached) gcc
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc accepts -g... (cached) yes
-checking for gcc option to accept ISO C89... (cached) none needed
-checking dependency style of gcc... (cached) gcc3
-checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /bin/grep
-checking for egrep... /bin/grep -E
-checking for ANSI C header files... yes
-checking build system type... i686-pc-linux-gnu
-checking host system type... i686-pc-linux-gnu
-checking how to print strings... printf
-checking for a sed that does not truncate output... /bin/sed
-checking for fgrep... /bin/grep -F
-checking for ld used by gcc... /usr/bin/ld
-checking if the linker (/usr/bin/ld) is GNU ld... yes
-checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
-checking the name lister (/usr/bin/nm -B) interface... BSD nm
-checking whether ln -s works... yes
-checking the maximum length of command line arguments... 1572864
-checking whether the shell understands some XSI constructs... yes
-checking whether the shell understands "+="... yes
-checking for /usr/bin/ld option to reload object files... -r
-checking for objdump... objdump
-checking how to recognize dependent libraries... pass_all
-checking for ar... ar
-checking for strip... strip
-checking for ranlib... ranlib
-checking command to parse /usr/bin/nm -B output from gcc object... ok
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking for dlfcn.h... yes
-checking for objdir... .libs
-checking if gcc supports -fno-rtti -fno-exceptions... no
-checking for gcc option to produce PIC... -fPIC -DPIC
-checking if gcc PIC flag -fPIC -DPIC works... yes
-checking if gcc static flag -static works... yes
-checking if gcc supports -c -o file.o... yes
-checking if gcc supports -c -o file.o... (cached) yes
-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
-checking whether -lc should be explicitly linked in... no
-checking dynamic linker characteristics... GNU/Linux ld.so
-checking how to hardcode library paths into programs... immediate
-checking whether stripping libraries is possible... yes
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-checking whether make sets $(MAKE)... (cached) yes
-checking whether ln -s works... yes
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... 64
-checking whether gcc and cc understand -c and -o together... yes
-checking for xsltproc... /usr/bin/xsltproc
-checking for pkg-config... /usr/bin/pkg-config
-checking pkg-config is at least version 0.9.0... yes
-checking for gtkdoc-check... /usr/bin/gtkdoc-check
-checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
-checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
-checking whether to build gtk-doc documentation... yes
-checking for GLIB... yes
-checking expat.h usability... yes
-checking expat.h presence... yes
-checking for expat.h... yes
-checking for XML_ParserCreate in -lexpat... yes
-checking for clearenv... yes
-checking for pam_start in -lpam... yes
-checking for sigtimedwait in -lc... yes
-checking how to call pam_strerror... two arguments
-checking security/pam_modutil.h usability... yes
-checking security/pam_modutil.h presence... yes
-checking for security/pam_modutil.h... yes
-checking security/pam_ext.h usability... yes
-checking security/pam_ext.h presence... yes
-checking for security/pam_ext.h... yes
-checking for pam_vsyslog in -lpam... yes
-checking for /etc/redhat-release... no
-checking for /etc/SuSE-release... no
-checking for /etc/gentoo-release... no
-checking for /etc/pardus-release... no
-Linux distribution autodetection failed, specify the distribution to target using --with-os-type=
-checking for INTROSPECTION... yes
-checking whether NLS is requested... yes
-checking for intltool >= 0.40.0... 0.41.1 found
-checking for intltool-update... /usr/bin/intltool-update
-checking for intltool-merge... /usr/bin/intltool-merge
-checking for intltool-extract... /usr/bin/intltool-extract
-checking for xgettext... /usr/bin/xgettext
-checking for msgmerge... /usr/bin/msgmerge
-checking for msgfmt... /usr/bin/msgfmt
-checking for gmsgfmt... /usr/bin/msgfmt
-checking for perl... /usr/bin/perl
-checking for perl >= 5.8.1... 5.12.1
-checking for XML::Parser... ok
-checking locale.h usability... yes
-checking locale.h presence... yes
-checking for locale.h... yes
-checking for LC_MESSAGES... yes
-checking libintl.h usability... yes
-checking libintl.h presence... yes
-checking for libintl.h... yes
-checking for ngettext in libc... yes
-checking for dgettext in libc... yes
-checking for bind_textdomain_codeset... yes
-checking for msgfmt... (cached) /usr/bin/msgfmt
-checking for dcgettext... yes
-checking if msgfmt accepts -c... yes
-checking for gmsgfmt... (cached) /usr/bin/msgfmt
-checking for xgettext... (cached) /usr/bin/xgettext
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating actions/Makefile
-config.status: creating data/Makefile
-config.status: creating data/polkit-1
-config.status: creating data/polkit-gobject-1.pc
-config.status: creating data/polkit-backend-1.pc
-config.status: creating data/polkit-agent-1.pc
-config.status: creating src/Makefile
-config.status: creating src/polkit/Makefile
-config.status: creating src/polkitbackend/Makefile
-config.status: creating src/polkitagent/Makefile
-config.status: creating src/polkitd/Makefile
-config.status: creating src/programs/Makefile
-config.status: creating src/examples/Makefile
-config.status: creating src/nullbackend/Makefile
-config.status: creating docs/version.xml
-config.status: creating docs/extensiondir.xml
-config.status: creating docs/Makefile
-config.status: creating docs/polkit/Makefile
-config.status: creating docs/man/Makefile
-config.status: creating po/Makefile.in
-config.status: creating config.h
-config.status: config.h is unchanged
-config.status: executing depfiles commands
-config.status: executing libtool commands
-config.status: executing default-1 commands
-config.status: executing po/stamp-it commands
-
-                  polkit 0.98
-                =================
-
-        prefix:                     /usr
-        libdir:                     ${exec_prefix}/lib
-        libexecdir:                 /usr/lib/polkit-1
-        bindir:                     ${exec_prefix}/bin
-        sbindir:                    ${exec_prefix}/sbin
-        datadir:                    ${datarootdir}
-        sysconfdir:                 /etc
-        localstatedir:              /var
-        docdir:                     ${datarootdir}/doc/${PACKAGE_TARNAME}
-
-        compiler:                   gcc
-        cflags:                     -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security
-        cppflags:                   
-        xsltproc:                   /usr/bin/xsltproc
-	introspection:		    yes
-
-        Distribution/OS:            unknown
-        authentication framework:   pam
-        PAM support:                yes
-
-        PAM file auth:              system-auth
-        PAM file account:           system-auth
-        PAM file password:          system-auth
-        PAM file session:           system-auth
-
-        Maintainer mode:            no
-        Building verbose mode:      no
-        Building api docs:          yes
-        Building man pages:         yes
-
-
-NOTE: The directory /etc/polkit-1/localauthority must be owned
-      by root and have mode 700
-
-NOTE: The directory /var/lib/polkit-1 must be owned
-      by root and have mode 700
-
-NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned
-      by root and have mode 4755 (setuid root binary)
-
-NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and
-      have mode 4755 (setuid root binary)
-
-make  all-recursive
-make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-Making all in actions
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy
-Found cached translation database
-Merging translations into org.freedesktop.policykit.policy.
-CREATED org.freedesktop.policykit.policy
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions'
-Making all in data
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data'
-Making all in src
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c
-( top_builddir=`cd ../.. && pwd`; \
-	 cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \
-	   polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-  CC     libpolkit_gobject_1_la-polkitenumtypes.lo
-  CC     libpolkit_gobject_1_la-polkitactiondescription.lo
-  CC     libpolkit_gobject_1_la-polkitauthorityfeatures.lo
-  CC     libpolkit_gobject_1_la-polkitdetails.lo
-  CC     libpolkit_gobject_1_la-polkitauthority.lo
-  CC     libpolkit_gobject_1_la-polkiterror.lo
-  CC     libpolkit_gobject_1_la-polkitsubject.lo
-  CC     libpolkit_gobject_1_la-polkitunixprocess.lo
-  CC     libpolkit_gobject_1_la-polkitunixsession.lo
-  CC     libpolkit_gobject_1_la-polkitsystembusname.lo
-  CC     libpolkit_gobject_1_la-polkitidentity.lo
-  CC     libpolkit_gobject_1_la-polkitunixuser.lo
-  CC     libpolkit_gobject_1_la-polkitunixgroup.lo
-  CC     libpolkit_gobject_1_la-polkitauthorizationresult.lo
-  CC     libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo
-  CC     libpolkit_gobject_1_la-polkitimplicitauthorization.lo
-  CC     libpolkit_gobject_1_la-polkittemporaryauthorization.lo
-  CC     libpolkit_gobject_1_la-polkitpermission.lo
-  CCLD   libpolkit-gobject-1.la
-/usr/bin/g-ir-scanner -v 					\
-		--namespace Polkit 				\
-		--nsversion=1.0 				\
-		--include=Gio-2.0 				\
-		--library=polkit-gobject-1 			\
-		--output Polkit-1.0.gir 					\
-		--pkg=glib-2.0 					\
-		--pkg=gobject-2.0 				\
-		--pkg=gio-2.0 					\
-		--libtool=../../libtool		\
-                -I../../src	 			\
-	        -D_POLKIT_COMPILATION                   	\
-		./polkit.h 				\
-		./polkittypes.h 			\
-		./polkitactiondescription.h 		\
-		./polkitauthority.h 			\
-		./polkitauthorizationresult.h 		\
-		./polkitcheckauthorizationflags.h 	\
-		./polkitdetails.h 			\
-		./polkitenumtypes.h 			\
-		./polkiterror.h 			\
-		./polkitidentity.h 			\
-		./polkitimplicitauthorization.h 	\
-		./polkitsubject.h 			\
-		./polkitsystembusname.h 		\
-		./polkittemporaryauthorization.h 	\
-		./polkitunixgroup.h 			\
-		./polkitunixprocess.h 			\
-		./polkitunixsession.h 			\
-		./polkitunixuser.h 			\
-		./polkitpermission.h 			\
-		
-g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.c
-g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.o
-/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit'
-Making all in polkitbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-  CC     libpolkit_backend_1_la-polkitbackendauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthority.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionpool.lo
-  CC     libpolkit_backend_1_la-polkitbackendsessionmonitor.lo
-  CC     libpolkit_backend_1_la-polkitbackendconfigsource.lo
-  CC     libpolkit_backend_1_la-polkitbackendactionlookup.lo
-  CC     libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo
-  CCLD   libpolkit-backend-1.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend'
-Making all in polkitagent
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
-(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
-touch marshal.stamp
-make  all-am
-make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-  CC     libpolkit_agent_1_la-polkitagentenumtypes.lo
-  CC     libpolkit_agent_1_la-polkitagentmarshal.lo
-  CC     libpolkit_agent_1_la-polkitagentsession.lo
-  CC     libpolkit_agent_1_la-polkitagentlistener.lo
-  CC     libpolkit_agent_1_la-polkitagenttextlistener.lo
-  CC     polkit_agent_helper_1-polkitagenthelperprivate.o
-  CC     polkit_agent_helper_1-polkitagenthelper-pam.o
-  CCLD   libpolkit-agent-1.la
-  CCLD   polkit-agent-helper-1
-make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent'
-Making all in polkitd
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-  CC     polkitd-main.o
-  CCLD   polkitd
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd'
-Making all in nullbackend
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-  CC     libnullbackend_la-nullbackend.lo
-  CC     libnullbackend_la-polkitbackendnullauthority.lo
-  CCLD   libnullbackend.la
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend'
-Making all in programs
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-  CC     libpkexec_action_lookup_la-pkexec-action-lookup.lo
-  CC     pkexec-pkexec.o
-  CC     pkcheck-pkcheck.o
-  CC     pkaction-pkaction.o
-  CCLD   pkaction
-  CCLD   pkcheck
-  CCLD   libpkexec-action-lookup.la
-  CCLD   pkexec
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs'
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[3]: Nothing to be done for `all-am'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src'
-Making all in docs
-make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-Making all in man
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man'
-Making all in polkit
-make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-gtk-doc: Scanning header files
-Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44.
-make[3]: *** [scan-build.stamp] Error 2
-make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit'
-make[2]: *** [all-recursive] Error 1
-make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98'
-make: *** [all] Error 2
-[1m    Aborting...(B[m
diff --git a/abs/extra/polkit/polkit-git-fixes.patch b/abs/extra/polkit/polkit-git-fixes.patch
deleted file mode 100644
index a0d35e8..0000000
--- a/abs/extra/polkit/polkit-git-fixes.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/src/polkit/polkitcheckauthorizationflags.h b/src/polkit/polkitcheckauthorizationflags.h
-index 94aa070..4baa0d1 100644
---- a/src/polkit/polkitcheckauthorizationflags.h
-+++ b/src/polkit/polkitcheckauthorizationflags.h
-@@ -30,10 +30,6 @@
- 
- G_BEGIN_DECLS
- 
--GType polkit_check_authorization_flags_get_type (void) G_GNUC_CONST;
--
--#define POLKIT_TYPE_CHECK_AUTHORIZATION_FLAGS (polkit_check_authorization_flags_get_type ())
--
- /**
-  * PolkitCheckAuthorizationFlags:
-  * @POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE: No flags set.
-diff --git a/src/polkit/polkiterror.h b/src/polkit/polkiterror.h
-index b31583d..e49cabf 100644
---- a/src/polkit/polkiterror.h
-+++ b/src/polkit/polkiterror.h
-@@ -40,10 +40,6 @@ G_BEGIN_DECLS
- 
- GQuark polkit_error_quark (void);
- 
--GType polkit_error_get_type (void) G_GNUC_CONST;
--
--#define POLKIT_TYPE_ERROR (polkit_error_get_type ())
--
- /**
-  * PolkitError:
-  * @POLKIT_ERROR_FAILED: The operation failed.
-diff --git a/src/polkit/polkitimplicitauthorization.h b/src/polkit/polkitimplicitauthorization.h
-index 9e5c51c..dee2611 100644
---- a/src/polkit/polkitimplicitauthorization.h
-+++ b/src/polkit/polkitimplicitauthorization.h
-@@ -30,10 +30,6 @@
- 
- G_BEGIN_DECLS
- 
--GType polkit_implicit_authorization_get_type (void) G_GNUC_CONST;
--
--#define POLKIT_TYPE_IMPLICIT_AUTHORIZATION (polkit_implicit_authorization_get_type ())
--
- /**
-  * PolkitImplicitAuthorization:
-  * @POLKIT_IMPLICIT_AUTHORIZATION_UNKNOWN: Unknown whether the subject is authorized, never returned in any public API.
-diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
-index d2fc9c8..96ffd7c 100644
---- a/src/polkitagent/Makefile.am
-+++ b/src/polkitagent/Makefile.am
-@@ -46,6 +46,7 @@ libpolkit_agent_1includedir=$(includedir)/polkit-1/polkitagent
- 
- libpolkit_agent_1include_HEADERS =                        				\
- 	polkitagent.h									\
-+	polkitagentenumtypes.h								\
- 	polkitagenttypes.h								\
- 	polkitagentsession.h								\
- 	polkitagentlistener.h								\
-diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
-index d4495dd..8f0c878 100644
---- a/src/polkitagent/polkitagenthelperprivate.c
-+++ b/src/polkitagent/polkitagenthelperprivate.c
-@@ -48,8 +48,8 @@ _polkit_clearenv (void)
- gboolean
- send_dbus_message (const char *cookie, const char *user)
- {
--  PolkitAuthority *authority;
--  PolkitIdentity *identity;
-+  PolkitAuthority *authority = NULL;
-+  PolkitIdentity *identity = NULL;
-   GError *error;
-   gboolean ret;
- 
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
-index e91ad84..495f752 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
-@@ -116,7 +116,7 @@ static gboolean
- ensure_database (PolkitBackendSessionMonitor  *monitor,
-                  GError                      **error)
- {
--  gboolean ret;
-+  gboolean ret = FALSE;
- 
-   if (monitor->database != NULL)
-     {
diff --git a/abs/extra/rrd_stats/PKGBUILD b/abs/extra/rrd_stats/PKGBUILD
index 1f987e4..6df24f4 100644
--- a/abs/extra/rrd_stats/PKGBUILD
+++ b/abs/extra/rrd_stats/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=rrd_stats
 pkgver=1
-pkgrel=18
+pkgrel=19
 pkgdesc="graph system stats"
 arch=('i686' 'x86_64')
 url=""
@@ -18,4 +18,4 @@ build() {
   chown -R http:users $startdir/pkg/data/srv/httpd
   chmod -R 755 $startdir/pkg/data/srv/httpd
 }
-md5sums=('e3d5f7d56fd1a3f26af0226ddcc53bfa')
+md5sums=('4398623b9a8afb62743509e35c15b683')
diff --git a/abs/extra/rrd_stats/rrd_stats.tgz b/abs/extra/rrd_stats/rrd_stats.tgz
index 4f1f3f5..6532648 100644
--- a/abs/extra/rrd_stats/rrd_stats.tgz
+++ b/abs/extra/rrd_stats/rrd_stats.tgz
diff --git a/abs/extra/sdl_image/PKGBUILD b/abs/extra/sdl_image/PKGBUILD
index f3ab8cb..062490b 100644
--- a/abs/extra/sdl_image/PKGBUILD
+++ b/abs/extra/sdl_image/PKGBUILD
@@ -1,27 +1,22 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
 pkgname=sdl_image
-pkgver=1.2.6
-pkgrel=3
+pkgver=1.2.10
+pkgrel=2
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('sdl>=1.2.13' 'libpng' 'libjpeg' 'libtiff' 'zlib')
+depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
 options=('!libtool')
 url="http://www.libsdl.org/projects/SDL_image/"
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz
-	SDL_image-IMG_lbm.patch
-	SDL_image-buffer-overflow.patch)
-md5sums=('b866dc4f647517bdaf57f6ffdefd013e'
-         '81424f716513845f27e1b69459343327'
-         'e774a12d1a07b788233f6c15aca05780')
+source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
+md5sums=('6c06584b31559e2b59f2b982d0d1f628')
 
 build() {
-  cd ${startdir}/src/SDL_image-${pkgver}
-  patch -Np2 -i ${startdir}/src/SDL_image-IMG_lbm.patch || return 1
-  patch -Np2 -i ${startdir}/src/SDL_image-buffer-overflow.patch || return 1
+  cd ${srcdir}/SDL_image-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }
diff --git a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch b/abs/extra/sdl_image/SDL_image-IMG_lbm.patch
deleted file mode 100644
index cc4a29b..0000000
--- a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- trunk/SDL_image/IMG_lbm.c	2007/07/20 04:37:11	3341
-+++ trunk/SDL_image/IMG_lbm.c	2008/01/03 20:05:34	3521
-@@ -28,6 +28,7 @@
-    EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain
-    (http://www.multimania.com/mavati) in December 2003.
-    Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004.
-+   Buffer overflow fix in RLE decompression by David Raulo in January 2008.
- */
- 
- #include <stdio.h>
-@@ -328,7 +329,7 @@
- 						count ^= 0xFF;
- 						count += 2; /* now it */
- 
--						if ( !SDL_RWread( src, &color, 1, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
-@@ -339,7 +340,7 @@
- 					{
- 						++count;
- 
--						if ( !SDL_RWread( src, ptr, count, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
diff --git a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch b/abs/extra/sdl_image/SDL_image-buffer-overflow.patch
deleted file mode 100644
index 0be82dc..0000000
--- a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/SDL_image/IMG_gif.c	2007/12/28 08:17:23	3461
-+++ trunk/SDL_image/IMG_gif.c	2007/12/28 16:43:56	3462
-@@ -418,6 +418,10 @@
-     static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
-     register int i;
- 
-+    /* Fixed buffer overflow found by Michael Skladnikiewicz */
-+    if (input_code_size > MAX_LWZ_BITS)
-+        return -1;
-+
-     if (flag) {
- 	set_code_size = input_code_size;
- 	code_size = set_code_size + 1;
diff --git a/abs/extra/smartmontools/PKGBUILD b/abs/extra/smartmontools/PKGBUILD
index ecb4fd5..fe12bd5 100644
--- a/abs/extra/smartmontools/PKGBUILD
+++ b/abs/extra/smartmontools/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 
 pkgname=smartmontools
-pkgver=5.40
+pkgver=5.41
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
@@ -12,20 +12,17 @@ license=('GPL')
 arch=('i686' 'x86_64')
 depends=('gcc-libs')
 backup=('etc/smartd.conf')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        smartd)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+install=smartmontools.install
 
 build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/src/linux-2.6.37-LinHES
+  ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/src/linux-2.6.39-LinHES
   make || return 1
 }
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/etc/rc.d
-  install -D -m 755 ../smartd ${pkgdir}/etc/rc.d/smartd
 }
-md5sums=('0f0be0239914ad87830a4fff594bda5b'
-         '850f98b6792b7642ff193a49a2f1139d')
+md5sums=('4577886bea79d4ff12bd9a7d323ce692')
diff --git a/abs/extra/smartmontools/__changelog b/abs/extra/smartmontools/__changelog
new file mode 100644
index 0000000..8e0d8a6
--- /dev/null
+++ b/abs/extra/smartmontools/__changelog
@@ -0,0 +1,2 @@
+* remove the rc script. runit script in runit-scripts pkg
+* added smartmontools.install
diff --git a/abs/extra/smartmontools/smartmontools.install b/abs/extra/smartmontools/smartmontools.install
new file mode 100644
index 0000000..f2baacd
--- /dev/null
+++ b/abs/extra/smartmontools/smartmontools.install
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+post_install() {
+
+  echo ""
+  echo "==> Configure your /etc/smart.conf config file and then"
+  echo "==> $ sudo add_service.sh smartd"
+  echo "==> to start the monitoring service."
+
+}
+
+post_upgrade() {
+
+  post_install
+
+}
+
+pre_remove() {
+
+  if [ -L /service/smartd ]; then
+    remove_service.sh smartd
+  fi
+
+}
diff --git a/abs/extra/strace/PKGBUILD b/abs/extra/strace/PKGBUILD
index c965f24..5a33af7 100644
--- a/abs/extra/strace/PKGBUILD
+++ b/abs/extra/strace/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 13699 2008-09-27 22:25:37Z giovanni $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
 pkgname=strace
-pkgver=4.5.18
+pkgver=4.6
 pkgrel=1
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 arch=('i686' 'x86_64')
-license=('custom')
 url="http://sourceforge.net/projects/strace/"
-depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/strace/strace-$pkgver.tar.bz2)
-md5sums=('e9449fcee97e6a8ed73934c883c870e0')
+license=('custom')
+depends=('perl')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz)
+md5sums=('e537b2b1afeec70c0e6e27a0d0fd671e')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -Dm644 COPYRIGHT ${startdir}/pkg/usr/share/licenses/strace/COPYRIGHT
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+
+  install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/extra/strace/no_linux_socket_h.patch b/abs/extra/strace/no_linux_socket_h.patch
deleted file mode 100644
index f1c3598..0000000
--- a/abs/extra/strace/no_linux_socket_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- strace-4.5.12.orig/configure.ac
-+++ strace-4.5.12/configure.ac
-@@ -193,8 +193,7 @@
- 
- AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
- AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h], [], [])
--AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
--                 [], [], [#include <linux/socket.h>])
-+AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
- 
---- strace-4.5.12.orig/configure
-+++ strace-4.5.12/configure
-@@ -6945,7 +6945,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <linux/socket.h>
- 
- #include <$ac_header>
- _ACEOF
diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD
index a903a21..eab07f3 100644
--- a/abs/extra/subversion/PKGBUILD
+++ b/abs/extra/subversion/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=subversion
 pkgver=1.6.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Replacement for CVS, another versioning system (SVN)"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
diff --git a/abs/extra/sysstat/PKGBUILD b/abs/extra/sysstat/PKGBUILD
index 12f5afe..07c36c2 100644
--- a/abs/extra/sysstat/PKGBUILD
+++ b/abs/extra/sysstat/PKGBUILD
@@ -1,35 +1,38 @@
-# $Id: PKGBUILD,v 1.24 2009/05/25 09:04:21 sergej Exp $
+# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=9.0.3
+pkgver=10.0.1
 pkgrel=1
-pkgdesc="A collection of performance monitoring tools"
+pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
 license=('GPL')
-depends=(glibc)
+depends=('lm_sensors')
+optdepends=('tk: to use isag'
+	    'gnuplot: to use isag')
 options=(zipman)
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
         sysstat)
-md5sums=('0b464951596db934418259737cf50a31'
+md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579'
          'ad46159609a2c13b4a46b506ff847bf6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   ./configure --prefix=/usr \
-        --mandir=/usr/share/man \
-        --enable-install-isag \
+	--mandir=/usr/share/man \
+	--enable-install-isag \
 	--disable-man-group
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat && \
-  install -D -m 744 sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat && \
-  install -D -m 744 sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat && \
-  install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat || return 1
+  make
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat
+  install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat
+  install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat
+  install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat
   chown -R root:root $pkgdir
 }
diff --git a/abs/extra/tatir/__delete b/abs/extra/tatir/__delete
new file mode 100644
index 0000000..61aca57
--- /dev/null
+++ b/abs/extra/tatir/__delete
@@ -0,0 +1 @@
+this pkg is marked to be removed
diff --git a/abs/extra/thunar/PKGBUILD b/abs/extra/thunar/PKGBUILD
deleted file mode 100644
index 9f6c5b2..0000000
--- a/abs/extra/thunar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 80836 2010-05-22 14:19:16Z andyrtr $
-# Maintainer: andyrtr <andyrtr funnychar archlinux.org>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=thunar
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="new modern file manager for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://thunar.xfce.org"
-groups=('xfce4')
-depends=('libexif>=0.6.19' 'hicolor-icon-theme' 'fam' 'gtk2' 'exo>=0.3.107' \
-         'libxfce4util>=4.6.2' 'hal>=0.5.14' 'libpng' 'libjpeg>=8.0.1' \
-         'startup-notification')
-makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.4')
-optdepends=('gamin:   a fam replacement to make thunar monitor changes to files on the fly'
-            'xfce4-panel: for trash applet')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.0/Thunar-${pkgver}.tar.bz2)
-md5sums=('c91073202d373a1f9951a1240083c36d')
-
-build() {
-  cd ${srcdir}/Thunar-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static \
-    --disable-gnome-thumbnailers --enable-exif --enable-pcre
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/Thunar-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  sed -i 's:x-directory/gnome-default-handler;::' \
-    ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop
-}
diff --git a/abs/extra/thunar/__changelog b/abs/extra/thunar/__changelog
deleted file mode 100644
index 630ddfa..0000000
--- a/abs/extra/thunar/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove dep for desktop-file-utils
diff --git a/abs/extra/thunar/thunar.install b/abs/extra/thunar/thunar.install
deleted file mode 100644
index 28fdb48..0000000
--- a/abs/extra/thunar/thunar.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/abs/extra/valgrind/PKGBUILD b/abs/extra/valgrind/PKGBUILD
new file mode 100644
index 0000000..0ac6fd4
--- /dev/null
+++ b/abs/extra/valgrind/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.6.1
+pkgrel=2
+pkgdesc="A tool to help find memory-management problems in programs"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://valgrind.org/"
+depends=('glibc>=2.14' 'glibc<2.15' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.6.1-glibc-2.14.patch
+        glibc-patch-version.patch)    
+md5sums=('2c3aa122498baecc9d69194057ca88f5'
+         '560032ce5d27ef0c7c1af32c3fd45833'
+         'b657f0ebdde3d9aefc9fd16f9e653702')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # make sure our CFLAGS are respected
+  sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+
+  # glibc-2.14 compatibility
+  patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch
+
+  # prevent need to rebuild with glibc patch level version bumps
+  patch -Np1 -i ${srcdir}/glibc-patch-version.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/abs/extra/valgrind/glibc-patch-version.patch b/abs/extra/valgrind/glibc-patch-version.patch
new file mode 100644
index 0000000..2c6830a
--- /dev/null
+++ b/abs/extra/valgrind/glibc-patch-version.patch
@@ -0,0 +1,52 @@
+Saves having to rebuild valgrind on glibc-x.x.* patch level releases
+
+diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in
+--- valgrind-3.5.0-old//glibc-2.X.supp.in	2009-08-19 23:37:48.000000000 +1000
++++ valgrind-3.5.0/glibc-2.X.supp.in	2010-05-22 19:43:08.088007038 +1000
+@@ -168,9 +168,9 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:__sendto_nocancel
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+    fun:__nscd_get_map_ref
+    fun:nscd_get*_r
+    fun:*nscd*
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ 
+@@ -199,18 +199,18 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    X11-64bit-padding-4b
+    Memcheck:Param
+    socketcall.send(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ ##----------------------------------------------------------------------##
diff --git a/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch
new file mode 100644
index 0000000..7fd2170
--- /dev/null
+++ b/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch
@@ -0,0 +1,67 @@
+--- valgrind/configure.in.jj	2010-10-21 03:14:02.000000000 +0200
++++ valgrind/configure.in	2010-11-05 17:09:18.674455299 +0100
+@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.14)
++	AC_MSG_RESULT(2.14 family)
++	AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      aix5)
+ 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
+ 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+--- valgrind/config.h.in.jj	2010-10-20 22:20:49.000000000 +0200
++++ valgrind/config.h.in	2010-11-05 17:08:33.863454886 +0100
+@@ -33,6 +33,9 @@
+ /* Define to 1 if you're using glibc 2.13.x */
+ #undef GLIBC_2_13
+ 
++/* Define to 1 if you're using glibc 2.14.x */
++#undef GLIBC_2_14
++
+ /* Define to 1 if you're using glibc 2.2.x */
+ #undef GLIBC_2_2
+ 
+--- valgrind/configure.jj	2010-10-21 03:16:18.000000000 +0200
++++ valgrind/configure	2010-11-05 17:09:39.163455396 +0100
+@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.14)
++	echo "$as_me:$LINENO: result: 2.14 family" >&5
++echo "${ECHO_T}2.14 family" >&6
++
++cat >>confdefs.h <<\_ACEOF
++#define GLIBC_2_14 1
++_ACEOF
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      aix5)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5
+ $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; }
+@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
+ 	as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
diff --git a/abs/extra/x11vnc/PKGBUILD b/abs/extra/x11vnc/PKGBUILD
index 543a7ab..8e6835f 100644
--- a/abs/extra/x11vnc/PKGBUILD
+++ b/abs/extra/x11vnc/PKGBUILD
@@ -2,20 +2,28 @@
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=x11vnc
-pkgver=0.9.9
+pkgver=0.9.12
 pkgrel=1
 pkgdesc="a VNC server for real X displays"
 arch=("i686" "x86_64")
 license=("GPL2")
-#source=(http://dl.sourceforge.net/sourceforge/libvncserver/$pkgname-$pkgver.tar.gz)
 url="http://www.karlrunge.com/x11vnc/"
-source=("http://x11vnc.sourceforge.net/dev/$pkgname-$pkgver.tar.gz")
-depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+source=("http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz")
+depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama'
+         'libxdamage' 'libxrandr' 'avahi' 'recordproto')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure
+
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
+
+}
+
+package() {
+
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make prefix=${pkgdir}/usr install || return 1
+
 }
-md5sums=('874008821a0588a73ec7fbe09b747bb0')
+md5sums=('1498a68d02aa7b6c97bf746c073c8d00')
diff --git a/abs/extra/xfce4-panel/PKGBUILD b/abs/extra/xfce4-panel/PKGBUILD
deleted file mode 100644
index f11c0b1..0000000
--- a/abs/extra/xfce4-panel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 80831 2010-05-22 13:45:04Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-panel
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="Panel for the Xfce desktop environment"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("libxfcegui4>=4.6.4" 'exo>=0.3.107' 'libwnck' 'hicolor-icon-theme')
-makedepends=('pkgconfig' "xfconf>=4.6.2" 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('82f10a42aefca4cc26a6633e7478cc65')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/xfce4-panel/xfce4-panel.install b/abs/extra/xfce4-panel/xfce4-panel.install
deleted file mode 100644
index 21b79d2..0000000
--- a/abs/extra/xfce4-panel/xfce4-panel.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/abs/extra/xine-ui/ChangeLog b/abs/extra/xine-ui/ChangeLog
deleted file mode 100644
index bfb45aa..0000000
--- a/abs/extra/xine-ui/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-2010-03-23  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.6-1
-	* Upstream update
-	* Cleaned up depends
-	* Removed optdepends
-	* Replaced lirc makedepends by lirc-utils
-	* Added shared-mime-info depends
-
-2010-01-19  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.5-6
-	* Rebuilt for libpng 1.4 and libjpeg 8
-	* Added install scriptlet to update icon cache
-
-2009-06-18  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.5-5
-	* Rebuilt against readline 6.0.00
-
-2008-08-19  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.5-4
-	* Added xine and xine-remote binaries (missing in 0.99.5-3)
-	* Added missing libxt makedepends
-	* Replaced .install file by an optdepends
-	* Added ChangeLog
diff --git a/abs/extra/xine-ui/PKGBUILD b/abs/extra/xine-ui/PKGBUILD
index 4c5471f..59ae0cb 100644
--- a/abs/extra/xine-ui/PKGBUILD
+++ b/abs/extra/xine-ui/PKGBUILD
@@ -1,41 +1,43 @@
-# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.xine-project.org"
 depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft'
 	'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
-	'lirc-utils')
+	'desktop-file-utils' 'lirc-utils')
 makedepends=('libxt')
 options=('!emptydirs' '!strip')
-install=${pkgname}.install
+install=xine-ui.install
 source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
-	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff)
+	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch 
+        fix_lirc.diff xine-ui-xdg.diff)
 md5sums=('d468b4e7fe39ff19888261e1da9be914'
          '4f06f63f5fd55b08a648e5d63f881898'
          '9f5acaf14f3945aa2ce428631d09cd47'
-         '0174bd096756b9c6f47e9b8b5ff6e145')
+         '0174bd096756b9c6f47e9b8b5ff6e145'
+         '5972b4061acf3b553760de9ae2178d38')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1
-  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1
-  patch -p1 < "${srcdir}/fix_lirc.diff" || return 1
-  autoconf || return 1
-
+  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch"
+  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
+  patch -p1 < "${srcdir}/fix_lirc.diff"
+  patch -p1 < "${srcdir}/xine-ui-xdg.diff"
+  autoconf
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug || return 1
-  make || return 1
+    --with-x --enable-lirc --without-aalib --enable-debug
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}/usr/share/applications"
   mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
 }
diff --git a/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 b/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1
deleted file mode 100644
index d1d33d7..0000000
--- a/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1
+++ /dev/null
@@ -1,2 +0,0 @@
-/data/linhes_pkgbuild/abs/extra/xine-ui/PKGBUILD: line 25: cd: /data/linhes_pkgbuild/abs/extra/xine-ui/src/xine-ui-0.99.6: No such file or directory
-[1m    Aborting...(B[m
diff --git a/abs/extra/xine-ui/xine-ui-xdg.diff b/abs/extra/xine-ui/xine-ui-xdg.diff
new file mode 100644
index 0000000..959d674
--- /dev/null
+++ b/abs/extra/xine-ui/xine-ui-xdg.diff
@@ -0,0 +1,206 @@
+--- xine-ui-0.99.6.orig/src/xitk/common.h
++++ xine-ui-0.99.6/src/xitk/common.h
+@@ -331,6 +331,5 @@ typedef struct {
+   int                       use_root_window;
+ 
+   int                       ssaver_enabled;
+-  int                       ssaver_timeout;
+ 
+   int                       skip_by_chapter;
+--- xine-ui-0.99.6.orig/src/xitk/main.c
++++ xine-ui-0.99.6/src/xitk/main.c
+@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
+   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
+     fprintf (stderr, "sigprocmask() failed.\n");
+ 
++  signal(SIGCHLD, SIG_IGN);
++
+   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
+   
+   gGui->stream                 = NULL;
+--- xine-ui-0.99.6.orig/src/xitk/panel.c
++++ xine-ui-0.99.6/src/xitk/panel.c
+@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
+  * Update slider thread.
+  */
+ static void *slider_loop(void *dummy) {
+-  int screensaver_timer = 0;
+   int status, speed;
+   int pos, secs;
+   int i = 0;
+@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
+ 	else
+ 	  video_window_set_mrl((char *)gGui->mmk.mrl);
+ 	
+-	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
+-	  
+-	  if(gGui->ssaver_timeout) {
+-	    
+-	    if(!(i % 2))
+-	      screensaver_timer++;
+-	    
+-	    if(screensaver_timer >= gGui->ssaver_timeout) {
+-	      screensaver_timer = 0;
+-	      video_window_reset_ssaver();
+-	      
+-	    }
+-	  }  
+-	}
++       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
+ 
+ 	if(gGui->logo_mode == 0) {
+ 	  
+@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
+ 	    stream_infos_update_infos();
+ 
+ 	}
++      } else {
++       video_window_suspend_ssaver(0);
+       }
+     }
+     
+--- xine-ui-0.99.6.orig/src/xitk/videowin.c
++++ xine-ui-0.99.6/src/xitk/videowin.c
+@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
+ 
+   /* The old window should be destroyed now */
+   if(old_video_window != None) {
++    /* Screensaver control is tied to our window id */
++    video_window_suspend_ssaver(0);
++
+     XDestroyWindow(gGui->video_display, old_video_window);
+      
+     if(gGui->cursor_grabbed)
+@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
+ 
+ }
+ 
+-void video_window_reset_ssaver(void) {
++void video_window_suspend_ssaver(int do_suspend) {
++  static int was_suspended;
+ 
+-  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
++  do_suspend = do_suspend && gGui->ssaver_enabled;
+ 
+-#ifdef HAVE_XTESTEXTENSION
+-    if(gVw.have_xtest == True) {
+-      
+-      gVw.fake_key_cur++;
+-      
+-      if(gVw.fake_key_cur >= 2)
+-	gVw.fake_key_cur = 0;
+-
+-      XLockDisplay(gGui->video_display);
+-      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
+-      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
+-      XSync(gGui->video_display, False);
+-      XUnlockDisplay(gGui->video_display);
++  if(was_suspended != do_suspend) {
++    if(fork() == 0) {
++      char window_id[30];
++      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
++      int fd;
++
++      for(fd = 3; fd < 256; fd++)
++	close(fd);
++
++      args[1] = do_suspend ? "suspend" : "resume";
++      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
++      execvp(args[0], args);
++      _exit(0);
+     }
+-    else 
+-#endif
+-    {
+-      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
+-      /* assuming its location and permission will not change during run time of xine-ui. */
+-      {
+-	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
+-	static char *gssaver_path   = NULL;
+-
+-	if(!gssaver_path) {
+-	  char *path = getenv("PATH");
+-
+-	  if(!path)
+-	    path = "/usr/local/bin:/usr/bin";
+-	  do {
+-	    char *p, *pbuf;
+-	    int   plen;
+-
+-	    for(p = path; *path && *path != ':'; path++)
+-	      ;
+-	    if(p == path)
+-	      plen = 1, p = ".";
+-	    else
+-	      plen = path - p;
+-	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
+-	    if ( access(pbuf, X_OK) ) {
+-	      free(pbuf);
+-	      gssaver_path = "";
+-	    } else
+-	      gssaver_path = pbuf;
+-	  } while(!gssaver_path[0] && *path++);
+-	}
+-	if(gssaver_path[0] && (fork() == 0)) {
+-	  execv(gssaver_path, gssaver_args);
+-	  exit(0);
+-	}
+-      }
+ 
+-      XLockDisplay(gGui->video_display);
+-      XResetScreenSaver(gGui->video_display);
+-      XUnlockDisplay(gGui->video_display);
+-    }
++    was_suspended = do_suspend;
+   }
+ }
+ 
++void video_window_reset_ssaver(void) {
++  video_window_suspend_ssaver(1);
++}
++
+ void video_window_get_frame_size(int *w, int *h) {
+   if(w)
+     *w = gVw.frame_width;
+--- xine-ui-0.99.6.orig/src/xitk/videowin.h
++++ xine-ui-0.99.6/src/xitk/videowin.h
+@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
+ void video_window_update_logo(void);
+ void video_window_change_skins(int);
+ 
++void video_window_suspend_ssaver(int do_suspend);
+ void video_window_reset_ssaver(void);
+ 
+ void video_window_get_frame_size(int *w, int *h);
+--- xine-ui-0.99.6.orig/src/xitk/event.c
++++ xine-ui-0.99.6/src/xitk/event.c
+@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
+   gGui->skip_by_chapter = cfg->num_value;
+   panel_update_nextprev_tips();
+ }
+-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
+-  gGui->ssaver_timeout = cfg->num_value;
+-}
+ 
+ static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
+   
+@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
+ 					 snapshot_loc_cb,
+ 					 CONFIG_NO_DATA);
+   
+-  gGui->ssaver_timeout =
+-    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
+-			      _("Screensaver reset interval (s)"),
+-			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
+-			      CONFIG_LEVEL_ADV,
+-			      ssaver_timeout_cb,
+-			      CONFIG_NO_DATA);
+-  
+   gGui->skip_by_chapter = 
+     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
+ 			       _("Chapter hopping"),
+
+
+
+
+ 
diff --git a/abs/extra/xine-ui/xine-ui.install b/abs/extra/xine-ui/xine-ui.install
index 8afc566..3b3aff7 100644
--- a/abs/extra/xine-ui/xine-ui.install
+++ b/abs/extra/xine-ui/xine-ui.install
@@ -1,6 +1,7 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
author	Cecil <knoppmyth@gmail.com>	2011-08-06 19:10:30 (GMT)
committer	Cecil <knoppmyth@gmail.com>	2011-08-06 19:10:30 (GMT)
commit	ad58e3033f6bb5137b8dcb0e7eca12d50d888402 (patch)
tree	9321335a68173bc3e4c1d237c19c8880411fa676 /abs/extra
parent	998faf16b1b62493b39aa13b3cb53dfac266ef4c (diff)
parent	9709ca528ca5dfbdb6ec6ea283ac6670e8f33b9d (diff)
download	linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.zip linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.gz linhes_pkgbuild-ad58e3033f6bb5137b8dcb0e7eca12d50d888402.tar.bz2